Changeset 28086 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Apr 8, 2010 12:32:07 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update; now buffered and deferred commands work.

File:

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

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

@@ -109 +109 @@
 VBGLR3DECL(int) VbglR3GuestCtrlGetHostMsg(uint32_t u32ClientId, uint32_t *puMsg, uint32_t *puNumParms)
 {
+    AssertPtr(puMsg);
+    AssertPtr(puNumParms);
+
     VBoxGuestCtrlHGCMMsgType Msg;
 
@@ -122 +125 @@
     if (RT_SUCCESS(rc))
     {
-        rc = Msg.hdr.result;
+        rc = VbglHGCMParmUInt32Get(&Msg.msg, puMsg);
         if (RT_SUCCESS(rc))
-        {
-            rc = VbglHGCMParmUInt32Get(&Msg.msg, puMsg);
+            rc = VbglHGCMParmUInt32Get(&Msg.num_parms, puNumParms);
             if (RT_SUCCESS(rc))
-                rc = VbglHGCMParmUInt32Get(&Msg.num_parms, puNumParms);
-            /* Ok, so now we know what message type and how much parameters there are. */
-        }
+                rc = Msg.hdr.result;
+                /* Ok, so now we know what message type and how much parameters there are. */
     }
     return rc;
@@ -176 +177 @@
     Msg.hdr.result = VERR_WRONG_ORDER;
     Msg.hdr.u32ClientID = u32ClientId;
-    Msg.hdr.u32Function = GUEST_GET_HOST_MSG_DATA; /* Tell the host we want the actual data of a command. */
+    Msg.hdr.u32Function = GUEST_GET_HOST_MSG;
     Msg.hdr.cParms = uNumParms;
 
@@ -196 +197 @@
     if (RT_SUCCESS(rc))
     {
-        rc = Msg.hdr.result;
-
-        Msg.flags.GetUInt32(puFlags);
-        Msg.num_args.GetUInt32(puNumArgs);
-        Msg.num_env.GetUInt32(puNumEnvVars);
-        Msg.cb_env.GetUInt32(pcbEnv);
-        Msg.timeout.GetUInt32(puTimeLimit);        
+        int rc2 = Msg.hdr.result;
+        if (RT_FAILURE(rc2))
+        {
+            rc = rc2;
+        }
+        else
+        {
+            Msg.flags.GetUInt32(puFlags);
+            Msg.num_args.GetUInt32(puNumArgs);
+            Msg.num_env.GetUInt32(puNumEnvVars);
+            Msg.cb_env.GetUInt32(pcbEnv);
+            Msg.timeout.GetUInt32(puTimeLimit);
+        }
     }
     return rc;