some compilation warning fixes and committing some stuff I haven't co…

…mmitted yet

Cheat Engine/FoundCodeUnit.pas

@@ -829,12 +829,14 @@ procedure TFoundCodedialog.moreinfo;
     {$IFDEF windows}
     if CurrentDebuggerInterface is TDBVMDebugInterface then
     begin
+      {$ifdef cpu64}
       if coderecord.context.P2Home<>0 then
       begin
         d:=TCR3Disassembler.Create;
         TCR3Disassembler(d).CR3:=coderecord.context.P2Home;
       end
       else
+      {$endif}
         d:=TDisassembler.Create;
     end
     else

Cheat Engine/LuaHandler.pas

@@ -8417,6 +8417,18 @@ function getTickCount_lua(L: PLua_State): integer; cdecl;
 function lua_rdtsc(L: PLua_State): integer; cdecl;
 var v: qword;
 begin
+  {$ifdef cpu32}
+  asm
+    push edx
+    push edi
+    rdtsc
+    lea edi,v
+    mov [edi],eax
+    mov [edi+4],edx
+    pop edi
+    pop edx
+  end;
+  {$else}
   asm
     push rdx
     rdtsc
@@ -8428,6 +8440,7 @@ function lua_rdtsc(L: PLua_State): integer; cdecl;
 
     mov v,rax
   end;
+  {$endif}
 
   lua_pushinteger(L,v);
   result:=1;
@@ -14565,7 +14578,7 @@ function lua_getNextReadablePageCR3(L: Plua_State): integer; cdecl;
 var
   cr3: qword;
   address: qword;
-  newaddress: qword;
+  newaddress: ptruint;
 begin
   result:=0;
   if lua_gettop(L)>=2 then

Cheat Engine/MainUnit.pas

@@ -7682,8 +7682,9 @@ procedure TMainForm.Findoutwhataccessesthisaddress1Click(Sender: TObject);
           address := addresslist.selectedRecord.GetRealAddress
         else
         if res = mrYes then
-          address := symhandler.getAddressFromName(
-            addresslist.selectedRecord.interpretableaddress)
+        begin
+          addresslist.selectedRecord.parseAddressString(addresslist.selectedRecord.interpretableaddress, address);
+        end
         else
           exit;
       end;
@@ -7720,8 +7721,9 @@ procedure TMainForm.Setbreakpoint1Click(Sender: TObject);
           address := addresslist.selectedRecord.GetRealAddress
         else
         if res = mrYes then
-          address := symhandler.getAddressFromName(
-            addresslist.selectedRecord.interpretableaddress)
+        begin
+          addresslist.selectedRecord.parseAddressString(addresslist.selectedRecord.interpretableaddress, address);
+        end
         else
           exit;
       end;

Cheat Engine/MainUnit2.pas

@@ -31,7 +31,7 @@ procedure initcetitle;
 
 
 
-const beta=' beta 1'; //empty this for a release
+const beta=' beta 2'; //empty this for a release
 
 var
   CEnorm:string;

Cheat Engine/MemoryBrowserFormUnit.pas

@@ -3157,14 +3157,20 @@ procedure TMemoryBrowser.Gotoaddress1Click(Sender: TObject);
   if(canceled)then
     exit;
 
-  oldAddress:=disassemblerview.SelectedAddress;
   try
-    disassemblerview.SelectedAddress:=symhandler.getaddressfromname(newaddress);
+    oldAddress:=disassemblerview.SelectedAddress;
+    try
+      disassemblerview.SelectedAddress:=symhandler.getaddressfromname(newaddress);
+    except
+      disassemblerview.SelectedAddress:=getaddress(newaddress);
+    end;
+
+    backlist.Push(pointer(oldAddress));
+
   except
-    disassemblerview.SelectedAddress:=getaddress(newaddress);
+    on e:exception do
+      MessageDlg(e.Message,mtError,[mbok],0);
   end;
-
-  backlist.Push(pointer(oldAddress));
 end;
 
 procedure TMemoryBrowser.Search1Click(Sender: TObject);

Cheat Engine/SynHighlighterAA.pas

@@ -1326,6 +1326,7 @@ procedure TSynAASyn.BraceOpenProc;
      (uppercase(fLine[3]) = 'U') and
      (uppercase(fLine[4]) = 'A') then
   begin
+    braceend:=length(fline);
     if (fLine[5] = '}') then
     begin
       changeHighlighter:=chlLua;

Cheat Engine/addresslist.pas

@@ -1135,53 +1135,59 @@ procedure Taddresslist.MultiEdit(memrec: TMemoryrecord);
 
   frmMemrecCombobox: TfrmMemrecCombobox;
 begin
-  if memrec.DropDownCount=0 then
-  begin
-    value:=AnsiToUtf8(memrec.value);
+  try
+    if memrec.DropDownCount=0 then
+    begin
+      value:=AnsiToUtf8(memrec.value);
 
 
-    if memrec.VarType=vtString then
-      canceled:=not MultilineInputQuery(rsChangeValue, rsWhatValueToChangeThisTo, value)
-    else
-      canceled:=not InputQuery(rsChangeValue, rsWhatValueToChangeThisTo, value);
+      if memrec.VarType=vtString then
+        canceled:=not MultilineInputQuery(rsChangeValue, rsWhatValueToChangeThisTo, value)
+      else
+        canceled:=not InputQuery(rsChangeValue, rsWhatValueToChangeThisTo, value);
 
 
-    value:=TrimRight(Utf8ToAnsi(value));
-  end
-  else
-  begin
-    frmMemrecCombobox:=TfrmMemrecCombobox.Create(memrec);
-    canceled:=frmMemrecCombobox.showmodal<>mrok;
+      value:=TrimRight(Utf8ToAnsi(value));
+    end
+    else
+    begin
+      frmMemrecCombobox:=TfrmMemrecCombobox.Create(memrec);
+      canceled:=frmMemrecCombobox.showmodal<>mrok;
 
-    if memrec.DropDownReadOnly and memrec.DropDownDescriptionOnly and memrec.DisplayAsDropDownListItem and (frmMemrecCombobox.value='*') then
-      canceled:=true;
+      if memrec.DropDownReadOnly and memrec.DropDownDescriptionOnly and memrec.DisplayAsDropDownListItem and (frmMemrecCombobox.value='*') then
+        canceled:=true;
 
-    if not canceled then
-      value:=utf8toansi(frmMemrecCombobox.value);
+      if not canceled then
+        value:=utf8toansi(frmMemrecCombobox.value);
 
-    frmMemrecCombobox.free;
-  end;
+      frmMemrecCombobox.free;
+    end;
 
-  if not canceled  then
-  begin
+    if not canceled  then
+    begin
 
 
-    allError:=true;
-    someError:=false;
-    for i:=0 to count-1 do
-      if memrecitems[i].isSelected then
-      begin
-        try
-          memrecitems[i].SetValue(value);
-          memrecitems[i].treenode.update;
-          allError:=false;
-        except
-          someError:=true;
+      allError:=true;
+      someError:=false;
+      for i:=0 to count-1 do
+        if memrecitems[i].isSelected then
+        begin
+          try
+            memrecitems[i].SetValue(value);
+            memrecitems[i].treenode.update;
+            allError:=false;
+          except
+            someError:=true;
+          end;
         end;
-      end;
 
-    if AllError then raise exception.create(Format(rsTheValueCouldNotBeParsed, [value]));
-    if SomeError then raise exception.create(Format(rsNotAllValueTypesCouldHandleTheValue, [value]));
+      if AllError then raise exception.create(Format(rsTheValueCouldNotBeParsed, [value]));
+      if SomeError then raise exception.create(Format(rsNotAllValueTypesCouldHandleTheValue, [value]));
+    end;
+
+  except
+    on e:Exception do
+      MessageDlg(e.message,mtError,[mbok],0);
   end;
 end;
 

Cheat Engine/betterControls/newmainmenu.pas

@@ -91,9 +91,10 @@ function TNewMenuItem.DoDrawItem(ACanvas: TCanvas; ARect: TRect; AState: TOwnerD
   if ShouldAppsUseDarkMode() and (result=false) then
   begin
     result:=Parent.Menu is TMainMenu;
+    oldc:=acanvas.Brush.color;
+
     if result then
     begin
-      oldc:=acanvas.Brush.color;
       acanvas.Brush.color:=$313131;
 
       lastvisible:=-1;

Cheat Engine/bin/autorun/dotnetinfo.lua

@@ -1990,8 +1990,13 @@ function miDotNetInfoClick(sender)
   frmDotNetInfo.miBrowseField.OnClick=function(sender) miBrowseFieldClick(frmDotNetInfo, sender) end
 
   frmDotNetInfo.pmFields.OnPopup=function(sender)
-    frmDotNetInfo.miBrowseField.Visible=frmDotNetInfo.lvFields.Selected and frmDotNetInfo.comboFieldBaseAddress.Text~=''
+    frmDotNetInfo.miBrowseField.Enabled=frmDotNetInfo.lvFields.Selected and frmDotNetInfo.comboFieldBaseAddress.Text~=''    
   end
+
+  frmDotNetInfo.pmMethods.OnPopup=function(sender)
+    frmDotNetInfo.miInvokeMethod.Enabled=(frmDotNetInfo.comboFieldBaseAddress.Text~='') and (getAddressSafe(frmDotNetInfo.comboFieldBaseAddress.Text)~=nil)
+  end
+
   --Init
 
 

Cheat Engine/bin/autorun/forms/DotNetInfo.frm

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FormData>
-  <frmDotNetInfo Class="TCEForm" Encoding="Ascii85">y.#qW,e8$$o%lzR-Gy#jiQX)EBve)_r4-Zy5@U1VHdV5[,Jr4a.xMr%$/VRKvL_U5iCYgG[(,#sL;v$ogoK3D3+y3@3s*pKqKX.M+zqLUHrcApCHC^1H^W}jdvBio,htAbAGdbxesjM=.$U,a2X[cPgtQ$FNx1]uwDgf--Gyj0rlq(ar9O#D9o?W-d@#;Ywm0]Yil)qhLK,inJEK7hLF@{X6GRk_)5loA[xmn4w$a20hE$q+TB=cr%u:{v!-.JLK@LH},G%!9VVrOa[Rack^r(o]R$}_sVls(u/PqDb9e?!]1jL]U4B}$!4$.sg!XGqq52I0NTL5#-=FNZ]822LJp;R}@BEz[;3QxEp!=;bK8-!947*I]yB;/;y^h[,]z2?{6.E3BXbgjx9:%9ph^J4nU)5-yE0^@:Vz5{qZyUYQ7sRMeoO/@GH8d}L.M3X3uu?ePi=-?3Y^fgnOj0Q}%k_c{oWBt^}+OmxY4zN*Sa0M$K%p({*aNx$vjBq6i/mO6/d6Dh:h.Bijrq5dlQy8lNjklLGzyz4d+8sOXzU2ZToj!a-?1l?e8$AeOZ_r(.mD7W]M=uVeVwW8lj[BCXE?j#,R[slJNo-d/,:c!?49:8=J$i/rZ4HwK!Tut%=vQ_$xXjC^g=m8]$-P$QkT%C51=wxVQpO;/]T1qKEz6X++Ej((Wl@s!/D9U5V6Fo7f*#ry1;,XbJTvaM(6#H/#jmZ:fDw:*PaGy9]ngMAYpF^,)xqGGb1THSqzd[Ra}(Ve,^aA.%pIo46#tBo.?,-VOk7RU;J-6.TX=$YUS9trC1G^+1-NCiGMxlrvZd$v%ZDI/!nWaS1$qB0S_,#md[RUsBH^e16]q-:08iwi)hXfJ)swHgiat6g5co$SKC4tt$V1juphqi)[+8gYMBi_x$q9?_Oy_g,(lYoZctcNzl3%nn[.9h?Tdl;Um.TYt(AP5,-NDmk]7V7U:-hcp3Ac]h!vs;9,E2BMQ$eKLK1B%^[email protected],[S0Afe{zoQ-#hO1P@uA1uw+4B/e4CQI%2/yinOs%K=@VYAY+4@dSoxKSqJ?f@voYM%a4LF7PXu^5P,Zs#^NeI.jas3%osW5Df2^ROK4]_pS/iR9rhY1CtmrY?xl}tTs6n?Xn9}/D52s5OsvwxQ7+Tv;8%63-^AWrEf2=m6f/W-Mfr1??u1j=X4bDsI6d}tf0i*W:/4Bq09)S;wO7J9_sqF4N-(-aRp9EUTu$/5Tp?I+g1,lJB?DtM{)%^#+rT=yUJYMo)=re9@^!JaU[7W)[#5F),yKm,eZ7+V!_mGF!AtmY)6+zo9h?oD.Kt[ICCMSo?}x}(%B#tBRqvG,o6%xsw80h2A.:GJQ4^G[eBO}$cJ[68b]VT^rmQF$ggZ!ABNo;QGmW_j5Mt81#b9fmL#q5?{Y1?Kqd;w7_DHfz$P-bJBwqB:^jxipocdzOC8XZWYeu+p^}F1jfeeW_ar:v{esL+x8K*qYOf,32i?@Y;oXYxzBICba.ivK9+cS-J2#ZQi7Oqf-}l+SNysD!,46xoTo:BASOLr8DcB0cynLVFJ?9x(13b:msz#?tGUL5tA-{l}t;Py?#lf:f,.U+Y58eK/diYtrZry0Xl$.I*K7sK*rDv1]%dAEfUXJc^9@/Bd,LDsp,!!0EUz6YN:)G5@i07/SFcB1!zeI6!2V/Ms/0l7j*IA3Efmy*ZGxebN/v*/!%AERKFUa=Bf]t/]8%:=UMPZ*$Q?GU4.eL7]=+JS+vV@Q.=)_${sPotfyp*t[cNp,6oQV%T*NO#wV6O3ShiVQ{F2s[HpC]K4a^MfDK}4/D[t:0GIydN8$e</frmDotNetInfo>
+  <frmDotNetInfo Class="TCEForm" Encoding="Ascii85">y.#q08${e{AGUXGCxM1kqPG/i5}]^,l!AIdg4m5yS9W5;CPhdb#:B#C:/LpFckDKmxb=t,_APZZ!}t:skdTmi/HDT[S0p(1ikY2RduP3A=Nn[p?xGn,:6mmb?6DUt,0nE=ueE0lng:Zs]J1E2zfI@7r0rltN+y=(:BGyG4n+S#HQz0n0{]4Yy=hUObYecXHuqhMX0S.D8WC)(?vIB!gm_(l1R,Hvs8n}44h9alw$a2022_R5X4b^=,_,Ftqj4{mKJ4_^/]b;dg}8OS[/k3lpw=-2PGJ.tlh%#hz1?#=[p}{geHf8x+dPz;?v!ZKF@mQ1U$hkTe/lZQXcF@JT6rI^eXI):eC2k7L;]R#A#hPJ-sK_0cuN)Ya6@W%qe;fuQsNuN,_]Nzp!*fT;gSJ_JpjXFZpYBI8grn7V#?L3EPg_.%:H!cKcw)(fQ8+62lPS+@je!jU*VLYYLA4_Fp04p]eN=_HjVvd!(?B;n.67#8sEqI;yNJ]5v(_wBOBl/Ry/fl[/P}NwO1M8YUs/(l?Rl=JMa,Qf+wuYw-BZ/QUMz86+Hg:Fq5wVt}kD;3=c0Sd]R!0fL1p85Jc_8aXBix4^?J?i2KBTc3=236GOX^u5PjNZxT!+tLow_@bR9%ro8OaGYqZDC}gq!Ei;yj?mYz;ysTQd7vzxKYh=}.ISwgUUu%@z4#}}WFVk(Vro7*qKHx5kdTkl!g!SX^Do])2v6m7sP6o_$/9?5W?XS;F,8PfT0V#4?2x3o0f9{$@TH={m;C).e3oFF9qzbuuc@x0ib00SaFlUq=Q}Wc:ihFzIY}t#YR.LI*+ut{A[vZCKRuZ.behF=[tW2kV5O3+o^G{t^Lt*$Sw2XXk78c2@eb0,v97^OAX[/HBQ-G(Z$-Jg)[email protected]%43)1Oo3kz-QI!33/S{3Up}T6Q3%Ni_8BnEIxrDiD-]O=8q.q!]pf=ru=d^!H0_GzS3Gwy7]ZGZq^]r;o%Sh/:gyD)7E%95=)nTjbcb.YQNAfP6d%{;lDRkh?ma/exqr+.o?a7Zu5YFA.h-*_Gs*m7;-gMdupziSX:Lb2,GsS7S=,pNUSIS@VY8;*{3PO[WqQTK6)VJ:QP4v1I^2mp0YFDstjjGB!FszxcVHbR2jC$lo/-PhcxIAa)@1OgP4NAO^cIgODfJZ3csi4j_Ff-gay+o+{us1n[[bZrMoK!5T_sL[)Q?/@0Lc,B;8TD7_NhOcb?sYba8r?vS,1{4c[vQAulGmUh%i,6?TgZUU8A+aKSdYnc5hh;gQ)LP#VMH8kOq_Pjw{9+H]NdYc%}DD-ZUD?io*mb3:%P[7V-eA7Vt:9,jB=[@^HPMll.6Z8thiUgc]AoTTW[G*1?6BHTD)[r@zXKX50@Mj6}@vZ8HnuC}n,ZQX5Bj%}6VXfS}hN?[(qndH1td=LM_Ityl%[0Fp,s//5lFcP8,XX[d8m*V6rrV+PpX{sG-fpns[NN;3=m7.r@KhJ0QXUee2wU)7]2(J#{b)B63N{m_#E7b.b,Ac/CMLfUvvR:!dc^[email protected]?/yjB%WGUlxyGNIM6R01O,/NUQo69d;7zzO9;g$tGq:AZgpLn:5{i2[95d,;SXs3y+t;]d]P_qWciV(Ohmbn5b!!:gEf$)!M)*F$(Zdw$LY(obd}@sI+#Lz-K.6jz]XOcyEfVEyypyhTLcY,Ua.3v:4$L!Qm_JE@/ksb9q0C,t9}I/GahFSyJQU_/X^^P)u^M!q+KUZlIe,TO.%*{GTz:U^:=6AO/]HmV)pTrhS,}zWm{L}M?Th.qnk$Pkh=9=PnD/*Ng.J#{VgWm!#R_twm,+6t(p7/6TC]0Q?X65jS=B;il@g[sjc%T8Cvau{oB#5_@M3</frmDotNetInfo>
 </FormData>

Cheat Engine/formFoundcodeListExtraUnit.lfm

@@ -498,6 +498,17 @@ object FormFoundCodeListExtra: TFormFoundCodeListExtra
       ParentFont = False
       OnMouseDown = RegisterMouseDown
     end
+    object lblGSBaseKernel: TLabel
+      Left = 182
+      Height = 15
+      Top = 38
+      Width = 143
+      Caption = 'GSBase K=XXXXXXXX'
+      ParentColor = False
+      ParentFont = False
+      OnDblClick = RegisterDblClick
+      OnMouseDown = RegisterMouseDown
+    end
   end
   object pmCopy: TPopupMenu
     Images = eiImageList

Cheat Engine/formsettingsunit.lfm

@@ -14,7 +14,7 @@ object formSettings: TformSettings
   OnDestroy = FormDestroy
   OnShow = FormShow
   Position = poMainFormCenter
-  LCLVersion = '2.0.10.0'
+  LCLVersion = '2.0.6.0'
   object pnlConfig: TPanel
     Left = 0
     Height = 571
@@ -29,7 +29,7 @@ object formSettings: TformSettings
       Left = 1
       Height = 569
       Top = 1
-      Width = 148
+      Width = 153
       Align = alLeft
       HideSelection = False
       Indent = 19
@@ -38,9 +38,10 @@ object formSettings: TformSettings
       ScrollBars = ssVertical
       ShowRoot = False
       TabOrder = 0
+      ToolTips = False
       OnChange = tvMenuSelectionChange
       OnCollapsing = tvMenuSelectionCollapsing
-      Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoShowButtons, tvoShowLines, tvoToolTips]
+      Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoShowButtons, tvoShowLines]
       Items.Data = {
         F9FFFFFF02000A000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF010000000000
         0000011000000047656E6572616C2053657474696E6773FFFFFFFFFFFFFFFFFF
@@ -59,10 +60,10 @@ object formSettings: TformSettings
       }
     end
     object pcSetting: TPageControl
-      Left = 149
+      Left = 154
       Height = 569
       Top = 1
-      Width = 660
+      Width = 655
       ActivePage = Assembler
       Align = alClient
       TabIndex = 6
@@ -1361,20 +1362,20 @@ object formSettings: TformSettings
       object Assembler: TTabSheet
         Caption = 'Debugger Options'
         ClientHeight = 541
-        ClientWidth = 652
+        ClientWidth = 647
         ImageIndex = 5
         object ScrollBox3: TScrollBox
           Left = 0
           Height = 541
           Top = 0
-          Width = 652
-          HorzScrollBar.Page = 631
+          Width = 647
+          HorzScrollBar.Page = 626
           HorzScrollBar.Tracking = True
           VertScrollBar.Page = 520
           VertScrollBar.Tracking = True
           Align = alClient
           ClientHeight = 520
-          ClientWidth = 631
+          ClientWidth = 626
           TabOrder = 0
           object replacewithnops: TCheckBox
             AnchorSideLeft.Control = Label4

Cheat Engine/formsettingsunit.pas

@@ -1440,10 +1440,9 @@ procedure TformSettings.FormShow(Sender: TObject);
   cbVEHRealContextOnThreadCreation.AutoSize:=true;
 
 
-
   j:=tvMenuSelection.Width;
   for i:=0 to tvMenuSelection.Items.Count-1 do
-    j:=max(j,tvMenuSelection.Canvas.TextWidth(tvMenuSelection.Items[i].Text)+tvMenuSelection.BorderWidth+tvMenuSelection.Indent*2);
+    j:=max(j,tvMenuSelection.Canvas.TextWidth(' '+tvMenuSelection.Items[i].Text+' ')+tvMenuSelection.BorderWidth+tvMenuSelection.Indent*2);
 
 
   tvMenuSelection.Width:=j;
@@ -1928,12 +1927,14 @@ procedure TformSettings.FormCreate(Sender: TObject);
   cbUseWindowsDebugger.visible:=false;
   cbKDebug.enabled:=false;
   cbKDebug.visible:=false;
+  cbUseDBVMDebugger.enabled:=false;
+  cbUseDBVMDebugger.visible:=false;
   panel11.visible:=false;
 
   cbUseMacDebugger.checked:=true;
+
   {$else}
   cbUseMacDebugger.visible:=false;
-
   {$endif}
 end;
 

Cheat Engine/frmBreakpointConditionUnit.lfm

@@ -8,6 +8,7 @@ object frmBreakpointCondition: TfrmBreakpointCondition
   ClientHeight = 232
   ClientWidth = 533
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   OnShow = FormShow
   Position = poScreenCenter
   LCLVersion = '2.0.6.0'