Changeset 53463 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

Timestamp:

Dec 5, 2014 2:43:21 PM (10 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuestLib: fix mode hint backwards compatibility.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

@@ -383 +383 @@
     {
         rc = VbglR3GuestPropWriteValue(u32ClientId, szModeName, szModeParms);
-        if (cScreen == 0)  /* Write out the mode using the legacy name too, in
-                            * case the user installs older Additions. */
+        /* Write out the mode using the legacy name too, in case the user
+         * re-installs older Additions. */
+        if (cScreen == 0)
+        {
+            RTStrPrintf(szModeParms, sizeof(szModeParms), "%ux%ux%u", cx, cy,
+                        cBits);
             VbglR3GuestPropWriteValue(u32ClientId, VIDEO_PROP_PREFIX"SavedMode",
                                       szModeParms);
+        }
     }
     if (u32ClientId != 0)
@@ -447 +452 @@
     uint32_t u32ClientId = 0;
     int cMatches;
-    unsigned cx, cy, cBits, x, y, fEnabled;
-    int rc, rc2 = VERR_UNRESOLVED_ERROR;
+    unsigned cx, cy, cBits;
+    unsigned x = 0;
+    unsigned y = 0;
+    unsigned fEnabled = 1;
+    int rc;
+    int rc2 = VERR_UNRESOLVED_ERROR;
 
     /** @todo add a VbglR3GuestPropReadValueF/FV that does the RTStrPrintf for you. */
@@ -457 +466 @@
         rc = VbglR3GuestPropReadValue(u32ClientId, szModeName, szModeParms,
                                       sizeof(szModeParms), NULL);
-        if (rc == VERR_NOT_FOUND)  /* Try legacy single screen name. */
+        /* Try legacy single screen name. */
+        if (rc == VERR_NOT_FOUND && cScreen == 0)
             rc = VbglR3GuestPropReadValue(u32ClientId,
                                           VIDEO_PROP_PREFIX"SavedMode",
@@ -473 +483 @@
     if (RT_SUCCESS(rc))
     {
-        cMatches = sscanf(szModeParms, "%ux%ux%u,%ux%u,%u\n", &cx, &cy, &cBits,
-                          &x, &y, &fEnabled);
-        if (cMatches == 6)
+        char c1, c2;
+        cMatches = sscanf(szModeParms, "%ux%ux%u%c%ux%u,%u%c", &cx, &cy, &cBits,
+                          &c1, &x, &y, &fEnabled, &c2);
+        if ((cMatches == 7 && c1 == ',') || cMatches == 3)
             rc = VINF_SUCCESS;
         else if (cMatches < 0)