kernel32: Return proper char count in get_registry_locale_info.

8826ba1b · Sebastian Lackner · Alexandre Julliard · 46d06eb4 · 8826ba1b
Commit 8826ba1b authored Dec 16, 2014 by Sebastian Lackner Committed by Alexandre Julliard Dec 16, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

locale.c dlls/kernel32/locale.c +3 -1

No files found.
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -1206,7 +1206,9 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS
        {
            if (status == STATUS_BUFFER_OVERFLOW && !buffer)
            {
-                ret = (size - info_size) / sizeof(WCHAR) + 1;
+                ret = (size - info_size) / sizeof(WCHAR);
+                if (!ret || ((WCHAR *)&info->Data)[ret-1])
+                    ret++;
            }
            else if (status == STATUS_OBJECT_NAME_NOT_FOUND)
            {