Changeset 33064 in vbox for trunk/src/VBox/HostServices

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/HostServices/GuestControl/service.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -389 +389 @@
     if (cParms != pBuf->uParmCount)
     {
+        LogFlowFunc(("Parameter count does not match (%u (buffer), %u (guest))\n",
+                     pBuf->uParmCount, cParms));
         rc = VERR_INVALID_PARAMETER;
     }
@@ -583 +585 @@
             if (it->mNumParms >= 2)
             {
-                it->mParms[0].setUInt32(GETHOSTMSG_EXEC_HOST_CANCEL_WAIT); /* Message ID. */
-                it->mParms[1].setUInt32(0);                                /* Required parameters for message. */
+                it->mParms[0].setUInt32(HOST_CANCEL_PENDING_WAITS); /* Message ID. */
+                it->mParms[1].setUInt32(0);                         /* Required parameters for message. */
             }
             if (mpHelpers)
@@ -628 +630 @@
         paParms[3].getUInt32(&data.u32Flags);
         paParms[4].getPointer(&data.pvData, &data.cbData);
+
+        if (mpfnHostCallback)
+            rc = mpfnHostCallback(mpvHostData, eFunction,
+                                  (void *)(&data), sizeof(data));
+    }
+    else if (   eFunction == GUEST_EXEC_SEND_INPUT_STATUS
+             && cParms    == 4)
+    {
+        CALLBACKDATAEXECINSTATUS data;
+        data.hdr.u32Magic = CALLBACKDATAMAGICEXECINSTATUS;
+        paParms[0].getUInt32(&data.hdr.u32ContextID);
+
+        paParms[1].getUInt32(&data.u32PID);
+        paParms[2].getUInt32(&data.u32Flags);
+        paParms[3].getUInt32(&data.cbProcessed);
 
         if (mpfnHostCallback)
@@ -745 +762 @@
 
             /*
-             * The guest notifies the host of the current client status.
+             * The guest notifies the host of the executed process status.
              */
             case GUEST_EXEC_SEND_STATUS:
-                LogFlowFunc(("SEND_STATUS\n"));
+                LogFlowFunc(("GUEST_EXEC_SEND_STATUS\n"));
+                rc = notifyHost(eFunction, cParms, paParms);
+                break;
+
+            case GUEST_EXEC_SEND_INPUT_STATUS:
+                LogFlowFunc(("GUEST_EXEC_SEND_INPUT_STATUS\n"));
                 rc = notifyHost(eFunction, cParms, paParms);
                 break;
@@ -790 +812 @@
                 break;
 
-            /* The host wants to send something to the guest's stdin pipe. */
+            /* The host wants to send something to the
+             * started process' stdin pipe. */
             case HOST_EXEC_SET_INPUT:
                 LogFlowFunc(("HOST_EXEC_SET_INPUT\n"));
+                rc = processHostCmd(eFunction, cParms, paParms);
                 break;