[SYSSETUP]

* Fix some icons not appearing. The desktop one for "Command Prompt" still appears on the SYSTEM folder instead of the Default User one somehow.

svn path=/branches/shell-experiments/; revision=65393

diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c
index 097537e..7b7d19c 100644 (file)
--- a/dll/win32/syssetup/install.c
+++ b/dll/win32/syssetup/install.c
@@ -262,7 +262,7 @@ static BOOL CreateShortcuts(HINF hinf, LPCWSTR szSection)
         if (!SetupGetStringFieldW(&Context, 2, szFolder, MAX_PATH, NULL))
             continue;
 
-        if (!SHGetSpecialFolderPathW(0, szPath, csidl, TRUE))
+        if (FAILED(SHGetFolderPathW(NULL, csidl|CSIDL_FLAG_CREATE, (HANDLE)-1, SHGFP_TYPE_DEFAULT, szPath)))
             continue;
 
         p = PathAddBackslash(szPath);
@@ -487,7 +487,7 @@ RegisterTypeLibraries (HINF hinf, LPCWSTR szSection)
         hret = SHGetFolderPathW(NULL, csidl, NULL, 0, szPath);
         if (FAILED(hret))
         {
-            FatalError("SHGetSpecialFolderPathW failed hret=0x%d\n", hret);
+            FatalError("SHGetFolderPathW failed hret=0x%d\n", hret);
             continue;
         }