win32u: Calculate buffer sizes from registry structs correctly.

Signed-off-by: Torge Matthies <tmatthies@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

win32u: Calculate buffer sizes from registry structs correctly.
32d55714 · Torge Matthies · Alexandre Julliard · 4e19373c · 32d55714
Commit 32d55714 authored May 01, 2022 by Torge Matthies Committed by Alexandre Julliard May 20, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sysparams.c dlls/win32u/sysparams.c +3 -2

No files found.
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -1258,7 +1258,8 @@ static BOOL update_display_cache_from_registry(void)
                                                  sizeof(devicemap_video_keyW) )))
        return FALSE;

-    status = NtQueryKey( video_key, KeyFullInformation, &key, sizeof(key), &size );
+    status = NtQueryKey( video_key, KeyFullInformation, &key,
+                         offsetof(KEY_FULL_INFORMATION, Class), &size );
    if (status && status != STATUS_BUFFER_OVERFLOW)
        return FALSE;

@@ -3210,7 +3211,7 @@ void sysparams_init(void)

        if ((hkey = reg_open_key( config_key, software_fontsW, sizeof(software_fontsW) )))
        {
-            char buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(DWORD)];
+            char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])];
            KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer;

            if (query_reg_value( hkey, log_pixelsW, value, sizeof(buffer) ) && value->Type == REG_DWORD)