[PATCH 1/5] user32: Trace ChangeDisplaySettingsExW() results.

[Zhiyi Zhang]

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/user32/sysparams.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 6c0c3e76db7..61cd06f6911 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -3310,12 +3310,18 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND
     WCHAR primary_adapter[CCHDEVICENAME];
     BOOL def_mode = TRUE;
     DEVMODEW dm;
+    LONG ret;
 
     TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam);
     TRACE("flags=%s\n", _CDS_flags(flags));
 
     if (!devname && !devmode)
-        return USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam);
+    {
+        ret = USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam);
+        if (ret != DISP_CHANGE_SUCCESSFUL)
+            ERR("Restoring all displays to their registry settings returned %d.\n", ret);
+        return ret;
+    }
 
     if (!devname && devmode)
     {
@@ -3359,7 +3365,10 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND
         return DISP_CHANGE_BADMODE;
     }
 
-    return USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam);
+    ret = USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam);
+    if (ret != DISP_CHANGE_SUCCESSFUL)
+        ERR("Changing %s display settings returned %d.\n", wine_dbgstr_w(devname), ret);
+    return ret;
 }
 
 
-- 
2.25.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=75829

Your paranoid android.


=== debiant (64 bit WoW report) ===

user32:
msg.c:8798: Test failed: WaitForSingleObject failed 102
msg.c:8804: Test failed: destroy child on thread exit: 0: the msg 0x0082 was expected, but got msg 0x000f instead
msg.c:8804: Test failed: destroy child on thread exit: 1: the msg 0x000f was expected, but got msg 0x0014 instead
msg.c:8804: Test failed: destroy child on thread exit: 2: the msg sequence is not complete: expected 0014 - actual 0000