Changeset 5847 for trunk/src/shell32/iconcache.c

Timestamp:

Jun 1, 2001, 3:13:24 AM (24 years ago)

Author:

phaller

Message:

Removed pre-initializing of icon cache

File:

• trunk/src/shell32/iconcache.c (modified) (4 diffs)

trunk/src/shell32/iconcache.c

@@ -1 @@
-/* $Id: iconcache.c,v 1.4 2001-04-28 13:33:44 sandervl Exp $ */
+/* $Id: iconcache.c,v 1.5 2001-06-01 01:13:23 phaller Exp $ */
 /*
  *      shell icon cache (SIC)
@@ -784 +784 @@
         index = pDPA_InsertPtr(sic_hdpa, 0x7fff, lpsice);
         if ( INVALID_INDEX == index )
-        {
+        {
+          // 2001-06-01 PH memory leak in WINE
+          HeapFree(GetProcessHeap(),0,lpsice->sSourceFile);
+          
           SHFree(lpsice);
           ret = INVALID_INDEX;
@@ -917 +920 @@
         ImageList_SetBkColor(ShellSmallIconList, GetSysColor(COLOR_WINDOW));
         ImageList_SetBkColor(ShellBigIconList, GetSysColor(COLOR_WINDOW));
-
+  
+  /* 2001-06-01 PH pre-initializing the list takes
+   * a long time. On-demand loading of the icons should
+   * be sufficient! (7 secs on P133)
+   *
         for (index=1; index<46; index++)
         {
@@ -929 +936 @@
           }
           SIC_IconAppend ("shell32.dll", index, hSm, hLg);
-        }
+          }
+   */
 
         TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList);