some structure spider fixes

zhuzeyu22 · Dec 13, 2016 · 8b74d73 · 8b74d73
1 parent ff9d4f7
commit 8b74d73
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 84 deletions.
diff --git a/Cheat Engine/frmStringMapUnit.lfm b/Cheat Engine/frmStringMapUnit.lfm
@@ -8,6 +8,7 @@ object frmStringMap: TfrmStringMap
   ClientHeight = 400
   ClientWidth = 480
   OnClose = FormClose
+  OnDestroy = FormDestroy
   OnResize = FormResize
   Position = poScreenCenter
   LCLVersion = '1.6.0.4'

diff --git a/Cheat Engine/frmStringMapUnit.pas b/Cheat Engine/frmStringMapUnit.pas
@@ -69,6 +69,7 @@   TfrmStringMap = class(TForm)
     procedure cbRegExpChange(Sender: TObject);
     procedure FindDialog1Find(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormDestroy(Sender: TObject);
     procedure FormResize(Sender: TObject);
     procedure ListView1DblClick(Sender: TObject);
     procedure miFindClick(Sender: TObject);
@@ -577,6 +578,11 @@ procedure TfrmStringMap.FormClose(Sender: TObject; var CloseAction: TCloseAction
   isfillinglist:=false;
 end;
 
+procedure TfrmStringMap.FormDestroy(Sender: TObject);
+begin
+  cleanup;
+end;
+
 procedure TfrmStringMap.FormResize(Sender: TObject);
 begin
   listview1.Column[listview1.ColumnCount-1].Width:=listview1.ClientWidth-listview1.Column[0].Width-3;

diff --git a/Cheat Engine/frmStringPointerScanUnit.lfm b/Cheat Engine/frmStringPointerScanUnit.lfm
@@ -53,7 +53,7 @@ object frmStringPointerScan: TfrmStringPointerScan
       AnchorSideRight.Side = asrBottom
       Left = 20
       Height = 23
-      Top = 330
+      Top = 349
       Width = 164
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Right = 4
@@ -66,7 +66,7 @@ object frmStringPointerScan: TfrmStringPointerScan
       AnchorSideTop.Side = asrBottom
       Left = 20
       Height = 19
-      Top = 311
+      Top = 330
       Width = 89
       Caption = 'Must be start'
       Enabled = False
@@ -78,19 +78,19 @@ object frmStringPointerScan: TfrmStringPointerScan
       AnchorSideTop.Side = asrBottom
       Left = 20
       Height = 19
-      Top = 292
+      Top = 311
       Width = 93
       Caption = 'Case sensitive'
       Enabled = False
       TabOrder = 7
     end
     object cbRegExp: TCheckBox
       AnchorSideLeft.Control = rbStringscan
-      AnchorSideTop.Control = rbStringscan
+      AnchorSideTop.Control = cbReuseStringmap
       AnchorSideTop.Side = asrBottom
       Left = 20
       Height = 19
-      Top = 273
+      Top = 292
       Width = 164
       BorderSpacing.Left = 16
       BorderSpacing.Right = 4
@@ -116,7 +116,7 @@ object frmStringPointerScan: TfrmStringPointerScan
       AnchorSideTop.Side = asrBottom
       Left = 4
       Height = 19
-      Top = 353
+      Top = 372
       Width = 71
       Caption = 'Data scan'
       OnChange = rbDatascanChange
@@ -130,7 +130,7 @@ object frmStringPointerScan: TfrmStringPointerScan
       AnchorSideRight.Side = asrBottom
       Left = 20
       Height = 23
-      Top = 387
+      Top = 406
       Width = 164
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Right = 4
@@ -144,7 +144,7 @@ object frmStringPointerScan: TfrmStringPointerScan
       AnchorSideTop.Side = asrBottom
       Left = 20
       Height = 15
-      Top = 372
+      Top = 391
       Width = 47
       BorderSpacing.Left = 16
       Caption = 'Alignsize'
@@ -212,7 +212,7 @@ object frmStringPointerScan: TfrmStringPointerScan
       AnchorSideTop.Side = asrBottom
       Left = 20
       Height = 15
-      Top = 330
+      Top = 349
       Width = 34
       Caption = 'String:'
       Enabled = False
@@ -374,19 +374,19 @@ object frmStringPointerScan: TfrmStringPointerScan
       AnchorSideBottom.Control = Panel1
       AnchorSideBottom.Side = asrBottom
       Left = 0
-      Height = 41
-      Top = 449
+      Height = 22
+      Top = 468
       Width = 188
       Anchors = [akTop, akLeft, akRight, akBottom]
       AutoSize = True
       BevelOuter = bvNone
-      ClientHeight = 41
+      ClientHeight = 22
       ClientWidth = 188
       TabOrder = 13
       object lblInfo: TLabel
         Left = 0
         Height = 15
-        Top = 26
+        Top = 7
         Width = 188
         Align = alBottom
         Caption = 'Info'
@@ -401,19 +401,22 @@ object frmStringPointerScan: TfrmStringPointerScan
       AnchorSideRight.Side = asrBottom
       Left = 0
       Height = 39
-      Top = 410
+      Top = 429
       Width = 188
       Anchors = [akTop, akLeft, akRight]
       AutoSize = True
       BevelOuter = bvNone
+      ChildSizing.LeftRightSpacing = 8
+      ChildSizing.HorizontalSpacing = 8
+      ChildSizing.EnlargeHorizontal = crsHomogenousSpaceResize
+      ChildSizing.Layout = cclLeftToRightThenTopToBottom
+      ChildSizing.ControlsPerLine = 2
       ClientHeight = 39
       ClientWidth = 188
       TabOrder = 14
       object btnNewScan: TButton
-        AnchorSideLeft.Control = Panel9
         AnchorSideLeft.Side = asrCenter
-        AnchorSideTop.Control = Panel9
-        Left = 54
+        Left = 10
         Height = 25
         Top = 7
         Width = 80
@@ -427,10 +430,8 @@ object frmStringPointerScan: TfrmStringPointerScan
         Visible = False
       end
       object btnScan: TButton
-        AnchorSideLeft.Control = Panel9
         AnchorSideLeft.Side = asrCenter
-        AnchorSideTop.Control = Panel9
-        Left = 54
+        Left = 100
         Height = 25
         Top = 7
         Width = 80
@@ -445,6 +446,20 @@ object frmStringPointerScan: TfrmStringPointerScan
         TabOrder = 1
       end
     end
+    object cbReuseStringmap: TCheckBox
+      AnchorSideLeft.Control = rbStringscan
+      AnchorSideTop.Control = rbStringscan
+      AnchorSideTop.Side = asrBottom
+      Left = 20
+      Height = 19
+      Top = 273
+      Width = 139
+      BorderSpacing.Left = 16
+      Caption = 'Use existing stringmap'
+      Checked = True
+      State = cbChecked
+      TabOrder = 15
+    end
   end
   object Panel2: TPanel
     Left = 188

diff --git a/Cheat Engine/frmStringPointerScanUnit.lrt b/Cheat Engine/frmStringPointerScanUnit.lrt
@@ -27,6 +27,7 @@ TFRMSTRINGPOINTERSCAN.LBLMAXLEVEL.CAPTION=Max Level
 TFRMSTRINGPOINTERSCAN.LBLINFO.CAPTION=Info
 TFRMSTRINGPOINTERSCAN.BTNNEWSCAN.CAPTION=New Scan
 TFRMSTRINGPOINTERSCAN.BTNSCAN.CAPTION=Scan
+TFRMSTRINGPOINTERSCAN.CBREUSESTRINGMAP.CAPTION=Use existing stringmap
 TFRMSTRINGPOINTERSCAN.LBLEXTRA.CAPTION=Compare against
 TFRMSTRINGPOINTERSCAN.CBHASSHADOW2.HINT=Use this if you're spidering a previously saved memory region that currently resides in a different location.
 Most commonly used for stacks where stack pointers point to it's own structure