Changeset 47697 in vbox

Timestamp:

Aug 13, 2013 2:43:13 PM (11 years ago)

Author:

vboxsync

Message:

Forgot some files, build fix.

Location:

trunk/include/VBox

Files:

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

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -52 +52 @@
 #define VBOX_GUESTCTRL_MAX_CONTEXTS     _64K
 
+/** Base (start) of guest control session IDs. Session
+ *  ID 0 is reserved for the root process which
+ *  hosts all other guest session processes. */
+#define VBOX_GUESTCTRL_SESSION_ID_BASE  1
+
 /** Builds a context ID out of the session ID, object ID and an
  *  increasing count. */
@@ -59 +64 @@
      | (uint32_t)((uCount)   & 0xffff)       \
     )
+/** Creates a context ID out of a session ID. */
 #define VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(uSession) \
     ((uint32_t)((uSession) & 0x1f) << 27)
@@ -70 +76 @@
 #define VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(uContextID) \
     ((uContextID) & 0xffff)
+/** Filter context IDs by session. Can be used in conjunction
+ *  with VbglR3GuestCtrlMsgFilterSet(). */
+#define VBOX_GUESTCTRL_FILTER_BY_SESSION(uSession) \
+    (VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(uSession) | 0xF8000000)
 
 /**
@@ -432 +442 @@
     VBoxGuestHGCMCallInfo hdr;
 
+    /** Value to filter for after filter mask
+     *  was applied. */
+    HGCMFunctionParameter value;         /* IN uint32_t */
     /** Mask to add to the current set filter. */
-    HGCMFunctionParameter add;      /* IN uint32_t */
+    HGCMFunctionParameter mask_add;      /* IN uint32_t */
     /** Mask to remove from the current set filter. */
-    HGCMFunctionParameter remove;   /* IN uint32_t */
+    HGCMFunctionParameter mask_remove;   /* IN uint32_t */
     /** Filter flags; currently unused. */
-    HGCMFunctionParameter flags;    /* IN uint32_t */
+    HGCMFunctionParameter flags;         /* IN uint32_t */
 
 } HGCMMsgCmdFilterSet;

trunk/include/VBox/VBoxGuestLib.h

@@ -610 +610 @@
 VBGLR3DECL(int) VbglR3GuestCtrlConnect(uint32_t *puClientId);
 VBGLR3DECL(int) VbglR3GuestCtrlDisconnect(uint32_t uClientId);
-VBGLR3DECL(int) VbglR3GuestCtrlMsgFilterSet(uint32_t uClientId, uint32_t uFilterAdd, uint32_t uFilterRemove);
+VBGLR3DECL(int) VbglR3GuestCtrlMsgFilterSet(uint32_t uClientId, uint32_t uValue, uint32_t uMaskAdd, uint32_t uMaskRemove);
 VBGLR3DECL(int) VbglR3GuestCtrlMsgFilterUnset(uint32_t uClientId);
 VBGLR3DECL(int) VbglR3GuestCtrlMsgWaitFor(uint32_t uClientId, uint32_t *puMsg, uint32_t *puNumParms);