Changeset 36900 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Apr 29, 2011 5:00:37 PM (14 years ago)

Author:

vboxsync

Message:

Main/win/svcmain.cpp: Switch to the user's home directory if VBoxSVC is started through COM. Avoids dropping debug log files in the system32 directory. On manual start the current directory isn't changed.

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31 +31 @@
 #include <VBox/err.h>
 #include <iprt/initterm.h>
+#include <iprt/path.h>
 
 #include <atlbase.h>
@@ -151 +152 @@
     HINSTANCE /*hPrevInstance*/, LPTSTR lpCmdLine, int /*nShowCmd*/)
 {
+    lpCmdLine = GetCommandLine(); /* this line necessary for _ATL_MIN_CRT */
+
+    /* Need to parse the command line before initializing the VBox runtime. */
+    TCHAR szTokens[] = _T("-/");
+    LPCTSTR lpszToken = FindOneOf(lpCmdLine, szTokens);
+    while (lpszToken != NULL)
+    {
+        if (WordCmpI(lpszToken, _T("Embedding")) == 0)
+        {
+            /* %HOMEDRIVE%%HOMEPATH% */
+            wchar_t wszHome[RTPATH_MAX];
+            DWORD cEnv = GetEnvironmentVariable(L"HOMEDRIVE", &wszHome[0], RTPATH_MAX);
+            if (cEnv && cEnv < RTPATH_MAX)
+            {
+                DWORD cwc = cEnv; /* doesn't include NUL */
+                cEnv = GetEnvironmentVariable(L"HOMEPATH", &wszHome[cEnv], RTPATH_MAX - cwc);
+                if (cEnv && cEnv < RTPATH_MAX - cwc)
+                {
+                    /* If this fails there is nothing we can do. Ignore. */
+                    SetCurrentDirectory(wszHome);
+                }
+            }
+        }
+
+        lpszToken = FindOneOf(lpszToken, szTokens);
+    }
+
     /*
      * Initialize the VBox runtime without loading
@@ -157 +185 @@
     RTR3Init();
 
-    lpCmdLine = GetCommandLine(); /* this line necessary for _ATL_MIN_CRT */
-
     HRESULT hRes = com::Initialize();
 
@@ -164 +190 @@
     _Module.Init(ObjectMap, hInstance, &LIBID_VirtualBox);
     _Module.dwThreadID = GetCurrentThreadId();
-    TCHAR szTokens[] = _T("-/");
 
     int nRet = 0;
     BOOL bRun = TRUE;
-    LPCTSTR lpszToken = FindOneOf(lpCmdLine, szTokens);
+    lpszToken = FindOneOf(lpCmdLine, szTokens);
     while (lpszToken != NULL)
     {