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

Timestamp:

Oct 12, 2010 1:20:50 PM (14 years ago)

Author:

vboxsync

Message:

Guest Execution/Copy: Added support for input handling, added more code for data copying.

File:

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

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

@@ -105 +105 @@
 VBGLR3DECL(int) VbglR3GuestCtrlGetHostMsg(uint32_t u32ClientId, uint32_t *puMsg, uint32_t *puNumParms)
 {
-    AssertPtr(puMsg);
-    AssertPtr(puNumParms);
+    AssertPtrReturn(puMsg, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puNumParms, VERR_INVALID_PARAMETER);
 
     VBoxGuestCtrlHGCMMsgType Msg;
@@ -178 +178 @@
                                               uint32_t *puTimeLimit)
 {
-    AssertPtr(puContext);
-    AssertPtr(pszCmd);
-    AssertPtr(puFlags);
-    AssertPtr(pszArgs);
-    AssertPtr(puNumArgs);
-    AssertPtr(pszEnv);
-    AssertPtr(pcbEnv);
-    AssertPtr(puNumEnvVars);
-    AssertPtr(pszUser);
-    AssertPtr(pszPassword);
-    AssertPtr(puTimeLimit);
+    AssertPtrReturn(puContext, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszCmd, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puFlags, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszArgs, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puNumArgs, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszEnv, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcbEnv, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puNumEnvVars, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszUser, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszPassword, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puTimeLimit, VERR_INVALID_PARAMETER);
 
     VBoxGuestCtrlHGCMMsgExecCmd Msg;
@@ -197 +197 @@
     Msg.hdr.cParms = uNumParms;
 
-    VbglHGCMParmUInt32Set(&Msg.context, 0); /** @todo Put this some header struct! */
+    VbglHGCMParmUInt32Set(&Msg.context, 0);
     VbglHGCMParmPtrSet(&Msg.cmd, pszCmd, cbCmd);
     VbglHGCMParmUInt32Set(&Msg.flags, 0);
@@ -245 +245 @@
                                                     uint32_t *puHandle,       uint32_t *puFlags)
 {
-    AssertPtr(puContext);
-    AssertPtr(puPID);
+    AssertPtrReturn(puContext, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puPID, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puHandle, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puFlags, VERR_INVALID_PARAMETER);
 
     VBoxGuestCtrlHGCMMsgExecOut Msg;
@@ -255 +257 @@
     Msg.hdr.cParms = uNumParms;
 
-    VbglHGCMParmUInt32Set(&Msg.context, 0); /** @todo Put this some header struct! */
+    VbglHGCMParmUInt32Set(&Msg.context, 0);
     VbglHGCMParmUInt32Set(&Msg.pid, 0);
     VbglHGCMParmUInt32Set(&Msg.handle, 0);
@@ -274 +276 @@
             Msg.handle.GetUInt32(puHandle);
             Msg.flags.GetUInt32(puFlags);
+        }
+    }
+    return rc;
+}
+
+
+/**
+ * Retrieves the input data from host which then gets sent to the
+ * started process.
+ *
+ * This will block until data becomes available.
+ *
+ * @returns VBox status code.
+ * @param   u32ClientId     The client id returned by VbglR3GuestCtrlConnect().
+ * @param   uNumParms
+ ** @todo Docs!
+ */
+VBGLR3DECL(int) VbglR3GuestCtrlExecGetHostCmdInput(uint32_t  u32ClientId,    uint32_t   uNumParms,
+                                                   uint32_t *puContext,      uint32_t  *puPID,
+                                                   uint32_t *puFlags,
+                                                   void      *pvData,        uint32_t  cbData,
+                                                   uint32_t *pcbSize)
+{
+    AssertPtrReturn(puContext, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puPID, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puFlags, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pvData, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcbSize, VERR_INVALID_PARAMETER);
+
+    VBoxGuestCtrlHGCMMsgExecIn Msg;
+
+    Msg.hdr.result = VERR_WRONG_ORDER;
+    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32Function = GUEST_GET_HOST_MSG;
+    Msg.hdr.cParms = uNumParms;
+
+    VbglHGCMParmUInt32Set(&Msg.context, 0);
+    VbglHGCMParmUInt32Set(&Msg.pid, 0);
+    VbglHGCMParmUInt32Set(&Msg.flags, 0);
+    VbglHGCMParmPtrSet(&Msg.data, pvData, cbData);
+    VbglHGCMParmUInt32Set(&Msg.size, 0);
+
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+    {
+        int rc2 = Msg.hdr.result;
+        if (RT_FAILURE(rc2))
+        {
+            rc = rc2;
+        }
+        else
+        {
+            Msg.context.GetUInt32(puContext);
+            Msg.pid.GetUInt32(puPID);
+            Msg.flags.GetUInt32(puFlags);
+            Msg.size.GetUInt32(pcbSize);
         }
     }
@@ -355 +413 @@
 }
 
+
+/**
+ * Reports back the input status to the host.
+ *
+ * @returns VBox status code.
+ ** @todo Docs!
+ */
+VBGLR3DECL(int) VbglR3GuestCtrlExecReportStatusIn(uint32_t     u32ClientId,
+                                                  uint32_t     u32Context,
+                                                  uint32_t     u32PID,
+                                                  uint32_t     u32Flags,
+                                                  uint32_t     cbWritten)
+{
+    VBoxGuestCtrlHGCMMsgExecStatusIn Msg;
+
+    Msg.hdr.result = VERR_WRONG_ORDER;
+    Msg.hdr.u32ClientID = u32ClientId;
+    Msg.hdr.u32Function = GUEST_EXEC_SEND_INPUT_STATUS;
+    Msg.hdr.cParms = 4;
+
+    VbglHGCMParmUInt32Set(&Msg.context, u32Context);
+    VbglHGCMParmUInt32Set(&Msg.pid, u32PID);
+    VbglHGCMParmUInt32Set(&Msg.flags, u32Flags);
+    VbglHGCMParmUInt32Set(&Msg.written, cbWritten);
+
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+    {
+        int rc2 = Msg.hdr.result;
+        if (RT_FAILURE(rc2))
+            rc = rc2;
+    }
+    return rc;
+}