Changeset 31756 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Aug 18, 2010 12:10:29 PM (14 years ago)

Author:

vboxsync

Message:

wddm: multi-screen fixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxScreen.cpp (modified) (3 diffs)
• Miniport/VBoxVideo.h (modified) (2 diffs)
• Miniport/wddm/VBoxVideoWddm.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxScreen.cpp

@@ -416 +416 @@
     HRESULT hr = S_FALSE;
 
-    Assert(0);
-
     if (!pMon->bInited)
     {
@@ -527 +525 @@
     {
         DWORD dwErr = WaitForSingleObject(pMon->hThread, INFINITE);
-        if (dwErr != WAIT_OBJECT_0)
+        if (dwErr == WAIT_OBJECT_0)
+        {
+            CloseHandle(pMon->hThread);
+            pMon->hThread = 0;
+        }
+        else
         {
             DWORD winErr = GetLastError();
@@ -537 +540 @@
     {
         DWORD winErr = GetLastError();
-        hr = HRESULT_FROM_WIN32(winErr);
-        Assert(0);
-    }
-
-    return hr;
-}
-
+        Assert(winErr != ERROR_SUCCESS);
+        if (winErr != ERROR_INVALID_THREAD_ID)
+        {
+            hr = HRESULT_FROM_WIN32(winErr);
+            Assert(0);
+        }
+        /* else - treat as OK */
+    }
+
+    return hr;
+}
+

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

@@ -156 +156 @@
 } VBOXWDDM_POINTER_INFO, *PVBOXWDDM_POINTER_INFO;
 
+typedef struct VBOXWDDM_GLOBAL_POINTER_INFO
+{
+    uint32_t cVisible;
+} VBOXWDDM_GLOBAL_POINTER_INFO, *PVBOXWDDM_GLOBAL_POINTER_INFO;
+
 #ifdef VBOX_WITH_VIDEOHWACCEL
 typedef struct VBOXWDDM_VHWA
@@ -308 +313 @@
    volatile uint32_t cContexts3D;
    volatile uint32_t cDMACmdsOutstanding;
+
+   VBOXWDDM_GLOBAL_POINTER_INFO PointerInfo;
 
    VBOXSHGSMILIST CtlList;

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -2668 +2668 @@
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
     PVBOXWDDM_POINTER_INFO pPointerInfo = &pDevExt->aSources[pSetPointerPosition->VidPnSourceId].PointerInfo;
+    PVBOXWDDM_GLOBAL_POINTER_INFO pGlobalPointerInfo = &pDevExt->PointerInfo;
     PVIDEO_POINTER_ATTRIBUTES pPointerAttributes = &pPointerInfo->Attributes.data;
     BOOLEAN bNotifyVisibility;
     if (pSetPointerPosition->Flags.Visible)
     {
-        bNotifyVisibility = !(pPointerAttributes->Enable & VBOX_MOUSE_POINTER_VISIBLE);
-        pPointerAttributes->Enable |= VBOX_MOUSE_POINTER_VISIBLE;
+        bNotifyVisibility = (pGlobalPointerInfo->cVisible == 0);
+        if (!(pPointerAttributes->Enable & VBOX_MOUSE_POINTER_VISIBLE))
+        {
+            ++pGlobalPointerInfo->cVisible;
+            pPointerAttributes->Enable |= VBOX_MOUSE_POINTER_VISIBLE;
+        }
     }
     else
     {
-        bNotifyVisibility = !!(pPointerAttributes->Enable & VBOX_MOUSE_POINTER_VISIBLE);
-        pPointerAttributes->Enable &= ~VBOX_MOUSE_POINTER_VISIBLE;
+        if (!!(pPointerAttributes->Enable & VBOX_MOUSE_POINTER_VISIBLE))
+        {
+            --pGlobalPointerInfo->cVisible;
+            Assert(pGlobalPointerInfo->cVisible < UINT32_MAX/2);
+            pPointerAttributes->Enable &= ~VBOX_MOUSE_POINTER_VISIBLE;
+            bNotifyVisibility = (pGlobalPointerInfo->cVisible == 0);
+        }
     }