Changeset 8996 in vbox

Timestamp:

May 21, 2008 8:24:45 AM (17 years ago)

Author:

vboxsync

Message:

VMMDev must return the last acknowledged resolution to the guest.

File:

• trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (1 diff)

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

@@ -859 +859 @@
             {
                 VMMDevDisplayChangeRequest *displayChangeRequest = (VMMDevDisplayChangeRequest*)pRequestHeader;
+
+                if (displayChangeRequest->eventAck == VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
+                {
+                    /* Remember which resolution the client has queried, subsequent reads will return the same values. */
+                    pData->lastReadDisplayChangeRequest = pData->displayChangeRequest;
+                }
+
                 /* just pass on the information */
                 Log(("VMMDev: returning display change request xres = %d, yres = %d, bpp = %d\n",
                      pData->displayChangeRequest.xres, pData->displayChangeRequest.yres, pData->displayChangeRequest.bpp));
-                displayChangeRequest->xres = pData->displayChangeRequest.xres;
-                displayChangeRequest->yres = pData->displayChangeRequest.yres;
-                displayChangeRequest->bpp  = pData->displayChangeRequest.bpp;
+                displayChangeRequest->xres = pData->lastReadDisplayChangeRequest.xres;
+                displayChangeRequest->yres = pData->lastReadDisplayChangeRequest.yres;
+                displayChangeRequest->bpp  = pData->lastReadDisplayChangeRequest.bpp;
+
+                pRequestHeader->rc = VINF_SUCCESS;
+            }
+            break;
+        }
+
+        case VMMDevReq_GetDisplayChangeRequest2:
+        {
+            if (pRequestHeader->size != sizeof(VMMDevDisplayChangeRequest2))
+            {
+                pRequestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                VMMDevDisplayChangeRequest2 *displayChangeRequest = (VMMDevDisplayChangeRequest2*)pRequestHeader;
 
                 if (displayChangeRequest->eventAck == VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
                 {
-                    /* Remember which resolution the client has queried. */
+                    /* Remember which resolution the client has queried, subsequent reads will return the same values. */
                     pData->lastReadDisplayChangeRequest = pData->displayChangeRequest;
                 }
 
-                pRequestHeader->rc = VINF_SUCCESS;
-            }
-            break;
-        }
-
-        case VMMDevReq_GetDisplayChangeRequest2:
-        {
-            if (pRequestHeader->size != sizeof(VMMDevDisplayChangeRequest2))
-            {
-                pRequestHeader->rc = VERR_INVALID_PARAMETER;
-            }
-            else
-            {
-                VMMDevDisplayChangeRequest2 *displayChangeRequest = (VMMDevDisplayChangeRequest2*)pRequestHeader;
                 /* just pass on the information */
                 Log(("VMMDev: returning display change request xres = %d, yres = %d, bpp = %d at %d\n",
                      pData->displayChangeRequest.xres, pData->displayChangeRequest.yres, pData->displayChangeRequest.bpp, pData->displayChangeRequest.display));
-                displayChangeRequest->xres    = pData->displayChangeRequest.xres;
-                displayChangeRequest->yres    = pData->displayChangeRequest.yres;
-                displayChangeRequest->bpp     = pData->displayChangeRequest.bpp;
-                displayChangeRequest->display = pData->displayChangeRequest.display;
-
-                if (displayChangeRequest->eventAck == VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
-                {
-                    /* Remember which resolution the client has queried. */
-                    pData->lastReadDisplayChangeRequest = pData->displayChangeRequest;
-                }
+                displayChangeRequest->xres    = pData->lastReadDisplayChangeRequest.xres;
+                displayChangeRequest->yres    = pData->lastReadDisplayChangeRequest.yres;
+                displayChangeRequest->bpp     = pData->lastReadDisplayChangeRequest.bpp;
+                displayChangeRequest->display = pData->lastReadDisplayChangeRequest.display;
 
                 pRequestHeader->rc = VINF_SUCCESS;