ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2020-07-21 14:49:49 +08:00 committed by Alexandre Julliard
parent 0503b17962
commit 7b5dac2fe1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/user32/tests/monitor.c
View File

@ -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,