Changeset 50467 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Feb 14, 2014 12:19:00 PM (11 years ago)

Author:

vboxsync

Message:

VBoxTray: VBoxDnD: NT compatibility.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDnD.cpp (modified) (4 diffs)
• VBoxDnD.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

@@ -58 +58 @@
 VBoxDnDWnd::VBoxDnDWnd(void)
     : hWnd(NULL),
+      mpfnEnumDisplayMonitors(NULL),
       mfMouseButtonDown(false),
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
@@ -84 +85 @@
     /* Save the context. */
     this->pContext = pContext;
+
+    HMODULE hUser = GetModuleHandle("user32.dll");
+    if (hUser)
+    {
+        *(uintptr_t *)&mpfnEnumDisplayMonitors = (uintptr_t)GetProcAddress(hUser, "EnumDisplayMonitors");
+        Log(("DnD: EnumDisplayMonitors = %p\n", mpfnEnumDisplayMonitors));
+    }
 
     int rc = RTSemEventCreate(&mEventSem);
@@ -1086 +1094 @@
     if (hDC)
     {
-        fRc = EnumDisplayMonitors(hDC, NULL, VBoxDnDWnd::MonitorEnumProc,
-                                  (LPARAM)&r);
+        fRc = mpfnEnumDisplayMonitors?
+                  mpfnEnumDisplayMonitors(hDC, NULL, VBoxDnDWnd::MonitorEnumProc, (LPARAM)&r):
+                  FALSE;
+
         if (!fRc)
             rc = VERR_NOT_FOUND;
@@ -1099 +1109 @@
         /* If multi-monitor enumeration failed above, try getting at least the
          * primary monitor as a fallback. */
-        MONITORINFO monitor_info;
-        monitor_info.cbSize = sizeof(monitor_info);
-        if (GetMonitorInfo(MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST),
-                           &monitor_info))
-        {
-
-            r = monitor_info.rcMonitor;
-            rc = VINF_SUCCESS;
-        }
+        r.left   = 0;
+        r.top    = 0;
+        r.right  = GetSystemMetrics(SM_CXSCREEN);
+        r.bottom = GetSystemMetrics(SM_CYSCREEN);
+        rc = VINF_SUCCESS;
     }
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.h

@@ -366 +366 @@
     /** The window's handle. */
     HWND                       hWnd;
+    BOOL (WINAPI* mpfnEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM);
     /** List of allowed MIME types this
      *  client can handle. Make this a per-instance