vbox的更動 49349 路徑 trunk/src/VBox/HostServices/GuestControl/service.cpp

時間撮記:

2013-10-31 下午04:40:46 (11 年 以前)

作者:

vboxsync

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

90367

訊息:

Guest Control:

• Implemented IGuestSession::DirectoryRemove, IGuestSession::DirectoryRemoveRecursive, IGuestSession::DirectoryRename + IGuestSession::FileRename.
• Added appropriate commands to VBoxManage (basic support for now).
• Implemented support for proper guest session process termination via SCM.
• Implemented support for internal anonymous wait events which are not relying on the public API's VBoxEventType_T.
• Various bugfixes.

檔案:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (修改) (7 筆差異)

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

@@ -388 +388 @@
         if (mParmCount > pConnection->mNumParms)
         {
+            LogFlowFunc(("pHostCmd=%p requires %RU32 parms, only got %RU32 from client\n",
+                         this, mParmCount, pConnection->mNumParms));
+
             /*
             * So this call apparently failed because the guest wanted to peek
@@ -766 +769 @@
                      mID, rcPending, mIsPending, mPendingCon.mNumParms, mFlags));
 
+        int rc;
         if (   mIsPending
             && mPendingCon.mNumParms >= 2)
@@ -776 +780 @@
 
             mIsPending = false;
-        }
-
-        return VINF_SUCCESS;
+
+            rc = VINF_SUCCESS;
+        }
+        else if (mPendingCon.mNumParms < 2)
+            rc = VERR_BUFFER_OVERFLOW;
+        else /** @todo Enqueue command instead of dropping? */
+            rc = VERR_WRONG_ORDER;
+
+        return rc;
     }
 
@@ -1015 +1025 @@
     void call(VBOXHGCMCALLHANDLE callHandle, uint32_t u32ClientID, void *pvClient, uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int hostCall(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
+    int sessionClose(uint32_t u32ClientID, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int uninit(void);
 };
@@ -1306 +1317 @@
 
 /**
- * Processes a command receiveed from the host side and re-routes it to
+ * Processes a command received from the host side and re-routes it to
  * a connect client on the guest.
  *
@@ -1450 +1461 @@
                     LogFlowFunc(("[Client %RU32] GUEST_MSG_SKIP\n", u32ClientID));
                     rc = clientSkipMsg(u32ClientID, callHandle, cParms, paParms);
+                    break;
+
+                /*
+                 * The guest wants to close specific guest session. This is handy for
+                 * shutting down dedicated guest session processes from another process.
+                 */
+                case GUEST_SESSION_CLOSE:
+                    LogFlowFunc(("[Client %RU32] GUEST_SESSION_CLOSE\n", u32ClientID));
+                    rc = sessionClose(u32ClientID, callHandle, cParms, paParms);
                     break;
 
@@ -1522 +1542 @@
 }
 
+/**
+ * Client asks another client (guest) session to close.
+ *
+ * @return  IPRT status code.
+ * @param   u32ClientID                 The client's ID.
+ * @param   callHandle                  The client's call handle.
+ * @param   cParms                      Number of parameters.
+ * @param   paParms                     Array of parameters.
+ */
+int Service::sessionClose(uint32_t u32ClientID, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+{
+    if (cParms < 2)
+        return VERR_INVALID_PARAMETER;
+
+    uint32_t uContextID, uFlags;
+    int rc = paParms[0].getUInt32(&uContextID);
+    if (RT_SUCCESS(rc))
+        rc = paParms[1].getUInt32(&uFlags);
+
+    uint32_t uSessionID = VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(uContextID);
+
+    if (RT_SUCCESS(rc))
+        rc = hostProcessCommand(HOST_SESSION_CLOSE, cParms, paParms);
+
+    LogFlowFunc(("Closing guest session ID=%RU32 (from client ID=%RU32) returned with rc=%Rrc\n",
+                 uSessionID, u32ClientID, rc));
+    return rc;
+}
+
 int Service::uninit()
 {