lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-02 01:11:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MSGINA] ReadRegDwordValue(): Support interpreting REG_SZ values as DWORDs when possible (#8381)

Browse Source 
This is useful for numerical values that are documented as being stored
in string format as `REG_SZ` in the registry; the reason being that they
are still read or written via `GetProfileIntW()`/`WriteProfileStringW()`
by Windows' Winlogon, and these functions store `REG_SZ` values because
of the INI <-> Registry mapping mechanism.
This commit is contained in:
Hermès Bélusca-Maïto
2025-09-09 21:41:56 +02:00
parent 01872b8495
commit 27db7ece88
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dll/win32/msgina/utils.c
View File

@@ -94,15 +94,34 @@ ReadRegDwordValue(
{
LONG rc;
DWORD dwValue, dwType, cbData;
/* Buffer big enough to hold the NULL-terminated string L"4294967295",
* corresponding to the literal 0xFFFFFFFF (MAXULONG) in decimal. */
WCHAR Buffer[sizeof("4294967295")];
C_ASSERT(sizeof(Buffer) >= sizeof(DWORD));
cbData = sizeof(dwValue);
rc = RegQueryValueExW(hKey, pszValue, NULL, &dwType, (PBYTE)&dwValue, &cbData);
cbData = sizeof(Buffer);
rc = RegQueryValueExW(hKey, pszValue, NULL, &dwType, (PBYTE)&Buffer, &cbData);
if (rc != ERROR_SUCCESS)
return rc;
if (dwType != REG_DWORD)
if (dwType == REG_DWORD)
{
if (cbData != sizeof(dwValue))
return ERROR_INVALID_DATA; // ERROR_DATATYPE_MISMATCH;
dwValue = *(PDWORD)Buffer;
}
else if (dwType == REG_SZ)
{
PWCHAR pEnd = NULL;
Buffer[cbData / sizeof(WCHAR) - 1] = UNICODE_NULL;
dwValue = wcstoul(Buffer, &pEnd, 0);
if (*pEnd) // Don't consider REG_SZ to be supported in this case!
return ERROR_UNSUPPORTED_TYPE;
}
else
{
return ERROR_UNSUPPORTED_TYPE;
if (cbData != sizeof(dwValue))
return ERROR_INVALID_DATA; // ERROR_DATATYPE_MISMATCH;
}
*pValue = dwValue;
return ERROR_SUCCESS;