Andrew Eikum : shell32: Fall back on CSIDL path for knownfolders without a path in the registry.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 3 09:42:10 CST 2015
Module: wine
Branch: master
Commit: db35807eb02bb8ee2ba50e7ecee46341f0999d75
URL: http://source.winehq.org/git/wine.git/?a=commit;h=db35807eb02bb8ee2ba50e7ecee46341f0999d75
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Mon Mar 2 09:28:55 2015 -0600
shell32: Fall back on CSIDL path for knownfolders without a path in the registry.
---
dlls/shell32/shellpath.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 493ab8b..84e663b 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -3589,7 +3589,7 @@ static HRESULT get_known_folder_path_by_id(
DWORD dwFlags,
LPWSTR *ppszPath)
{
- HRESULT hr;
+ HRESULT hr = E_FAIL;
WCHAR sGuid[39];
DWORD dwAttributes;
@@ -3603,7 +3603,8 @@ static HRESULT get_known_folder_path_by_id(
hr = get_known_folder_path(sGuid, lpRegistryPath, ppszPath);
}
/* in other case, use older way */
- else
+
+ if(FAILED(hr))
hr = SHGetKnownFolderPath( folderId, dwFlags, NULL, ppszPath );
if (FAILED(hr)) return hr;
More information about the wine-cvs
mailing list