commit 88dcf834959b000f430a519d7d8e0711b3b8a63e
author Detlef Riekenberg <wine.dev@web.de> Thu Nov 17 11:04:01 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Nov 17 11:04:01 2005 +0000
tree 45ddab80c742619f7820ef48a445d761f3e7c1ba
parent d15de714e32931b245007e2735108dbd6edaac9d

Made test loadable on win95 again (EnumDisplayDevicesA not present).

dlls/user/tests/monitor.c

diff --git a/dlls/user/tests/monitor.c b/dlls/user/tests/monitor.c
index fdff027..3fdd5c7 100644
--- a/dlls/user/tests/monitor.c
+++ b/dlls/user/tests/monitor.c
@@ -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 @@
 
     if(hdll)
     {
+       pEnumDisplayDevicesA = (void*)GetProcAddress(hdll, "EnumDisplayDevicesA");
        pEnumDisplayMonitors = (void*)GetProcAddress(hdll, "EnumDisplayMonitors");
        pGetMonitorInfoA = (void*)GetProcAddress(hdll, "GetMonitorInfoA");
     }
@@ -61,10 +63,11 @@
     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)