user32/tests: Make sure the tests run on NT4 again.
This commit is contained in:
parent
53dae9b7f5
commit
75414bb4ad
|
@ -27,6 +27,8 @@ static HMODULE hdll;
|
||||||
static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD);
|
static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD);
|
||||||
static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM);
|
static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM);
|
||||||
static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO);
|
static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO);
|
||||||
|
static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD);
|
||||||
|
static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD);
|
||||||
|
|
||||||
static void init_function_pointers(void)
|
static void init_function_pointers(void)
|
||||||
{
|
{
|
||||||
|
@ -37,6 +39,8 @@ static void init_function_pointers(void)
|
||||||
pEnumDisplayDevicesA = (void*)GetProcAddress(hdll, "EnumDisplayDevicesA");
|
pEnumDisplayDevicesA = (void*)GetProcAddress(hdll, "EnumDisplayDevicesA");
|
||||||
pEnumDisplayMonitors = (void*)GetProcAddress(hdll, "EnumDisplayMonitors");
|
pEnumDisplayMonitors = (void*)GetProcAddress(hdll, "EnumDisplayMonitors");
|
||||||
pGetMonitorInfoA = (void*)GetProcAddress(hdll, "GetMonitorInfoA");
|
pGetMonitorInfoA = (void*)GetProcAddress(hdll, "GetMonitorInfoA");
|
||||||
|
pMonitorFromPoint = (void*)GetProcAddress(hdll, "MonitorFromPoint");
|
||||||
|
pMonitorFromWindow = (void*)GetProcAddress(hdll, "MonitorFromWindow");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,14 +183,14 @@ static void test_monitors(void)
|
||||||
POINT pt;
|
POINT pt;
|
||||||
|
|
||||||
pt.x = pt.y = 0;
|
pt.x = pt.y = 0;
|
||||||
primary = MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY );
|
primary = pMonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY );
|
||||||
ok( primary != 0, "couldn't get primary monitor\n" );
|
ok( primary != 0, "couldn't get primary monitor\n" );
|
||||||
|
|
||||||
monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTONULL );
|
monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTONULL );
|
||||||
ok( !monitor, "got %p, should not get a monitor for an invalid window\n", monitor );
|
ok( !monitor, "got %p, should not get a monitor for an invalid window\n", monitor );
|
||||||
monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY );
|
monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY );
|
||||||
ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTOPRIMARY\n", monitor, primary );
|
ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTOPRIMARY\n", monitor, primary );
|
||||||
monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST );
|
monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST );
|
||||||
ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTONEAREST\n", monitor, primary );
|
ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTONEAREST\n", monitor, primary );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -197,5 +201,6 @@ START_TEST(monitor)
|
||||||
test_enumdisplaydevices();
|
test_enumdisplaydevices();
|
||||||
if (winetest_interactive)
|
if (winetest_interactive)
|
||||||
test_ChangeDisplaySettingsEx();
|
test_ChangeDisplaySettingsEx();
|
||||||
|
if (pMonitorFromPoint && pMonitorFromWindow)
|
||||||
test_monitors();
|
test_monitors();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue