Zhiyi Zhang : user32/tests: Test that EnumDisplayMonitors() doesn't set error codes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7b5dac2fe17c1dd17e3ac7ab72f368e9546db82d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7b5dac2fe17c1dd17e3ac7ab7...

Author: Zhiyi Zhang 
Date:   Tue Jul 21 14:49:49 2020 +0800

user32/tests: Test that EnumDisplayMonitors() doesn't set error codes.

ERROR_INVALID_HANDLE or ERROR_INVALID_MONITOR_HANDLE is from
GetMonitorInfo(), not EnumDisplayMonitor().

Signed-off-by: Zhiyi Zhang 
Signed-off-by: Alexandre Julliard

---

dlls/user32/tests/monitor.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c
index 6e8c9a275d..5d7069591b 100644
--- a/dlls/user32/tests/monitor.c
+++ b/dlls/user32/tests/monitor.c
@@ -1199,6 +1199,7 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor
 {
     MONITORINFOEXA mi, mi2;
     DEVMODEA old_dm, dm;
+    DWORD error;
     INT count;
     LONG ret;

@@ -1235,13 +1236,18 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor
         if (GetSystemMetrics(SM_CMONITORS) != count - 1)
         {
             skip("Failed to detach %s.\n", mi.szDevice);
+            SetLastError(0xdeadbeef);
             return TRUE;
         }

/* The monitor handle should be invalid now */
         mi2.cbSize = sizeof(mi2);
+        SetLastError(0xdeadbeef);
         ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi2);
         ok(!ret, "GetMonitorInfoA succeeded.\n");
+        error = GetLastError();
+        ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE,
+               "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error);

/* Restore the original display settings */
         ret = ChangeDisplaySettingsExA(mi.szDevice, &old_dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET,
@@ -1253,6 +1259,7 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor
                 mi.szDevice, ret);
     }

+    SetLastError(0xdeadbeef);
     return TRUE;
 }

@@ -1276,16 +1283,10 @@ static void test_EnumDisplayMonitors(void)
     ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_invalid_handle_cb, 0);
     error = GetLastError();
     if (count >= 2)
-    {
         todo_wine ok(!ret, "EnumDisplayMonitors succeeded.\n");
-        todo_wine ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE,
-                "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error);
-    }
     else
-    {
         ok(ret, "EnumDisplayMonitors failed.\n");
-        ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error);
-    }
+    ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error);
 }

static void test_QueryDisplayConfig_result(UINT32 flags,