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

Timestamp:

Sep 27, 2013 1:07:09 PM (12 years ago)

Author:

vboxsync

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

89367

Message:

fix seamless for wddm display only case

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (5 diffs)
• VBoxTray/VBoxDispIf.cpp (modified) (12 diffs)
• VBoxTray/VBoxDispIf.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -3691 +3691 @@
             {
                 PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
                 if (!pContext)
                 {
@@ -3704 +3705 @@
                     break;
                 }
-
+#endif
                 /* visible regions for seamless */
                 LPRGNDATA lpRgnData = VBOXDISPIFESCAPE_DATA(pEscapeHdr, RGNDATA);
@@ -3857 +3858 @@
                 }
 
-#if 0
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
                 /* win8.1 does not allow context-based escapes for display-only mode */
                 PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
@@ -3889 +3890 @@
                 }
 
-#if 0
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
                 /* win8.1 does not allow context-based escapes for display-only mode */
                 PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
@@ -3931 +3932 @@
                 }
 
-#if 0
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
                 /* win8.1 does not allow context-based escapes for display-only mode */
                 PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;

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

@@ -37 +37 @@
     PCVBOXDISPIF pIf;
     VBOXDISPKMT_ADAPTER Adapter;
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
     VBOXDISPKMT_DEVICE Device;
     VBOXDISPKMT_CONTEXT Context;
+#endif
 } VBOXDISPIF_OP;
 
@@ -510 +512 @@
     if (SUCCEEDED(hr))
     {
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
         hr = vboxDispKmtCreateDevice(&pOp->Adapter, &pOp->Device);
         if (SUCCEEDED(hr))
@@ -516 +519 @@
                     0, 0, NULL, 0ULL);
             if (SUCCEEDED(hr))
+#endif
                 return ERROR_SUCCESS;
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
             else
                 WARN(("VBoxTray: vboxDispKmtCreateContext failed hr 0x%x", hr));
@@ -526 +531 @@
 
         vboxDispKmtCloseAdapter(&pOp->Adapter);
+#endif
     }
 
@@ -533 +539 @@
 static VOID vboxDispIfOpEnd(VBOXDISPIF_OP *pOp)
 {
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
     vboxDispKmtDestroyContext(&pOp->Context);
     vboxDispKmtDestroyDevice(&pOp->Device);
+#endif
     vboxDispKmtCloseAdapter(&pOp->Adapter);
 }
@@ -1304 +1312 @@
     D3DKMT_ESCAPE EscapeData = {0};
     EscapeData.hAdapter = pOp->Adapter.hAdapter;
-#if 0
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
     /* win8.1 does not allow context-based escapes for display-only mode */
     EscapeData.hDevice = pOp->Device.hDevice;
@@ -1695 +1703 @@
     D3DKMT_ESCAPE EscapeData = {0};
     EscapeData.hAdapter = pOp->Adapter.hAdapter;
-#if 0
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
     /* win8.1 does not allow context-based escapes for display-only mode */
     EscapeData.hDevice = pOp->Device.hDevice;
@@ -1992 +2000 @@
     if (SUCCEEDED(hr))
     {
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
         hr = vboxDispKmtCreateDevice(&pSeamless->modeData.wddm.Adapter, &pSeamless->modeData.wddm.Device);
         if (SUCCEEDED(hr))
@@ -1998 +2007 @@
                     0, 0, hEvent, 0ULL);
             if (SUCCEEDED(hr))
+#endif
                 return ERROR_SUCCESS;
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
             else
                 WARN(("VBoxTray: vboxDispKmtCreateContext failed hr 0x%x", hr));
@@ -2008 +2019 @@
 
         vboxDispKmtCloseAdapter(&pSeamless->modeData.wddm.Adapter);
+#endif
     }
 
@@ -2015 +2027 @@
 static DWORD vboxDispIfSeamlesTermWDDM(VBOXDISPIF_SEAMLESS *pSeamless)
 {
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
     vboxDispKmtDestroyContext(&pSeamless->modeData.wddm.Context);
     vboxDispKmtDestroyDevice(&pSeamless->modeData.wddm.Device);
+#endif
     vboxDispKmtCloseAdapter(&pSeamless->modeData.wddm.Adapter);
 
@@ -2026 +2040 @@
     D3DKMT_ESCAPE EscapeData = {0};
     EscapeData.hAdapter = pSeamless->modeData.wddm.Adapter.hAdapter;
+#ifdef VBOX_DISPIF_WITH_OPCONTEXT
     EscapeData.hDevice = pSeamless->modeData.wddm.Device.hDevice;
     EscapeData.hContext = pSeamless->modeData.wddm.Context.hContext;
+#endif
     EscapeData.Type = D3DKMT_ESCAPE_DRIVERPRIVATE;
     EscapeData.Flags.HardwareAccess = 1;

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

@@ -93 +93 @@
         {
             VBOXDISPKMT_ADAPTER Adapter;
+# ifdef VBOX_DISPIF_WITH_OPCONTEXT
             VBOXDISPKMT_DEVICE Device;
             VBOXDISPKMT_CONTEXT Context;
+# endif
         } wddm;
 #endif