Changeset 29625 in vbox for trunk/src/VBox

Timestamp:

May 18, 2010 12:40:24 PM (15 years ago)

Author:

vboxsync

Message:

Additions: only check the return code of VbglGRPerform()

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Miniport/Helper.cpp (modified) (3 diffs)
• WINNT/Graphics/Miniport/VBoxVideo.cpp (modified) (1 diff)
• common/VBoxGuest/VBoxGuest.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.cpp

@@ -133 +133 @@
         req2->bpp    = bpp;
         rc = VbglGRPerform(&req2->header);
-        if (RT_SUCCESS(rc) && RT_SUCCESS(req2->header.rc))
+        if (RT_SUCCESS(rc))
         {
             bRC = req2->fSupported;
@@ -153 +153 @@
 
             rc = VbglGRPerform(&req->header);
-            if (RT_SUCCESS(rc) && RT_SUCCESS(req->header.rc))
+            if (RT_SUCCESS(rc))
             {
                 bRC = req->fSupported;
@@ -379 +379 @@
         rc = VbglGRPerform (&req->header);
 
-        if (RT_SUCCESS(rc) && RT_SUCCESS(req->header.rc))
+        if (RT_SUCCESS(rc))
         {
             bRC = TRUE;

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -3372 +3372 @@
             {
                 dprintf(("VBoxVideo::vboxVbvaEnable: rc = %Rrc!\n", rc));
-
-                if (RT_SUCCESS(rc))
-                {
-                    rc = req->header.rc;
-                }
             }
 

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

@@ -246 +246 @@
         pReq->u32NotMask = ~fMask;
         rc = VbglGRPerform(&pReq->header);
-        if (    RT_FAILURE(rc)
-            ||  RT_FAILURE(pReq->header.rc))
-            LogRel(("vboxGuestSetFilterMask: failed with rc=%Rrc and VMMDev rc=%Rrc\n",
-                    rc, pReq->header.rc));
+        if (RT_FAILURE(rc))
+            LogRel(("vboxGuestSetFilterMask: failed with rc=%Rrc\n", rc));
         VbglGRFree(&pReq->header);
     }
@@ -1143 +1141 @@
     rc = VbglGRPerform(&pReq->header);
     if (RT_FAILURE(rc))
-        Log(("VBoxGuestSetGuestCapabilities:VbglGRPerform failed, rc=%Rrc!\n", rc));
-    else if (RT_FAILURE(pReq->header.rc))
-    {
-        Log(("VBoxGuestSetGuestCapabilities: The request failed; VMMDev rc=%Rrc!\n", pReq->header.rc));
-        rc = pReq->header.rc;
-    }
+        Log(("VBoxGuestSetGuestCapabilities: VbglGRPerform failed, rc=%Rrc!\n", rc));
 
     VbglGRFree(&pReq->header);
@@ -1492 +1485 @@
     if (RT_FAILURE(rc))
         Log(("VBoxGuestCommonIOCtl: CTL_FILTER_MASK: VbglGRPerform failed, rc=%Rrc!\n", rc));
-    else if (RT_FAILURE(pReq->header.rc))
-    {
-        Log(("VBoxGuestCommonIOCtl: CTL_FILTER_MASK: The request failed; VMMDev rc=%Rrc!\n", pReq->header.rc));
-        rc = pReq->header.rc;
-    }
 
     VbglGRFree(&pReq->header);