Alexandre Julliard : shell32: Set the correct default for shell folders relative to the windows directory .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7c25ab8a07da7956eebed25fafecacb3aa9d8b05
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7c25ab8a07da7956eebed25faf...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue May  6 15:50:10 2008 +0200

shell32: Set the correct default for shell folders relative to the windows directory.

---

 dlls/shell32/shellpath.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 6e66d1f..fb0c309 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -1925,7 +1925,15 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken,
             else if (CSIDL_Data[folders[i]].type == CSIDL_Type_AllUsers)
                 _SHGetAllUsersProfilePath(SHGFP_TYPE_DEFAULT, folders[i], path);
             else if (CSIDL_Data[folders[i]].type == CSIDL_Type_WindowsPath)
+            {
                 GetWindowsDirectoryW(path, MAX_PATH);
+                if (CSIDL_Data[folders[i]].szDefaultPath &&
+                    !IS_INTRESOURCE(CSIDL_Data[folders[i]].szDefaultPath))
+                {
+                    PathAddBackslashW(path);
+                    strcatW(path, CSIDL_Data[folders[i]].szDefaultPath);
+                }
+            }
             else
                 hr = E_FAIL;
             if (*path)