Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

RegQueryValueExW and RegQueryValueExA calls accept bytes. Patch by Victor Martinez Calvo. CORE-9665 #comment Thanks!

Browse source 
svn path=/trunk/; revision=72947
This commit is contained in:
Mark Jansen 2016-10-09 20:58:08 +00:00
parent fc0c290789
commit aef3f9c467
15 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/applications/mstsc/connectdialog.c
View file

@ -138,7 +138,7 @@ LoadUsernameHint(HWND hDlg, INT iCur)
if(RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) if(RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS)
break; break;
dwSize = MAXVALUE; dwSize = MAXVALUE * sizeof(WCHAR);
if(RegQueryValueExW(hKey, L"UsernameHint", 0, NULL, (LPBYTE)szValue, &dwSize) == ERROR_SUCCESS) if(RegQueryValueExW(hKey, L"UsernameHint", 0, NULL, (LPBYTE)szValue, &dwSize) == ERROR_SUCCESS)
{ {
@ -185,7 +185,7 @@ FillServerAddesssCombo(PINFO pInfo)
NULL); NULL);
if (ret == ERROR_SUCCESS) if (ret == ERROR_SUCCESS)
{ {
size = MAX_KEY_NAME; size = sizeof(Name);
if (RegQueryValueExW(hKey, if (RegQueryValueExW(hKey,
Name, Name,
0, 0,

10
reactos/base/applications/rapps/installed.c
View file

@ -11,7 +11,7 @@
BOOL BOOL
GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString) GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString)
{ {
DWORD dwSize = MAX_PATH; DWORD dwSize = MAX_PATH * sizeof(WCHAR);
if (RegQueryValueExW(hKey, if (RegQueryValueExW(hKey,
lpKeyName, lpKeyName,
@ -50,7 +50,7 @@ IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey)
if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS) if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS)
{ {
dwType = REG_SZ; dwType = REG_SZ;
dwSize = MAX_PATH; dwSize = sizeof(szDisplayName);
if (RegQueryValueExW(hSubKey, if (RegQueryValueExW(hSubKey,
L"DisplayName", L"DisplayName",
NULL, NULL,
@ -118,7 +118,7 @@ UninstallApplication(INT Index, BOOL bModify)
hKey = ItemInfo->hSubKey; hKey = ItemInfo->hSubKey;
dwType = REG_SZ; dwType = REG_SZ;
dwSize = MAX_PATH; dwSize = sizeof(szPath);
if (RegQueryValueExW(hKey, if (RegQueryValueExW(hKey,
bModify ? szModify : szUninstall, bModify ? szModify : szUninstall,
NULL, NULL,
@ -254,7 +254,7 @@ EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc)
} }
dwType = REG_SZ; dwType = REG_SZ;
dwSize = MAX_PATH; dwSize = sizeof(pszParentKeyName);
bIsUpdate = (RegQueryValueExW(Info.hSubKey, bIsUpdate = (RegQueryValueExW(Info.hSubKey,
L"ParentKeyName", L"ParentKeyName",
NULL, NULL,
@ -262,7 +262,7 @@ EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc)
(LPBYTE)pszParentKeyName, (LPBYTE)pszParentKeyName,
&dwSize) == ERROR_SUCCESS); &dwSize) == ERROR_SUCCESS);
dwSize = MAX_PATH; dwSize = sizeof(pszDisplayName);
if (RegQueryValueExW(Info.hSubKey, if (RegQueryValueExW(Info.hSubKey,
L"DisplayName", L"DisplayName",
NULL, NULL,

10
reactos/base/applications/rapps_new/installed.cpp
View file

@ -11,7 +11,7 @@
BOOL BOOL
GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR lpString) GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR lpString)
{ {
DWORD dwSize = MAX_PATH; DWORD dwSize = MAX_PATH * sizeof(WCHAR);
if (RegQueryValueExW(hKey, if (RegQueryValueExW(hKey,
lpKeyName, lpKeyName,
@ -50,7 +50,7 @@ IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey)
if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS) if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS)
{ {
dwType = REG_SZ; dwType = REG_SZ;
dwSize = MAX_PATH; dwSize = sizeof(szDisplayName);
if (RegQueryValueExW(hSubKey, if (RegQueryValueExW(hSubKey,
L"DisplayName", L"DisplayName",
NULL, NULL,
@ -118,7 +118,7 @@ UninstallApplication(INT Index, BOOL bModify)
hKey = ItemInfo->hSubKey; hKey = ItemInfo->hSubKey;
dwType = REG_SZ; dwType = REG_SZ;
dwSize = MAX_PATH; dwSize = sizeof(szPath);
if (RegQueryValueExW(hKey, if (RegQueryValueExW(hKey,
bModify ? szModify : szUninstall, bModify ? szModify : szUninstall,
NULL, NULL,
@ -254,7 +254,7 @@ EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc)
} }
dwType = REG_SZ; dwType = REG_SZ;
dwSize = MAX_PATH; dwSize = sizeof(pszParentKeyName);
bIsUpdate = (RegQueryValueExW(Info.hSubKey, bIsUpdate = (RegQueryValueExW(Info.hSubKey,
L"ParentKeyName", L"ParentKeyName",
NULL, NULL,
@ -262,7 +262,7 @@ EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc)
(LPBYTE)pszParentKeyName, (LPBYTE)pszParentKeyName,
&dwSize) == ERROR_SUCCESS); &dwSize) == ERROR_SUCCESS);
dwSize = MAX_PATH; dwSize = sizeof(pszDisplayName);
if (RegQueryValueExW(Info.hSubKey, if (RegQueryValueExW(Info.hSubKey,
L"DisplayName", L"DisplayName",
NULL, NULL,

2
reactos/base/applications/regedit/framewnd.c
View file

@ -774,7 +774,7 @@ static void ChooseFavorite(LPCWSTR pszFavorite)
if (RegOpenKeyExW(HKEY_CURRENT_USER, s_szFavoritesRegKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) if (RegOpenKeyExW(HKEY_CURRENT_USER, s_szFavoritesRegKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS)
goto done; goto done;
cbData = (sizeof(szFavoritePath) / sizeof(szFavoritePath[0])) - 1; cbData = sizeof(szFavoritePath);
memset(szFavoritePath, 0, sizeof(szFavoritePath)); memset(szFavoritePath, 0, sizeof(szFavoritePath));
if (RegQueryValueExW(hKey, pszFavorite, NULL, &dwType, (LPBYTE) szFavoritePath, &cbData) != ERROR_SUCCESS) if (RegQueryValueExW(hKey, pszFavorite, NULL, &dwType, (LPBYTE) szFavoritePath, &cbData) != ERROR_SUCCESS)
goto done; goto done;

2
reactos/base/applications/taskmgr/procpage.c
View file

@ -390,7 +390,7 @@ void ProcessPageShowContextMenu(DWORD dwProcessId)
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_READ, &hKey) == ERROR_SUCCESS) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_READ, &hKey) == ERROR_SUCCESS)
{ {
dwDebuggerSize = 260; dwDebuggerSize = sizeof(strDebugger);
if (RegQueryValueExW(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) == ERROR_SUCCESS) if (RegQueryValueExW(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) == ERROR_SUCCESS)
{ {
CharUpper(strDebugger); CharUpper(strDebugger);

2
reactos/base/system/services/rpcserver.c
View file

@ -841,7 +841,7 @@ Int_EnumDependentServicesW(HKEY hServicesKey,
if (dwError != ERROR_SUCCESS) if (dwError != ERROR_SUCCESS)
return dwError; return dwError;
dwSize = MAX_PATH; dwSize = MAX_PATH * sizeof(WCHAR);
/* Check for the DependOnService Value */ /* Check for the DependOnService Value */
dwError = RegQueryValueExW(hServiceEnumKey, dwError = RegQueryValueExW(hServiceEnumKey,

2
reactos/base/system/winlogon/setup.c
View file

@ -80,7 +80,7 @@ RunSetupThreadProc(
return FALSE; return FALSE;
/* Read key */ /* Read key */
dwSize = (sizeof(Shell) / sizeof(Shell[0])) - 1; dwSize = sizeof(Shell);
dwError = RegQueryValueExW(hKey, dwError = RegQueryValueExW(hKey,
L"CmdLine", L"CmdLine",
NULL, NULL,

2
reactos/dll/cpl/wined3dcfg/general.c
View file

@ -51,7 +51,7 @@ WINED3D_SETTINGS gwd3dsDdRender[] =
void InitControl(HWND hWndDlg, HKEY hKey, PWCHAR szKey, PWINED3D_SETTINGS pSettings, INT iControlId, INT iCount) void InitControl(HWND hWndDlg, HKEY hKey, PWCHAR szKey, PWINED3D_SETTINGS pSettings, INT iControlId, INT iCount)
{ {
WCHAR szBuffer[MAX_KEY_LENGTH]; WCHAR szBuffer[MAX_KEY_LENGTH];
DWORD dwSize = MAX_KEY_LENGTH; DWORD dwSize = sizeof(szBuffer);
DWORD dwType = 0; DWORD dwType = 0;
INT iCurrent; INT iCurrent;
INT iActive = 0; INT iActive = 0;

4
reactos/dll/win32/avicap32/avicap32.c
View file

@ -179,7 +179,7 @@ capGetDriverDescriptionW(WORD wDriverIndex,
{ {
if (RegOpenKeyW(hKey, szDriver, &hSubKey) == ERROR_SUCCESS) if (RegOpenKeyW(hKey, szDriver, &hSubKey) == ERROR_SUCCESS)
{ {
dwSize = sizeof(szFileName) / sizeof(WCHAR); dwSize = sizeof(szFileName);
if (RegQueryValueExW(hSubKey, if (RegQueryValueExW(hSubKey,
L"Driver", L"Driver",
@ -188,7 +188,7 @@ capGetDriverDescriptionW(WORD wDriverIndex,
(LPBYTE)&szFileName, (LPBYTE)&szFileName,
&dwSize) == ERROR_SUCCESS) &dwSize) == ERROR_SUCCESS)
{ {
dwSize = sizeof(szDriverName) / sizeof(WCHAR); dwSize = sizeof(szDriverName);
if (RegQueryValueExW(hSubKey, if (RegQueryValueExW(hSubKey,
L"FriendlyName", L"FriendlyName",

2
reactos/dll/win32/powrprof/powrprof.c
View file

@ -299,7 +299,7 @@ GetActivePwrScheme(PUINT puiID)
return FALSE; return FALSE;
} }
dwSize = MAX_PATH; dwSize = sizeof(szBuf);
Err = RegQueryValueExW(hKey, L"CurrentPowerPolicy", Err = RegQueryValueExW(hKey, L"CurrentPowerPolicy",
NULL, NULL, NULL, NULL,
(LPBYTE)&szBuf, &dwSize); (LPBYTE)&szBuf, &dwSize);

2
reactos/dll/win32/secur32/sspi.c
View file

@ -531,7 +531,7 @@ static void SECUR32_initializeProviders(void)
if (apiRet == ERROR_SUCCESS) if (apiRet == ERROR_SUCCESS)
{ {
WCHAR securityPkgNames[MAX_PATH]; /* arbitrary len */ WCHAR securityPkgNames[MAX_PATH]; /* arbitrary len */
DWORD size = sizeof(securityPkgNames) / sizeof(WCHAR), type; DWORD size = sizeof(securityPkgNames), type;
apiRet = RegQueryValueExW(key, securityProvidersW, NULL, &type, apiRet = RegQueryValueExW(key, securityProvidersW, NULL, &type,
(PBYTE)securityPkgNames, &size); (PBYTE)securityPkgNames, &size);

5
reactos/dll/win32/setupapi/install.c
View file

@ -228,7 +228,8 @@ static void append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s
if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return; if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return;
if (type != REG_MULTI_SZ) return; if (type != REG_MULTI_SZ) return;
if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size + str_size) * sizeof(WCHAR) ))) return; size = size + str_size * sizeof(WCHAR) ;
if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size))) return;
if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) goto done; if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) goto done;
/* compare each string against all the existing ones */ /* compare each string against all the existing ones */
@ -271,7 +272,7 @@ static void delete_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s
if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return; if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return;
if (type != REG_MULTI_SZ) return; if (type != REG_MULTI_SZ) return;
/* allocate double the size, one for value before and one for after */ /* allocate double the size, one for value before and one for after */
if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size * 2 * sizeof(WCHAR) ))) return; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size * 2))) return;
if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) goto done; if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) goto done;
src = buffer; src = buffer;
dst = buffer + size; dst = buffer + size;

2
reactos/dll/win32/setupapi/interface.c
View file

@ -232,7 +232,7 @@ SETUP_CreateInterfaceList(
/* Step 2. Create an interface list for this element */ /* Step 2. Create an interface list for this element */
HeapFree(GetProcessHeap(), 0, pSymbolicLink); HeapFree(GetProcessHeap(), 0, pSymbolicLink);
pSymbolicLink = HeapAlloc(GetProcessHeap(), 0, (dwLength + 1) * sizeof(WCHAR)); pSymbolicLink = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR));
if (!pSymbolicLink) if (!pSymbolicLink)
{ {
rc = ERROR_NOT_ENOUGH_MEMORY; rc = ERROR_NOT_ENOUGH_MEMORY;

10
reactos/dll/win32/uxtheme/system.c
View file

@ -81,7 +81,7 @@ BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg)
static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue,
LPVOID pvData) LPVOID pvData)
{ {
DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH, dwExpDataLen; DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH * sizeof(WCHAR), dwExpDataLen;
TRACE("(hkey=%p,%s,%p)\n", hKey, debugstr_w(lpszValue), TRACE("(hkey=%p,%s,%p)\n", hKey, debugstr_w(lpszValue),
pvData); pvData);
@ -194,7 +194,7 @@ void UXTHEME_LoadTheme(BOOL bLoad)
/* Get current theme configuration */ /* Get current theme configuration */
if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) {
TRACE("Loading theme config\n"); TRACE("Loading theme config\n");
buffsize = sizeof(tmp)/sizeof(tmp[0]); buffsize = sizeof(tmp);
if(!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) { if(!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) {
bThemeActive = (tmp[0] != '0'); bThemeActive = (tmp[0] != '0');
} }
@ -202,10 +202,10 @@ void UXTHEME_LoadTheme(BOOL bLoad)
bThemeActive = FALSE; bThemeActive = FALSE;
TRACE("Failed to get ThemeActive: %d\n", GetLastError()); TRACE("Failed to get ThemeActive: %d\n", GetLastError());
} }
buffsize = sizeof(szCurrentColor)/sizeof(szCurrentColor[0]); buffsize = sizeof(szCurrentColor);
if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor, &buffsize)) if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor, &buffsize))
szCurrentColor[0] = '\0'; szCurrentColor[0] = '\0';
buffsize = sizeof(szCurrentSize)/sizeof(szCurrentSize[0]); buffsize = sizeof(szCurrentSize);
if(RegQueryValueExW(hKey, szSizeName, NULL, NULL, (LPBYTE)szCurrentSize, &buffsize)) if(RegQueryValueExW(hKey, szSizeName, NULL, NULL, (LPBYTE)szCurrentSize, &buffsize))
szCurrentSize[0] = '\0'; szCurrentSize[0] = '\0';
if (query_reg_path (hKey, szDllName, szCurrentTheme)) if (query_reg_path (hKey, szDllName, szCurrentTheme))
@ -618,7 +618,7 @@ BOOL WINAPI IsThemeActive(void)
Result = RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey); Result = RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey);
if (Result == ERROR_SUCCESS) if (Result == ERROR_SUCCESS)
{ {
buffsize = sizeof(tmp)/sizeof(tmp[0]); buffsize = sizeof(tmp);
if (!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) if (!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize))
bActive = (tmp[0] != '0'); bActive = (tmp[0] != '0');
RegCloseKey(hKey); RegCloseKey(hKey);

2
reactos/dll/win32/winmm/playsound.c
View file

@ -130,7 +130,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName)
if (err != 0) if (err != 0)
goto none; goto none;
} }
count = sizeof(str)/sizeof(str[0]); count = sizeof(str);
err = RegQueryValueExW(hSnd, NULL, 0, &type, (LPBYTE)str, &count); err = RegQueryValueExW(hSnd, NULL, 0, &type, (LPBYTE)str, &count);
RegCloseKey(hSnd); RegCloseKey(hSnd);
if (err != 0 || !*str) goto none; if (err != 0 || !*str) goto none;