user32: Handle NULL device and not NULL mode parameters in ChangeDisplaySettingsExW().

This makes sure that user graphics drivers has a valid device name when a DEVMODE is specified. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Handle NULL device and not NULL mode parameters in ChangeDisplaySettingsExW().
ae157bec · Zhiyi Zhang · Alexandre Julliard · 12fa0cce · ae157bec
Commit ae157bec authored Feb 11, 2020 by Zhiyi Zhang Committed by Alexandre Julliard Feb 12, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

sysparams.c dlls/user32/sysparams.c +9 -0

No files found.
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -3293,12 +3293,21 @@ static void trace_devmode(const DEVMODEW *devmode)
 LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd,
                                      DWORD flags, LPVOID lparam )
 {
+    WCHAR primary_adapter[CCHDEVICENAME];
    BOOL def_mode = TRUE;
    DEVMODEW dm;

    TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam);
    TRACE("flags=%s\n", _CDS_flags(flags));

+    if (!devname && devmode)
+    {
+        if (!get_primary_adapter(primary_adapter))
+            return DISP_CHANGE_FAILED;
+
+        devname = primary_adapter;
+    }
+
    if (devmode)
    {
        trace_devmode(devmode);