From ae5067a1ab6653c3397aa8cb462c8cdf1174e31d Mon Sep 17 00:00:00 2001
From: Ged Murphy <gedmurphy@reactos.org>
Date: Mon, 30 Mar 2009 22:41:53 +0000
Subject: [PATCH] partially revert to slightly broken Wine code for now

svn path=/trunk/; revision=40302
---
 reactos/dll/win32/shell32/iconcache.c | 46 +++++++--------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/reactos/dll/win32/shell32/iconcache.c b/reactos/dll/win32/shell32/iconcache.c
index c8533b524a1..3e84cf738a7 100644
--- a/reactos/dll/win32/shell32/iconcache.c
+++ b/reactos/dll/win32/shell32/iconcache.c
@@ -429,49 +429,25 @@ BOOL SIC_Initialize(void)
                                           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);