Changeset 9637 for trunk/src/user32/win32wbase.cpp

Timestamp:

Jan 6, 2003, 5:15:13 PM (23 years ago)

Author:

sandervl

Message:

Fixed icon leak in IconForWindow method

File:

• trunk/src/user32/win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.352 2003-01-06 15:38:17 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.353 2003-01-06 16:15:13 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2267 +2267 @@
         hWndIcon = windowClass->getIcon();
     else
-    if (!(dwStyle & DS_MODALFRAME))
-         hWndIcon = LoadImageA(0,MAKEINTRESOURCEA(OIC_ODINICON),IMAGE_ICON,0,0,LR_DEFAULTCOLOR);
+    if (!(dwStyle & DS_MODALFRAME)) 
+    {//SvL: load it as shared or else we'll leak icons
+         hWndIcon = LoadImageA(0,MAKEINTRESOURCEA(OIC_ODINICON),IMAGE_ICON,0,0,LR_DEFAULTCOLOR|LR_SHARED);
+    }
     else hWndIcon = 0;
   }
@@ -2285 +2287 @@
         hWndIcon = windowClass->getIcon();
     else
-    if (!(dwStyle & DS_MODALFRAME))
-         hWndIcon = LoadImageA(0,MAKEINTRESOURCEA(OIC_ODINICON),IMAGE_ICON,0,0,LR_DEFAULTCOLOR);
+    if (!(dwStyle & DS_MODALFRAME)) 
+    {//SvL: load it as shared or else we'll leak icons
+         hWndIcon = LoadImageA(0,MAKEINTRESOURCEA(OIC_ODINICON),IMAGE_ICON,0,0,LR_DEFAULTCOLOR|LR_SHARED);
+    }
     else hWndIcon = 0;
   }