Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Use UNICODE versions of Win32 API

Browse source
This commit is contained in:
kervala 2016-12-02 15:57:25 +01:00
parent 832da192ec
commit fbac57da97
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
code/nel/src/misc/common.cpp
View file

@ -1416,17 +1416,17 @@ NLMISC_CATEGORISED_COMMAND(nel, killProgram, "kill a program given the pid", "<p
} }
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
LONG GetRegKey(HKEY key, LPCSTR subkey, LPSTR retdata) LONG GetRegKey(HKEY key, LPCWSTR subkey, LPWSTR retdata)
{ {
HKEY hkey; HKEY hkey;
LONG retval = RegOpenKeyExA(key, subkey, 0, KEY_QUERY_VALUE, &hkey); LONG retval = RegOpenKeyExW(key, subkey, 0, KEY_QUERY_VALUE, &hkey);
if (retval == ERROR_SUCCESS) if (retval == ERROR_SUCCESS)
{ {
long datasize = MAX_PATH; long datasize = MAX_PATH;
char data[MAX_PATH]; wchar_t data[MAX_PATH];
RegQueryValueA(hkey, NULL, data, &datasize); RegQueryValueW(hkey, NULL, data, &datasize);
lstrcpyA(retdata,data); lstrcpyW(retdata, data);
RegCloseKey(hkey); RegCloseKey(hkey);
} }
@ -1438,16 +1438,17 @@ static bool openDocWithExtension (const char *document, const char *ext)
{ {
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
// First try ShellExecute() // First try ShellExecute()
HINSTANCE result = ShellExecuteA(NULL, "open", document, NULL, NULL, SW_SHOWDEFAULT); HINSTANCE result = ShellExecuteW(NULL, L"open", utf8ToWide(document), NULL, NULL, SW_SHOWDEFAULT);
// If it failed, get the .htm regkey and lookup the program // If it failed, get the .htm regkey and lookup the program
if ((uintptr_t)result <= HINSTANCE_ERROR) if ((uintptr_t)result <= HINSTANCE_ERROR)
{ {
char key[MAX_PATH + MAX_PATH]; wchar_t key[MAX_PATH + MAX_PATH];
if (GetRegKey(HKEY_CLASSES_ROOT, ext, key) == ERROR_SUCCESS) // get the type of the extension
if (GetRegKey(HKEY_CLASSES_ROOT, utf8ToWide("." + ext), key) == ERROR_SUCCESS)
{ {
lstrcatA(key, "\\shell\\open\\command"); lstrcatW(key, L"\\shell\\open\\command");
if (GetRegKey(HKEY_CLASSES_ROOT, key, key) == ERROR_SUCCESS) if (GetRegKey(HKEY_CLASSES_ROOT, key, key) == ERROR_SUCCESS)
{ {