Changeset 53434 in vbox for trunk

Timestamp:

Dec 3, 2014 3:20:59 PM (10 years ago)

Author:

vboxsync

Message:

Additions/common and x11: improve error handling related to mode hint passing.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/VBoxGuest.cpp (modified) (1 diff)
• common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp (modified) (2 diffs)
• common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (4 diffs)
• x11/VBoxClient/display.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -2319 +2319 @@
             }
         }
+        else
+            rc = pInfo->result;
         if (pcbDataReturned)
             *pcbDataReturned = sizeof(*pInfo);

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

@@ -121 +121 @@
  *
  * @returns VBox status code
+ * @returns VERR_NOT_SUPPORTED if guest properties are not available on the host.
  * @param   pu32ClientId    Where to put the client id on success. The client id
  *                          must be passed to all the other calls to the service.
@@ -139 +140 @@
         if (RT_SUCCESS(rc))
             *pu32ClientId = Info.u32ClientID;
+        if (rc == VERR_NOT_IMPLEMENTED || rc == VERR_HGCM_SERVICE_NOT_FOUND)
+            rc = VERR_NOT_SUPPORTED;
     }
     return rc;

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

@@ -305 +305 @@
  *
  * @returns iprt status value
+ * @returns VERR_NOT_SUPPORTED if the guest property service is not available.
  * @param   pcScreen   where to store the virtual screen number
  */
@@ -343 +344 @@
     return rc;
 #else /* !VBOX_WITH_GUEST_PROPS */
-    return VERR_NOT_IMPLEMENTED;
+    return VERR_NOT_SUPPORTED;
 #endif /* !VBOX_WITH_GUEST_PROPS */
 }
@@ -404 +405 @@
     return rc;
 #else /* !VBOX_WITH_GUEST_PROPS */
-    return VERR_NOT_IMPLEMENTED;
+    return VERR_NOT_SUPPORTED;
 #endif /* !VBOX_WITH_GUEST_PROPS */
 }
@@ -488 +489 @@
     return rc;
 #else /* !VBOX_WITH_GUEST_PROPS */
-    return VERR_NOT_IMPLEMENTED;
+    return VERR_NOT_SUPPORTED;
 #endif /* !VBOX_WITH_GUEST_PROPS */
 }

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -207 +207 @@
     LogRelFlowFunc(("\n"));
     rc = VbglR3VideoModeGetHighestSavedScreen(&cScreens);
-    if (RT_FAILURE(rc))
+    if (rc != VINF_SUCCESS && rc != VERR_NOT_SUPPORTED)
         VBClFatalError(("Failed to get the number of saved screen modes, rc=%Rrc\n",
                     rc));
-    for (i = 0; i < RT_MAX(cScreens + 1, 8); ++i)
-    {
-        unsigned cx = 0, cy = 0, cBPP = 0, x = 0, y = 0;
-        bool fEnabled = true;
-
-        rc = VbglR3RetrieveVideoMode(i, &cx, &cy, &cBPP, &x, &y,
-                                     &fEnabled);
-        if (RT_SUCCESS(rc) && i > cScreens) /* Sanity */
-            VBClFatalError(("Internal error retrieving the number of saved screen modes.\n"));
-        if (RT_SUCCESS(rc))
-            setModeX11(pState, cx, cy, cBPP, i, x, y, fEnabled,
-                       true);
-    }
+    if (rc == VINF_SUCCESS)
+        /* The "8" is to sanity test that VbglR3VideoModeGetHighestSavedScreen()
+         * worked right. */
+        for (i = 0; i < RT_MAX(cScreens + 1, 8); ++i)
+        {
+            unsigned cx = 0, cy = 0, cBPP = 0, x = 0, y = 0;
+            bool fEnabled = true;
+
+            rc = VbglR3RetrieveVideoMode(i, &cx, &cy, &cBPP, &x, &y,
+                                         &fEnabled);
+            /* Sanity test. */
+            if (   (rc != VINF_SUCCESS && rc != VERR_NOT_FOUND)
+                || (i > cScreens && rc != VERR_NOT_FOUND))
+                VBClFatalError(("Internal error retrieving the number of saved screen modes.\n"));
+            if (rc == VINF_SUCCESS)
+                setModeX11(pState, cx, cy, cBPP, i, x, y, fEnabled,
+                           true);
+        }
     while (true)
     {
@@ -261 +266 @@
                                                &fChangeOrigin, true);
             /* Extended display version not supported on host */
-            if (RT_FAILURE(rc))
+            if (rc != VINF_SUCCESS)
                 VBClFatalError(("Failed to get display change request, rc=%Rrc\n",
                                 rc));
             else
-                LogRelFlowFunc(("Got extended size hint from host cx=%d, cy=%d, bpp=%d, iDisplay=%d, x=%d, y=%d fEnabled=%d\n",
+                LogRelFlowFunc(("Got size hint from host cx=%d, cy=%d, bpp=%d, iDisplay=%d, x=%d, y=%d fEnabled=%d\n",
                                 cx, cy, cBPP, iDisplay, x, y,
                                 fEnabled));
-            if (RT_FAILURE(rc))
-                VBClFatalError(("Failed to retrieve size hint, rc=%Rrc\n", rc));
             if (iDisplay > INT32_MAX)
                 VBClFatalError(("Received a size hint for too high display number %u\n",
@@ -280 +283 @@
                 rc = VbglR3SaveVideoMode(iDisplay, cx, cy, cBPP, x, y,
                                          fEnabled);
-                if (   RT_FAILURE(rc)
-                    && rc != VERR_HGCM_SERVICE_NOT_FOUND
-                    && rc != VERR_NOT_IMPLEMENTED /* No HGCM */)
+                if (RT_FAILURE(rc) && rc != VERR_NOT_SUPPORTED)
                     VBClFatalError(("Failed to save size hint, rc=%Rrc\n", rc));
             }