Changeset 105749 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Aug 21, 2024 9:31:01 AM (5 months ago)

Author:

vboxsync

Message:

GA/Windows: Use two separate bitmasks for displays to enable and disable. bugref:10714

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (3 diffs)

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

@@ -3493 +3493 @@
                 }
 
-                if (pEscape->PrivateDriverDataSize != sizeof (*pEscapeHdr))
+                if (pEscape->PrivateDriverDataSize < sizeof (VBOXDISPIFESCAPE_RECONNECT_TARGETS))
                 {
                     WARN(("VBOXESC_RECONNECT_TARGETS invalid private driver size %d\n", pEscape->PrivateDriverDataSize));
@@ -3500 +3500 @@
                 }
 
-                if (pEscapeHdr->u32CmdSpecific == 0)
-                {
-                    WARN(("VBOXESC_RECONNECT_TARGETS u32CmdSpecific is zero\n"));
+                if (pEscapeHdr->u32CmdSpecific != 0)
+                {
+                    WARN(("VBOXESC_RECONNECT_TARGETS u32CmdSpecific is not zero\n"));
                     Status = STATUS_INVALID_PARAMETER;
                     break;
                 }
 
-                uint32_t u32ConnectMask = pEscapeHdr->u32CmdSpecific;
+                VBOXDISPIFESCAPE_RECONNECT_TARGETS *pVBoxEscapeReconnectTargets = (VBOXDISPIFESCAPE_RECONNECT_TARGETS *)pEscape->pPrivateDriverData;
+                uint32_t u32ConnectMask = pVBoxEscapeReconnectTargets->u32ConnectMask;
+                uint32_t u32DisconnectMask = pVBoxEscapeReconnectTargets->u32DisconnectMask;
+
+                if (u32ConnectMask & u32DisconnectMask)
+                {
+                    WARN(("VBOXESC_RECONNECT_TARGETS (u32ConnectMask & u32DisconnectMask) is not zero\n"));
+                    Status = STATUS_INVALID_PARAMETER;
+                    break;
+                }
 
                 HANDLE hKey = NULL;
@@ -3520 +3529 @@
                 {
                     VBOXWDDM_TARGET *pTarget = &pDevExt->aTargets[i];
-                    bool fConnectReq = u32ConnectMask & RT_BIT(i);
+                    bool fConnectReq;
+
+                    if (u32ConnectMask & RT_BIT(i))
+                        fConnectReq = true;
+                    else if (u32DisconnectMask & RT_BIT(i))
+                        fConnectReq = false;
+                    else
+                        continue;
 
                     pTarget->fConfigured = true;