Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

some small reg fixes

Browse source 
svn path=/trunk/; revision=41116
This commit is contained in:
Christoph von Wittich 2009-05-25 13:10:58 +00:00
parent b9d4186258
commit b2f816bb35
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/advapi32/reg/reg.c
View file

@ -4025,10 +4025,6 @@ RegQueryValueExA(HKEY hKey,
if (ErrorCode == ERROR_SUCCESS ||
ErrorCode == ERROR_MORE_DATA)
{
if (lpType != NULL)
{
*lpType = Type;
}
if ((Type == REG_SZ) || (Type == REG_MULTI_SZ) || (Type == REG_EXPAND_SZ))
{
@ -4062,6 +4058,11 @@ RegQueryValueExA(HKEY hKey,
}
}
if (lpType != NULL)
{
*lpType = Type;
}
if (ValueData.Buffer != NULL)
{
RtlFreeHeap(ProcessHeap, 0, ValueData.Buffer);
@ -4114,6 +4115,9 @@ RegQueryValueExW(HKEY hkeyorg,
if (count) *count = 0;
}
/* this matches Win9x behaviour - NT sets *type to a random value */
if (type) *type = REG_NONE;
status = NtQueryValueKey( hkey, &name_str, KeyValuePartialInformation,
buffer, total_size, &total_size );
if (status && status != STATUS_BUFFER_OVERFLOW) goto done;
@ -4125,7 +4129,10 @@ RegQueryValueExW(HKEY hkeyorg,
{
if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr );
if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size )))
{
ClosePredefKey(hkey);
return ERROR_NOT_ENOUGH_MEMORY;
}
info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr;
status = NtQueryValueKey( hkey, &name_str, KeyValuePartialInformation,
buf_ptr, total_size, &total_size );