Changeset 15102

Timestamp:

Oct 26, 2000, 7:22:23 PM (24 years ago)

Author:

sandervl

Message:

EnumDisplayDevicesA/W added

Location:

tags/trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• display.cpp (modified) (2 diffs)

tags/trunk/src/user32/USER32.DEF ¶

@@ -1 @@
-; $Id: USER32.DEF,v 1.37 2000-08-24 09:30:29 sandervl Exp $
+; $Id: USER32.DEF,v 1.38 2000-10-26 17:22:23 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -628 +628 @@
     MonitorFromPoint              = _MonitorFromPoint@12        @1004
     EnumDisplayMonitors        = _EnumDisplayMonitors@16        @1005
+    EnumDisplayDevicesA        = _EnumDisplayDevicesA@16        @1006
+    EnumDisplayDevicesW        = _EnumDisplayDevicesW@16        @1007
 
 ;

tags/trunk/src/user32/display.cpp ¶

@@ -1 @@
-/* $Id: display.cpp,v 1.9 2000-10-05 13:47:06 sandervl Exp $ */
+/* $Id: display.cpp,v 1.10 2000-10-26 17:22:23 sandervl Exp $ */
 /*
  * Display/Monitor Win32 apis
@@ -595 +595 @@
             dwData);
 }
-//******************************************************************************
-//******************************************************************************
+/***********************************************************************
+ *           EnumDisplayDevicesA   (USER32.184)
+ */
+BOOL WINAPI EnumDisplayDevicesA(
+        LPVOID unused,DWORD i,LPDISPLAY_DEVICEA lpDisplayDevice,DWORD dwFlags) 
+{
+        dprintf(("EnumDisplayDevicesA: %x %d %x %x", unused, i, lpDisplayDevice, dwFlags));
+        if (i)
+                return FALSE;
+        
+        strcpy((char *)lpDisplayDevice->DeviceName,"OS/2-PM");
+        strcpy((char *)lpDisplayDevice->DeviceString,"OS/2 Presentation Manager Display");
+        lpDisplayDevice->StateFlags =
+                        DISPLAY_DEVICE_ATTACHED_TO_DESKTOP      |
+                        DISPLAY_DEVICE_PRIMARY_DEVICE           |
+                        DISPLAY_DEVICE_VGA_COMPATIBLE;
+        return TRUE;
+}
+
+/***********************************************************************
+ *           EnumDisplayDevicesW   (USER32.185)
+ */
+BOOL WINAPI EnumDisplayDevicesW(
+        LPVOID unused,DWORD i,LPDISPLAY_DEVICEW lpDisplayDevice,DWORD dwFlags) 
+{
+        dprintf(("EnumDisplayDevicesW: %x %d %x %x", unused, i, lpDisplayDevice, dwFlags));
+        if (i)
+                return FALSE;
+
+        lstrcpyAtoW(lpDisplayDevice->DeviceName,"OS/2-PM");
+        lstrcpyAtoW(lpDisplayDevice->DeviceString,"OS/2 Presentation Manager Display");
+        lpDisplayDevice->StateFlags =
+                        DISPLAY_DEVICE_ATTACHED_TO_DESKTOP      |
+                        DISPLAY_DEVICE_PRIMARY_DEVICE           |
+                        DISPLAY_DEVICE_VGA_COMPATIBLE;
+        return TRUE;
+}
+//******************************************************************************
+//******************************************************************************