Changeset 27788 in vbox for trunk/src/VBox

Timestamp:

Mar 29, 2010 12:42:22 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (Main, registering host service, bugfixes).

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/GuestImpl.cpp (modified) (3 diffs)
• Main/include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -77 +77 @@
      */
     /** @todo */
-    if (a->argc < 2)
+    if (a->argc < 2) /* At least the command we want to execute should be present. */
         return errorSyntax(USAGE_GUESTCONTROL, "Incorrect parameters");
-    const char *pszCmd = a->argv[1];
+    Utf8Str Utf8Cmd(a->argv[1]);
     uint32_t uFlags = 0;
-    const char *pszArgs;
+    Utf8Str Utf8Args;
     com::SafeArray <BSTR> env;
-    const char *pszStdIn = NULL;
-    const char *pszStdOut = NULL;
-    const char *pszStdErr = NULL;
-    const char *pszUserName = NULL;
-    const char *pszPassword = NULL;
+    Utf8Str Utf8StdIn;
+    Utf8Str Utf8StdOut;
+    Utf8Str Utf8StdErr;
+    Utf8Str Utf8UserName;
+    Utf8Str Utf8Password;
     uint32_t uTimeoutMS = 0;
 
@@ -107 +107 @@
     
             /* open an existing session for VM - so the VM has to be running */
-            CHECK_ERROR_BREAK(a->virtualBox, OpenExistingSession(a->session, uuid), 1);
+            CHECK_ERROR_BREAK(a->virtualBox, OpenExistingSession(a->session, uuid));
     
             /* get the mutable session machine */
@@ -120 +120 @@
 
             ULONG uPID = 0;
-            CHECK_ERROR_BREAK(guest, ExecuteProgram(Bstr(pszCmd), uFlags, 
-                                                    Bstr(pszArgs), ComSafeArrayAsInParam(env), 
-                                                    Bstr(pszStdIn), Bstr(pszStdOut), Bstr(pszStdErr),
-                                                    Bstr(pszUserName), Bstr(pszPassword), uTimeoutMS,
+            CHECK_ERROR_BREAK(guest, ExecuteProgram(Bstr(Utf8Cmd), uFlags, 
+                                                    Bstr(Utf8Args), ComSafeArrayAsInParam(env), 
+                                                    Bstr(Utf8StdIn), Bstr(Utf8StdOut), Bstr(Utf8StdErr),
+                                                    Bstr(Utf8UserName), Bstr(Utf8Password), uTimeoutMS,
                                                     &uPID));
             a->session->Close();

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2166 +2166 @@
 #endif /* VBOX_WITH_GUEST_PROPS defined */
 
+#ifdef VBOX_WITH_GUEST_CONTROL
+    /*
+     * Guest control service
+     */
+
+    rc = configGuestControl(pConsole);
+#endif /* VBOX_WITH_GUEST_CONTROL defined */
+
     /*
      * ACPI
@@ -3519 +3527 @@
 #endif /* !VBOX_WITH_GUEST_PROPS */
 }
+
+/**
+ * Set up the Guest Control service.
+ */
+/* static */ int Console::configGuestControl(void *pvConsole)
+{
+#ifdef VBOX_WITH_GUEST_CONTROL
+    AssertReturn(pvConsole, VERR_GENERAL_FAILURE);
+    ComObjPtr<Console> pConsole = static_cast <Console *> (pvConsole);
+
+    /* Load the service */
+    int rc = pConsole->mVMMDev->hgcmLoadService ("VBoxGuestControlSvc", "VBoxGuestControlSvc");
+
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("VBoxGuestControlSvc is not available. rc = %Rrc\n", rc));
+        /* That is not a fatal failure. */
+        rc = VINF_SUCCESS;
+    }
+
+    return VINF_SUCCESS;
+#else /* !VBOX_WITH_GUEST_CONTROL */
+    return VERR_NOT_SUPPORTED;
+#endif /* !VBOX_WITH_GUEST_CONTROL */
+}
+

trunk/src/VBox/Main/GuestImpl.cpp

@@ -352 +352 @@
             *ppvList = pszTemp;
             *pcArgs = iArgs;
-            *pcbList = strlen(pszTemp) + 1; /* Include zero termination. */
+            if (pszTemp)
+                *pcbList = strlen(pszTemp) + 1; /* Include zero termination. */
         }
         else
@@ -455 +456 @@
         {
             /* Prepare environment. */
+            com::SafeArray<IN_BSTR> env(ComSafeArrayInArg(aEnvironment));
+
             void *pvEnv = NULL;
-            uint32_t uNumEnv;
-            uint32_t cbEnv;
-
-            com::SafeArray<IN_BSTR> env(ComSafeArrayInArg(aEnvironment));
-            for (unsigned i = 0; i < env.size(); ++i)
+            uint32_t uNumEnv = env.size();
+            uint32_t cbEnv = 0;
+
+            for (unsigned i = 0; i < uNumEnv; i++)
             {
                 const char *pszCurEnv = Utf8Str(env[i]).raw();
@@ -497 +499 @@
                 {
                     vrc = vmmDev->hgcmHostCall("VBoxGuestControlSvc", HOST_EXEC_CMD,
-                                               13, &paParms[0]);
+                                               13, paParms);
                     /** @todo Get the PID. */
                 }

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

@@ -435 +435 @@
     static DECLCALLBACK(int) configConstructor(PVM pVM, void *pvConsole);
     static DECLCALLBACK(int) configGuestProperties(void *pvConsole);
+    static DECLCALLBACK(int) configGuestControl(void *pvConsole);
     static int configNetwork(Console *pThis, const char *pszDevice,
                              unsigned uInstance, unsigned uLun,