winemac.drv: Fix RegQueryValueExW size handling.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac.drv: Fix RegQueryValueExW size handling.
60bece33 · Alexandre Julliard · 83d7b1d3 · 60bece33
Commit 60bece33 authored Nov 29, 2021 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

display.c dlls/winemac.drv/display.c +3 -4

No files found.
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -461,12 +461,11 @@ static struct display_mode_descriptor* create_original_display_mode_descriptor(C
    size = 0;
    if (RegQueryValueExW(hkey, pixelencodingW, 0, &type, NULL, &size) || type != REG_SZ)
        goto done;
-    pixel_encoding = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR));
+    size += sizeof(WCHAR);
+    pixel_encoding = HeapAlloc(GetProcessHeap(), 0, size);
    if (RegQueryValueExW(hkey, pixelencodingW, 0, &type, (BYTE*)pixel_encoding, &size) || type != REG_SZ)
        goto done;
-    if ((end = memchrW(pixel_encoding, 0, size)))
-        size = end - pixel_encoding;
-    desc->pixel_encoding = CFStringCreateWithCharacters(NULL, (const UniChar*)pixel_encoding, size);
+    desc->pixel_encoding = CFStringCreateWithCharacters(NULL, (const UniChar*)pixel_encoding, strlenW(pixel_encoding));

    ret = desc;