Changeset 42439 in vbox

Timestamp:

Jul 27, 2012 3:20:34 PM (13 years ago)

Author:

vboxsync

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

79555

Message:

Guest Control 2.0: Bugfixes.

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestProcessImpl.cpp (modified) (6 diffs)
• src-client/GuestSessionImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -130 +130 @@
     int                     processClose(ComObjPtr<GuestProcess> pProcess);
     int                     processCreateExInteral(GuestProcessInfo &procInfo, ComObjPtr<GuestProcess> &pProgress);
-    inline bool             processExists(ULONG uProcessID, ComObjPtr<GuestProcess> *pProcess);
+    inline bool             processExists(uint32_t uint32_t, ComObjPtr<GuestProcess> *pProcess);
     inline int              processGetByPID(ULONG uPID, ComObjPtr<GuestProcess> *pProcess);
     /** @}  */

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -357 +357 @@
     if (RT_SUCCESS(rc))
     {
-        /* Add callback with new context ID to our callback map. */
-        mData.mCallbacks[uNewContextID] = pCallback;
+        /* Add callback with new context ID to our callback map.
+         * Note: This is *not* uNewContextID (which also includes
+         *       the session + process ID), just the context count
+         *       will be used here. */
+        mData.mCallbacks[mData.mNextContextID] = pCallback;
         Assert(mData.mCallbacks.size());
 
@@ -374 +377 @@
 int GuestProcess::callbackDispatcher(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData)
 {
-/*    LogFlowFunc(("uPID=%RU32, uContextID=%RU32, uFunction=%RU32, pvData=%p, cbData=%z\n",
-                 mData.mPID, uContextID, uFunction, pvData, cbData));*/
+#ifdef DEBUG
+    LogFlowFunc(("uPID=%RU32, uContextID=%RU32, uFunction=%RU32, pvData=%p, cbData=%RU32\n",
+                 mData.mPID, uContextID, uFunction, pvData, cbData));
+#endif
 
     AssertPtrReturn(pvData, VERR_INVALID_POINTER);
@@ -381 +386 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+#ifdef DEBUG
+    LogFlowFunc(("Callback count=%RU32\n", VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(uContextID)));
+#endif
 
     int rc;
@@ -447 +456 @@
         rc = VERR_NOT_FOUND;
 
-    //LogFlowFuncLeaveRC(rc);
+#ifdef DEBUG
+    LogFlowFuncLeaveRC(rc);
+#endif
     return rc;
 }
@@ -453 +464 @@
 inline bool GuestProcess::callbackExists(ULONG uContextID)
 {
-    GuestCtrlCallbacks::const_iterator it = mData.mCallbacks.find(uContextID);
+    GuestCtrlCallbacks::const_iterator it =
+        mData.mCallbacks.find(VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(uContextID));
     return (it == mData.mCallbacks.end()) ? false : true;
 }
@@ -459 +471 @@
 inline int GuestProcess::callbackRemove(ULONG uContextID)
 {
-    GuestCtrlCallbacks::iterator it = mData.mCallbacks.find(uContextID);
+    GuestCtrlCallbacks::iterator it =
+        mData.mCallbacks.find(VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(uContextID));
     if (it == mData.mCallbacks.end())
     {

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -385 +385 @@
     LogFlowFunc(("uProcessID=%RU32 (%RU32 total)\n",
                  uProcessID, mData.mProcesses.size()));
-    SessionProcesses::const_iterator i = mData.mProcesses.begin();
-    while (i != mData.mProcesses.end())
-    {
-        LogFlowFunc(("\tproc %RU32\n", i->first));
-        i++;
-    }
 #endif
     int rc;
@@ -532 +526 @@
 }
 
-inline bool GuestSession::processExists(ULONG uProcessID, ComObjPtr<GuestProcess> *pProcess)
+inline bool GuestSession::processExists(uint32_t uProcessID, ComObjPtr<GuestProcess> *pProcess)
 {
     SessionProcesses::const_iterator it = mData.mProcesses.find(uProcessID);