Changeset 60494 in vbox for trunk/src

Timestamp:

Apr 14, 2016 1:47:28 PM (9 years ago)

Author:

vboxsync

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

106600

Message:

GuestControl/Main: Fixed broken internal tools handling for guest side (argv0).

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestSessionImpl.cpp (modified) (4 diffs)
• GuestSessionImplTasks.cpp (modified) (5 diffs)

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

@@ -661 +661 @@
     procInfo.mFlags      = ProcessCreateFlag_Hidden;
     procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_MKDIR);
-    procInfo.mArguments.push_back(procInfo.mExecutable);
+
+    procInfo.mArguments.push_back(procInfo.mExecutable); /* Set argv0. */
 
     try
@@ -819 +820 @@
     procInfo.mFlags      = ProcessCreateFlag_WaitForStdOut;
     procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_MKTEMP);
-    procInfo.mArguments.push_back(procInfo.mExecutable);
+
+    procInfo.mArguments.push_back(procInfo.mExecutable); /* Set argv0. */
 
     try
@@ -1222 +1224 @@
     procInfo.mFlags      = ProcessCreateFlag_WaitForStdOut;
     procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_RM);
-    procInfo.mArguments.push_back(procInfo.mExecutable);
+
+    procInfo.mArguments.push_back(procInfo.mExecutable); /* Set argv0. */
 
     try
@@ -1390 +1393 @@
     procInfo.mFlags      = ProcessCreateFlag_WaitForStdOut;
     procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_STAT);
-    procInfo.mArguments.push_back(procInfo.mExecutable);
+
+    procInfo.mArguments.push_back(procInfo.mExecutable); /* Set argv0. */
 
     try

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -343 +343 @@
 
     /* Set arguments.*/
+    procInfo.mArguments.push_back(procInfo.mExecutable);                     /* Set argv0. */
     procInfo.mArguments.push_back(Utf8StrFmt("--output=%s", mDest.c_str())); /** @todo Do we need path conversion? */
 
@@ -673 +674 @@
 
             /* Set arguments.*/
-            procInfo.mArguments.push_back(mSource); /* Which file to output? */
+            procInfo.mArguments.push_back(procInfo.mExecutable); /* Set argv0. */
+            procInfo.mArguments.push_back(mSource);              /* Which file to output? */
 
             /* Startup process. */
@@ -982 +984 @@
                 catch(...)
                 {
-                    hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, 
+                    hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                   GuestSession::tr("Failed to create SessionTaskCopyTo object "));
                     throw;
@@ -1005 +1007 @@
                 }
                 else
-                    hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, 
+                    hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                   GuestSession::tr("Starting thread for updating additions failed "));
             }