Changeset 28557 in vbox for trunk/src/VBox/HostServices/GuestControl

Timestamp:

Apr 21, 2010 11:18:32 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60367

Message:

Guest Control: Update (first stuff for piping output).

Location:

trunk/src/VBox/HostServices/GuestControl

Files:

• Makefile.kmk (modified) (1 diff)
• service.cpp (modified) (8 diffs)

trunk/src/VBox/HostServices/GuestControl/Makefile.kmk

@@ -24 +24 @@
 
 # Include sub-makefile(s).
-include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
+# include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 
 #

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

@@ -235 +235 @@
     }
 private:
-    int paramBufferAllocate(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
+    int paramBufferAllocate(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     void paramBufferFree(PVBOXGUESTCTRPARAMBUFFER pBuf);
     int paramBufferAssign(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
@@ -269 +269 @@
 /** @todo Write some nice doc headers! */
 /* Stores a HGCM request in an internal buffer (pEx). Needs to be freed later using execBufferFree(). */
-int Service::paramBufferAllocate(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+int Service::paramBufferAllocate(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     AssertPtr(pBuf);
@@ -281 +281 @@
     if (RT_SUCCESS(rc))
     {
+        pBuf->uMsg = uMsg;
         pBuf->uParmCount = cParms;
         pBuf->pParms = (VBOXHGCMSVCPARM*)RTMemAlloc(sizeof(VBOXHGCMSVCPARM) * pBuf->uParmCount);
@@ -436 +437 @@
              if (uParmCount > cParms)
              {
-                uint32_t uCmd = 0;
-                if (uParmCount)
-                    curCmd.parmBuf.pParms[0].getUInt32(&uCmd);
-
-                 paParms[0].setUInt32(/*uCmd*/ 1); /* Message ID */
+                 paParms[0].setUInt32(curCmd.parmBuf.uMsg); /* Message ID */
                  paParms[1].setUInt32(uParmCount); /* Required parameters for message */
 
@@ -508 +505 @@
                                   (void *)(&data), sizeof(data));
     }
+    else if (   eFunction == GUEST_EXEC_SEND_OUTPUT
+             && cParms    == 5)
+    {
+        HOSTEXECOUTCALLBACKDATA data;
+        data.hdr.u32Magic = HOSTEXECOUTCALLBACKDATAMAGIC;
+        paParms[0].getUInt32(&data.hdr.u32ContextID);
+
+        paParms[1].getUInt32(&data.u32PID);
+        paParms[2].getUInt32(&data.u32HandleId);
+        paParms[3].getUInt32(&data.u32Flags);
+        paParms[4].getPointer(&data.pvData, &data.cbData);
+
+        if (mpfnHostCallback)
+            rc = mpfnHostCallback(mpvHostData, eFunction,
+                                  (void *)(&data), sizeof(data));
+    }
     else
         rc = VERR_NOT_SUPPORTED;
@@ -519 +532 @@
 
     HostCmd newCmd;
-    rc = paramBufferAllocate(&newCmd.parmBuf, cParms, paParms);
+    rc = paramBufferAllocate(&newCmd.parmBuf, eFunction, cParms, paParms);
     if (RT_SUCCESS(rc))
     {
@@ -565 +578 @@
                 break;
 
-            /* The guest notifies the host that some output at stdout is available. */
-            case GUEST_EXEC_SEND_STDOUT:
-                LogFlowFunc(("GUEST_EXEC_SEND_STDOUT\n"));
-                break;
-
-            /* The guest notifies the host that some output at stderr is available. */
-            case GUEST_EXEC_SEND_STDERR:
-                LogFlowFunc(("GUEST_EXEC_SEND_STDERR\n"));
+            /* The guest notifies the host that some output at stdout/stderr is available. */
+            case GUEST_EXEC_SEND_OUTPUT:
+                LogFlowFunc(("GUEST_EXEC_SEND_OUTPUT\n"));
+                rc = notifyHost(eFunction, cParms, paParms);
                 break;
 
@@ -621 +630 @@
 
             /* The host wants to send something to the guest's stdin pipe. */
-            case HOST_EXEC_SEND_STDIN:
-                LogFlowFunc(("HOST_EXEC_SEND_STDIN\n"));
-                break;
-
-            case HOST_EXEC_GET_STATUS:
-                LogFlowFunc(("HOST_EXEC_GET_STATUS\n"));
+            case HOST_EXEC_SET_INPUT:
+                LogFlowFunc(("HOST_EXEC_SET_INPUT\n"));
+                break;
+
+            case HOST_EXEC_GET_OUTPUT:
+                LogFlowFunc(("HOST_EXEC_GET_OUTPUT\n"));
+                rc = processCmd(eFunction, cParms, paParms);
                 break;