Changeset 28233 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 13, 2010 8:23:52 AM (15 years ago)

Author:

vboxsync

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

59974

Message:

Guest Control: Update.

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (6 diffs)
• include/GuestImpl.h (modified) (1 diff)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -437 +437 @@
 }
 
-// static
-DECLCALLBACK(int) Guest::doGuestCtrlNotification(void *pvExtension,
-                                                 uint32_t u32Function,
-                                                 void *pvParms,
-                                                 uint32_t cbParms)
+/**
+ * Static callback function for receiving updates on processes started on
+ * the guest side.
+ *
+ * @returns VBox status code.
+ *
+ * @todo
+ *
+ */
+DECLCALLBACK(int) Guest::doGuestCtrlExecNotification(void *pvExtension,
+                                                     uint32_t u32Function,
+                                                     void *pvParms,
+                                                     uint32_t cbParms)
 {
     using namespace guestControl;
@@ -449 +457 @@
      * changes to the object state.
      */
-    PHOSTCALLBACKDATA pCBData = reinterpret_cast<PHOSTCALLBACKDATA>(pvParms);
+    PHOSTEXECCALLBACKDATA pCBData = reinterpret_cast<PHOSTEXECCALLBACKDATA>(pvParms);
     AssertPtr(pCBData);
-    AssertReturn(sizeof(HOSTCALLBACKDATA) == cbParms, VERR_INVALID_PARAMETER);
+    AssertReturn(sizeof(HOSTEXECCALLBACKDATA) == cbParms, VERR_INVALID_PARAMETER);
     AssertReturn(HOSTCALLBACKMAGIC == pCBData->u32Magic, VERR_INVALID_PARAMETER);
     LogFlowFunc(("pvExtension = %p, u32Function = %d, pvParms = %p, cbParms = %d\n",
                  pvExtension, u32Function, pvParms, cbParms));
+    ComObjPtr<Guest> pGuest = reinterpret_cast<Guest *>(pvExtension);
 
     int rc = VINF_SUCCESS;
-    Guest *pGuest = static_cast <Guest *>(pvExtension);
-    AssertPtr(pGuest);
-
-    switch (u32Function)
-    {        
-        case GUEST_EXEC_SEND_STATUS:
-            LogFlowFunc(("GUEST_EXEC_SEND_STATUS\n"));
-            break;
-
-        default:
-            rc = VERR_NOT_SUPPORTED;
-            break;
-    }
+    if (u32Function == GUEST_EXEC_SEND_STATUS)
+    {
+        
+    }
+    else
+        rc = VERR_NOT_SUPPORTED;
 
     ASMAtomicWriteBool(&pGuest->mSignalled, true);
@@ -520 +522 @@
         HGCMSVCEXTHANDLE hExt;
         int vrc = HGCMHostRegisterServiceExtension(&hExt, "VBoxGuestControlSvc",
-                                                   &Guest::doGuestCtrlNotification,
+                                                   &Guest::doGuestCtrlExecNotification,
                                                    this);
         if (RT_SUCCESS(vrc))
@@ -594 +596 @@
                         if (vmmDev)
                         {
-                            LogFlow(("Guest::ExecuteProgram: numParms=%d\n", i));
+                            LogFlowFunc(("hgcmHostCall numParms=%d\n", i));
                             vrc = vmmDev->hgcmHostCall("VBoxGuestControlSvc", HOST_EXEC_CMD,
                                                        i, paParms);
-                            /** @todo Get the PID. */
                         }
                         RTMemFree(pvEnv);
@@ -605 +606 @@
                 if (RT_SUCCESS(vrc))
                 {
-                    /* Wait for the HGCM low level callback */
+                    LogFlowFunc(("Waiting for HGCM callback (timeout=%ldms) ...\n", aTimeoutMS));
+
+                    /* 
+                     * Wait for the HGCM low level callback until the process
+                     * has been started (or something went wrong). This is necessary to 
+                     * get the PID.
+                     */
                     mSignalled = false;
                     uint64_t u64Started = RTTimeMilliTS();
@@ -622 +629 @@
                         RTThreadSleep(100);
                     } while (!mSignalled);
+
+                    /* Did we get some status? */
+                    if (mSignalled)
+                    {
+
+                    }
 #if 0
                     progress.queryInterfaceTo(aProgress);

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

@@ -110 +110 @@
     int prepareExecuteEnv(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnv);
     /** Static callback for handling guest notifications. */
-    static DECLCALLBACK(int) doGuestCtrlNotification(void *pvExtension, uint32_t u32Function, void *pvParms, uint32_t cbParms);
+    static DECLCALLBACK(int) doGuestCtrlExecNotification(void *pvExtension, uint32_t u32Function, void *pvParms, uint32_t cbParms);
 # endif