Issue #1212: Fixed mem leaks

Author: joachimmarder

Demos/Advanced/DrawTreeDemo.dfm

@@ -1,25 +1,24 @@
 object DrawTreeForm: TDrawTreeForm
   Left = 544
   Top = 320
-  Width = 726
-  Height = 513
+  ClientHeight = 475
+  ClientWidth = 714
   Color = clBtnFace
   Font.Charset = ANSI_CHARSET
   Font.Color = clWindowText
   Font.Height = -13
   Font.Name = 'Trebuchet MS'
   Font.Style = []
-  OldCreateOrder = False
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   DesignSize = (
-    710
+    714
     475)
-  PixelsPerInch = 96
   TextHeight = 18
   object Label7: TLabel
     Left = 0
     Top = 0
-    Width = 710
+    Width = 714
     Height = 61
     Align = alTop
     AutoSize = False
@@ -32,15 +31,15 @@ object DrawTreeForm: TDrawTreeForm
   end
   object Label1: TLabel
     Left = 4
-    Top = 381
+    Top = 390
     Width = 247
     Height = 18
     Anchors = [akLeft, akBottom]
     Caption = 'Adjust vertical image alignment of nodes:'
   end
   object Label3: TLabel
     Left = 424
-    Top = 381
+    Top = 390
     Width = 22
     Height = 18
     Anchors = [akLeft, akBottom]
@@ -49,8 +48,8 @@ object DrawTreeForm: TDrawTreeForm
   object VDT1: TVirtualDrawTree
     Left = 10
     Top = 84
-    Width = 684
-    Height = 278
+    Width = 690
+    Height = 287
     Anchors = [akLeft, akTop, akRight, akBottom]
     AutoExpandDelay = 200
     AutoScrollDelay = 200
@@ -92,6 +91,8 @@ object DrawTreeForm: TDrawTreeForm
     OnInitChildren = VDT1InitChildren
     OnInitNode = VDT1InitNode
     OnStateChange = VDT1StateChange
+    Touch.InteractiveGestures = [igPan, igPressAndTap]
+    Touch.InteractiveGestureOptions = [igoPanSingleFingerHorizontal, igoPanSingleFingerVertical, igoPanInertia, igoPanGutter, igoParentPassthrough]
     Columns = <
       item
         BiDiMode = bdLeftToRight
@@ -113,7 +114,7 @@ object DrawTreeForm: TDrawTreeForm
   end
   object TrackBar1: TTrackBar
     Left = 264
-    Top = 379
+    Top = 388
     Width = 157
     Height = 21
     Anchors = [akLeft, akBottom]

Demos/Advanced/DrawTreeDemo.pas

@@ -53,6 +53,7 @@   TDrawTreeForm = class(TForm)
       var InitialStates: TVirtualNodeInitStates);
     procedure TrackBar1Change(Sender: TObject);
     procedure VDT1StateChange(Sender: TBaseVirtualTree; Enter, Leave: TVirtualTreeStates);
+    procedure FormDestroy(Sender: TObject);
   private
     FThumbSize: Integer;
     FExtensionsInitialized: Boolean;
@@ -189,6 +190,11 @@ procedure TDrawTreeForm.FormCreate(Sender: TObject);
   FThumbSize := 200;
 end;
 
+procedure TDrawTreeForm.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(FExtensionList);
+end;
+
 //----------------------------------------------------------------------------------------------------------------------
 
 function TDrawTreeForm.CanDisplay(const Name: string): Boolean;
@@ -334,58 +340,60 @@ procedure TDrawTreeForm.VDT1InitNode(Sender: TBaseVirtualTree; ParentNode, Node:
   end
   else
   begin
-    Picture := TPicture.Create;
     Data.Display := ExtractFileName(ExcludeTrailingBackslash(Data.FullPath));
     if (Data.Attributes and SFGAO_FOLDER) = 0 then
-    try
+    begin
+      Picture := TPicture.Create;
       try
-        Data.Image := TBitmap.Create;
-        Picture.LoadFromFile(Data.FullPath);
-        if not (Picture.Graphic is TBitmap) then
-        begin
-          // Some extra steps needed to keep non TBitmap descentants alive when
-          // scaling. This is needed because when accessing Picture.Bitmap all
-          // non-TBitmap content will simply be erased (definitly the wrong
-          // action, but we can't do anything to prevent this). Hence we
-          // must explicitly draw the graphic to a bitmap.
-          with Data.Image do
+        try
+          Data.Image := TBitmap.Create;
+          Picture.LoadFromFile(Data.FullPath);
+          if not (Picture.Graphic is TBitmap) then
           begin
-            Width := Picture.Width;
-            Height := Picture.Height;
-            Canvas.Draw(0, 0, Picture.Graphic);
+            // Some extra steps needed to keep non TBitmap descentants alive when
+            // scaling. This is needed because when accessing Picture.Bitmap all
+            // non-TBitmap content will simply be erased (definitly the wrong
+            // action, but we can't do anything to prevent this). Hence we
+            // must explicitly draw the graphic to a bitmap.
+            with Data.Image do
+            begin
+              Width := Picture.Width;
+              Height := Picture.Height;
+              Canvas.Draw(0, 0, Picture.Graphic);
+            end;
+            Picture.Bitmap.Assign(Data.Image);
           end;
-          Picture.Bitmap.Assign(Data.Image);
-        end;
-        RescaleImage(Picture.Bitmap, Data.Image);
-
-        // Collect some additional image properties.
-        Data.Properties := Data.Properties + Format('%d x %d pixels', [Picture.Width, Picture.Height]);
-        case Picture.Bitmap.PixelFormat of
-          pf1bit:
-            Data.Properties := Data.Properties + ', 2 colors';
-          pf4bit:
-            Data.Properties := Data.Properties + ', 16 colors';
-          pf8bit:
-            Data.Properties := Data.Properties + ', 256 colors';
-          pf15bit:
-            Data.Properties := Data.Properties + ', 32K colors';
-          pf16bit:
-            Data.Properties := Data.Properties + ', 64K colors';
-          pf24bit:
-            Data.Properties := Data.Properties + ', 16M colors';
-          pf32bit:
-            Data.Properties := Data.Properties + ', 16M+ colors';
+          RescaleImage(Picture.Bitmap, Data.Image);
+
+          // Collect some additional image properties.
+          Data.Properties := Data.Properties + Format('%d x %d pixels', [Picture.Width, Picture.Height]);
+          case Picture.Bitmap.PixelFormat of
+            pf1bit:
+              Data.Properties := Data.Properties + ', 2 colors';
+            pf4bit:
+              Data.Properties := Data.Properties + ', 16 colors';
+            pf8bit:
+              Data.Properties := Data.Properties + ', 256 colors';
+            pf15bit:
+              Data.Properties := Data.Properties + ', 32K colors';
+            pf16bit:
+              Data.Properties := Data.Properties + ', 64K colors';
+            pf24bit:
+              Data.Properties := Data.Properties + ', 16M colors';
+            pf32bit:
+              Data.Properties := Data.Properties + ', 16M+ colors';
+          end;
+          if Cardinal(Data.Image.Height) + 4 > TVirtualDrawTree(Sender).DefaultNodeHeight then
+              Sender.NodeHeight[Node] := Data.Image.Height + 4;
+        except
+          Data.Image.Free;
+          Data.Image := nil;
         end;
-        if Cardinal(Data.Image.Height) + 4 > TVirtualDrawTree(Sender).DefaultNodeHeight then
-            Sender.NodeHeight[Node] := Data.Image.Height + 4;
-      except
-        Data.Image.Free;
-        Data.Image := nil;
-      end;
-    finally
-      Picture.Free;
-    end;
-  end;
+      finally
+        Picture.Free;
+      end;// try..finally
+    end;// if
+  end;// else
   Data.Attributes := ReadAttributes(Data.FullPath);
   if ((Data.Attributes and SFGAO_HASSUBFOLDER) <> 0) or
     (((Data.Attributes and SFGAO_FOLDER) <> 0) and HasChildren(Data.FullPath)) then