vbox的更動 3793 路徑 trunk/src/VBox/Devices/VMMDev

時間撮記:

2007-7-23 下午04:02:49 (17 年 以前)

作者:

vboxsync

訊息:

Inform guest about seamless mode changes

位置:

trunk/src/VBox/Devices/VMMDev

檔案:

• VBoxDev.cpp (修改) (3 筆差異)
• VMMDevState.h (修改) (1 筆差異)

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -1166 +1166 @@
                 VMMDevSeamlessChangeRequest *seamlessChangeRequest = (VMMDevSeamlessChangeRequest*)requestHeader;
                 /* just pass on the information */
-                Log(("VMMDev: returning seamless change request mode=%d\n", pData->SeamlessMode));
-                switch(pData->SeamlessMode)
-                {
-                case PDM_SEAMLESS_MODE_DISABLED:
+                Log(("VMMDev: returning seamless change request mode=%d\n", pData->fSeamlessEnabled));
+                if (pData->fSeamlessEnabled)
+                    seamlessChangeRequest->mode = VMMDev_Seamless_Visible_Region;
+                else
                     seamlessChangeRequest->mode = VMMDev_Seamless_Disabled;
-                    break;
-                case PDM_SEAMLESS_MODE_VISIBLE_REGION:
-                    seamlessChangeRequest->mode = VMMDev_Seamless_Visible_Region;
-                    break;
-                case PDM_SEAMLESS_MODE_HOSTWINDOW:
-                    seamlessChangeRequest->mode = VMMDev_Seamless_Host_Window;
-                    break;
-                }
 
                 if (seamlessChangeRequest->eventAck == VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST)
                 {
                     /* Remember which mode the client has queried. */
-                    pData->lastSeamlessMode = pData->SeamlessMode;
+                    pData->fLastSeamlessEnabled = pData->fSeamlessEnabled;
                 }
 
@@ -1600 +1592 @@
 }
 
-static DECLCALLBACK(int) vmmdevRequestSeamlessChange(PPDMIVMMDEVPORT pInterface, PDMISEAMLESSMODE mode)
+static DECLCALLBACK(int) vmmdevRequestSeamlessChange(PPDMIVMMDEVPORT pInterface, bool fEnabled)
 {
     VMMDevState *pData = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
 
     /* Verify that the new resolution is different and that guest does not yet know about it. */
-    bool fSameMode = (pData->lastSeamlessMode == mode);
-
-    Log(("vmmdevRequestSeamlessChange: same=%d. new=%d\n", fSameMode, mode));
+    bool fSameMode = (pData->fLastSeamlessEnabled == fEnabled);
+
+    Log(("vmmdevRequestSeamlessChange: same=%d. new=%d\n", fSameMode, fEnabled));
 
     if (!fSameMode)
     {
         /* we could validate the information here but hey, the guest can do that as well! */
-        pData->SeamlessMode = mode;
+        pData->fSeamlessEnabled = fEnabled;
 
         /* IRQ so the guest knows what's going on */
@@ -2014 +2006 @@
 
     /* disable seamless mode */
-
-    pData->lastSeamlessMode = PDM_SEAMLESS_MODE_DISABLED;
+    pData->fLastSeamlessEnabled = false;
 
     /* Clear the event variables.

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -137 +137 @@
 
     /* seamless mode change request */
-    PDMISEAMLESSMODE lastSeamlessMode, SeamlessMode;
+    bool fLastSeamlessEnabled, fSeamlessEnabled;
 
 #ifdef TIMESYNC_BACKDOOR