[ros-diffs] [gedmurphy] 40302: partially revert to slightly broken Wine code for now

[gedmurphy at svn.reactos.org]

Author: gedmurphy
Date: Tue Mar 31 02:41:53 2009
New Revision: 40302

URL: http://svn.reactos.org/svn/reactos?rev=40302&view=rev
Log:
partially revert to slightly broken Wine code for now

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

Modified: trunk/reactos/dll/win32/shell32/iconcache.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcache.c?rev=40302&r1=40301&r2=40302&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Tue Mar 31 02:41:53 2009
@@ -429,49 +429,25 @@
                                           ilMask,
                                           100,
                                           100);
-    if (ShellSmallIconList)
-    {
-         /* Load the document icon, which is used as the default if an icon isn't found. */
-        hSm = (HICON)LoadImageW(shell32_hInstance,
-                                MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT),
-                                IMAGE_ICON,
-                                cx_small,
-                                cy_small,
-                                LR_SHARED | LR_DEFAULTCOLOR);
-        if (!hSm)
-        {
-            ERR("Failed to load IDI_SHELL_DOCUMENT icon!\n");
-            return FALSE;
-        }
-    }
-
     ShellBigIconList = ImageList_Create(cx_large,
                                         cy_large,
                                         ilMask,
                                         100,
                                         100);
-    if (!ShellBigIconList)
-    {
-        hLg = (HICON)LoadImageW(shell32_hInstance,
-                                MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT),
-                                IMAGE_ICON,
-                                cx_large,
-                                cy_large,
-                                LR_SHARED | LR_DEFAULTCOLOR);
-        if (!hLg)
+        /* Load the document icon, which is used as the default if an icon isn't found. */
+        hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT),
+                                IMAGE_ICON, cx_small, cy_small, LR_SHARED);
+        hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT),
+                                IMAGE_ICON, cx_large, cy_large, LR_SHARED);
+
+        if (!hSm || !hLg) 
         {
-            ERR("Failed to load IDI_SHELL_DOCUMENT icon!\n");
-            DestroyIcon(hSm);
-            return FALSE;
+          FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n");
+          return FALSE;
         }
-    }
-
-
-    SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0);
-    SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0);
-
-    DestroyIcon(hSm);
-    DestroyIcon(hLg);
+
+        SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0);
+        SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0);
 
     TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList);