[SHELL32]
authorThomas Faber <thomas.faber@reactos.org>
Tue, 18 Aug 2015 10:10:36 +0000 (10:10 +0000)
committerThomas Faber <thomas.faber@reactos.org>
Tue, 18 Aug 2015 10:10:36 +0000 (10:10 +0000)
- Don't use SHELL32_GetDisplayNameOfGUIDItem on the desktop folder. Fixes file open dialog. Giannis please review ;)

svn path=/trunk/; revision=68749

reactos/dll/win32/shell32/folders/CDesktopFolder.cpp

index 59cd25b..8ea35db 100644 (file)
@@ -650,7 +650,7 @@ HRESULT WINAPI CDesktopFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFl
     if (!strRet)
         return E_INVALIDARG;
 
     if (!strRet)
         return E_INVALIDARG;
 
-    if (_ILIsPidlSimple(pidl) && _ILIsSpecialFolder(pidl))
+    if (!_ILIsDesktop(pidl) && _ILIsPidlSimple(pidl) && _ILIsSpecialFolder(pidl))
     {
         return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet);
     }
     {
         return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet);
     }