Changeset 266

Timestamp:

Jun 26, 2020, 1:13:34 AM (4 years ago)

Author:

chronos

Message:

• Added: Application BeforeFinalization handler to free forms before finalization.

Location:

branches/highdpi

Files:

• GameServer.pas (modified) (1 diff)
• Packages/CevoComponents/BaseWin.pas (modified) (2 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (3 diffs)
• Packages/DpiControls/UDpiControls.pas (modified) (6 diffs)

branches/highdpi/GameServer.pas

@@ -289 +289 @@
         FreeLibrary(hm);
     end;
-  PlayersBrain.Free;
-  bix.Free;
-  Brains.Free;
+  FreeAndNil(PlayersBrain);
+  FreeAndNil(bix);
+  FreeAndNil(Brains);
 end;
 

branches/highdpi/Packages/CevoComponents/BaseWin.pas

@@ -106 +106 @@
 destructor TBufferedDrawDlg.Destroy;
 begin
-  Offscreen.Free;
+  // Name
+  FreeAndNil(Offscreen);
   inherited Destroy;
 end;
@@ -496 +497 @@
 begin
   if Offscreen <> nil then
-    exit;
+    Exit;
   Offscreen := TDpiBitmap.Create;
   Offscreen.PixelFormat := pf24bit;

branches/highdpi/Packages/CevoComponents/ScreenTools.pas

@@ -406 +406 @@
     jtex := TDpiJpegImage.Create;
     try
-      jtex.LoadFromFile(Path);
-    except
-      Result := False;
-    end;
-    if Result then
-    begin
-      if Options and gfNoGamma = 0 then
-        bmp.PixelFormat := pf24bit;
-      Bmp.SetSize(jtex.Width, jtex.Height);
-      Bmp.Canvas.Draw(0, 0, jtex);
-    end;
-    jtex.Free;
+      try
+        jtex.LoadFromFile(Path);
+      except
+        Result := False;
+      end;
+      if Result then
+      begin
+        if Options and gfNoGamma = 0 then
+          bmp.PixelFormat := pf24bit;
+        Bmp.SetSize(jtex.Width, jtex.Height);
+        Bmp.Canvas.Draw(0, 0, jtex);
+      end;
+    finally
+      FreeAndNil(jtex);
+    end;
   end
   else
   if ExtractFileExt(Path) = '.png' then begin
     Png := TDpiPortableNetworkGraphic.Create;
-    Png.PixelFormat := Bmp.PixelFormat;
     try
-      Png.LoadFromFile(Path);
-    except
-      Result := False;
-    end;
-    if Result then
-    begin
-      if Options and gfNoGamma = 0 then
-        bmp.PixelFormat := pf24bit;
-      bmp.SetSize(Png.Width, Png.Height);
-      if (Png.RawImage.Description.Format = ricfGray) then
-      begin
-        // LCL doesn't support 8-bit colors properly. Use 24-bit instead.
-        Bmp.PixelFormat := pf24bit;
-        CopyGray8BitTo24bitBitmap(Bmp, Png);
-      end
-      else
-        Bmp.Canvas.draw(0, 0, Png);
-    end;
-    Png.Free;
-  end
-  else
+      Png.PixelFormat := Bmp.PixelFormat;
+      try
+        Png.LoadFromFile(Path);
+      except
+        Result := False;
+        end;
+      if Result then begin
+        if Options and gfNoGamma = 0 then
+          bmp.PixelFormat := pf24bit;
+        bmp.SetSize(Png.Width, Png.Height);
+        if (Png.RawImage.Description.Format = ricfGray) then
+        begin
+          // LCL doesn't support 8-bit colors properly. Use 24-bit instead.
+          Bmp.PixelFormat := pf24bit;
+          CopyGray8BitTo24bitBitmap(Bmp, Png);
+        end else
+          Bmp.Canvas.draw(0, 0, Png);
+      end;
+    finally
+      FreeAndNil(Png);
+    end;
+  end else
   if ExtractFileExt(Path) = '.bmp' then begin
     try
@@ -455 +458 @@
         bmp.PixelFormat := pf24bit;
     end;
-  end
-  else
+  end else
     raise Exception.Create('Unsupported image file type ' + ExtractFileExt(Path));
 
@@ -1728 +1730 @@
   RestoreResolution;
   for I := 0 to nGrExt - 1 do begin
-    GrExt[I].Data.Free;
-    GrExt[I].Mask.Free;
+    FreeAndNil(GrExt[I].Data);
+    FreeAndNil(GrExt[I].Mask);
     FreeMem(GrExt[I]);
   end;

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -812 +812 @@
     FMainForm: TDpiForm;
     FCreatingForm: TDpiForm;
+    FOldExitProc: Pointer;
     function GetActive: Boolean;
     function GetShowMainForm: Boolean;
@@ -821 +822 @@
   protected
     function GetNativeApplication: TApplication; virtual;
+    procedure DoBeforeFinalization;
   public
     constructor Create(AOwner: TComponent); override;
@@ -1594 +1596 @@
 end;
 
+procedure DpiBeforeFinalization;
+// This is our ExitProc handler.
+begin
+  DpiApplication.DoBeforeFinalization;
+end;
+
+procedure TDpiApplication.DoBeforeFinalization;
+var
+  i: Integer;
+  C: TComponent;
+begin
+  if Self = nil then Exit;
+  for i := ComponentCount - 1 downto 0 do begin
+    if i < ComponentCount then begin
+      C := Components[i];
+      // C.Name
+      C.Free;
+    end;
+  end;
+end;
+
 function DpiFindApplicationComponent(const ComponentName: string): TComponent;
 // Note: this function is used by TReader to auto rename forms to unique names.
@@ -1603 +1626 @@
 begin
   RegisterFindGlobalComponentProc(@DpiFindApplicationComponent);
+  FOldExitProc := ExitProc;
+  ExitProc := @DpiBeforeFinalization;
   inherited;
 end;
@@ -1608 +1633 @@
 destructor TDpiApplication.Destroy;
 begin
+  ExitProc := FOldExitProc;
   inherited Destroy;
 end;
@@ -3736 +3762 @@
 destructor TDpiForm.Destroy;
 begin
+  // Name
   // TODO: Can't destroy directly?
   //FreeAndNil(NativeForm);
+
+  TFormEx(NativeForm).OnMessage := nil;
   DpiScreen.RemoveForm(Self);
 end;