From cd8132e2d26538aa994cf740ea005bfdf7e940af Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Thu, 1 Apr 2004 19:14:14 +0000 Subject: [PATCH] Merged Wine commit: Kevin Koltzau Added support for CSIDL_RESOURCES path. svn path=/trunk/; revision=8945 --- reactos/lib/shell32/shellpath.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/reactos/lib/shell32/shellpath.c b/reactos/lib/shell32/shellpath.c index 8d8521479e2..c1912ccce58 100644 --- a/reactos/lib/shell32/shellpath.c +++ b/reactos/lib/shell32/shellpath.c @@ -997,9 +997,9 @@ static const CSIDL_DATA CSIDL_Data[] = /*"Documents and Settings\\"*/"All Users\\Documents\\My Video" }, { /* CSIDL_RESOURCES */ - 0, 0, /* FIXME */ + 0, (HKEY)2, NULL, - NULL + "Resources" }, { /* CSIDL_RESOURCES_LOCALIZED */ 0, 0, /* FIXME */ @@ -1070,6 +1070,15 @@ HRESULT WINAPI SHGetFolderPathW( MultiByteToWideChar(CP_ACP, 0, CSIDL_Data[folder].szValueName, -1, szValueName, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, CSIDL_Data[folder].szDefaultPath, -1, szDefaultPath, MAX_PATH); + /* Special case for some values that don't exist in registry */ + if (CSIDL_Data[folder].hRootKey == (HKEY)2) + { + GetWindowsDirectoryW(pszPath, MAX_PATH); + PathAddBackslashW(pszPath); + strcatW(pszPath, szDefaultPath); + return S_OK; + } + if (dwCsidlFlags & CSIDL_MYFLAG_SHFOLDER) { /* user shell folders */