Changeset 106452 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 17, 2024 1:45:57 PM (4 months ago)

Author:

vboxsync

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

165271

Message:

Additions/VBoxTray: Kicked it to make it build with VBOX_WITH_WDDM=. That code area needs a major cleanup for better separation and interfacing later. Untested. bugref:10792

Location:

trunk/src/VBox/Additions

Files:

• 3D/win/VBoxGL/GaDrvEnvKMT.cpp (modified) (2 diffs)
• 3D/win/VBoxICD/VBoxICD.c (modified) (2 diffs)
• 3D/win/VBoxWddmUmHlp/D3DKMT.cpp (modified) (2 diffs)
• 3D/win/VBoxWddmUmHlp/VBoxMpLogger.cpp (modified) (2 diffs)
• 3D/win/VBoxWddmUmHlp/VBoxWddmUmHlp.h (modified) (1 diff)
• WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.cpp (modified) (2 diffs)
• WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.h (modified) (1 diff)
• WINNT/Graphics/Video/disp/wddm/shared/VBoxDispMpLogger.cpp (modified) (5 diffs)
• WINNT/VBoxTray/VBoxDispIf.cpp (modified) (33 diffs)
• WINNT/VBoxTray/VBoxDispIf.h (modified) (1 diff)
• WINNT/VBoxTray/VBoxDisplay.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/3D/win/VBoxGL/GaDrvEnvKMT.cpp

@@ -1274 +1274 @@
 
     /* Figure out which adapter to use. */
-    NTSTATUS Status = vboxDispKmtOpenAdapter2(&mKmtCallbacks.hAdapter, &mKmtCallbacks.AdapterLuid);
+    NTSTATUS Status = VBoxWddmKmtOpenAdapter2(&mKmtCallbacks.hAdapter, &mKmtCallbacks.AdapterLuid);
     Assert(Status == STATUS_SUCCESS);
     if (Status == STATUS_SUCCESS)
@@ -1298 +1298 @@
         }
 
-        vboxDispKmtCloseAdapter(mKmtCallbacks.hAdapter);
+        VBoxWddmKmtCloseAdapter(mKmtCallbacks.hAdapter);
     }
 

trunk/src/VBox/Additions/3D/win/VBoxICD/VBoxICD.c

@@ -84 +84 @@
     D3DKMTLoad();
 
-    Status = vboxDispKmtOpenAdapter(&hAdapter);
+    Status = VBoxWddmKmtOpenAdapter(&hAdapter);
     if (Status == STATUS_SUCCESS)
     {
@@ -109 +109 @@
         }
 
-        vboxDispKmtCloseAdapter(hAdapter);
+        VBoxWddmKmtCloseAdapter(hAdapter);
     }
 }

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/D3DKMT.cpp

@@ -228 +228 @@
 }
 
-NTSTATUS vboxDispKmtOpenAdapter2(D3DKMT_HANDLE *phAdapter, LUID *pLuid)
+NTSTATUS VBoxWddmKmtOpenAdapter2(D3DKMT_HANDLE *phAdapter, LUID *pLuid)
 {
     NTSTATUS Status = vboxDispKmtOpenAdapterFromLuid(phAdapter, pLuid);
@@ -240 +240 @@
 }
 
-NTSTATUS vboxDispKmtOpenAdapter(D3DKMT_HANDLE *phAdapter)
-{
-    return vboxDispKmtOpenAdapter2(phAdapter, NULL);
-}
-
-NTSTATUS vboxDispKmtCloseAdapter(D3DKMT_HANDLE hAdapter)
+NTSTATUS VBoxWddmKmtOpenAdapter(D3DKMT_HANDLE *phAdapter)
+{
+    return VBoxWddmKmtOpenAdapter2(phAdapter, NULL);
+}
+
+NTSTATUS VBoxWddmKmtCloseAdapter(D3DKMT_HANDLE hAdapter)
 {
     D3DKMTFUNCTIONS const *d3dkmt = D3DKMTFunctions();

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/VBoxMpLogger.cpp

@@ -53 +53 @@
 
     D3DKMT_HANDLE hAdapter;
-    NTSTATUS Status = vboxDispKmtOpenAdapter(&hAdapter);
+    NTSTATUS Status = VBoxWddmKmtOpenAdapter(&hAdapter);
     Assert(Status == STATUS_SUCCESS);
     if (Status == 0)
@@ -84 +84 @@
         }
 
-        Status = vboxDispKmtCloseAdapter(hAdapter);
+        Status = VBoxWddmKmtCloseAdapter(hAdapter);
         Assert(Status == STATUS_SUCCESS);
     }

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/VBoxWddmUmHlp.h

@@ -107 +107 @@
 DECLCALLBACK(void) VBoxWddmUmLog(const char *pszString);
 
-/** @todo Rename to VBoxWddm* */
-NTSTATUS vboxDispKmtOpenAdapter2(D3DKMT_HANDLE *phAdapter, LUID *pLuid);
-NTSTATUS vboxDispKmtOpenAdapter(D3DKMT_HANDLE *phAdapter);
-NTSTATUS vboxDispKmtCloseAdapter(D3DKMT_HANDLE hAdapter);
+NTSTATUS VBoxWddmKmtOpenAdapter2(D3DKMT_HANDLE *phAdapter, LUID *pLuid);
+NTSTATUS VBoxWddmKmtOpenAdapter(D3DKMT_HANDLE *phAdapter);
+NTSTATUS VBoxWddmKmtCloseAdapter(D3DKMT_HANDLE hAdapter);
 
 RT_C_DECLS_END

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.cpp

@@ -306 +306 @@
 }
 
-HRESULT vboxDispKmtOpenAdapter(const VBOXDISPKMT_CALLBACKS *pCallbacks, PVBOXDISPKMT_ADAPTER pAdapter)
+HRESULT VBoxWddmKmtOpenAdapter(const VBOXDISPKMT_CALLBACKS *pCallbacks, PVBOXDISPKMT_ADAPTER pAdapter)
 {
     HRESULT hr = vboxDispKmtOpenAdapterViaHdc(pCallbacks, pAdapter);
@@ -319 +319 @@
 }
 
-HRESULT vboxDispKmtCloseAdapter(PVBOXDISPKMT_ADAPTER pAdapter)
+HRESULT VBoxWddmKmtCloseAdapter(PVBOXDISPKMT_ADAPTER pAdapter)
 {
     D3DKMT_CLOSEADAPTER ClosaAdapterData = {0};

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.h

@@ -148 +148 @@
 HRESULT vboxDispKmtCallbacksTerm(PVBOXDISPKMT_CALLBACKS pCallbacks);
 
-HRESULT vboxDispKmtOpenAdapter(const VBOXDISPKMT_CALLBACKS *pCallbacks, PVBOXDISPKMT_ADAPTER pAdapter);
-HRESULT vboxDispKmtCloseAdapter(PVBOXDISPKMT_ADAPTER pAdapter);
+HRESULT VBoxWddmKmtOpenAdapter(const VBOXDISPKMT_CALLBACKS *pCallbacks, PVBOXDISPKMT_ADAPTER pAdapter);
+HRESULT VBoxWddmKmtCloseAdapter(PVBOXDISPKMT_ADAPTER pAdapter);
 HRESULT vboxDispKmtCreateDevice(PVBOXDISPKMT_ADAPTER pAdapter, PVBOXDISPKMT_DEVICE pDevice);
 HRESULT vboxDispKmtDestroyDevice(PVBOXDISPKMT_DEVICE pDevice);

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispMpLogger.cpp

@@ -78 +78 @@
              * check if we can Open Adapter, i.e. WDDM driver is installed */
             VBOXDISPKMT_ADAPTER Adapter;
-            hr = vboxDispKmtOpenAdapter(&g_VBoxDispMpLogger.KmtCallbacks, &Adapter);
+            hr = VBoxWddmKmtOpenAdapter(&g_VBoxDispMpLogger.KmtCallbacks, &Adapter);
             if (hr == S_OK)
             {
                 ASMAtomicWriteU32((volatile uint32_t *)&g_VBoxDispMpLogger.enmState, VBOXDISPMPLOGGER_STATE_INITIALIZED);
-                vboxDispKmtCloseAdapter(&Adapter);
+                VBoxWddmKmtCloseAdapter(&Adapter);
                 return &g_VBoxDispMpLogger;
             }
@@ -125 +125 @@
 
     VBOXDISPKMT_ADAPTER Adapter;
-    HRESULT hr = vboxDispKmtOpenAdapter(&pLogger->KmtCallbacks, &Adapter);
+    HRESULT hr = VBoxWddmKmtOpenAdapter(&pLogger->KmtCallbacks, &Adapter);
     if (hr == S_OK)
     {
@@ -157 +157 @@
             BP_WARN();
         }
-        hr = vboxDispKmtCloseAdapter(&Adapter);
+        hr = VBoxWddmKmtCloseAdapter(&Adapter);
         if(hr != S_OK)
         {
@@ -193 +193 @@
 
     VBOXDISPKMT_ADAPTER Adapter;
-    HRESULT hr = vboxDispKmtOpenAdapter(&pLogger->KmtCallbacks, &Adapter);
+    HRESULT hr = VBoxWddmKmtOpenAdapter(&pLogger->KmtCallbacks, &Adapter);
     if (hr == S_OK)
     {
@@ -228 +228 @@
             BP_WARN();
         }
-        hr = vboxDispKmtCloseAdapter(&Adapter);
+        hr = VBoxWddmKmtCloseAdapter(&Adapter);
         if(hr != S_OK)
         {

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

@@ -73 +73 @@
 {
     PCVBOXDISPIF pIf;
-    VBOXDISPKMT_ADAPTER Adapter;
-    VBOXDISPKMT_DEVICE Device;
-    VBOXDISPKMT_CONTEXT Context;
+#ifdef VBOX_WITH_WDDM
+    union
+    {
+        struct
+        {
+            VBOXDISPKMT_ADAPTER Adapter;
+            VBOXDISPKMT_DEVICE Device;
+            VBOXDISPKMT_CONTEXT Context;
+        } wddm;
+    } u;
+#endif
 } VBOXDISPIF_OP;
 
@@ -118 +126 @@
                                      DISPLAY_DEVICE *paDisplayDevices, DEVMODE *paDeviceModes, UINT cDevModes);
 static DWORD vboxDispIfWddmEnableDisplaysTryingTopology(PCVBOXDISPIF const pIf, UINT cIds, UINT *pIds, BOOL fEnable);
-static DWORD vboxDispIfResizeStartedWDDMOp(VBOXDISPIF_OP *pOp);
+static DWORD vboxDispIfResizeStartedOpWDDM(VBOXDISPIF_OP *pOp);
 
 static void vboxDispIfWddmDcLogRel(VBOXDISPIF_WDDM_DISPCFG const *pCfg, UINT fFlags)
@@ -643 +651 @@
 }
 
-static DWORD vboxDispIfOpBegin(PCVBOXDISPIF pIf, VBOXDISPIF_OP *pOp)
+#ifdef VBOX_WITH_WDDM
+static DWORD vboxDispIfOpBeginWddm(PCVBOXDISPIF pIf, VBOXDISPIF_OP *pOp)
 {
     pOp->pIf = pIf;
 
-    HRESULT hr = vboxDispKmtOpenAdapter(&pIf->modeData.wddm.KmtCallbacks, &pOp->Adapter);
+    HRESULT hr = VBoxWddmKmtOpenAdapter(&pIf->modeData.wddm.KmtCallbacks, &pOp->u.wddm.Adapter);
     if (SUCCEEDED(hr))
     {
-        hr = vboxDispKmtCreateDevice(&pOp->Adapter, &pOp->Device);
+        hr = vboxDispKmtCreateDevice(&pOp->u.wddm.Adapter, &pOp->u.wddm.Device);
         if (SUCCEEDED(hr))
         {
-            hr = vboxDispKmtCreateContext(&pOp->Device, &pOp->Context, VBOXWDDM_CONTEXT_TYPE_CUSTOM_DISPIF_RESIZE,
+            hr = vboxDispKmtCreateContext(&pOp->u.wddm.Device, &pOp->u.wddm.Context, VBOXWDDM_CONTEXT_TYPE_CUSTOM_DISPIF_RESIZE,
                     NULL, 0ULL);
             if (SUCCEEDED(hr))
@@ -660 +669 @@
                 WARN(("VBoxTray: vboxDispKmtCreateContext failed hr 0x%x", hr));
 
-            vboxDispKmtDestroyDevice(&pOp->Device);
+            vboxDispKmtDestroyDevice(&pOp->u.wddm.Device);
         }
         else
             WARN(("VBoxTray: vboxDispKmtCreateDevice failed hr 0x%x", hr));
 
-        vboxDispKmtCloseAdapter(&pOp->Adapter);
+        VBoxWddmKmtCloseAdapter(&pOp->u.wddm.Adapter);
     }
 
@@ -671 +680 @@
 }
 
-static VOID vboxDispIfOpEnd(VBOXDISPIF_OP *pOp)
-{
-    vboxDispKmtDestroyContext(&pOp->Context);
-    vboxDispKmtDestroyDevice(&pOp->Device);
-    vboxDispKmtCloseAdapter(&pOp->Adapter);
-}
+static VOID vboxDispIfOpEndWddm(VBOXDISPIF_OP *pOp)
+{
+    vboxDispKmtDestroyContext(&pOp->u.wddm.Context);
+    vboxDispKmtDestroyDevice(&pOp->u.wddm.Device);
+    VBoxWddmKmtCloseAdapter(&pOp->u.wddm.Adapter);
+}
+#endif /* VBOX_WITH_WDDM */
 
 /* display driver interface abstraction for XPDM & WDDM
@@ -844 +854 @@
     DWORD winEr = ERROR_SUCCESS;
     VBOXDISPKMT_ADAPTER Adapter;
-    HRESULT hr = vboxDispKmtOpenAdapter(&pIf->modeData.wddm.KmtCallbacks, &Adapter);
+    HRESULT hr = VBoxWddmKmtOpenAdapter(&pIf->modeData.wddm.KmtCallbacks, &Adapter);
     if (!SUCCEEDED(hr))
     {
@@ -870 +880 @@
     }
 
-    vboxDispKmtCloseAdapter(&Adapter);
+    VBoxWddmKmtCloseAdapter(&Adapter);
 
     return winEr;
@@ -1395 +1405 @@
 
         D3DKMT_POLLDISPLAYCHILDREN PollData = {0};
-        PollData.hAdapter = pOp->Adapter.hAdapter;
+        PollData.hAdapter = pOp->u.wddm.Adapter.hAdapter;
         PollData.NonDestructiveOnly = 1;
         NTSTATUS Status = pOp->pIf->modeData.wddm.KmtCallbacks.pfnD3DKMTPollDisplayChildren(&PollData);
@@ -1443 +1453 @@
 
     D3DKMT_ESCAPE EscapeData = {0};
-    EscapeData.hAdapter = pOp->Adapter.hAdapter;
+    EscapeData.hAdapter = pOp->u.wddm.Adapter.hAdapter;
 #ifdef VBOX_DISPIF_WITH_OPCONTEXT
     /* win8.1 does not allow context-based escapes for display-only mode */
@@ -1483 +1493 @@
     D3DKMT_ESCAPE EscapeData;
     RT_ZERO(EscapeData);
-    EscapeData.hAdapter = pOp->Adapter.hAdapter;
+    EscapeData.hAdapter = pOp->u.wddm.Adapter.hAdapter;
     EscapeData.Type = D3DKMT_ESCAPE_DRIVERPRIVATE;
     EscapeData.Flags.HardwareAccess = 1;
@@ -1564 +1574 @@
     VBOXDISPIF_OP Op;
 
-    winEr = vboxDispIfOpBegin(pIf, &Op);
+    winEr = vboxDispIfOpBeginWddm(pIf, &Op);
     if (winEr != NO_ERROR)
     {
@@ -1597 +1607 @@
         }
 
-        ddiArgInvalidateVidPN.hAdapter = Op.Adapter.hAdapter;
+        ddiArgInvalidateVidPN.hAdapter = Op.u.wddm.Adapter.hAdapter;
         ddiArgInvalidateVidPN.pPrivateDriverData = &vboxRecommendVidPN;
         ddiArgInvalidateVidPN.PrivateDriverDataSize = sizeof (vboxRecommendVidPN);
@@ -1631 +1641 @@
     }
 
-    vboxDispIfOpEnd(&Op);
+    vboxDispIfOpEndWddm(&Op);
 
     return winEr;
@@ -1791 +1801 @@
 }
 
-BOOL VBoxDispIfResizeDisplayWin7(PCVBOXDISPIF const pIf, uint32_t cDispDef, const VMMDevDisplayDef *paDispDef)
+BOOL VBoxDispIfResizeDisplayWin7Wddm(PCVBOXDISPIF const pIf, uint32_t cDispDef, const VMMDevDisplayDef *paDispDef)
 {
     const VMMDevDisplayDef *pDispDef;
@@ -1811 +1821 @@
 
     VBOXDISPIF_OP Op;
-    DWORD winEr = vboxDispIfOpBegin(pIf, &Op);
+    DWORD winEr = vboxDispIfOpBeginWddm(pIf, &Op);
     if (winEr != ERROR_SUCCESS)
     {
@@ -1838 +1848 @@
     }
 
-    vboxDispIfOpEnd(&Op);
+    vboxDispIfOpEndWddm(&Op);
 
     if (winEr != ERROR_SUCCESS)
@@ -2363 +2373 @@
         case VBOXDISPIF_MODE_WDDM_W7:
             return vboxDispIfResizeModesWDDM(pIf, iChangedMode, fEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
+#else
+        RT_NOREF(iChangedMode, fEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
 #endif
         default:
@@ -2389 +2401 @@
 }
 
+#ifdef VBOX_WITH_WDDM
 static DWORD vboxDispIfConfigureTargetsWDDM(VBOXDISPIF_OP *pOp, uint32_t *pcConnected)
 {
@@ -2396 +2409 @@
 
     D3DKMT_ESCAPE EscapeData = {0};
-    EscapeData.hAdapter = pOp->Adapter.hAdapter;
+    EscapeData.hAdapter = pOp->u.wddm.Adapter.hAdapter;
 #ifdef VBOX_DISPIF_WITH_OPCONTEXT
     /* win8.1 does not allow context-based escapes for display-only mode */
@@ -2418 +2431 @@
 }
 
-static DWORD vboxDispIfResizeStartedWDDMOp(VBOXDISPIF_OP *pOp)
+static DWORD vboxDispIfResizeStartedOpWDDM(VBOXDISPIF_OP *pOp)
 {
     DWORD NumDevices = VBoxDisplayGetCount();
     if (NumDevices == 0)
     {
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: Zero devices found\n"));
+        WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM: Zero devices found\n"));
         return ERROR_GEN_FAILURE;
     }
@@ -2435 +2448 @@
     if (winEr != NO_ERROR)
     {
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: VBoxGetDisplayConfig failed, %d\n", winEr));
+        WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM: VBoxGetDisplayConfig failed, %d\n", winEr));
         return winEr;
     }
 
     if (NumDevices != DevNum)
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: NumDevices(%d) != DevNum(%d)\n", NumDevices, DevNum));
+        WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM: NumDevices(%d) != DevNum(%d)\n", NumDevices, DevNum));
 
 
@@ -2447 +2460 @@
     if (winEr != NO_ERROR)
     {
-        WARN(("VBoxTray: vboxDispIfConfigureTargetsWDDM failed winEr 0x%x\n", winEr));
+        WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM failed winEr 0x%x\n", winEr));
         return winEr;
     }
@@ -2459 +2472 @@
     winEr = vboxDispIfWaitDisplayDataInited(pOp);
     if (winEr != NO_ERROR)
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: vboxDispIfWaitDisplayDataInited failed winEr 0x%x\n", winEr));
+        WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM: vboxDispIfWaitDisplayDataInited failed winEr 0x%x\n", winEr));
 
     DWORD NewNumDevices = VBoxDisplayGetCount();
     if (NewNumDevices == 0)
     {
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: Zero devices found\n"));
+        WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM: Zero devices found\n"));
         return ERROR_GEN_FAILURE;
     }
 
     if (NewNumDevices != NumDevices)
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: NumDevices(%d) != NewNumDevices(%d)\n", NumDevices, NewNumDevices));
+        WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM: NumDevices(%d) != NewNumDevices(%d)\n", NumDevices, NewNumDevices));
 
     DISPLAY_DEVICE *paNewDisplayDevices = (DISPLAY_DEVICE *)alloca (sizeof (DISPLAY_DEVICE) * NewNumDevices);
@@ -2479 +2492 @@
     if (winEr != NO_ERROR)
     {
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: VBoxGetDisplayConfig failed for new devices, %d\n", winEr));
+        WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM: VBoxGetDisplayConfig failed for new devices, %d\n", winEr));
         return winEr;
     }
 
     if (NewNumDevices != NewDevNum)
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: NewNumDevices(%d) != NewDevNum(%d)\n", NewNumDevices, NewDevNum));
+        WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM: NewNumDevices(%d) != NewDevNum(%d)\n", NewNumDevices, NewDevNum));
 
     DWORD minDevNum = RT_MIN(DevNum, NewDevNum);
@@ -2518 +2531 @@
             winEr = vboxDispIfWddmResizeDisplayVista(paNewDeviceModes, paNewDisplayDevices, NewDevNum, i, FALSE, TRUE);
             if (winEr != NO_ERROR)
-                WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: vboxDispIfWddmResizeDisplayVista failed winEr 0x%x\n", winEr));
+                WARN(("VBoxTray: vboxDispIfResizeStartedOpWDDM: vboxDispIfWddmResizeDisplayVista failed winEr 0x%x\n", winEr));
         }
     }
@@ -2525 +2538 @@
 }
 
-
 static DWORD vboxDispIfResizeStartedWDDM(PCVBOXDISPIF const pIf)
 {
     VBOXDISPIF_OP Op;
 
-    DWORD winEr = vboxDispIfOpBegin(pIf, &Op);
+    DWORD winEr = vboxDispIfOpBeginWddm(pIf, &Op);
     if (winEr != NO_ERROR)
     {
@@ -2537 +2549 @@
     }
 
-    winEr = vboxDispIfResizeStartedWDDMOp(&Op);
+    winEr = vboxDispIfResizeStartedOpWDDM(&Op);
     if (winEr != NO_ERROR)
     {
@@ -2543 +2555 @@
     }
 
-    vboxDispIfOpEnd(&Op);
+    vboxDispIfOpEndWddm(&Op);
 
     return winEr;
 }
+#endif /* VBOX_WITH_WDDM */
 
 DWORD VBoxDispIfResizeStarted(PCVBOXDISPIF const pIf)
@@ -2691 +2704 @@
 }
 
+#ifdef VBOX_WITH_WDDM
 static DWORD vboxDispIfSeamlessCreateWDDM(PCVBOXDISPIF const pIf, VBOXDISPIF_SEAMLESS *pSeamless, HANDLE hEvent)
 {
     RT_NOREF(hEvent);
-    HRESULT hr = vboxDispKmtOpenAdapter(&pIf->modeData.wddm.KmtCallbacks, &pSeamless->modeData.wddm.Adapter);
+    HRESULT hr = VBoxWddmKmtOpenAdapter(&pIf->modeData.wddm.KmtCallbacks, &pSeamless->modeData.wddm.Adapter);
     if (SUCCEEDED(hr))
     {
@@ -2714 +2728 @@
             WARN(("VBoxTray: vboxDispKmtCreateDevice failed hr 0x%x", hr));
 
-        vboxDispKmtCloseAdapter(&pSeamless->modeData.wddm.Adapter);
+        VBoxWddmKmtCloseAdapter(&pSeamless->modeData.wddm.Adapter);
 #endif /* VBOX_DISPIF_WITH_OPCONTEXT */
     }
@@ -2727 +2741 @@
     vboxDispKmtDestroyDevice(&pSeamless->modeData.wddm.Device);
 #endif
-    vboxDispKmtCloseAdapter(&pSeamless->modeData.wddm.Adapter);
+    VBoxWddmKmtCloseAdapter(&pSeamless->modeData.wddm.Adapter);
 
     return NO_ERROR;
@@ -2752 +2766 @@
     return Status;
 }
+#endif /* VBOX_WITH_WDDM */
 
 DWORD VBoxDispIfSeamlessCreate(PCVBOXDISPIF const pIf, VBOXDISPIF_SEAMLESS *pSeamless, HANDLE hEvent)
@@ -2767 +2782 @@
         case VBOXDISPIF_MODE_WDDM_W7:
             return vboxDispIfSeamlessCreateWDDM(pIf, pSeamless, hEvent);
+#else
+        RT_NOREF(hEvent);
 #endif
         default:

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

@@ -101 +101 @@
 DWORD VBoxDispIfResizeStarted(PCVBOXDISPIF const pIf);
 
-BOOL VBoxDispIfResizeDisplayWin7(PCVBOXDISPIF const pIf, uint32_t cDispDef, const VMMDevDisplayDef *paDispDef);
+BOOL VBoxDispIfResizeDisplayWin7Wddm(PCVBOXDISPIF const pIf, uint32_t cDispDef, const VMMDevDisplayDef *paDispDef);
 
 typedef struct VBOXDISPIF_SEAMLESS

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

@@ -162 +162 @@
         else
             rc = VINF_SUCCESS;
-#endif
+#else  /* !VBOX_WITH_WDDM */
+        rc = VINF_SUCCESS;
+#endif /* VBOX_WITH_WDDM */
     }
     else if (uNtVersion < RTSYSTEM_MAKE_NT_VERSION(5, 0, 0)) /* Windows NT 4.0. */
@@ -850 +852 @@
 static BOOL DisplayChangeRequestHandler(PVBOXDISPLAYCONTEXT pCtx)
 {
+    int rc = VINF_SUCCESS;
+
+#ifdef VBOX_WITH_WDDM
     VMMDevDisplayDef aDisplays[64];
-    uint32_t cDisplays = RT_ELEMENTS(aDisplays);
-    int rc = VINF_SUCCESS;
+    uint32_t         cDisplays = RT_ELEMENTS(aDisplays);
 
     /* Multidisplay resize is still implemented only for Win7 and newer guests. */
-    if (pCtx->pEnv->dispIf.enmMode >= VBOXDISPIF_MODE_WDDM_W7 &&
-        RT_SUCCESS(rc = VbglR3GetDisplayChangeRequestMulti(cDisplays, &cDisplays, &aDisplays[0], true /* fAck */)))
+    if (   pCtx->pEnv->dispIf.enmMode >= VBOXDISPIF_MODE_WDDM_W7
+        && RT_SUCCESS(rc = VbglR3GetDisplayChangeRequestMulti(cDisplays, &cDisplays, &aDisplays[0], true /* fAck */)))
     {
         uint32_t i;
@@ -874 +878 @@
         }
 
-        return VBoxDispIfResizeDisplayWin7(&pCtx->pEnv->dispIf, cDisplays, &aDisplays[0]);
-    }
+        return VBoxDispIfResizeDisplayWin7Wddm(&pCtx->pEnv->dispIf, cDisplays, &aDisplays[0]);
+    }
+#endif /* VBOX_WITH_WDDM */
 
     /* Fall back to the single monitor resize request. */
@@ -981 +986 @@
             if (ASMAtomicXchgU32(&g_fGuestDisplaysChanged, 0))
             {
+#ifdef VBOX_WITH_WDDM
                 // XPDM driver has VBoxDispDrvNotify to receive such a notifications
                 if (pCtx->pEnv->dispIf.enmMode >= VBOXDISPIF_MODE_WDDM)
@@ -990 +996 @@
                     LogFlowFunc(("VBoxDispIfEscapeInOut returned %d\n", err)); NOREF(err);
                 }
+#endif
             }