Changeset 5861 for trunk/src

Timestamp:

Jun 1, 2001, 10:22:10 AM (24 years ago)

Author:

sandervl

Message:

ifdefs added

Location:

trunk/src/shell32

Files:

• iconcache.c (modified) (4 diffs)
• shell32_main.c (modified) (3 diffs)

trunk/src/shell32/iconcache.c

@@ -1 @@
-/* $Id: iconcache.c,v 1.5 2001-06-01 01:13:23 phaller Exp $ */
+/* $Id: iconcache.c,v 1.6 2001-06-01 08:22:09 sandervl Exp $ */
 /*
  *      shell icon cache (SIC)
@@ -785 +785 @@
         if ( INVALID_INDEX == index )
         {
+#ifdef __WIN32OS2__
           // 2001-06-01 PH memory leak in WINE
           HeapFree(GetProcessHeap(),0,lpsice->sSourceFile);
-          
+#endif          
           SHFree(lpsice);
           ret = INVALID_INDEX;
@@ -920 +921 @@
         ImageList_SetBkColor(ShellSmallIconList, GetSysColor(COLOR_WINDOW));
         ImageList_SetBkColor(ShellBigIconList, GetSysColor(COLOR_WINDOW));
-  
+
+#ifndef __WIN32OS2__  
   /* 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++)
         {
@@ -937 +939 @@
           SIC_IconAppend ("shell32.dll", index, hSm, hLg);
           }
-   */
+#endif
 
         TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList);

trunk/src/shell32/shell32_main.c

@@ -1 @@
-/* $Id: shell32_main.c,v 1.4 2001-06-01 01:46:30 phaller Exp $ */
+/* $Id: shell32_main.c,v 1.5 2001-06-01 08:22:10 sandervl Exp $ */
 /*
  *                              Shell basics
@@ -893 +893 @@
         switch (fdwReason)
         {
-        case DLL_PROCESS_ATTACH:
-          
+          case DLL_PROCESS_ATTACH:
             shell32_RefCount++;
             if (shell32_hInstance) return TRUE;
@@ -914 +913 @@
             /* initialize the common controls */
             InitCommonControlsEx(NULL);
-          
+
             SIC_Initialize();
             SYSTRAY_Init();