Changeset 69

Timestamp:

Sep 28, 2023, 8:07:29 PM (23 months ago)

Author:

gyoung

Message:

Fix memory leak. Lars Erdmann provided this fix.

File:

• trunk/classes/c/c_mm/mmfolder.c (modified) (6 diffs)

trunk/classes/c/c_mm/mmfolder.c

@@ -59 +59 @@
 #include "sys_funcs.h"
 
-//#if 0
-#ifndef  _cwmmQuerySmallBitmapHandle
-#define _cwmmQuerySmallBitmapHandle MMImage_cwmmQuerySmallBitmapHandle
-#define _cwmmQuerySmallBitmapHandleCWBitmap MMBitmap_cwmmQuerySmallBitmapHandle
-#endif
-//#endif
 #define STOREWINDOWID 112233
 
@@ -389 +383 @@
                     Wondering what hidden problems/bugs will show upt in the future...
                     */
-                  if((hbm=_cwmmQuerySmallBitmapHandle( (MMImage*) wpObject, ulIconSize, mrc, hwndCnr))!=NULLHANDLE)          
+                  if((hbm=MMImage_cwmmQuerySmallBitmapHandle( (MMImage*) wpObject, ulIconSize, mrc, hwndCnr))!=NULLHANDLE)
                     pBmpInfoHeader2=(PBITMAPINFOHEADER2)_wpQueryBitmapInfoHeader((MMImage*)wpObject);
 #ifdef DEBUG
@@ -399 +393 @@
                   /* The default WPS bitmap class (WPBitmap) returns an PBITMAPHEADER. The CWBitmap class
                      does return a PBITMAPHEADER2<-. */
-                  if((hbm=_cwmmQuerySmallBitmapHandleCWBitmap( (MMBitmap*) wpObject, ulIconSize))!=NULLHANDLE)
+                  if((hbm=MMBitmap_cwmmQuerySmallBitmapHandle( (MMBitmap*) wpObject, ulIconSize))!=NULLHANDLE)
                     pBmpInfoHeader2=(PBITMAPINFOHEADER2)_cwmmQueryBitmapInfoHeader((MMBitmap*)wpObject);
                 }
@@ -442 +436 @@
                     cwDraw2ColorBorder(pOwnerItem->hps, &rclTemp, CLR_BLACK, CLR_DARKGRAY);
                     /* Done */
-                    free(hbm);
+                    if(_somIsA(wpObject, cwImageClass)) {
+                      MMImage_cwmmFreeSmallBitmap((MMImage *)wpObject);
+                    }
+                    else {
+                     MMBitmap_cwmmFreeSmallBitmap((MMBitmap*)wpObject);
+                    }
                     return (MRESULT) TRUE;
                   }/* hbm */
@@ -581 +580 @@
                   /* Get the small bitmap from the object */ 
                   if(_somIsA(wpObject, cwImageClass)) {
-                    hbm=_cwmmQuerySmallBitmapHandle( (MMImage*) wpObject, ulIconSize, mrc, hwndCnr);
+                    hbm=MMImage_cwmmQuerySmallBitmapHandle( (MMImage*) wpObject, ulIconSize, mrc, hwndCnr);
                     pBmpInfoHeader2=(PBITMAPINFOHEADER2)_wpQueryBitmapInfoHeader((MMImage*)wpObject);
                   }
                   else if(_somIsA(wpObject, cwBitmapClass)) {
-                    hbm=_cwmmQuerySmallBitmapHandleCWBitmap( (MMImage*) wpObject, ulIconSize);
+                    hbm=MMBitmap_cwmmQuerySmallBitmapHandle( (MMImage*) wpObject, ulIconSize);
                     pBmpInfoHeader2=(PBITMAPINFOHEADER2)_wpQueryBitmapInfoHeader((MMBitmap*)wpObject);
                   }
@@ -636 +635 @@
                                       CLR_WHITE, CLR_BLACK, DBM_STRETCH /*|DBM_IMAGEATTRS*/);
                       }
+                      if(_somIsA(wpObject, cwImageClass)) {
+                      MMImage_cwmmFreeSmallBitmap((MMImage *)wpObject);
+                    }
+                    else {
+                      MMBitmap_cwmmFreeSmallBitmap((MMBitmap*)wpObject);
+                    }
                       return (MRESULT) TRUE;
                     }/* hbm */