Changeset 28286 in vbox for trunk/include

Timestamp:

Apr 14, 2010 10:02:30 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (introducing contexts for callbacks).

Location:

trunk/include/VBox

Files:

• HostServices/GuestControlSvc.h (modified) (5 diffs)
• VBoxGuestLib.h (modified) (1 diff)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -72 +72 @@
 };
 
+typedef struct _VBoxGuestCtrlCallbackHeader
+{
+    /** Magic number to identify the structure. */
+    uint32_t u32Magic;
+    /** Context ID to identify callback data. */
+    uint32_t u32ContextID;
+    /** Atomic flag whether callback was called. */
+    bool bCalled;
+} HOSTCCALLBACKHEADER, *PHOSTCCALLBACKHEADER;
+
 /**
  * Data structure to pass to the service extension callback.  We use this to
@@ -78 +88 @@
 typedef struct _VBoxGuestCtrlExecCallbackData
 {
-    /** Magic number to identify the structure. */
-    uint32_t u32Magic;
+    /** Callback data header. */
+    HOSTCCALLBACKHEADER hdr;
     /** The process ID (PID). */
-    uint32_t pid;
+    uint32_t u32PID;
     /* The process status. */
-    uint32_t status;    
+    uint32_t u32Status;    
     /** Optional flags (not used atm). */
-    uint32_t flags;
+    uint32_t u32Flags;
     /** Optional data buffer (not used atm). */
     void *pvData;
     /** Size of optional data buffer (not used atm). */
     uint32_t cbData;
-    /** Atomic flags whether callback was called. */
-    bool called;
     
 } HOSTEXECCALLBACKDATA, *PHOSTEXECCALLBACKDATA;
@@ -97 +105 @@
 enum
 {
-    /** Magic number for sanity checking the HOSTCALLBACKDATA structure */
-    HOSTCALLBACKMAGIC = 0x26011982
+    /** Magic number for sanity checking the HOSTEXECCALLBACKDATA structure */
+    HOSTEXECCALLBACKDATAMAGIC = 0x26011982
 };
 
@@ -184 +192 @@
 {
     VBoxGuestHGCMCallInfo hdr;
+
+    HGCMFunctionParameter context;
 
     HGCMFunctionParameter cmd;
@@ -216 +226 @@
 {
     VBoxGuestHGCMCallInfo hdr;
+    /** Context ID. */
+    HGCMFunctionParameter context;
     /** The process ID (PID). */
     HGCMFunctionParameter pid;

trunk/include/VBox/VBoxGuestLib.h

@@ -514 +514 @@
 VBGLR3DECL(int)     VbglR3GuestCtrlDisconnect(uint32_t u32ClientId);
 VBGLR3DECL(int)     VbglR3GuestCtrlGetHostMsg(uint32_t u32ClientId, uint32_t *puMsg, uint32_t *puNumParms);
-VBGLR3DECL(int)     VbglR3GuestCtrlExecGetHostCmd(uint32_t u32ClientId, uint32_t uNumParms,
-                                                  char    *pszCmd,      uint32_t cbCmd,
+VBGLR3DECL(int)     VbglR3GuestCtrlExecGetHostCmd(uint32_t  u32ClientId,    uint32_t  uNumParms,
+                                                  uint32_t *puContext,
+                                                  char     *pszCmd,         uint32_t  cbCmd,
                                                   uint32_t *puFlags,
-                                                  char *pszArgs,        uint32_t cbArgs,  uint32_t *puNumArgs,
-                                                  char *pszEnv,         uint32_t *pcbEnv, uint32_t *puNumEnvVars,
-                                                  char *pszStdIn,       uint32_t cbStdIn,
-                                                  char *pszStdOut,      uint32_t cbStdOut,
-                                                  char *pszStdErr,      uint32_t cbStdErr,
-                                                  char *pszUser,        uint32_t cbUser,
-                                                  char *pszPassword,    uint32_t cbPassword,
+                                                  char     *pszArgs,        uint32_t  cbArgs,   uint32_t *puNumArgs,
+                                                  char     *pszEnv,         uint32_t *pcbEnv,   uint32_t *puNumEnvVars,
+                                                  char     *pszStdIn,       uint32_t  cbStdIn,
+                                                  char     *pszStdOut,      uint32_t  cbStdOut,
+                                                  char     *pszStdErr,      uint32_t  cbStdErr,
+                                                  char     *pszUser,        uint32_t  cbUser,
+                                                  char     *pszPassword,    uint32_t  cbPassword,
                                                   uint32_t *puTimeLimit);
-VBGLR3DECL(int)     VbglR3GuestCtrlExecReportStatus(uint32_t  u32ClientId, 
+VBGLR3DECL(int)     VbglR3GuestCtrlExecReportStatus(uint32_t  u32ClientId,
+                                                    uint32_t  u32Context,
                                                     uint32_t  u32PID,
                                                     uint32_t  u32Status,