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

bug 272166 : nsIWindowsShellService::getRegistryEntry does not support non-latin1 keys/values (r=mconnor, sr=darin, a=asa)

Browse Source
This commit is contained in:
jshin@mailaps.org
2005-05-24 11:30:49 +00:00
parent 4979ae4136
commit e6d0189a3e
2 changed files with 1 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1009,54 +1009,6 @@ nsWindowsShellService::GetMailAccountKey(HKEY* aResult)
return PR_FALSE;
}
NS_IMETHODIMP
nsWindowsShellService::GetRegistryEntry(PRInt32 aHKEYConstant,
const char *aSubKeyName,
const char *aValueName,
char **aResult)
{
HKEY hKey, fullKey;
*aResult = 0;
// Calculate HKEY_* base key
switch (aHKEYConstant) {
case HKCR:
hKey = HKEY_CLASSES_ROOT;
break;
case HKCC:
hKey = HKEY_CURRENT_CONFIG;
break;
case HKCU:
hKey = HKEY_CURRENT_USER;
break;
case HKLM:
hKey = HKEY_LOCAL_MACHINE;
break;
case HKU:
hKey = HKEY_USERS;
break;
default:
return NS_ERROR_INVALID_ARG;
}
// Open Key
LONG rv = ::RegOpenKeyEx(hKey, aSubKeyName, 0, KEY_READ, &fullKey);
if (rv == ERROR_SUCCESS) {
char buffer[4096] = { 0 };
DWORD len = sizeof buffer;
rv = ::RegQueryValueEx(fullKey, aValueName, NULL, NULL,
(LPBYTE)buffer, &len);
if (rv == ERROR_SUCCESS)
*aResult = PL_strdup(buffer);
}
::RegCloseKey(fullKey);
return *aResult ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
NS_IMETHODIMP
nsWindowsShellService::Observe(nsISupports* aObject, const char* aTopic, const PRUnichar* aMessage)
{