Changeset 105527 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jul 26, 2024 5:13:32 PM (4 months ago)

Author:

vboxsync

Message:

GA/Windows: Send VBOXESC_RECONNECT_TARGETS from VboxService to VBoxWddm upon request from a host. bugref:10714

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceDisplayConfig.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceDisplayConfig.cpp

@@ -73 +73 @@
 }
 
-void ReplugDisplays(uint32_t cDisplays, VMMDevDisplayDef *paDisplays)
-{
-    RT_NOREF2(cDisplays, paDisplays);
+void ReconnectDisplays(uint32_t cDisplays, VMMDevDisplayDef *paDisplays)
+{
     D3DKMT_HANDLE hAdapter;
     D3DKMT_ENUMADAPTERS EnumAdapters = {0};
     NTSTATUS rcNt;
-    ULONG id = 0;
+    uint32_t u32Mask = 0;
+
+    for(uint32_t i = 0; i < cDisplays; i++)
+    {
+        u32Mask |= (paDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_DISABLED) ? 0 : RT_BIT(i);
+    }
+
+    VGSvcVerbose(2, "ReconnectDisplays u32Mask 0x%x\n", u32Mask);
 
     EnumAdapters.NumAdapters = RT_ELEMENTS(EnumAdapters.Adapters);
@@ -86 +92 @@
     VGSvcVerbose(2, "D3DKMTEnumAdapters  rcNt=%#x NumAdapters=%d\n", rcNt, EnumAdapters.NumAdapters);
 
-    for(id = 0; id < EnumAdapters.NumAdapters; id++)
+    for(ULONG id = 0; id < EnumAdapters.NumAdapters; id++)
     {
         D3DKMT_ADAPTERINFO *pAdapterInfo = &EnumAdapters.Adapters[id];
@@ -104 +110 @@
     {
         VBOXDISPIFESCAPE EscapeHdr = {0};
-        EscapeHdr.escapeCode = VBOXESC_CONFIGURETARGETS;
-        EscapeHdr.u32CmdSpecific = 0;
+        EscapeHdr.escapeCode = VBOXESC_RECONNECT_TARGETS;
+        EscapeHdr.u32CmdSpecific = u32Mask;
 
         D3DKMT_ESCAPE EscapeData = {0};
@@ -162 +168 @@
             if (cDisplays > 0)
             {
-                ReplugDisplays(cDisplays, &aDisplays[0]);
-                VGSvcVerbose(2, "Display[0] (%dx%d)\n", aDisplays[0].cx, aDisplays[0].cy);
+                for(uint32_t i = 0; i < cDisplays; i++)
+                {
+                    VGSvcVerbose(2, "Display[%i] flags=%#x (%dx%d)\n", i,
+                        aDisplays[i].fDisplayFlags,
+                        aDisplays[i].cx, aDisplays[i].cy);
+                }
+
+                ReconnectDisplays(cDisplays, &aDisplays[0]);
             }
         }