Changeset 53825 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jan 15, 2015 2:50:38 PM (10 years ago)

Author:

vboxsync

Message:

Runtime: try the official Windows XP+ way to get the home (profile) directory, and if that doesn't work fall back to using the environment (without HOME as this isn't used on Windows)

File:

• trunk/src/VBox/Runtime/r3/win/path-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/path-win.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -158 +158 @@
 RTDECL(int) RTPathUserHome(char *pszPath, size_t cchPath)
 {
+    /*
+     * Validate input
+     */
+    AssertPtrReturn(pszPath, VERR_INVALID_POINTER);
+    AssertReturn(cchPath, VERR_INVALID_PARAMETER);
+
     RTUTF16 wszPath[RTPATH_MAX];
     DWORD   dwAttr;
-
-    /*
-     * There are multiple definitions for what WE think of as user home...
-     */
-    if (    !GetEnvironmentVariableW(L"HOME", &wszPath[0], RTPATH_MAX)
+    bool    fValidFolderPath = false;
+
+    /*
+     * Try with Windows XP+ functionality first.
+     */
+    {
+        RTLDRMOD hShell32;
+        int rc = RTLdrLoadSystem("Shell32.dll", true /*fNoUnload*/, &hShell32);
+        if (RT_SUCCESS(rc))
+        {
+            PFNSHGETFOLDERPATHW pfnSHGetFolderPathW;
+            rc = RTLdrGetSymbol(hShell32, "SHGetFolderPathW", (void**)&pfnSHGetFolderPathW);
+            if (RT_SUCCESS(rc))
+            {
+                HRESULT hrc = pfnSHGetFolderPathW(0, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, wszPath);
+                fValidFolderPath = (hrc == S_OK);
+            }
+            RTLdrClose(hShell32);
+        }
+    }
+
+    if (    !fValidFolderPath
         ||  (dwAttr = GetFileAttributesW(&wszPath[0])) == INVALID_FILE_ATTRIBUTES
         ||  !(dwAttr & FILE_ATTRIBUTE_DIRECTORY))
     {
+        /*
+         * Fall back to Windows specific environment variables. HOME is not used.
+         */
         if (    !GetEnvironmentVariableW(L"USERPROFILE", &wszPath[0], RTPATH_MAX)
             ||  (dwAttr = GetFileAttributesW(&wszPath[0])) == INVALID_FILE_ATTRIBUTES