ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Fix calculation of returned buffer in get_registry_locale_info. 

Fixes a regression introduced by 8826ba1bc8.
This commit is contained in:
Sebastian Lackner 2015-04-03 14:25:57 +02:00 committed by Alexandre Julliard
parent 61b8a189c5
commit 51c21cca98
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/kernel32/locale.c
View File

@ -1177,6 +1177,17 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS
status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size );
/* try again with a bigger buffer when we have to return the correct size */
if (status == STATUS_BUFFER_OVERFLOW && !buffer && size > info_size)
{
KEY_VALUE_PARTIAL_INFORMATION *new_info;
if ((new_info = HeapReAlloc( GetProcessHeap(), 0, info, size )))
{
info = new_info;
status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size );
}
}
NtClose( hkey );
if (!status)
@ -1207,8 +1218,6 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS
if (status == STATUS_BUFFER_OVERFLOW && !buffer)
{
ret = (size - info_size) / sizeof(WCHAR);
if (!ret || ((WCHAR *)&info->Data)[ret-1])
ret++;
}
else if (status == STATUS_OBJECT_NAME_NOT_FOUND)
{