Changeset 36879 in vbox

Timestamp:

Apr 29, 2011 9:15:52 AM (14 years ago)

Author:

vboxsync

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

71457

Message:

IPRT/path-win: Fixed NT4 breakage when using SHGetFolderPathW.

File:

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

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

@@ -37 +37 @@
 #include <iprt/string.h>
 #include <iprt/time.h>
+#include <iprt/ldr.h>
 #include <iprt/mem.h>
 #include <iprt/param.h>
@@ -44 +45 @@
 #include "internal/fs.h"
 
+/* Needed for lazy loading SHGetFolderPathW in RTPathUserDocuments(). */
+typedef HRESULT FNSHGETFOLDERPATHW(HWND, int, HANDLE, DWORD, LPWSTR);
+typedef FNSHGETFOLDERPATHW *PFNSHGETFOLDERPATHW;
 
 /**
@@ -191 +195 @@
     AssertReturn(cchPath, VERR_INVALID_PARAMETER);
 
-    RTUTF16 wszPath[RTPATH_MAX];
-    HRESULT rc = SHGetFolderPathW(0, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, wszPath);
-    if (   rc == S_OK     /* Found */
-        || rc == S_FALSE) /* Found, but doesn't exists */
-        /*
-         * Convert and return.
-         */
-        return RTUtf16ToUtf8Ex(&wszPath[0], RTSTR_MAX, &pszPath, cchPath, NULL);
-
+    RTLDRMOD hShell32;
+    int rc = RTLdrLoad("Shell32.dll", &hShell32);
+    if (RT_SUCCESS(rc))
+    {
+        PFNSHGETFOLDERPATHW pfnSHGetFolderPathW;
+        rc = RTLdrGetSymbol(hShell32, "SHGetFolderPathW", (void**)&pfnSHGetFolderPathW);
+        if (RT_SUCCESS(rc))
+        {
+            RTUTF16 wszPath[RTPATH_MAX];
+            HRESULT hrc = pfnSHGetFolderPathW(0, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, wszPath);
+            if (   hrc == S_OK     /* Found */
+                || hrc == S_FALSE) /* Found, but doesn't exist */
+            {
+                /*
+                 * Convert and return.
+                 */
+                RTLdrClose(hShell32);
+                return RTUtf16ToUtf8Ex(&wszPath[0], RTSTR_MAX, &pszPath, cchPath, NULL);
+            }
+        }
+        RTLdrClose(hShell32);
+    }
     return VERR_PATH_NOT_FOUND;
 }