Andrew Eikum : shell32: Allow registering knownfolders without relative paths.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Mar 18 10:26:28 CDT 2015
Module: wine
Branch: master
Commit: cdf6aecc22312ae1e750f1618d293c6e18256da8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf6aecc22312ae1e750f1618d293c6e18256da8
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Tue Mar 17 10:03:17 2015 -0500
shell32: Allow registering knownfolders without relative paths.
---
dlls/shell32/shellpath.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 56ead5f..b9d9421 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -3946,11 +3946,8 @@ static HRESULT WINAPI foldermanager_RegisterFolder(
hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szParentFolder, 0, REG_SZ, (LPBYTE)sParentGuid, sizeof(sParentGuid)));
}
- if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL)
+ if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL && pKFD->pszRelativePath)
{
- if(!pKFD->pszRelativePath)
- hr = E_INVALIDARG;
-
if(SUCCEEDED(hr))
hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) ));
}
More information about the wine-cvs
mailing list