[ros-diffs] [cwittich] 44728: [shell32] partial SHGetFileInfoW winesync to wine 1.1.35 (fixes uninitialized memory access)

cwittich at svn.reactos.org cwittich at svn.reactos.org
Wed Dec 23 12:21:41 CET 2009


Author: cwittich
Date: Wed Dec 23 12:21:41 2009
New Revision: 44728

URL: http://svn.reactos.org/svn/reactos?rev=44728&view=rev
Log:
[shell32]
partial SHGetFileInfoW winesync to wine 1.1.35 (fixes uninitialized memory access)

Modified:
    trunk/reactos/dll/win32/shell32/shell32_main.c

Modified: trunk/reactos/dll/win32/shell32/shell32_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_main.c?rev=44728&r1=44727&r2=44728&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] Wed Dec 23 12:21:41 2009
@@ -538,7 +538,7 @@
     /* 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;




More information about the Ros-diffs mailing list