Changeset 31687 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Timestamp:

Aug 16, 2010 10:59:01 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

64830

Message:

wddm: multimonitor support

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Files:

• VBoxDispD3D.cpp (modified) (6 diffs)
• VBoxScreen.cpp (added)
• VBoxScreen.h (added)

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

@@ -23 +23 @@
 #include "VBoxDispD3DCmn.h"
 #include "VBoxDispD3D.h"
+#include "VBoxScreen.h"
 
 #ifdef VBOXDISPMP_TEST
@@ -34 +35 @@
 
 #define VBOXWDDMDISP_WITH_TMPWORKAROUND 1
+
+static VBOXSCREENMONRUNNER g_VBoxScreenMonRunner;
 
 //#define VBOXWDDMOVERLAY_TEST
@@ -1344 +1347 @@
                     LPVOID    lpReserved)
 {
-    BOOL bOk = TRUE;
-
     switch (dwReason)
     {
         case DLL_PROCESS_ATTACH:
         {
+            vboxVDbgPrint(("VBoxDispD3D: DLL loaded.\n"));
 #ifdef VBOXWDDMDISP_DEBUG
             vboxVDbgVEHandlerRegister();
@@ -1357 +1359 @@
             HRESULT hr = vboxDispCmInit();
             Assert(hr == S_OK);
+            if (hr == S_OK)
+            {
 #ifdef VBOXDISPMP_TEST
-            if (hr == S_OK)
-            {
                 hr = vboxDispMpTstStart();
                 Assert(hr == S_OK);
-            }
+                if (hr == S_OK)
 #endif
-            if (hr == S_OK)
-                vboxVDbgPrint(("VBoxDispD3D: DLL loaded.\n"));
-            else
-                bOk = FALSE;
-
+                {
+                    hr = VBoxScreenMRunnerStart(&g_VBoxScreenMonRunner);
+                    Assert(hr == S_OK);
+                    /* succeed in any way */
+                    hr = S_OK;
+                    if (hr == S_OK)
+                    {
+                        vboxVDbgPrint(("VBoxDispD3D: DLL loaded OK\n"));
+                        return TRUE;
+                    }
+#ifdef VBOXDISPMP_TEST
+                    vboxDispMpTstStop();
+#endif
+                }
+                vboxDispCmTerm();
+            }
 //                VbglR3Init();
             break;
@@ -1378 +1391 @@
             vboxVDbgVEHandlerUnregister();
 #endif
-            HRESULT hr;
-#ifdef VBOXDISPMP_TEST
-            hr = vboxDispMpTstStop();
+            HRESULT hr = VBoxScreenMRunnerStop(&g_VBoxScreenMonRunner);
             Assert(hr == S_OK);
             if (hr == S_OK)
-#endif
-            {
-                hr = vboxDispCmTerm();
+            {
+#ifdef VBOXDISPMP_TEST
+                hr = vboxDispMpTstStop();
                 Assert(hr == S_OK);
                 if (hr == S_OK)
-                    vboxVDbgPrint(("VBoxDispD3D: DLL unloaded.\n"));
-                else
-                    bOk = FALSE;
+#endif
+                {
+                    hr = vboxDispCmTerm();
+                    Assert(hr == S_OK);
+                    if (hr == S_OK)
+                    {
+                        vboxVDbgPrint(("VBoxDispD3D: DLL unloaded.\n"));
+                        return TRUE;
+                    }
+                }
             }
 //                VbglR3Term();
@@ -1398 +1416 @@
 
         default:
-            break;
-    }
-    return bOk;
+            return TRUE;
+    }
+    return FALSE;
 }