[PATCH 2/5] user32: Trace EnumDisplaySettingsExW() results.

[Zhiyi Zhang]

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

diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 61cd06f6911..14d3778a535 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -3440,8 +3440,9 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum,
                                    LPDEVMODEW lpDevMode, DWORD dwFlags)
 {
     WCHAR primary_adapter[CCHDEVICENAME];
+    BOOL ret;
 
-    TRACE("%s %u %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags);
+    TRACE("%s %#x %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags);
 
     if (!lpszDeviceName)
     {
@@ -3451,7 +3452,16 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum,
         lpszDeviceName = primary_adapter;
     }
 
-    return USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags);
+    ret = USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags);
+    if (ret)
+        TRACE("device:%s mode index:%#x position:(%d,%d) resolution:%ux%u frequency:%uHz "
+              "depth:%ubits orientation:%#x.\n", wine_dbgstr_w(lpszDeviceName), iModeNum,
+              lpDevMode->u1.s2.dmPosition.x, lpDevMode->u1.s2.dmPosition.y, lpDevMode->dmPelsWidth,
+              lpDevMode->dmPelsHeight, lpDevMode->dmDisplayFrequency, lpDevMode->dmBitsPerPel,
+              lpDevMode->u1.s2.dmDisplayOrientation);
+    else
+        WARN("Failed to query %s display settings.\n", wine_dbgstr_w(lpszDeviceName));
+    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=75830

Your paranoid android.


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

user32:
win.c:10813: Test failed: 01370094: expected prev 0022013C, got 00000000
win.c:10827: Test failed: hwnd should NOT be topmost
win.c:10829: Test failed: 01370094: expected NOT topmost
win.c:10773: Test failed: 1: hwnd 01370094 is still topmost