Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1192248 - Fix wchar_t/char16_t mismatch WinIMEHandler.cpp. r=masayuki

Browse Source 
--HG--
extra : source : 964d3b1c37c71524344e8a0d691655162204210c
This commit is contained in:
Jacek Caban 2015-08-10 09:24:57 +10:00
parent 91a0fc233b
commit 3e9f91bf1f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widget/windows/WinIMEHandler.cpp
View File

@ -705,7 +705,7 @@ IMEHandler::ShowOnScreenKeyboard()
L"{054AAE20-4BEA-4347-8A35-64A533254A9D}\\LocalServer32";
if (!WinUtils::GetRegistryKey(HKEY_LOCAL_MACHINE,
kRegKeyName,
0,
nullptr,
path,
sizeof path)) {
return;
@ -745,7 +745,8 @@ IMEHandler::ShowOnScreenKeyboard()
if (FAILED(hres) || !path) {
return;
}
commonProgramFilesPath = nsDependentString(path).get();
commonProgramFilesPath =
static_cast<const wchar_t*>(nsDependentString(path).get());
::CoTaskMemFree(path);
}
wstrpath.replace(commonProgramFilesOffset,
@ -757,14 +758,14 @@ IMEHandler::ShowOnScreenKeyboard()
Preferences::SetString(kOskPathPrefName, cachedPath);
}
LPCWSTR cachedPathPtr;
const char16_t *cachedPathPtr;
cachedPath.GetData(&cachedPathPtr);
HINSTANCE ret = ::ShellExecuteW(nullptr,
L"",
cachedPathPtr,
nullptr,
nullptr,
SW_SHOW);
ShellExecuteW(nullptr,
L"",
char16ptr_t(cachedPathPtr),
nullptr,
nullptr,
SW_SHOW);
sShowingOnScreenKeyboard = true;
}