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

Timestamp:

Aug 2, 2016 10:11:36 AM (9 years ago)

Author:

vboxsync

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

109461

Message:

3D: report guest screen position to the host when the user rearranges screens in the guest. bugref:8450

Location:

trunk/src/VBox/Additions/WINNT

Files:

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

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

@@ -4929 +4929 @@
                 break;
             }
+            case VBOXESC_GUEST_DISPLAYCHANGED:
+            {
+                LOG(("=> VBOXESC_GUEST_DISPLAYCHANGED"));
+
+                for (int i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+                {
+                    vboxWddmDisplaySettingsCheckPos(pDevExt, i);
+                }
+                break;
+            }
             default:
                 WARN(("unsupported escape code (0x%x)", pEscapeHdr->escapeCode));

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

@@ -1011 +1011 @@
         else
         {
+            // Checking once a second whether or not WM_DISPLAYCHANGED happened.
+            if (ASMAtomicXchgU32(&g_fGuestDisplaysChanged, 0))
+            {
+                // XPDM driver has VBoxDispDrvNotify to receive such a notifications
+                if (pCtx->pEnv->dispIf.enmMode >= VBOXDISPIF_MODE_WDDM)
+                {
+                    VBOXDISPIFESCAPE EscapeHdr = { 0 };
+                    EscapeHdr.escapeCode = VBOXESC_GUEST_DISPLAYCHANGED;
+
+                    DWORD err = VBoxDispIfEscapeInOut(&pCtx->pEnv->dispIf, &EscapeHdr, 0);
+                    LogFlowFunc(("VBoxDispIfEscapeInOut returned %d\n", err));
+                }
+            }
             /* sleep a bit to not eat too much CPU in case the above call always fails */
             RTThreadSleep(10);

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

@@ -144 +144 @@
 NOTIFYICONDATA        g_NotifyIconData;
 DWORD                 g_dwMajorVersion;
+
+uint32_t              g_fGuestDisplaysChanged = 0;
 
 static PRTLOGGER      g_pLoggerRelease = NULL;
@@ -1165 +1167 @@
 
         case WM_DISPLAYCHANGE:
+            ASMAtomicUoWriteU32(&g_fGuestDisplaysChanged, 1);
+            // No break or return is intentional here.
         case WM_VBOX_SEAMLESS_UPDATE:
         {

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

@@ -189 +189 @@
 extern HWND         g_hwndToolWindow;
 extern HINSTANCE    g_hInstance;
+extern uint32_t     g_fGuestDisplaysChanged;
 
 #endif /* !___VBOXTRAY_H */

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

@@ -42 +42 @@
 # define VBOXESC_CRHGSMICTLCON_GETHOSTCAPS  0xABCD9015
 # define VBOXESC_UPDATEMODES                0xABCD9016
+# define VBOXESC_GUEST_DISPLAYCHANGED       0xABCD9017
 #endif /* #ifdef VBOX_WITH_WDDM */