Changeset 53833 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 15, 2015 8:01:33 PM (10 years ago)

Author:

vboxsync

Message:

Runtime: looks like the 32-bit compiler does something silly

File:

• trunk/src/VBox/Runtime/r3/win/path-win.cpp (modified) (1 diff)

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

@@ -165 +165 @@
 
     RTUTF16 wszPath[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);
+    }
+
     DWORD   dwAttr;
-    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