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

Fixed RegQueryValueExA. It was broken in a way that made it work properly,

Browse source 
given the broken RegQueryValueExW.  I'm checking in a test case for these
two that should print the same string for each assuming everything works.

svn path=/trunk/; revision=7303
This commit is contained in:
Art Yerkes 2003-12-28 23:22:30 +00:00
parent c1bd24b5d5
commit f1f2b431c9
1 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $Id: reg.c,v 1.40 2003/12/28 09:28:39 arty Exp $ /* $Id: reg.c,v 1.41 2003/12/28 23:22:30 arty 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
@ -2215,8 +2215,8 @@ RegQueryValueExA(
UNICODE_STRING ValueData; UNICODE_STRING ValueData;
ANSI_STRING AnsiString; ANSI_STRING AnsiString;
LONG ErrorCode; LONG ErrorCode;
DWORD Type;
DWORD Length; DWORD Length;
DWORD Type;
if ((lpData) && (!lpcbData)) if ((lpData) && (!lpcbData))
{ {
@ -2226,11 +2226,12 @@ RegQueryValueExA(
if (lpData) if (lpData)
{ {
ValueData.Length = ValueData.MaximumLength = *lpcbData * sizeof(WCHAR); ValueData.Length = *lpcbData * sizeof(WCHAR);
ValueData.MaximumLength = ValueData.Length + sizeof(WCHAR);
ValueData.Buffer = RtlAllocateHeap( ValueData.Buffer = RtlAllocateHeap(
ProcessHeap, ProcessHeap,
0, 0,
ValueData.Length); ValueData.MaximumLength);
if (!ValueData.Buffer) if (!ValueData.Buffer)
{ {
SetLastError(ERROR_OUTOFMEMORY); SetLastError(ERROR_OUTOFMEMORY);
@ -2240,22 +2241,22 @@ RegQueryValueExA(
else else
{ {
ValueData.Buffer = NULL; ValueData.Buffer = NULL;
ValueData.Length = 0;
ValueData.MaximumLength = 0;
} }
RtlCreateUnicodeStringFromAsciiz(&ValueName, (LPSTR)lpValueName); RtlCreateUnicodeStringFromAsciiz(&ValueName, (LPSTR)lpValueName);
/* Convert length from USHORT to DWORD */ /* Convert length from USHORT to DWORD */
Length = ValueData.Length; Length = ValueData.Length / sizeof(WCHAR);
ErrorCode = RegQueryValueExW( ErrorCode = RegQueryValueExW
hKey, (hKey,
ValueName.Buffer, ValueName.Buffer,
lpReserved, lpReserved,
&Type, &Type,
(LPBYTE)ValueData.Buffer, (LPBYTE)ValueData.Buffer,
&Length); &Length);
if (lpType) *lpType = Type; if (lpType) *lpType = Type;
ValueData.Length = Length;
if ((ErrorCode == ERROR_SUCCESS) && (ValueData.Buffer != NULL)) if ((ErrorCode == ERROR_SUCCESS) && (ValueData.Buffer != NULL))
{ {
if ((Type == REG_SZ) || (Type == REG_MULTI_SZ) || (Type == REG_EXPAND_SZ)) if ((Type == REG_SZ) || (Type == REG_MULTI_SZ) || (Type == REG_EXPAND_SZ))
@ -2263,14 +2264,17 @@ 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.MaximumLength = ValueData.Length + sizeof(WCHAR);
RtlUnicodeStringToAnsiString(&AnsiString, &ValueData, FALSE); RtlUnicodeStringToAnsiString(&AnsiString, &ValueData, FALSE);
*lpcbData = ValueData.Length / sizeof(WCHAR);
} else { } else {
RtlMoveMemory(lpData, ValueData.Buffer, *lpcbData); RtlMoveMemory(lpData, ValueData.Buffer,
*lpcbData = ValueData.Length; min(*lpcbData,Length));
} }
} }
*lpcbData = Length;
if (ValueData.Buffer) if (ValueData.Buffer)
{ {
RtlFreeHeap(ProcessHeap, 0, ValueData.Buffer); RtlFreeHeap(ProcessHeap, 0, ValueData.Buffer);