Changeset 5847 for trunk/src

Timestamp:

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

Author:

phaller

Message:

Removed pre-initializing of icon cache

Location:

trunk/src/shell32

Files:

• iconcache.c (modified) (4 diffs)
• shell32_main.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);

trunk/src/shell32/shell32_main.c

@@ -1 @@
-/* $Id: shell32_main.c,v 1.2 2001-04-28 13:33:45 sandervl Exp $ */
+/* $Id: shell32_main.c,v 1.3 2001-06-01 01:13:24 phaller Exp $ */
 /*
  *                              Shell basics
@@ -39 +39 @@
 #include <misc.h>
 #endif
+
+#define PERF_ENABLED
+#include "perf.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
@@ -889 +892 @@
 BOOL WINAPI Shell32LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
+  PERF_INIT(shell32_i1)
+  PERF_INIT(shell32_i2)
+  PERF_INIT(shell32_i3)
+  PERF_INIT(shell32_i4)
+  PERF_INIT(shell32_i5)
+    
         TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
 
         switch (fdwReason)
         {
-          case DLL_PROCESS_ATTACH:
+        case DLL_PROCESS_ATTACH:
+          
+          PERF_START(shell32_i1)
+            
             shell32_RefCount++;
             if (shell32_hInstance) return TRUE;
@@ -913 +925 @@
             /* initialize the common controls */
             InitCommonControlsEx(NULL);
-
+          
+          PERF_ELAPSED(shell32_i1, "Shell32LibMain", "i1")
+          PERF_START(shell32_i2)
             SIC_Initialize();
+          PERF_ELAPSED(shell32_i2, "Shell32LibMain", "i2")
+          PERF_START(shell32_i3)
             SYSTRAY_Init();
+          PERF_ELAPSED(shell32_i3, "Shell32LibMain", "i3")
+          PERF_START(shell32_i4)
             InitChangeNotifications();
+          PERF_ELAPSED(shell32_i4, "Shell32LibMain", "i4")
+          PERF_START(shell32_i5)
             SHInitRestricted(NULL, NULL);
+          PERF_ELAPSED(shell32_i5, "Shell32LibMain", "i5")
             break;