Changeset 45010 in vbox for trunk/src/VBox/HostServices/GuestControl/service.cpp

Timestamp:

Mar 12, 2013 5:47:56 PM (12 years ago)

Author:

vboxsync

Message:

GuestCtrl: More code for guest session infrastructure handling (untested, work in progress).

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (5 diffs)

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

@@ -459 +459 @@
 {
     ClientState(void)
-        : mSvcHelpers(NULL), 
-          mFlags(0), mContextFilter(0), 
+        : mSvcHelpers(NULL),
+          mFlags(0), mContextFilter(0),
           mpHostCmd(NULL), mHostCmdRc(VINF_SUCCESS), mHostCmdTries(0),
           mIsPending(false) {}
 
     ClientState(PVBOXHGCMSVCHELPERS pSvcHelpers)
-        : mSvcHelpers(pSvcHelpers), 
-          mFlags(0), mContextFilter(0), 
+        : mSvcHelpers(pSvcHelpers),
+          mFlags(0), mContextFilter(0),
           mpHostCmd(NULL), mHostCmdRc(VINF_SUCCESS), mHostCmdTries(0),
           mIsPending(false) {}
@@ -474 +474 @@
         AssertPtrReturn(pHostCmd, false);
 
+#ifdef DEBUG_andy
+            LogFlowFunc(("mFlags=%x, mContextID=%RU32, mContextFilter=%x, filterRes=%x\n",
+                         mFlags, pHostCmd->mContextID, mContextFilter, pHostCmd->mContextID & mContextFilter));
+#endif
         /*
          * If a sesseion filter is set, only obey those sessions we're interested in.
@@ -479 +483 @@
         if (mFlags & CLIENTSTATE_FLAG_CONTEXTFILTER)
         {
-            if (VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(pHostCmd->mContextID) == mContextFilter)
+            if ((pHostCmd->mContextID & mContextFilter) == mContextFilter)
                 return true;
         }
@@ -1113 +1117 @@
         return VERR_INVALID_PARAMETER;
 
-    uint32_t uMaskAdd;
+    uint32_t uMaskAdd, uMaskRemove;
     int rc = paParms[0].getUInt32(&uMaskAdd);
     if (RT_SUCCESS(rc))
+        rc = paParms[1].getUInt32(&uMaskRemove);
+    if (RT_SUCCESS(rc))
     {
         /* paParms[1] unused yet. */
@@ -1122 +1128 @@
 
         clientState.mFlags |= CLIENTSTATE_FLAG_CONTEXTFILTER;
-        clientState.mContextFilter = uMaskAdd;
-
-        LogFlowFunc(("Client ID=%RU32 now has filter=%x enabled (flags=%x)\n",
-                     u32ClientID, clientState.mContextFilter, clientState.mFlags));
+        if (uMaskAdd)
+            clientState.mContextFilter |= uMaskAdd;
+        if (uMaskRemove)
+            clientState.mContextFilter &= ~uMaskRemove;
+
+        LogFlowFunc(("Client ID=%RU32 now has filter=%x enabled (flags=%x, maskAdd=%x, maskRemove=%x)\n",
+                     u32ClientID, clientState.mContextFilter, clientState.mFlags,
+                     uMaskAdd, uMaskRemove));
     }