Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

On error return from RegQueryValueExW, don't touch *lpcbData. *lpcbData

Browse source 
is always in bytes, even for string registry settings.

svn path=/trunk/; revision=7312
This commit is contained in:
Gé van Geldorp 2003-12-29 23:04:55 +00:00
parent e12604e3d7
commit 6161de8e1a
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
reactos/lib/advapi32/reg/reg.c
View file

@ -1,4 +1,4 @@
/* $Id: reg.c,v 1.41 2003/12/28 23:22:30 arty Exp $ /* $Id: reg.c,v 1.42 2003/12/29 23:04:55 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -2156,6 +2156,10 @@ RegQueryValueExW (HKEY hKey,
ErrorCode = RtlNtStatusToDosError (Status); ErrorCode = RtlNtStatusToDosError (Status);
SetLastError (ErrorCode); SetLastError (ErrorCode);
MaxCopy = 0; MaxCopy = 0;
if (NULL != lpcbData)
{
ResultSize = sizeof(*ValueInfo) + *lpcbData;
}
} }
if (lpType != NULL) if (lpType != NULL)
@ -2172,11 +2176,11 @@ RegQueryValueExW (HKEY hKey,
(ValueInfo->Type == REG_MULTI_SZ) || (ValueInfo->Type == REG_MULTI_SZ) ||
(ValueInfo->Type == REG_EXPAND_SZ)) (ValueInfo->Type == REG_EXPAND_SZ))
{ {
if (MaxCopy > ValueInfo->DataLength / sizeof(WCHAR)) if (MaxCopy > ValueInfo->DataLength)
((PWSTR)lpData)[ValueInfo->DataLength / sizeof(WCHAR)] = 0; ((PWSTR)lpData)[ValueInfo->DataLength / sizeof(WCHAR)] = 0;
if (lpcbData) { if (lpcbData) {
*lpcbData = (ResultSize - sizeof(*ValueInfo)) / sizeof(WCHAR); *lpcbData = (ResultSize - sizeof(*ValueInfo));
DPRINT("(string) Returning Size: %d\n", *lpcbData); DPRINT("(string) Returning Size: %d\n", *lpcbData);
} }
} }
@ -2248,7 +2252,7 @@ RegQueryValueExA(
RtlCreateUnicodeStringFromAsciiz(&ValueName, (LPSTR)lpValueName); RtlCreateUnicodeStringFromAsciiz(&ValueName, (LPSTR)lpValueName);
/* Convert length from USHORT to DWORD */ /* Convert length from USHORT to DWORD */
Length = ValueData.Length / sizeof(WCHAR); Length = ValueData.Length;
ErrorCode = RegQueryValueExW ErrorCode = RegQueryValueExW
(hKey, (hKey,
ValueName.Buffer, ValueName.Buffer,
@ -2264,16 +2268,20 @@ RegQueryValueExA(
RtlInitAnsiString(&AnsiString, NULL); RtlInitAnsiString(&AnsiString, NULL);
AnsiString.Buffer = lpData; AnsiString.Buffer = lpData;
AnsiString.MaximumLength = *lpcbData; AnsiString.MaximumLength = *lpcbData;
ValueData.Length = Length * sizeof(WCHAR); ValueData.Length = Length;
ValueData.MaximumLength = ValueData.Length + sizeof(WCHAR); ValueData.MaximumLength = ValueData.Length + sizeof(WCHAR);
RtlUnicodeStringToAnsiString(&AnsiString, &ValueData, FALSE); RtlUnicodeStringToAnsiString(&AnsiString, &ValueData, FALSE);
Length = Length / sizeof(WCHAR);
} else { } else {
RtlMoveMemory(lpData, ValueData.Buffer, Length = min(*lpcbData, Length);
min(*lpcbData,Length)); RtlMoveMemory(lpData, ValueData.Buffer, Length);
} }
} }
*lpcbData = Length; if (NULL != lpcbData)
{
*lpcbData = Length;
}
if (ValueData.Buffer) if (ValueData.Buffer)
{ {