Changeset 28557 in vbox for trunk/include

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/include/VBox

Files:

• HostServices/GuestControlSvc.h (modified) (6 diffs)
• VBoxGuestLib.h (modified) (2 diffs)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -98 +98 @@
     /** Size of optional data buffer (not used atm). */
     uint32_t cbData;
-
 } HOSTEXECCALLBACKDATA, *PHOSTEXECCALLBACKDATA;
 
+typedef struct _VBoxGuestCtrlExecOutCallbackData
+{
+    /** Callback data header. */
+    HOSTCCALLBACKHEADER hdr;
+    /** The process ID (PID). */
+    uint32_t u32PID;
+    /* The handle ID (stdout/stderr). */
+    uint32_t u32HandleId;
+    /** Optional flags (not used atm). */
+    uint32_t u32Flags;
+    /** Optional data buffer. */
+    void *pvData;
+    /** Size of optional data buffer. */
+    uint32_t cbData;
+} HOSTEXECOUTCALLBACKDATA, *PHOSTEXECOUTCALLBACKDATA;
+
 enum
 {
-    /** Magic number for sanity checking the HOSTEXECCALLBACKDATA structure */
-    HOSTEXECCALLBACKDATAMAGIC = 0x26011982
+    /** Magic number for sanity checking the HOSTEXECCALLBACKDATA structure. */
+    HOSTEXECCALLBACKDATAMAGIC = 0x26011982,
+    /** Magic number for sanity checking the HOSTEXECOUTCALLBACKDATA structure. */
+    HOSTEXECOUTCALLBACKDATAMAGIC = 0x11061949
 };
 
@@ -120 +137 @@
      * Sends input data for stdin to a running process executed by HOST_EXEC_CMD.
      */
-    HOST_EXEC_SEND_STDIN = 2,
+    HOST_EXEC_SET_INPUT = 2,
     /**
      * Gets the current status of a running process, e.g.
      * new data on stdout/stderr, process terminated etc.
      */
-    HOST_EXEC_GET_STATUS = 3
+    HOST_EXEC_GET_OUTPUT = 3
 };
 
@@ -141 +158 @@
      * TODO
      */
-    GUEST_EXEC_SEND_STDOUT = 3,
+    GUEST_EXEC_SEND_OUTPUT = 2,
     /**
      * TODO
      */
-    GUEST_EXEC_SEND_STDERR = 4,
-    /**
-     * TODO
-     */
-    GUEST_EXEC_SEND_STATUS = 5
+    GUEST_EXEC_SEND_STATUS = 3
 };
 
@@ -162 +175 @@
      * or starting a program.
      */
-    GETHOSTMSG_EXEC_CMD = 1,
+    GETHOSTMSG_EXEC_START_PROCESS = 1,
     /**
      * Sends input data for stdin to a running process executed by HOST_EXEC_CMD.
      */
-    GETHOSTMSG_EXEC_STDIN = 2
+    GETHOSTMSG_EXEC_SEND_INPUT = 2,
+    /**
+     * Host requests the so far collected stdout/stderr output
+     * from a running process executed by HOST_EXEC_CMD.
+     */
+    GETHOSTMSG_EXEC_GET_OUTPUT = 3
 };
 
@@ -220 +238 @@
 
 } VBoxGuestCtrlHGCMMsgExecCmd;
+
+typedef struct _VBoxGuestCtrlHGCMMsgExecOut
+{
+    VBoxGuestHGCMCallInfo hdr;
+    /** Context ID. */
+    HGCMFunctionParameter context;
+    /** The process ID (PID). */
+    HGCMFunctionParameter pid;
+    /** The pipe handle ID. */
+    HGCMFunctionParameter handle;
+    /** Optional flags. */
+    HGCMFunctionParameter flags;
+    /** Data buffer. */
+    HGCMFunctionParameter data;
+
+} VBoxGuestCtrlHGCMMsgExecOut;
 
 typedef struct _VBoxGuestCtrlHGCMMsgExecStatus
@@ -241 +275 @@
 typedef struct _VBoxGuestCtrlParamBuffer
 {
+    uint32_t uMsg;
     uint32_t uParmCount;
     VBOXHGCMSVCPARM *pParms;

trunk/include/VBox/VBoxGuestLib.h

@@ -526 +526 @@
                                                   char     *pszPassword,    uint32_t  cbPassword,
                                                   uint32_t *puTimeLimit);
+VBGLR3DECL(int) VbglR3GuestCtrlExecGetHostCmdOutput(uint32_t  u32ClientId,    uint32_t  uNumParms,
+                                                    uint32_t *puContext,      uint32_t *puPID,
+                                                    uint32_t *puHandle,       uint32_t *puFlags);
 VBGLR3DECL(int)     VbglR3GuestCtrlExecReportStatus(uint32_t  u32ClientId,
                                                     uint32_t  u32Context,
@@ -533 +536 @@
                                                     void     *pvData,
                                                     uint32_t  cbData);
+VBGLR3DECL(int)     VbglR3GuestCtrlExecSendOut(uint32_t     u32ClientId,
+                                               uint32_t     u32Context,
+                                               uint32_t     u32PID,
+                                               uint32_t     u32Handle,
+                                               uint32_t     u32Flags,
+                                               void        *pvData,
+                                               uint32_t     cbData);
 /** @}  */
 # endif /* VBOX_WITH_GUEST_CONTROL defined */