[shell32]

partial SHGetFileInfoW winesync to wine 1.1.35 (fixes uninitialized memory access)

svn path=/trunk/; revision=44728

diff --git a/reactos/dll/win32/shell32/shell32_main.c b/reactos/dll/win32/shell32/shell32_main.c
index f078188..f4ae815 100644 (file)
--- a/reactos/dll/win32/shell32/shell32_main.c
+++ b/reactos/dll/win32/shell32/shell32_main.c
@@ -538,7 +538,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
     /* get icon index (or load icon)*/
     if (SUCCEEDED(hr) && (flags & (SHGFI_ICON | SHGFI_SYSICONINDEX)))
     {
-        if (flags & SHGFI_USEFILEATTRIBUTES)
+        if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL))
         {
             WCHAR sTemp [MAX_PATH];
             WCHAR * szExt;