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

Timestamp:

Mar 21, 2014 9:29:56 AM (11 years ago)

Author:

vboxsync

Message:

Additions: also check the actual result of certain vbglDriverIOCtl() calls

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCM.cpp (modified) (1 diff)
• Mouse.cpp (modified) (2 diffs)

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

@@ -138 +138 @@
         return VERR_INVALID_PARAMETER;
 
-    pHandleData = vbglHGCMHandleAlloc ();
-
-    rc = VINF_SUCCESS;
-
+    pHandleData = vbglHGCMHandleAlloc();
     if (!pHandleData)
-    {
         rc = VERR_NO_MEMORY;
-    }
     else
     {
         rc = vbglDriverOpen (&pHandleData->driver);
-
         if (RT_SUCCESS(rc))
         {
             rc = vbglDriverIOCtl (&pHandleData->driver, VBOXGUEST_IOCTL_HGCM_CONNECT, pData, sizeof (*pData));
-
-            if (RT_SUCCESS(rc))
+            if (   RT_SUCCESS(rc)
+                && RT_SUCCESS(pData->result))
             {
                 *pHandle = pHandleData;
-            }
-            else
-            {
-                vbglDriverClose (&pHandleData->driver);
+                return rc;
             }
         }
-
-        if (RT_FAILURE(rc))
-        {
-            vbglHGCMHandleFree (pHandleData);
-        }
     }
-
+    vbglDriverClose (&pHandleData->driver);
+    vbglHGCMHandleFree (pHandleData);
     return rc;
 }

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

@@ -46 +46 @@
     VBoxGuestMouseSetNotifyCallback NotifyCallback;
     VBGLDRIVER *pDriver;
-    int rc;
-
-    rc = vbglGetDriver(&pDriver);
+    int rc = vbglGetDriver(&pDriver);
     if (RT_FAILURE(rc))
         return rc;
@@ -85 +83 @@
     if (RT_FAILURE(rc))
         return rc;
+    if (RT_FAILURE(Req.header.rc))
+        return Req.header.rc;
     if (pfFeatures)
         *pfFeatures = Req.mouseFeatures;