[mjansen] 72947: RegQueryValueExW and RegQueryValueExA calls accept bytes. Patch by Victor Martinez Calvo. CORE-9665 #comment Thanks!
Author: mjansen Date: Sun Oct 9 20:58:08 2016 New Revision: 72947
URL: http://svn.reactos.org/svn/reactos?rev=72947&view=rev Log: RegQueryValueExW and RegQueryValueExA calls accept bytes. Patch by Victor Martinez Calvo. CORE-9665 #comment Thanks!
Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/rapps/installed.c trunk/reactos/base/applications/rapps_new/installed.cpp trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/winlogon/setup.c trunk/reactos/dll/cpl/wined3dcfg/general.c trunk/reactos/dll/win32/avicap32/avicap32.c trunk/reactos/dll/win32/powrprof/powrprof.c trunk/reactos/dll/win32/secur32/sspi.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/interface.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/winmm/playsound.c
Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/con... ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -138,7 +138,7 @@ if(RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) break;
- dwSize = MAXVALUE; + dwSize = MAXVALUE * sizeof(WCHAR);
if(RegQueryValueExW(hKey, L"UsernameHint", 0, NULL, (LPBYTE)szValue, &dwSize) == ERROR_SUCCESS) { @@ -185,7 +185,7 @@ NULL); if (ret == ERROR_SUCCESS) { - size = MAX_KEY_NAME; + size = sizeof(Name); if (RegQueryValueExW(hKey, Name, 0,
Modified: trunk/reactos/base/applications/rapps/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ins... ============================================================================== --- trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -11,7 +11,7 @@ BOOL GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString) { - DWORD dwSize = MAX_PATH; + DWORD dwSize = MAX_PATH * sizeof(WCHAR);
if (RegQueryValueExW(hKey, lpKeyName, @@ -50,7 +50,7 @@ if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS) { dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(szDisplayName); if (RegQueryValueExW(hSubKey, L"DisplayName", NULL, @@ -118,7 +118,7 @@ hKey = ItemInfo->hSubKey;
dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(szPath); if (RegQueryValueExW(hKey, bModify ? szModify : szUninstall, NULL, @@ -254,7 +254,7 @@ }
dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(pszParentKeyName); bIsUpdate = (RegQueryValueExW(Info.hSubKey, L"ParentKeyName", NULL, @@ -262,7 +262,7 @@ (LPBYTE)pszParentKeyName, &dwSize) == ERROR_SUCCESS);
- dwSize = MAX_PATH; + dwSize = sizeof(pszDisplayName); if (RegQueryValueExW(Info.hSubKey, L"DisplayName", NULL,
Modified: trunk/reactos/base/applications/rapps_new/installed.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_new... ============================================================================== --- trunk/reactos/base/applications/rapps_new/installed.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/installed.cpp [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -11,7 +11,7 @@ BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR lpString) { - DWORD dwSize = MAX_PATH; + DWORD dwSize = MAX_PATH * sizeof(WCHAR);
if (RegQueryValueExW(hKey, lpKeyName, @@ -50,7 +50,7 @@ if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS) { dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(szDisplayName); if (RegQueryValueExW(hSubKey, L"DisplayName", NULL, @@ -118,7 +118,7 @@ hKey = ItemInfo->hSubKey;
dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(szPath); if (RegQueryValueExW(hKey, bModify ? szModify : szUninstall, NULL, @@ -254,7 +254,7 @@ }
dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(pszParentKeyName); bIsUpdate = (RegQueryValueExW(Info.hSubKey, L"ParentKeyName", NULL, @@ -262,7 +262,7 @@ (LPBYTE)pszParentKeyName, &dwSize) == ERROR_SUCCESS);
- dwSize = MAX_PATH; + dwSize = sizeof(pszDisplayName); if (RegQueryValueExW(Info.hSubKey, L"DisplayName", NULL,
Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/f... ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -774,7 +774,7 @@ if (RegOpenKeyExW(HKEY_CURRENT_USER, s_szFavoritesRegKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) goto done;
- cbData = (sizeof(szFavoritePath) / sizeof(szFavoritePath[0])) - 1; + cbData = sizeof(szFavoritePath); memset(szFavoritePath, 0, sizeof(szFavoritePath)); if (RegQueryValueExW(hKey, pszFavorite, NULL, &dwType, (LPBYTE) szFavoritePath, &cbData) != ERROR_SUCCESS) goto done;
Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/p... ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -390,7 +390,7 @@
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) { CharUpper(strDebugger);
Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcser... ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -841,7 +841,7 @@ if (dwError != ERROR_SUCCESS) return dwError;
- dwSize = MAX_PATH; + dwSize = MAX_PATH * sizeof(WCHAR);
/* Check for the DependOnService Value */ dwError = RegQueryValueExW(hServiceEnumKey,
Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup.... ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/setup.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -80,7 +80,7 @@ return FALSE;
/* Read key */ - dwSize = (sizeof(Shell) / sizeof(Shell[0])) - 1; + dwSize = sizeof(Shell); dwError = RegQueryValueExW(hKey, L"CmdLine", NULL,
Modified: trunk/reactos/dll/cpl/wined3dcfg/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/general.... ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/general.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -51,7 +51,7 @@ void InitControl(HWND hWndDlg, HKEY hKey, PWCHAR szKey, PWINED3D_SETTINGS pSettings, INT iControlId, INT iCount) { WCHAR szBuffer[MAX_KEY_LENGTH]; - DWORD dwSize = MAX_KEY_LENGTH; + DWORD dwSize = sizeof(szBuffer); DWORD dwType = 0; INT iCurrent; INT iActive = 0;
Modified: trunk/reactos/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/avicap32... ============================================================================== --- trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -179,7 +179,7 @@ { if (RegOpenKeyW(hKey, szDriver, &hSubKey) == ERROR_SUCCESS) { - dwSize = sizeof(szFileName) / sizeof(WCHAR); + dwSize = sizeof(szFileName);
if (RegQueryValueExW(hSubKey, L"Driver", @@ -188,7 +188,7 @@ (LPBYTE)&szFileName, &dwSize) == ERROR_SUCCESS) { - dwSize = sizeof(szDriverName) / sizeof(WCHAR); + dwSize = sizeof(szDriverName);
if (RegQueryValueExW(hSubKey, L"FriendlyName",
Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrprof... ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -299,7 +299,7 @@ return FALSE; }
- dwSize = MAX_PATH; + dwSize = sizeof(szBuf); Err = RegQueryValueExW(hKey, L"CurrentPowerPolicy", NULL, NULL, (LPBYTE)&szBuf, &dwSize);
Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?re... ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -531,7 +531,7 @@ if (apiRet == ERROR_SUCCESS) { WCHAR securityPkgNames[MAX_PATH]; /* arbitrary len */ - DWORD size = sizeof(securityPkgNames) / sizeof(WCHAR), type; + DWORD size = sizeof(securityPkgNames), type;
apiRet = RegQueryValueExW(key, securityProvidersW, NULL, &type, (PBYTE)securityPkgNames, &size);
Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install.... ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -228,7 +228,8 @@ if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) 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;
/* compare each string against all the existing ones */ @@ -271,7 +272,7 @@ if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return; if (type != REG_MULTI_SZ) return; /* 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; src = buffer; dst = buffer + size;
Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfac... ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -232,7 +232,7 @@
/* Step 2. Create an interface list for this element */ HeapFree(GetProcessHeap(), 0, pSymbolicLink); - pSymbolicLink = HeapAlloc(GetProcessHeap(), 0, (dwLength + 1) * sizeof(WCHAR)); + pSymbolicLink = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); if (!pSymbolicLink) { rc = ERROR_NOT_ENOUGH_MEMORY;
Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c?... ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -81,7 +81,7 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, 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), pvData); @@ -194,7 +194,7 @@ /* Get current theme configuration */ if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { TRACE("Loading theme config\n"); - buffsize = sizeof(tmp)/sizeof(tmp[0]); + buffsize = sizeof(tmp); if(!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) { bThemeActive = (tmp[0] != '0'); } @@ -202,10 +202,10 @@ bThemeActive = FALSE; 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)) szCurrentColor[0] = '\0'; - buffsize = sizeof(szCurrentSize)/sizeof(szCurrentSize[0]); + buffsize = sizeof(szCurrentSize); if(RegQueryValueExW(hKey, szSizeName, NULL, NULL, (LPBYTE)szCurrentSize, &buffsize)) szCurrentSize[0] = '\0'; if (query_reg_path (hKey, szDllName, szCurrentTheme)) @@ -618,7 +618,7 @@ Result = RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey); if (Result == ERROR_SUCCESS) { - buffsize = sizeof(tmp)/sizeof(tmp[0]); + buffsize = sizeof(tmp); if (!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) bActive = (tmp[0] != '0'); RegCloseKey(hKey);
Modified: trunk/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/playsound.c... ============================================================================== --- trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -130,7 +130,7 @@ if (err != 0) goto none; } - count = sizeof(str)/sizeof(str[0]); + count = sizeof(str); err = RegQueryValueExW(hSnd, NULL, 0, &type, (LPBYTE)str, &count); RegCloseKey(hSnd); if (err != 0 || !*str) goto none;
-
mjansen＠svn.reactos.org