Another attempt at fixing shell32

Mike Hearn mike at navi.cx
Mon May 9 16:19:36 CDT 2005


Juan pointed out that I missed the A case (which I had wrongly assumed was a converter)

Mike Hearn <mh at codeweavers.com>
Fix SHELL_GetPathFromIDList[AW] to return the desktop path given an empty PIDL

Index: dlls/shell32/pidl.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/pidl.c,v
retrieving revision 1.129
diff -u -p -d -r1.129 pidl.c
--- dlls/shell32/pidl.c	13 Apr 2005 14:39:27 -0000	1.129
+++ dlls/shell32/pidl.c	9 May 2005 21:18:53 -0000
@@ -1219,7 +1219,7 @@ HRESULT SHELL_GetPathFromIDListA(LPCITEM
     pszPath[0]=0;
 
     /* One case is a PIDL rooted at desktop level */
-    if (_ILIsValue(pidl) || _ILIsFolder(pidl))
+    if (_ILIsDesktop(pidl) || _ILIsValue(pidl) || _ILIsFolder(pidl))
     {
         hr = SHGetSpecialFolderPathA(0, pszPath, CSIDL_DESKTOP, FALSE);
 
@@ -1331,7 +1331,7 @@ HRESULT SHELL_GetPathFromIDListW(LPCITEM
     pszPath[0]=0;
 
     /* One case is a PIDL rooted at desktop level */
-    if (_ILIsValue(pidl) || _ILIsFolder(pidl))
+    if (_ILIsDesktop(pidl) ||_ILIsValue(pidl) || _ILIsFolder(pidl))
     {
         hr = SHGetSpecialFolderPathW(0, pszPath, CSIDL_DESKTOP, FALSE);
 



More information about the wine-patches mailing list