corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 945245 - Fixed misc char16_t/wchar_t mismatches. r=ehsan

Browse Source
This commit is contained in:
Jacek Caban
2013-12-03 16:09:50 +01:00
parent 1ff8afb08c
commit bb5cc03789
20 changed files with 40 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
browser/components/shell/src/nsWindowsShellService.cpp
View File

@@ -410,7 +410,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
// otherwise.
*aIsDefaultBrowser = true;
PRUnichar exePath[MAX_BUF];
wchar_t exePath[MAX_BUF];
if (!::GetModuleFileNameW(0, exePath, MAX_BUF))
return NS_ERROR_FAILURE;
@@ -424,7 +424,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
HKEY theKey;
DWORD res;
nsresult rv;
PRUnichar currValue[MAX_BUF];
wchar_t currValue[MAX_BUF];
SETTING* settings = gSettings;
if (!aForAllTypes && IsWin8OrLater()) {
@@ -611,7 +611,7 @@ DynSHOpenWithDialog(HWND hwndParent, const OPENASINFO *poainfo)
// shell32.dll is in the knownDLLs list so will always be loaded from the
// system32 directory.
static const PRUnichar kSehllLibraryName[] = L"shell32.dll";
static const wchar_t kSehllLibraryName[] = L"shell32.dll";
HMODULE shellDLL = ::LoadLibraryW(kSehllLibraryName);
if (!shellDLL) {
return NS_ERROR_FAILURE;
@@ -967,7 +967,7 @@ nsWindowsShellService::OpenApplication(int32_t aApplication)
if (NS_FAILED(rv))
return rv;
PRUnichar buf[MAX_BUF];
wchar_t buf[MAX_BUF];
DWORD type, len = sizeof buf;
DWORD res = ::RegQueryValueExW(theKey, EmptyString().get(), 0,
&type, (LPBYTE)&buf, &len);
@@ -1068,7 +1068,7 @@ nsWindowsShellService::SetDesktopBackgroundColor(uint32_t aColor)
nsIWindowsRegKey::ACCESS_SET_VALUE);
NS_ENSURE_SUCCESS(rv, rv);
PRUnichar rgb[12];
wchar_t rgb[12];
_snwprintf(rgb, 12, L"%u %u %u", r, g, b);
rv = regKey->WriteStringValue(NS_LITERAL_STRING("Background"),