wine/dlls/user/tests monitor.c
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Nov 17 05:04:01 CST 2005
ChangeSet ID: 21303
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/11/17 05:04:01
Modified files:
dlls/user/tests: monitor.c
Log message:
Detlef Riekenberg <wine.dev at web.de>
Made test loadable on win95 again (EnumDisplayDevicesA not present).
Patch: http://cvs.winehq.org/patch.py?id=21303
Old revision New revision Changes Path
1.2 1.3 +4 -1 wine/dlls/user/tests/monitor.c
Index: wine/dlls/user/tests/monitor.c
diff -u -p wine/dlls/user/tests/monitor.c:1.2 wine/dlls/user/tests/monitor.c:1.3
--- wine/dlls/user/tests/monitor.c:1.2 17 Nov 2005 11: 4: 1 -0000
+++ wine/dlls/user/tests/monitor.c 17 Nov 2005 11: 4: 1 -0000
@@ -24,6 +24,7 @@
#include "winuser.h"
static HMODULE hdll;
+static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD);
static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM);
static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO);
@@ -33,6 +34,7 @@ static void init_function_pointers(void)
if(hdll)
{
+ pEnumDisplayDevicesA = (void*)GetProcAddress(hdll, "EnumDisplayDevicesA");
pEnumDisplayMonitors = (void*)GetProcAddress(hdll, "EnumDisplayMonitors");
pGetMonitorInfoA = (void*)GetProcAddress(hdll, "GetMonitorInfoA");
}
@@ -61,10 +63,11 @@ static void test_enumdisplaydevices(void
DWORD primary_num = -1, num = 0;
dd.cb = sizeof(dd);
+ if(pEnumDisplayDevicesA == NULL) return;
while(1)
{
BOOL ret;
- ret = EnumDisplayDevicesA(NULL, num, &dd, 0), "EnumDisplayDevices fails\n";
+ ret = pEnumDisplayDevicesA(NULL, num, &dd, 0);
ok(ret || num != 0, "EnumDisplayDevices fails with num == 0\n");
if(!ret) break;
if(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
More information about the wine-cvs
mailing list