Changeset 105 for trunk

Timestamp:

Jan 25, 2018, 11:33:52 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Various memory leaks.

Location:

trunk

Files:

• Back.pas (modified) (1 diff)
• Directories.pas (modified) (3 diffs)
• GameServer.pas (modified) (2 diffs)
• Start.pas (modified) (3 diffs)
• Switches.inc (modified) (1 diff)

trunk/Back.pas

@@ -37 +37 @@
 
 procedure TBackground.FormShow(Sender: TObject);
+var
+  FileName: string;
 begin
-  Img := nil;
   if FullScreen then begin
-    if FileExists(HomeDir + 'Graphics' + DirectorySeparator + 'Background.png') then begin
-      Img := TBitmap.Create;
-      LoadGraphicFile(img, HomeDir + 'Graphics' + DirectorySeparator + 'Background.png');
+    if not Assigned(Img) then begin
+      FileName := HomeDir + 'Graphics' + DirectorySeparator + 'Background.png';
+      if FileExists(FileName) then begin
+        Img := TBitmap.Create;
+        LoadGraphicFile(img, FileName);
+      end;
     end;
   end else begin

trunk/Directories.pas

@@ -27 +27 @@
 begin
   result := FindFirst(path, faDirectory, f) = 0;
+  FindClose(f);
 end;
 
@@ -94 +95 @@
         CopyFile(PChar(HomeDir + 'AppData' + DirectorySeparator + 'Saved' + DirectorySeparator + src.Name),
           PChar(DataDir + 'Saved' + DirectorySeparator + src.Name), false);
+      FindClose(dst);
     until FindNext(src) <> 0;
+  FindClose(src);
 end;
 
@@ -101 +104 @@
 InitUnit;
 
+
 end.

trunk/GameServer.pas

@@ -273 +273 @@
         inc(nBrain);
     until FindNext(f) <> 0;
+  FindClose(F);
 end;
 
@@ -4499 +4500 @@
 
 FindFirst(ParamStr(0), $21, ExeInfo);
+FindClose(ExeInfo);
 
 {$IFOPT O-}nHandoverStack := 0; {$ENDIF}

trunk/Start.pas

@@ -265 +265 @@
     r1 := CreateRectRgn(TabOffset + 4 * TabSize + 2, 0, Width, TabHeight);
     CombineRgn(r0, r0, r1, RGN_DIFF);
-    // DeleteObject(r1);
+    DeleteObject(r1);
     r1 := CreateRectRgn(QuitBtn.left, QuitBtn.top, QuitBtn.left + QuitBtn.width,
       QuitBtn.top + QuitBtn.height);
     CombineRgn(r0, r0, r1, RGN_OR);
-    // DeleteObject(r1);
+    DeleteObject(r1);
     SetWindowRgn(Handle, r0, false);
-    // DeleteObject(r0); // causes crash with Windows 95
+    DeleteObject(r0); // causes crash with Windows 95
   end
   else
@@ -1343 +1343 @@
         TObject(f.Time));
     until FindNext(f) <> 0;
+  FindClose(f);
   ListIndex[2] := FormerGames.Count - 1;
   if (ShowTab = 2) and (FormerGames.Count > 0) then
@@ -1358 +1359 @@
       Maps.Add(Copy(f.Name, 1, Length(f.Name) - 9));
     until FindNext(f) <> 0;
+  FindClose(F);
   Maps.Sort;
   Maps.Insert(0, Phrases.Lookup('RANMAP'));

trunk/Switches.inc

@@ -5 +5 @@
 {$LONGSTRINGS ON}
 
-{$IOCHECKS ON}
-{$OVERFLOWCHECKS OFF}
+//{$IOCHECKS ON}
+//{$OVERFLOWCHECKS OFF}
 
-{$TYPEINFO OFF}
-{$DEBUGINFO ON}
+//{$TYPEINFO OFF}
+//{$DEBUGINFO ON}
 //{$LOCALSYMBOLS ON}
 
 //{$E-}
-{$S-}
+//{$S-}
 {$Z1}
 
 {$IFDEF FPC} // freepascal
   {$MODE DELPHI}
-  {$SMARTLINK ON}
+  //{$SMARTLINK ON}
 {$ELSE} // delphi
   {$APPTYPE GUI}