Changeset 105526 in vbox for trunk

Timestamp:

Jul 26, 2024 3:48:28 PM (6 months ago)

Author:

vboxsync

Message:

GA/Windows: New VBOXESC_RECONNECT_TARGETS instead of VBOXESC_CONFIGURETARGETS to forcibly reconnect a guest displays. bugref:10714

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (2 diffs)
• include/VBoxDisplay.h (modified) (1 diff)

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

@@ -3423 +3423 @@
                 {
                     WARN(("VBOXESC_CONFIGURETARGETS invalid command %d", pEscapeHdr->u32CmdSpecific));
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
+//                    Status = STATUS_INVALID_PARAMETER;
+//                    break;
                 }
 
@@ -3481 +3481 @@
                 break;
             }
+
+            case VBOXESC_RECONNECT_TARGETS:
+            {
+                LOG(("=> VBOXESC_RECONNECT_TARGETS"));
+
+                if (!pEscape->Flags.HardwareAccess)
+                {
+                    WARN(("VBOXESC_RECONNECT_TARGETS called without HardwareAccess flag set, failing\n"));
+                    Status = STATUS_INVALID_PARAMETER;
+                    break;
+                }
+
+                if (pEscape->PrivateDriverDataSize != sizeof (*pEscapeHdr))
+                {
+                    WARN(("VBOXESC_RECONNECT_TARGETS invalid private driver size %d\n", pEscape->PrivateDriverDataSize));
+                    Status = STATUS_INVALID_PARAMETER;
+                    break;
+                }
+
+                if (pEscapeHdr->u32CmdSpecific == 0)
+                {
+                    WARN(("VBOXESC_RECONNECT_TARGETS u32CmdSpecific is zero\n"));
+                    Status = STATUS_INVALID_PARAMETER;
+                    break;
+                }
+
+                uint32_t u32Mask = pEscapeHdr->u32CmdSpecific;
+
+                for (int i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+                {
+                    VBOXWDDM_TARGET *pTarget = &pDevExt->aTargets[i];
+                    bool fConnReq = u32Mask & RT_BIT(i);
+
+                    pTarget->fConfigured = true;
+
+                    if (!pTarget->fConnected && fConnReq)
+                    {
+                        Status = VBoxWddmChildStatusConnect(pDevExt, (uint32_t)i, TRUE);
+                        LOG(("VBOXESC_RECONNECT_TARGETS connecting target %d, status 0x%x", i, Status));
+                    }
+                    else if (pTarget->fConnected && !fConnReq)
+                    {
+                        Status = VBoxWddmChildStatusConnect(pDevExt, (uint32_t)i, FALSE);
+                        LOG(("VBOXESC_RECONNECT_TARGETS disconnecting target %d, status 0x%x", i, Status));
+                    }
+                 }
+
+                Status = STATUS_SUCCESS;
+
+                LOG(("<= VBOXESC_RECONNECT_TARGETS"));
+                break;
+            }
+
             case VBOXESC_SETALLOCHOSTID:
             {

trunk/src/VBox/Additions/WINNT/include/VBoxDisplay.h

@@ -59 +59 @@
 # define VBOXESC_GUEST_DISPLAYCHANGED       0xABCD9017
 # define VBOXESC_TARGET_CONNECTIVITY        0xABCD9018
+
+# define VBOXESC_RECONNECT_TARGETS          0xABCD9019
 #endif /* #ifdef VBOX_WITH_WDDM */