Changeset 92659 in vbox for trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

Timestamp:

Dec 1, 2021 2:08:08 AM (3 years ago)

Author:

vboxsync

Message:

VBoxService: Made vgsvcGstCtrlProcessMakeFullPath do the same thing everywhere, as the ExpandEnvironmentStrings call is the wrong approach here (see ancient @todo) and works on ANSI strings where as our strings are UTF-8 and this would prevent executables with non-ASCII characters in them from running. bugref:10153

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -974 +974 @@
 static int vgsvcGstCtrlProcessMakeFullPath(const char *pszPath, char *pszExpanded, size_t cbExpanded)
 {
-    int rc = VINF_SUCCESS;
 /** @todo r=bird: This feature shall be made optional, i.e. require a
  *        flag to be passed down.  Further, it shall work on the environment
@@ -983 +982 @@
  *        Since this currently not available on non-windows guests, I suggest
  *        we disable it until such a time as it is implemented correctly. */
-#ifdef RT_OS_WINDOWS
+#if 0 /*def RT_OS_WINDOWS - see above. Don't know why this wasn't disabled before 7.0, didn't see the @todo yet? */
+    int rc = VINF_SUCCESS;
     if (!ExpandEnvironmentStrings(pszPath, pszExpanded, (DWORD)cbExpanded))
         rc = RTErrConvertFromWin32(GetLastError());
 #else
-    /* No expansion for non-Windows yet. */
-    rc = RTStrCopy(pszExpanded, cbExpanded, pszPath);
+    /* There is no expansion anywhere yet, see above @todo. */
+    int rc = RTStrCopy(pszExpanded, cbExpanded, pszPath);
 #endif
 #ifdef DEBUG