Changeset 50 for trunk

Timestamp:

Jan 11, 2017, 5:26:09 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Deallocation of TPVScrollBar structure. Changed to class and added initialization and finalization.

Location:

trunk/LocalPlayer

Files:

• Help.pas (modified) (2 diffs)
• PVSB.pas (modified) (2 diffs)
• Select.pas (modified) (7 diffs)
• Term.pas (modified) (5 diffs)

trunk/LocalPlayer/Help.pas

@@ -208 +208 @@
   SearchResult := THyperText.Create;
   SearchResult.OwnsObjects := True;
+  sb := TPVScrollbar.Create;
   CreatePVSB(sb, Handle, 36, 551, 36 + 432);
 
@@ -244 +245 @@
 procedure THelpDlg.FormDestroy(Sender: TObject);
 begin
+  FreeAndNil(sb);
   FreeAndNil(MainText);
   FreeAndNil(SearchResult);

trunk/LocalPlayer/PVSB.pas

@@ -11 +11 @@
 
 type
-  TPVScrollbar = record
+
+  { TPVScrollbar }
+
+  TPVScrollbar = class
     h: integer;
     si: TScrollInfo;
     Form: TForm;
+    destructor Destroy; override;
   end;
 
@@ -154 +158 @@
 end;
 
+{ TPVScrollbar }
+
+destructor TPVScrollbar.Destroy;
+begin
+  h := 0;
+  si.cbSize := 0;
+  FreeAndNil(Form);
+end;
+
 end.

trunk/LocalPlayer/Select.pas

@@ -100 +100 @@
   inherited;
   Canvas.Font.Assign(UniFont[ftNormal]);
+  sb := TPVScrollbar.Create;
   CreatePVSB(sb, Handle, 2, 361, 2 + 422);
   InitButtons();
@@ -114 +115 @@
 procedure TListDlg.FormDestroy(Sender: TObject);
 begin
-  ScienceNationDot.Free;
+  FreeAndNil(sb);
+  FreeAndNil(ScienceNationDot);
 end;
 
@@ -120 +122 @@
 begin
   Closable := true;
-  Close
+  Close;
 end;
 
 procedure TListDlg.FormCloseQuery(Sender: TObject; var CanClose: boolean);
 begin
-  CanClose := Closable or not(Kind in MustChooseKind)
+  CanClose := Closable or not(Kind in MustChooseKind);
 end;
 
@@ -133 +135 @@
   begin
     Sel := -2;
-    SmartUpdateContent(true)
-  end
+    SmartUpdateContent(true);
+  end;
 end;
 
@@ -145 +147 @@
     PaintBox1MouseMove(nil, [], m.lParam and $FFFF - Left,
       m.lParam shr 16 - Top);
-  end
+  end;
 end;
 
@@ -154 +156 @@
     line(Canvas, Sel, false, false);
     Sel := -2;
-  end
+  end;
 end;
 
@@ -183 +185 @@
     LoweredTextOut(Canvas, -2, MainTexture,
       (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, ClientHeight - 29, s);
-  end
+  end;
 end;
 

trunk/LocalPlayer/Term.pas

@@ -3455 +3455 @@
   i, j: integer;
 begin
+  sb := TPVScrollbar.Create;
 {$IFDEF WINDOWS}{ TODO }
   Screen.Cursors[crImpDrag] := LoadCursor(HInstance, 'DRAG');
@@ -3529 +3530 @@
   i: integer;
 begin
-  TopBar.free;
-  Mini.free;
-  Buffer.free;
-  Panel.free;
+  FreeAndNil(sb);
+  FreeAndNil(TopBar);
+  FreeAndNil(Mini);
+  FreeAndNil(Buffer);
+  FreeAndNil(Panel);
   for i := 0 to nPl - 1 do
     if AILogo[i] <> nil then
-      AILogo[i].free;
+      FreeAndNil(AILogo[i]);
 end;
 
@@ -4155 +4157 @@
 end;
 
-function ScrollDCCopy(Canvas: TCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
+{$IFDEF LINUX}
+// Can't do scrolling of DC under Linux, then fallback into BitBlt.
+function ScrollDC(Canvas: TCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
 begin
   BitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
     Canvas, lprcScroll.Left, lprcScroll.Top, SRCCOPY);
 end;
+{$ENDIF}
 
 procedure TMainScreen.MainOffscreenPaint;
@@ -4212 +4217 @@
 {$ENDIF}
 {$IFDEF LINUX}
-    // Fallback to bitblt
-    ScrollDCCopy(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+    ScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
       rec, rec, 0, nil);
 {$ENDIF}
@@ -4226 +4230 @@
 {$ENDIF}
 {$IFDEF LINUX}
-        // Fallback to bitblt
-        ScrollDCCopy(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+        ScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
           rec, rec, 0, nil);
 {$ENDIF}