Changeset 311

Timestamp:

01/20/10 16:16:58 (7 weeks ago)

Author:

dark_byte

Message:

mass commit for beta 6

Location:

Cheat Engine

Files:

• CheatEngine.res (modified) (previous)
• FoundCodeUnit.dfm (modified) (2 diffs)
• FoundCodeUnit.pas (modified) (4 diffs)
• OpenSave.pas (modified) (4 diffs)
• Release/readme.txt (modified) (1 diff)
• Structuresfrm.dfm (modified) (2 diffs)
• Structuresfrm.pas (modified) (25 diffs)
• SynEdit/Source/SynHighlighterAA.pas (modified) (3 diffs)
• autoassembler.pas (modified) (10 diffs)
• cheatengine.dof (modified) (2 diffs)
• cheatengine.drc (modified) (9 diffs)
• frmCScriptUnit.dfm (modified) (4 diffs)
• frmautoinjectunit.dfm (modified) (1 diff)
• frmautoinjectunit.pas (modified) (1 diff)
• help/cheat engine.sh6 (modified) (previous)
• memscan.pas (modified) (1 diff)
• plugin/cepluginsdk.h (modified) (3 diffs)
• pointerscannerfrm.pas (modified) (1 diff)
• underc.pas (modified) (3 diffs)

Cheat Engine/FoundCodeUnit.dfm

@@ -145 +145 @@
   end
   object pmOptions: TPopupMenu
+    OnPopup = pmOptionsPopup
     Left = 64
     Top = 64
@@ -164 +165 @@
       OnClick = btnExtraInfoClick
     end
+    object N1: TMenuItem
+      Caption = '-'
+    end
+    object Copyselectiontoclipboard1: TMenuItem
+      Caption = 'Copy selection to clipboard'
+      ShortCut = 16451
+      OnClick = Copyselectiontoclipboard1Click
+    end
   end
 end

Cheat Engine/FoundCodeUnit.pas

@@ -5 +5 @@
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls,disassembler,cefuncproc,ExtCtrls, Menus, newkernelhandler;
+  Dialogs, StdCtrls,disassembler,cefuncproc,ExtCtrls, Menus, newkernelhandler, clipbrd;
 
 type Tcoderecord = record
@@ -33 +33 @@
     btnOpenDisassembler: TButton;
     btnReplacewithnops: TButton;
+    N1: TMenuItem;
+    Copyselectiontoclipboard1: TMenuItem;
     procedure FoundcodeListClick(Sender: TObject);
     procedure btnOKClick(Sender: TObject);
@@ -44 +46 @@
     procedure FoundcodeListContextPopup(Sender: TObject; MousePos: TPoint;
       var Handled: Boolean);
+    procedure pmOptionsPopup(Sender: TObject);
+    procedure Copyselectiontoclipboard1Click(Sender: TObject);
   private
     { Private declarations }
@@ -425 +429 @@
 end;
 
+procedure TFoundCodeDialog.pmOptionsPopup(Sender: TObject);
+begin
+  n1.visible:=foundcodelist.ItemIndex<>-1;
+  Copyselectiontoclipboard1.visible:=foundcodelist.ItemIndex<>-1;
+end;
+
+procedure TFoundCodeDialog.Copyselectiontoclipboard1Click(Sender: TObject);
+var
+  i: integer;
+  s: string;
+begin
+  s:='';
+  for i:=0 to FoundcodeList.Items.count-1 do
+    if FoundcodeList.Selected[i] then
+      s:=s+FoundcodeList.Items[i]+#13;
+
+  clipboard.AsText:=s;
+end;
+
 end.

Cheat Engine/OpenSave.pas

@@ -138 +138 @@
 
 function GetmemrecFromXMLNode(CheatEntry: IXMLNode): MemoryRecord;
-procedure LoadStructFromXMLNode(var struct: Tbasestucture; Structure: IXMLNode);
-procedure SaveStructToXMLNode(struct: Tbasestucture; Structures: IXMLNode);
+procedure LoadStructFromXMLNode(var struct: TbaseStructure; Structure: IXMLNode);
+procedure SaveStructToXMLNode(struct: TbaseStructure; Structures: IXMLNode);
 
 {$ifdef net}
@@ -4097 +4097 @@
 end;
 
-procedure LoadStructFromXMLNode(var struct: Tbasestucture; Structure: IXMLNode);
+procedure LoadStructFromXMLNode(var struct: TbaseStructure; Structure: IXMLNode);
 var tempnode: IXMLNode;
     elements: IXMLNode;
@@ -4165 +4165 @@
 end;
 {
-procedure SaveStructToXMLNode(struct: Tbasestucture; Structures: IXMLNode);
+procedure SaveStructToXMLNode(struct: TbaseStructure; Structures: IXMLNode);
 var structure: IXMLNode;
     elements: IXMLNode;
@@ -6523 +6523 @@
 end;
 
-procedure SaveStructToXMLNode(struct: Tbasestucture; Structures: IXMLNode);
+procedure SaveStructToXMLNode(struct: TbaseStructure; Structures: IXMLNode);
 var structure: IXMLNode;
     elements: IXMLNode;

Cheat Engine/Release/readme.txt

@@ -23 +23 @@
 There's now a stacktrace visible during debugging
 The registerview is gone as long as you're not debugging
-CE now suppresses the "No disk" message when the searchpath is invalid
+CE now suppresses the "No disk" message when the systems searchpath is invalid
 Added a common modulelist to the ce folder that you can edit. Include files that you do NOT want to go through when doing memory inspection
 You can now open another pointerscanner window while another pointerscan is running and read the results.
 Added a string reference windows
-Improved the plugin system with some extra disassembler commands and a command to load modules into memory
+Improved the plugin system:
+  You can now add auto assembler commands
+  You can now get a callback when the disassembler is being rendered
+  You can now add a plugin item to the context of the disassemler
+  etc...
 Added (float)#, (double)# and (int)# support to the assembler, (double) is mainly usable in combination with the new DQ command though
 

Cheat Engine/Structuresfrm.dfm

@@ -147 +147 @@
         OnClick = Deletecurrentstructure1Click
       end
+      object Autoguessoffsets1: TMenuItem
+        Caption = 'Automatically guess offset types'
+        OnClick = Autoguessoffsets1Click
+      end
     end
   end
@@ -260 +264 @@
       OnClick = Remove1Click
     end
+    object Setgroup1: TMenuItem
+      Caption = 'Set group'
+      OnClick = Setgroup1Click
+    end
   end
 end

Cheat Engine/Structuresfrm.pas

@@ -6 +6 @@
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, Menus, StdCtrls, ExtCtrls, ComCtrls,cefuncproc,newkernelhandler,
-  symbolhandler, XMLDoc, XMLIntf, byteinterpreter;
+  symbolhandler, XMLDoc, XMLIntf, byteinterpreter, underc;
 
 const structureversion=1;
@@ -21 +21 @@
 
 
-type Tbasestucture=record
+type TbaseStructure=record
   name: string;
   structelement: array of TStructElement;
@@ -90 +90 @@
     Memorybrowsepointer1: TMenuItem;
     Memorybrowsethisaddress1: TMenuItem;
+    Autoguessoffsets1: TMenuItem;
+    Setgroup1: TMenuItem;
     procedure Definenewstructure1Click(Sender: TObject);
     procedure Addelement1Click(Sender: TObject);
@@ -130 +132 @@
     procedure Memorybrowsepointer1Click(Sender: TObject);
     procedure Memorybrowsethisaddress1Click(Sender: TObject);
+    procedure Autoguessoffsets1Click(Sender: TObject);
+    procedure Setgroup1Click(Sender: TObject);
   private
     { Private declarations }
@@ -136 +140 @@
 
     addresses: array of dword;  //first address (old compat)
+
+    groupindex: array of integer; //e.g 1,3,9,10000000
+    groups: array of dword;               //the grouplist holds the groupnumbers provided by the user
+    internalgrouplist: array of dword;    //where as the internelgrouplist holds the entrypoints into the groupindex for each specific address 
     edits: array of tedit;
     lastnewedit: TEdit;
+
+
 
     procedure refreshmenuitems;
@@ -144 +154 @@
 //    function RawToType(address: dword; const buf: array of byte; size: integer):integer;
     procedure ExtraEnter(Sender: TObject);
+    procedure automaticallyGuessOffsets(baseOffset: dword; structsize: integer);
+    procedure UpdateGroupIndex;
   public
     { Public declarations }
@@ -152 +164 @@
 var
   frmStructures: array of TfrmStructures;
-  definedstructures: array of Tbasestucture;
-
-procedure sortStructure(struct: Tbasestucture);
+  definedstructures: array of TbaseStructure;
+
+procedure sortStructure(struct: TbaseStructure);
 
 implementation
@@ -201 +213 @@
   refresh;
 end;
+
 
 procedure TStructure.setaddress(i: integer; x:dword);
@@ -550 +563 @@
 end;
 
-procedure sortStructure(struct: Tbasestucture);
+procedure sortStructure(struct: TbaseStructure);
 var
   i,j: integer;
@@ -746 +759 @@
     autofillin,structsize: integer;
     structname: string;
-    buf: array of byte;
-    buf2: array of byte;
-    i,j,t: integer;
-    t2: TVariableType;
-    x,y: dword;
+
 begin
   structname:='unnamed structure';
@@ -766 +775 @@
   if autofillin=mryes then
   begin
+
     sstructsize:='4096';
     if not inputquery('Structure define','Please give a starting size of the struct (You can change this later if needed)',Sstructsize) then exit;
     structsize:=strtoint(sstructsize);
 
-
-    setlength(buf,structsize);
-    setlength(buf2,8);
-    //now read the memory
-    if readprocessmemory(processhandle,pointer(addresses[0]),@buf[0],structsize,x) then
-    begin
-      x:=0;
-      while x<structsize do
-      begin
-        i:=length(definedstructures[length(definedstructures)-1].structelement);
-        setlength(definedstructures[length(definedstructures)-1].structelement,i+1);
-        definedstructures[length(definedstructures)-1].structelement[i].offset:=x;
-        definedstructures[length(definedstructures)-1].structelement[i].pointerto:=false;
-
-        //value
-        //check what type it is
-        t2:=FindTypeOfData(addresses[0]+x,@buf[x],structsize-x);
-        if t2=vtPointer then
-        begin
-          //pointer
-
-
-          definedstructures[length(definedstructures)-1].structelement[i].pointerto:=true;
-          definedstructures[length(definedstructures)-1].structelement[i].pointertoSize:=8;
-          definedstructures[length(definedstructures)-1].structelement[i].bytesize:=4;
-          definedstructures[length(definedstructures)-1].structelement[i].description:='pointer to ';
-
-          if readprocessmemory(processhandle,pointer(pdword(@buf[x])^),@buf2[0],8,y) then
-          begin
-            t2:=FindTypeOfData(pdword(@buf[x])^,@buf2[0],8);
-            t:=convertVariableTypeTostructnr(t2);
-            definedstructures[length(definedstructures)-1].structelement[i].structurenr:=t;
-          end
-          else definedstructures[length(definedstructures)-1].structelement[i].structurenr:=-9;
-
-          inc(x,4);
-          continue;
-        end;
-
-
-        t:=convertVariableTypeTostructnr(t2);
-
-
-
-        definedstructures[length(definedstructures)-1].structelement[i].structurenr:=t;
-
-
-
-        case t of
-          -1: //byte
-          begin
-            definedstructures[length(definedstructures)-1].structelement[i].description:='Byte';
-            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=1;
-            inc(x,1);
-          end;
-
-          -4: //word
-          begin
-            definedstructures[length(definedstructures)-1].structelement[i].description:='Word';
-            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=2;
-            inc(x,2);
-          end;
-
-          -7: //dword
-          begin
-            definedstructures[length(definedstructures)-1].structelement[i].description:='Dword';
-            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=4;
-            inc(x,4);
-          end;
-
-          -12: //single
-          begin
-            definedstructures[length(definedstructures)-1].structelement[i].description:='Float';
-            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=4;
-            inc(x,4);
-          end;
-
-          -13: //double
-          begin
-            definedstructures[length(definedstructures)-1].structelement[i].description:='Double';
-            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=8;
-            inc(x,8);
-          end;
-
-          -14: //string
-          begin
-            definedstructures[length(definedstructures)-1].structelement[i].description:='String';
-
-            //find out how long this string is:
-            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=0;
-            while (x<structsize) and (buf[x]>=32) and (buf[x]<=127) do
-            begin
-              inc(x);
-              inc(definedstructures[length(definedstructures)-1].structelement[i].bytesize);
-            end;
-          end;
-
-
-        end;
-      end;
-
-    end;
-  end;
-  update(true); 
+    automaticallyGuessOffsets(0, structsize);
+  end;
+  update(true);
 end;
 
@@ -1847 +1756 @@
 procedure TfrmStructures.FormCreate(Sender: TObject);
 begin
+  setlength(groups,1);
   setlength(addresses,1);
   setlength(edits,1);
   edits[0]:=edtAddress;
+  groups[0]:=0;
   lastnewedit:=edtaddress;
   edtAddress.OnEnter:=extraenter;
@@ -1855 +1766 @@
   setlength(frmStructures,length(frmStructures)+1);
   frmStructures[length(frmStructures)-1]:=self;
+
+  UpdateGroupIndex;
 end;
 
@@ -1884 +1797 @@
   setlength(addresses,length(addresses)+1);
   addresses[length(addresses)-1]:=addresses[x.tag-1];
+
+  setlength(groups,length(groups)+1);
+  groups[length(groups)-1]:=0;
+  UpdateGroupIndex;
+
+
     
   setlength(edits,length(edits)+1);
@@ -1903 +1822 @@
   x:=TEdit(popupmenu2.PopupComponent);
   if x.tag=0 then exit; //can't remove the first one
-  
+
   for i:=x.tag to length(edits)-2 do
   begin
+    groups[i]:=groups[i+1];
     edits[i]:=edits[i+1];
     edits[i].Left:=edits[i].Left-edits[i].Width-16;
@@ -1917 +1837 @@
     currentstructure.removeAddress(x.tag);
 
+  UpdateGroupIndex;
+  
   x.free;
 end;
@@ -1953 +1875 @@
   Sender: TCustomTreeView; Node: TTreeNode; State: TCustomDrawState;
   Stage: TCustomDrawStage; var PaintImages, DefaultDraw: Boolean);
+{
+multigroup usage:
+If all entries of the same group are the same, mark them green, otherwhise red
+If the value of another group does not match the value of the first group, mark it red
+}
 var  
-  i: integer;
+  i,j: integer;
   laststart: integer;
   textrect: trect;
@@ -1966 +1893 @@
   oldcolor: tcolor;
 
-  different: boolean;
-
   clip: trect;
+
+  currentGroup: integer;
+  groupmatches: array of boolean;
+  groupcolors: array of tcolor;
+  groupvalues: array of string;
 begin
   //looks like it's even called before create is done...
   if stage=cdPostPaint then
   begin
-    different:=false;
     textrect:=node.DisplayRect(true);
     linerect:=node.DisplayRect(false);
-  
+
     fulltextline:=linerect;
     fulltextline.Left:=textrect.Left;
@@ -1988 +1917 @@
     setlength(sections2,totalsections);
     currentsection:=0;
+
+
+    setlength(groupvalues,length(groupindex));
+    setlength(groupcolors,length(groupindex));
+    setlength(groupmatches,length(groupindex));
+    for i:=0 to length(groupcolors)-1 do
+    begin
+      groupcolors[i]:=clGreen;
+      groupmatches[i]:=true;
+    end;
 
     laststart:=1;
@@ -2003 +1942 @@
       end;
 
-    for i:=1 to length(sections2)-2 do
-      if sections2[i]<>sections2[i+1] then
+    //go through the values
+    for i:=1 to length(sections2)-1 do
+    begin
+      currentGroup:=internalgrouplist[i-1];
+
+      if groupvalues[currentGroup]='' then
+        groupvalues[currentGroup]:=sections2[i]
+      else
       begin
-        different:=true;
-        break;
+        if groupvalues[currentGroup]<>sections2[i] then
+        begin
+          groupcolors[currentGroup]:=clred;
+          groupmatches[currentGroup]:=false;
+        end;
       end;
+    end;
+
+    for i:=1 to length(groupvalues)-1 do
+    begin
+      if (groupmatches[i]) and (groupmatches[i-1]) then //both groups match
+      begin
+        if groupvalues[i-1]<>groupvalues[i] then  //but the values don't match with the previous group
+          groupcolors[i]:=clBlue;
+      end;
+    end;
+
 
     //if laststart=1 then
@@ -2026 +1985 @@
       sender.Canvas.Brush.Color:=tvStructureView.Color;
       sender.Canvas.FillRect(textlinerect);
-      if different then
-        tvStructureView.canvas.Font.Color:=clRed
-      else
-        tvStructureView.canvas.Font.Color:=clWindowText;
+//      if different then
+//        tvStructureView.canvas.Font.Color:=clRed
+//      else
+//        tvStructureView.canvas.Font.Color:=clWindowText;
 
     end
@@ -2038 +1997 @@
       sender.Canvas.FillRect(textlinerect);
       sender.Canvas.DrawFocusRect(textlinerect);
-      if different then
-      begin
-        tvStructureView.canvas.Font.Color:=clRed;
-        tvStructureView.canvas.Font.Style:=[fsBold];
-      end
-      else
-        tvStructureView.canvas.Font.Color:=clHighlightText;
+//      if different then
+//      begin
+//        tvStructureView.canvas.Font.Color:=clRed;
+//        tvStructureView.canvas.Font.Style:=[fsBold];
+//      end
+//      else
+//        tvStructureView.canvas.Font.Color:=clHighlightText;
 
     end;
@@ -2058 +2017 @@
     for i:=1 to totalsections-1 do
     begin
+      currentGroup:=internalgrouplist[i-1];
+      tvStructureView.canvas.Font.Color:=groupcolors[currentgroup];
+
       clip.Left:=headercontrol1.Sections[i].Left;
       clip.Right:=headercontrol1.Sections[i].Left+headercontrol1.Sections[i].Width;
@@ -2089 +2051 @@
 begin
   x:=TEdit(popupmenu2.PopupComponent);
-  Remove1.Visible:=(x=nil) or (x.tag<>0);
+  Remove1.Visible:=(x<>nil) and (x.tag<>0);
   n6.Visible:=remove1.Visible;
+
+  if groups[x.Tag]<>0 then
+    setgroup1.Caption:='Change group ('+inttostr(groups[x.tag])+')'
+  else
+    setgroup1.Caption:='Set group';
 end;
 
@@ -2249 +2216 @@
 end;
 
+procedure TfrmStructures.automaticallyGuessOffsets(baseOffset: dword; structsize: integer);
+var
+  buf: array of byte;
+  buf2: array of byte;
+  i,j,t: integer;
+  t2: TVariableType;
+  x,y: dword;
+begin
+    setlength(buf,structsize);
+    setlength(buf2,8);
+    //now read the memory
+    if readprocessmemory(processhandle,pointer(addresses[0]+baseOffset),@buf[0],structsize,x) then
+    begin
+      x:=0;
+      while x<structsize do
+      begin
+        i:=length(definedstructures[length(definedstructures)-1].structelement);
+        setlength(definedstructures[length(definedstructures)-1].structelement,i+1);
+        definedstructures[length(definedstructures)-1].structelement[i].offset:=baseoffset+x;
+        definedstructures[length(definedstructures)-1].structelement[i].pointerto:=false;
+
+        //value
+        //check what type it is
+        t2:=FindTypeOfData(addresses[0]+baseoffset+x,@buf[x],structsize-x);
+        if t2=vtPointer then
+        begin
+          //pointer
+
+
+          definedstructures[length(definedstructures)-1].structelement[i].pointerto:=true;
+          definedstructures[length(definedstructures)-1].structelement[i].pointertoSize:=8;
+          definedstructures[length(definedstructures)-1].structelement[i].bytesize:=4;
+          definedstructures[length(definedstructures)-1].structelement[i].description:='pointer to ';
+
+          if readprocessmemory(processhandle,pointer(pdword(@buf[x])^),@buf2[0],8,y) then
+          begin
+            t2:=FindTypeOfData(pdword(@buf[x])^,@buf2[0],8);
+            t:=convertVariableTypeTostructnr(t2);
+            definedstructures[length(definedstructures)-1].structelement[i].structurenr:=t;
+          end
+          else definedstructures[length(definedstructures)-1].structelement[i].structurenr:=-9;
+
+          inc(x,4);
+          continue;
+        end;
+
+
+        t:=convertVariableTypeTostructnr(t2);
+
+
+
+        definedstructures[length(definedstructures)-1].structelement[i].structurenr:=t;
+
+
+
+        case t of
+          -1: //byte
+          begin
+            definedstructures[length(definedstructures)-1].structelement[i].description:='Byte';
+            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=1;
+            inc(x,1);
+          end;
+
+          -4: //word
+          begin
+            definedstructures[length(definedstructures)-1].structelement[i].description:='Word';
+            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=2;
+            inc(x,2);
+          end;
+
+          -7: //dword
+          begin
+            definedstructures[length(definedstructures)-1].structelement[i].description:='Dword';
+            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=4;
+            inc(x,4);
+          end;
+
+          -12: //single
+          begin
+            definedstructures[length(definedstructures)-1].structelement[i].description:='Float';
+            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=4;
+            inc(x,4);
+          end;
+
+          -13: //double
+          begin
+            definedstructures[length(definedstructures)-1].structelement[i].description:='Double';
+            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=8;
+            inc(x,8);
+          end;
+
+          -14: //string
+          begin
+            definedstructures[length(definedstructures)-1].structelement[i].description:='String';
+
+            //find out how long this string is:
+            definedstructures[length(definedstructures)-1].structelement[i].bytesize:=0;
+            while (x<structsize) and (buf[x]>=32) and (buf[x]<=127) do
+            begin
+              inc(x);
+              inc(definedstructures[length(definedstructures)-1].structelement[i].bytesize);
+            end;
+          end;
+
+
+        end;
+      end;
+
+    end;
+end;
+
+procedure TfrmStructures.Autoguessoffsets1Click(Sender: TObject);
+var
+  sStartOffset: string;
+  sStructSize: string;
+  base: TbaseStructure;
+  startOffset: integer;
+  structSize: integer;
+begin
+  if currentstructure<>nil then
+  begin
+    base:=definedstructures[currentstructure.basestructure];
+    if length(base.structelement)>0 then
+      sStartOffset:=inttohex(base.structelement[length(base.structelement)-1].offset+base.structelement[length(base.structelement)-1].bytesize,1)
+    else
+      sStartOffset:='0';
+
+    if not inputquery('Structure define','Please give a starting offset to evaluate',sStartOffset) then exit;
+    startOffset:=StrToInt('$'+sStartOffset);
+
+    sStructSize:='4096';
+    if not inputquery('Structure define','Please give the size of the block to evaluate',sStructSize) then exit;
+    structSize:=StrToInt(sStructSize);
+
+    automaticallyGuessOffsets(startOffset, structsize);
+  end;
+end;
+
+procedure  TfrmStructures.UpdateGroupIndex;
+var i,j: integer;
+    alreadyIndexed: boolean;
+begin
+  setlength(groupindex,0);
+  setlength(internalgrouplist,length(groups));
+  for i:=0 to length(groups)-1 do
+  begin
+    alreadyIndexed:=false;
+    for j:=0 to length(groupindex)-1 do
+    begin
+      if groupindex[j]=groups[i] then
+      begin
+        alreadyIndexed:=true;
+        internalgrouplist[i]:=j;
+        break;
+      end;
+    end;
+
+    if not alreadyIndexed then
+    begin
+      setlength(groupindex,length(groupindex)+1);
+      groupindex[length(groupindex)-1]:=groups[i];
+      internalgrouplist[i]:=length(groupindex)-1;
+    end;
+
+
+  end;
+end;
+
+
+procedure TfrmStructures.Setgroup1Click(Sender: TObject);
+var
+  x: tedit;
+  sgroup: string;
+begin
+  x:=TEdit(popupmenu2.PopupComponent);
+
+  sgroup:=inttostr(groups[x.Tag]);
+
+  InputQuery('Structure definer', 'Which group do you want to set this address to?', sgroup);
+  groups[x.Tag]:=strtoint(sgroup);
+
+  updategroupindex;
+
+  tvStructureView.Refresh;
+end;
+
 end.
 

Cheat Engine/SynEdit/Source/SynHighlighterAA.pas

@@ -137 +137 @@
     function Func52: TtkTokenKind; //dealloc / disable
     function Func54: TtkTokenKind; //kalloc
+    function Func55: TtkTokenKind; //aobscan
     function Func59: TtkTokenKind; //readmem    
     function Func68: TtkTokenKind; //include
@@ -329 +330 @@
   fIdentFuncTable[52] := Func52;
   fIdentFuncTable[54] := Func54;
+  fIdentFuncTable[55] := Func55;  
   fIdentFuncTable[59] := Func59;
   fIdentFuncTable[68] := Func68;
@@ -526 +528 @@
     Result := tkIdentifier;
 end;
+
+function TSynAASyn.Func55: TtkTokenKind; //aobscan
+begin
+  if KeyComp('aobscan') then Result := tkKey else
+    Result := tkIdentifier;
+end;
+
 
 function TSynAASyn.Func59: TtkTokenKind; //readmem

Cheat Engine/autoassembler.pas

@@ -19 +19 @@
 function getenableanddisablepos(code:tstrings;var enablepos,disablepos: integer): boolean;
 function autoassemble(code: tstrings;popupmessages: boolean):boolean; overload;
-function autoassemble(code: Tstrings; popupmessages,enable,syntaxcheckonly, targetself: boolean;var CEAllocarray: TCEAllocArray): boolean; overload;
+function autoassemble(code: Tstrings; popupmessages,enable,syntaxcheckonly, targetself: boolean;var CEAllocarray: TCEAllocArray; registeredsymbols: tstringlist=nil): boolean; overload;
 
 implementation
@@ -245 +245 @@
 
 
-function autoassemble2(code: tstrings;popupmessages: boolean;syntaxcheckonly:boolean; targetself: boolean ;var ceallocarray:TCEAllocArray):boolean;
+function autoassemble2(code: tstrings;popupmessages: boolean;syntaxcheckonly:boolean; targetself: boolean ;var ceallocarray:TCEAllocArray; registeredsymbols: tstringlist=nil):boolean;
+{
+registeredsymbols is a stringlist that is initialized by the caller as case insensitive and no duplicates
+}
 type tassembled=record
   address: dword;
@@ -315 +318 @@
     symhandler: TSymhandler;
 begin
+  if syntaxcheckonly and (registeredsymbols<>nil) then
+  begin
+    //add the symbols as defined labels
+    setlength(labels,registeredsymbols.count);
+    for i:=0 to registeredsymbols.count-1 do
+    begin
+      labels[i].labelname:=registeredsymbols[i];
+      labels[i].defined:=true;
+      labels[i].address:=0;
+      labels[i].assemblerline:=0;
+      setlength(labels[i].references,0);
+      setlength(labels[i].references2,0);
+    end;
+  end;
+
   if targetself then
   begin
@@ -393 +411 @@
           if uppercase(copy(currentline,1,7))='ASSERT(' then //assert(address,aob)
           begin
-            a:=pos('(',currentline);
-            b:=pos(',',currentline);
-            c:=pos(')',currentline);
-            if (a>0) and (b>0) and (c>0) then
-            begin
-              s1:=copy(currentline,a+1,b-a-1);
-              s2:=copy(currentline,b+1,c-b-1);
-              testdword:= symhandler.getAddressFromName(s1,false);
-
-              setlength(bytes,0);
-              ConvertStringToBytes(s2, true, bytes);
-              if length(bytes)>0 then
+            if not syntaxcheckonly then
+            begin
+              a:=pos('(',currentline);
+              b:=pos(',',currentline);
+              c:=pos(')',currentline);
+              if (a>0) and (b>0) and (c>0) then
               begin
-                getmem(bytebuf,length(bytes));
-                if ReadProcessMemory(processhandle, pointer(testdword), bytebuf, length(bytes),x) then
+                s1:=copy(currentline,a+1,b-a-1);
+                s2:=copy(currentline,b+1,c-b-1);
+                testdword:= symhandler.getAddressFromName(s1,false);
+
+                setlength(bytes,0);
+                ConvertStringToBytes(s2, true, bytes);
+                if length(bytes)>0 then
                 begin
-                  try
-                    for j:=0 to length(bytes)-1 do
-                    begin
-                      if bytes[j]>=0 then
-                        if byte(bytes[j])<>bytebuf[j] then
-                          raise exception.Create('The bytes at '+s1+' are not what was expected');
+                  getmem(bytebuf,length(bytes));
+                  if ReadProcessMemory(processhandle, pointer(testdword), bytebuf, length(bytes),x) then
+                  begin
+                    try
+                      for j:=0 to length(bytes)-1 do
+                      begin
+                        if bytes[j]>=0 then
+                          if byte(bytes[j])<>bytebuf[j] then
+                            raise exception.Create('The bytes at '+s1+' are not what was expected');
+                      end;
+                    finally
+                      freemem(bytebuf);
                     end;
-                  finally
-                    freemem(bytebuf);
-                  end;
-                end else raise exception.Create('The memory at +'+s1+' can not be read');
-
+                  end else raise exception.Create('The memory at +'+s1+' can not be read');
+
+                end
+                else raise exception.Create(s2+' is not a valid bytestring');
+
+
+
+                setlength(assemblerlines,length(assemblerlines)-1);
+                continue;
               end
-              else raise exception.Create(s2+' is not a valid bytestring');
-
-
-
-              setlength(assemblerlines,length(assemblerlines)-1);
-              continue;
-            end
-            else
-              raise exception.Create('Wrong syntax. ASSERT(address,bvtes)');
+              else
+                raise exception.Create('Wrong syntax. ASSERT(address,bytes)');
+            end;
           end;
 
@@ -652 +673 @@
               setlength(addsymbollist,length(addsymbollist)+1);
               addsymbollist[length(addsymbollist)-1]:=s1;
+
+              if registeredsymbols<>nil then
+                registeredsymbols.Add(s1);
             end
             else raise exception.Create('Syntax error');
@@ -694 +718 @@
               //s2=AOBstring
               testdword:=findaob(s2);
-              if testdword=0 then
+              if (testdword=0) and (not syntaxcheckonly) then
                 raise exception.Create('The array of byte '''+s2+''' could not be found');
 
@@ -1018 +1042 @@
               break;
             end;
+
 
         if not ok1 then raise exception.Create(addsymbollist[i]+' was supposed to be added to the symbollist, but it isn''t declared');
@@ -1631 +1656 @@
 
 
-function autoassemble(code: Tstrings; popupmessages,enable,syntaxcheckonly, targetself: boolean;var CEAllocarray: TCEAllocArray): boolean; overload;
+function autoassemble(code: Tstrings; popupmessages,enable,syntaxcheckonly, targetself: boolean;var CEAllocarray: TCEAllocArray; registeredsymbols: tstringlist=nil): boolean; overload;
 {
 targetself defines if the process that gets injected to is CE itself or the target process
@@ -1689 +1714 @@
     end;
 
-    result:=autoassemble2(tempstrings,popupmessages,syntaxcheckonly,targetself,ceallocarray);
+    result:=autoassemble2(tempstrings,popupmessages,syntaxcheckonly,targetself,ceallocarray, registeredsymbols);
   finally
     tempstrings.Free;
@@ -1700 +1725 @@
 begin
   setlength(aa,0);
-  result:=autoassemble(code,popupmessages,true,false,false,aa);
+  result:=autoassemble(code,popupmessages,true,false,false,aa,nil);
 end;
 

Cheat Engine/cheatengine.dof

@@ -189 +189 @@
 MinorVer=6
 Release=0
-Build=53
+Build=55
 Debug=0
 PreRelease=1
@@ -200 +200 @@
 CompanyName=
 FileDescription=Cheat Engine 5.6
-FileVersion=5.6.0.53
+FileVersion=5.6.0.55
 InternalName=CheatEngine
 LegalCopyright=none

Cheat Engine/cheatengine.drc

@@ -9 +9 @@
 */
 
-#define MainUnit_strXMess 64944
-#define MainUnit_strNewyear 64945
-#define MainUnit_strfuture 64946
-#define MainUnit_strdontbother 64947
-#define MainUnit_strneeddebugger 64948
-#define MainUnit_strfailuretosetspeed 64949
-#define MainUnit_strIncorrectspeed 64950
-#define MainUnit_strCantSetSpeed 64951
-#define MainUnit_strHyperscanFailed 64952
-#define MainUnit_strUnknownExtension 64953
-#define MainUnit_strCustomScanConfig 64954
-#define MainUnit_strRecalculateAddress 64960
-#define MainUnit_strRecalculateSelectedAddresses 64961
-#define MainUnit_strRecalculateAllAddresses 64962
-#define MainUnit_strRemoveFromGroup 64963
-#define MainUnit_strEnableCheat 64964
-#define MainUnit_strDisableCheat 64965
-#define MainUnit_strFindWhatWritesToPointer 64966
-#define MainUnit_strFindWhatWritesToPointer2 64967
-#define MainUnit_strcantdebugnow 64968
-#define MainUnit_strpointercantberead 64969
-#define MainUnit_strconfirmUndo 64970
-#define MainUnit_strHideForeground 64971
-#define MainUnit_strHideAll 64972
-#define MainUnit_strUnHideForeground 64973
-#define MainUnit_strUnhideAll 64974
-#define MainUnit_strhappybirthday 64975
-#define MainUnit_strDeleteMoreGroups 64976
-#define MainUnit_strSelectedAddressIsAPointer 64977
-#define MainUnit_strMorePointers 64978
-#define MainUnit_strMorePointers2 64979
-#define MainUnit_strNotAValidValue 64980
-#define MainUnit_strdeleteall 64981
-#define MainUnit_stralreadyin 64982
-#define MainUnit_stralreadyinlistmultiple 64983
-#define MainUnit_strsethotkey 64984
-#define MainUnit_strshowasdecimal 64985
-#define MainUnit_strshowashex 64986
-#define MainUnit_strFreezeAddressInList 64987
-#define MainUnit_strFreezeAllAddresses 64988
-#define MainUnit_strUnfreezeAllAddresses 64989
-#define MainUnit_strUnfreezeAddressInList 64990
-#define MainUnit_strDeleteAddress 64991
-#define MainUnit_strCantdoNextScan 64992
-#define MainUnit_strClickToGoHome 64993
-#define MainUnit_strChangeDescription1 64994
-#define MainUnit_strChangeDescription2 64995
-#define MainUnit_strNotTheSameSize1 64996
-#define MainUnit_strNotTheSameSize2 64997
-#define MainUnit_strAdd0 64998
-#define MainUnit_strNotAValidNotation 64999
-#define MainUnit_strNotSameAmmountofBytes 65000
-#define MainUnit_strNotAValidBinaryNotation 65001
-#define MainUnit_strValue 65002
-#define MainUnit_strChange1Value 65003
-#define MainUnit_strChangeMoreValues 65004
-#define MainUnit_strDelete1Address 65005
-#define MainUnit_strDeleteMultipleAddresses 65006
-#define MainUnit_strDelete1Group 65007
-#define MainUnit_strAllowNegative 65008
-#define MainUnit_strAllowPositive 65009
-#define MainUnit_strNormalFreeze 65010
-#define MainUnit_strAskToSave 65011
-#define MainUnit_strScantextcaptiontotext 65012
-#define MainUnit_strScantextcaptiontoValue 65013
-#define MainUnit_strsearchForText 65014
-#define MainUnit_strSearchForArray 65015
-#define MainUnit_strConfirmProcessTermination 65016
-#define MainUnit_strError 65017
-#define MainUnit_strErrorwhileOpeningProcess 65018
-#define MainUnit_strKeepList 65019
-#define MainUnit_strInfoAboutTable 65020
-#define MainUnit_strPhysicalMemory 65021
-#define MainUnit_strfillInSomething 65022
-#define MainUnit_strFirstSelectAProcess 65023
-#define MainUnit2_strbiggerThan 65024
-#define MainUnit2_strSmallerThan 65025
-#define MainUnit2_strIncreasedValue 65026
-#define MainUnit2_strIncreasedValueBy 65027
-#define MainUnit2_strDecreasedValue 65028
-#define MainUnit2_strDecreasedValueBy 65029
-#define MainUnit2_strValueBetween 65030
-#define MainUnit2_strChangedValue 65031
-#define MainUnit2_strUnchangedValue 65032
-#define MainUnit2_strUnknownInitialValue 65033
-#define MainUnit2_strSameAsFirstScan 65034
-#define MainUnit2_strtoolong 65035
-#define FoundCodeUnit_strClose 65036
-#define MainUnit_strWindowFailedToHide 65037
-#define MainUnit_strAccessed 65038
-#define MainUnit_strOpcodeChanged 65039
-#define AdvancedOptionsUnit_strcouldntwrite 65040
-#define AdvancedOptionsUnit_StrSelectExeFor3D 65041
-#define AdvancedOptionsUnit_StrSelectExeForOpenGL3D 65042
-#define formsettingsunit_strProcessWatcherWillPreventUnloader 65043
-#define MainUnit2_strStart 65044
-#define MainUnit2_strStop 65045
-#define MainUnit2_strOK 65046
-#define MainUnit2_strBug 65047
-#define MainUnit2_strAutoAssemble 65048
-#define MainUnit2_strAddressHasToBeReadable 65049
-#define MainUnit2_strNewScan 65050
-#define MainUnit2_strFirstScan 65051
-#define MainUnit2_strNoDescription 65052
-#define MainUnit2_strNeedNewerWindowsVersion 65053
-#define MainUnit2_strexact 65054
-#define MainUnit2_strexactvalue 65055
-#define frmFindstaticsUnit_strStop 65056
-#define frmFindstaticsUnit_strStopping 65057
-#define frmLoadMemoryunit_strinvalidfile 65058
-#define AdvancedOptionsUnit_strnotreadable 65059
-#define AdvancedOptionsUnit_strNotWhatitshouldbe 65060
-#define AdvancedOptionsUnit_stralreadyinthelist 65061
-#define AdvancedOptionsUnit_strPartOfOpcodeInTheList 65062
-#define AdvancedOptionsUnit_strCECode 65063
-#define AdvancedOptionsUnit_strNameCECode 65064
-#define AdvancedOptionsUnit_strChangeOf 65065
-#define AdvancedOptionsUnit_strCode 65066
-#define AdvancedOptionsUnit_strFindWhatCodeaccesses 65067
-#define AdvancedOptionsUnit_strFindWhatCodeReads 65068
-#define AdvancedOptionsUnit_strFindWhatCodeWrites 65069
-#define AdvancedOptionsUnit_strcouldntrestorecode 65070
-#define AdvancedOptionsUnit_strnotthesame 65071
-#define SynEditStrConst_SYNS_AttrOctal 65072
-#define SynEditStrConst_SYNS_AttrPreprocessor 65073
-#define SynEditStrConst_SYNS_AttrReservedWord 65074
-#define SynEditStrConst_SYNS_AttrSpace 65075
-#define SynEditStrConst_SYNS_AttrString 65076
-#define SynEditStrConst_SYNS_AttrSymbol 65077
-#define SynEditStrConst_SYNS_ScrollInfoFmt 65078
-#define SynEditStrConst_SYNS_ScrollInfoFmtTop 65079
-#define SynEditStrConst_SYNS_EDuplicateShortcut 65080
-#define SynEditStrConst_SYNS_FilterPascal 65081
-#define SynEditStrConst_SYNS_FilterCPP 65082
-#define SynEditStrConst_SYNS_LangCPP 65083
-#define SynEditStrConst_SYNS_LangPascal 65084
-#define SynEditTextBuffer_SListIndexOutOfBounds 65085
-#define SynEditTextBuffer_SInvalidCapacity 65086
-#define frmFindstaticsUnit_strScan 65087
+#define AdvancedOptionsUnit_strCode 64944
+#define AdvancedOptionsUnit_strFindWhatCodeaccesses 64945
+#define AdvancedOptionsUnit_strFindWhatCodeReads 64946
+#define AdvancedOptionsUnit_strFindWhatCodeWrites 64947
+#define AdvancedOptionsUnit_strcouldntrestorecode 64948
+#define AdvancedOptionsUnit_strnotthesame 64949
+#define AdvancedOptionsUnit_strcouldntwrite 64950
+#define AdvancedOptionsUnit_StrSelectExeFor3D 64951
+#define AdvancedOptionsUnit_StrSelectExeForOpenGL3D 64952
+#define formsettingsunit_strProcessWatcherWillPreventUnloader 64953
+#define FoundCodeUnit_strClose 64954
+#define MainUnit_strIncorrectspeed 64960
+#define MainUnit_strCantSetSpeed 64961
+#define MainUnit_strHyperscanFailed 64962
+#define MainUnit_strUnknownExtension 64963
+#define MainUnit_strCustomScanConfig 64964
+#define frmFindstaticsUnit_strScan 64965
+#define frmFindstaticsUnit_strStop 64966
+#define frmFindstaticsUnit_strStopping 64967
+#define frmLoadMemoryunit_strinvalidfile 64968
+#define AdvancedOptionsUnit_strnotreadable 64969
+#define AdvancedOptionsUnit_strNotWhatitshouldbe 64970
+#define AdvancedOptionsUnit_stralreadyinthelist 64971
+#define AdvancedOptionsUnit_strPartOfOpcodeInTheList 64972
+#define AdvancedOptionsUnit_strCECode 64973
+#define AdvancedOptionsUnit_strNameCECode 64974
+#define AdvancedOptionsUnit_strChangeOf 64975
+#define MainUnit_strFindWhatWritesToPointer 64976
+#define MainUnit_strFindWhatWritesToPointer2 64977
+#define MainUnit_strcantdebugnow 64978
+#define MainUnit_strpointercantberead 64979
+#define MainUnit_strconfirmUndo 64980
+#define MainUnit_strHideForeground 64981
+#define MainUnit_strHideAll 64982
+#define MainUnit_strUnHideForeground 64983
+#define MainUnit_strUnhideAll 64984
+#define MainUnit_strhappybirthday 64985
+#define MainUnit_strXMess 64986
+#define MainUnit_strNewyear 64987
+#define MainUnit_strfuture 64988
+#define MainUnit_strdontbother 64989
+#define MainUnit_strneeddebugger 64990
+#define MainUnit_strfailuretosetspeed 64991
+#define MainUnit_stralreadyin 64992
+#define MainUnit_stralreadyinlistmultiple 64993
+#define MainUnit_strsethotkey 64994
+#define MainUnit_strshowasdecimal 64995
+#define MainUnit_strshowashex 64996
+#define MainUnit_strFreezeAddressInList 64997
+#define MainUnit_strFreezeAllAddresses 64998
+#define MainUnit_strUnfreezeAllAddresses 64999
+#define MainUnit_strUnfreezeAddressInList 65000
+#define MainUnit_strDeleteAddress 65001
+#define MainUnit_strRecalculateAddress 65002
+#define MainUnit_strRecalculateSelectedAddresses 65003
+#define MainUnit_strRecalculateAllAddresses 65004
+#define MainUnit_strRemoveFromGroup 65005
+#define MainUnit_strEnableCheat 65006
+#define MainUnit_strDisableCheat 65007
+#define MainUnit_strAdd0 65008
+#define MainUnit_strNotAValidNotation 65009
+#define MainUnit_strNotSameAmmountofBytes 65010
+#define MainUnit_strNotAValidBinaryNotation 65011
+#define MainUnit_strValue 65012
+#define MainUnit_strChange1Value 65013
+#define MainUnit_strChangeMoreValues 65014
+#define MainUnit_strDelete1Address 65015
+#define MainUnit_strDeleteMultipleAddresses 65016
+#define MainUnit_strDelete1Group 65017
+#define MainUnit_strDeleteMoreGroups 65018
+#define MainUnit_strSelectedAddressIsAPointer 65019
+#define MainUnit_strMorePointers 65020
+#define MainUnit_strMorePointers2 65021
+#define MainUnit_strNotAValidValue 65022
+#define MainUnit_strdeleteall 65023
+#define MainUnit_strsearchForText 65024
+#define MainUnit_strSearchForArray 65025
+#define MainUnit_strConfirmProcessTermination 65026
+#define MainUnit_strError 65027
+#define MainUnit_strErrorwhileOpeningProcess 65028
+#define MainUnit_strKeepList 65029
+#define MainUnit_strInfoAboutTable 65030
+#define MainUnit_strPhysicalMemory 65031
+#define MainUnit_strfillInSomething 65032
+#define MainUnit_strFirstSelectAProcess 65033
+#define MainUnit_strCantdoNextScan 65034
+#define MainUnit_strClickToGoHome 65035
+#define MainUnit_strChangeDescription1 65036
+#define MainUnit_strChangeDescription2 65037
+#define MainUnit_strNotTheSameSize1 65038
+#define MainUnit_strNotTheSameSize2 65039
+#define SynEditStrConst_SYNS_EDuplicateShortcut 65040
+#define SynEditStrConst_SYNS_FilterPascal 65041
+#define SynEditStrConst_SYNS_FilterCPP 65042
+#define SynEditStrConst_SYNS_LangCPP 65043
+#define SynEditStrConst_SYNS_LangPascal 65044
+#define SynEditTextBuffer_SListIndexOutOfBounds 65045
+#define SynEditTextBuffer_SInvalidCapacity 65046
+#define MainUnit_strWindowFailedToHide 65047
+#define MainUnit_strAccessed 65048
+#define MainUnit_strOpcodeChanged 65049
+#define MainUnit_strAllowNegative 65050
+#define MainUnit_strAllowPositive 65051
+#define MainUnit_strNormalFreeze 65052
+#define MainUnit_strAskToSave 65053
+#define MainUnit_strScantextcaptiontotext 65054
+#define MainUnit_strScantextcaptiontoValue 65055
+#define SynEditStrConst_SYNS_AttrAssembler 65056
+#define SynEditStrConst_SYNS_AttrCharacter 65057
+#define SynEditStrConst_SYNS_AttrComment 65058
+#define SynEditStrConst_SYNS_AttrFloat 65059
+#define SynEditStrConst_SYNS_AttrHexadecimal 65060
+#define SynEditStrConst_SYNS_AttrIdentifier 65061
+#define SynEditStrConst_SYNS_AttrIllegalChar 65062
+#define SynEditStrConst_SYNS_AttrNumber 65063
+#define SynEditStrConst_SYNS_AttrOctal 65064
+#define SynEditStrConst_SYNS_AttrPreprocessor 65065
+#define SynEditStrConst_SYNS_AttrReservedWord 65066
+#define SynEditStrConst_SYNS_AttrSpace 65067
+#define SynEditStrConst_SYNS_AttrString 65068
+#define SynEditStrConst_SYNS_AttrSymbol 65069
+#define SynEditStrConst_SYNS_ScrollInfoFmt 65070
+#define SynEditStrConst_SYNS_ScrollInfoFmtTop 65071
+#define MainUnit2_strIncreasedValue 65072
+#define MainUnit2_strIncreasedValueBy 65073
+#define MainUnit2_strDecreasedValue 65074
+#define MainUnit2_strDecreasedValueBy 65075
+#define MainUnit2_strValueBetween 65076
+#define MainUnit2_strChangedValue 65077
+#define MainUnit2_strUnchangedValue 65078
+#define MainUnit2_strUnknownInitialValue 65079
+#define MainUnit2_strSameAsFirstScan 65080
+#define MainUnit2_strtoolong 65081
+#define OpenSave_strunknowncomponent 65082
+#define OpenSave_strCorruptIcon 65083
+#define OpenSave_strCantLoadFilepatcher 65084
+#define OpenSave_strNotACETrainer 65085
+#define OpenSave_strUnknownTrainerVersion 65086
+#define OpenSave_strCantLoadProtectedfile 65087
 #define XMLConst_SMissingFileName 65088
 #define XMLConst_SLine 65089
-#define OpenSave_strunknowncomponent 65090
-#define OpenSave_strCorruptIcon 65091
-#define OpenSave_strCantLoadFilepatcher 65092
-#define OpenSave_strNotACETrainer 65093
-#define OpenSave_strUnknownTrainerVersion 65094
-#define OpenSave_strCantLoadProtectedfile 65095
-#define SynEditStrConst_SYNS_AttrAssembler 65096
-#define SynEditStrConst_SYNS_AttrCharacter 65097
-#define SynEditStrConst_SYNS_AttrComment 65098
-#define SynEditStrConst_SYNS_AttrFloat 65099
-#define SynEditStrConst_SYNS_AttrHexadecimal 65100
-#define SynEditStrConst_SYNS_AttrIdentifier 65101
-#define SynEditStrConst_SYNS_AttrIllegalChar 65102
-#define SynEditStrConst_SYNS_AttrNumber 65103
+#define MainUnit2_strStart 65090
+#define MainUnit2_strStop 65091
+#define MainUnit2_strOK 65092
+#define MainUnit2_strBug 65093
+#define MainUnit2_strAutoAssemble 65094
+#define MainUnit2_strAddressHasToBeReadable 65095
+#define MainUnit2_strNewScan 65096
+#define MainUnit2_strFirstScan 65097
+#define MainUnit2_strNoDescription 65098
+#define MainUnit2_strNeedNewerWindowsVersion 65099
+#define MainUnit2_strexact 65100
+#define MainUnit2_strexactvalue 65101
+#define MainUnit2_strbiggerThan 65102
+#define MainUnit2_strSmallerThan 65103
 #define XMLConst_SDuplicateRegistration 65104
 #define XMLConst_SNoMatchingDOMVendor 65105
@@ -598 +598 @@
 STRINGTABLE
 BEGIN
-        MainUnit_strXMess,      "Merry christmas and happy new year"
-        MainUnit_strNewyear,    "And what are your good intentions for this year? ;-)"
-        MainUnit_strfuture,     "Wow,I never imagined people would use Cheat Engine up to today"
-        MainUnit_strdontbother, "Don't even bother. Cheat Engine uses the main thread to receive messages when the scan is done, freeze it and CE will crash!"
-        MainUnit_strneeddebugger,       "To use this option the debugger must be attached to the game"
-        MainUnit_strfailuretosetspeed,  "Failure to set the speed"
+        AdvancedOptionsUnit_strCode,    "Code :"
+        AdvancedOptionsUnit_strFindWhatCodeaccesses,    "Find out what addresses this code accesses"
+        AdvancedOptionsUnit_strFindWhatCodeReads,       "Find out what addresses this code reads from"
+        AdvancedOptionsUnit_strFindWhatCodeWrites,      "Find out what addresses this code writes to"
+        AdvancedOptionsUnit_strcouldntrestorecode,      "Error when trying to restore this code!"
+        AdvancedOptionsUnit_strnotthesame,      "The memory at this address isn't what it should be! Continue?"
+        AdvancedOptionsUnit_strcouldntwrite,    "The memory at this address couldn't be written"
+        AdvancedOptionsUnit_StrSelectExeFor3D,  "Select the executable of the Direct-3D game"
+        AdvancedOptionsUnit_StrSelectExeForOpenGL3D,    "Select the executable of the OpenGL game"
+        formsettingsunit_strProcessWatcherWillPreventUnloader,  "Enabling the process watcher will prevent the unloader from working"
+        FoundCodeUnit_strClose, "Close"
         MainUnit_strIncorrectspeed,     "The speed value is incorrect"
         MainUnit_strCantSetSpeed,       "I can't set this speed. (must be bigger than 0)"
@@ -609 +614 @@
         MainUnit_strUnknownExtension,   "Unknown extension"
         MainUnit_strCustomScanConfig,   "Custom scan config"
-        MainUnit_strRecalculateAddress, "Recalculate address"
-        MainUnit_strRecalculateSelectedAddresses,       "Recalculate selected addresses"
-        MainUnit_strRecalculateAllAddresses,    "Recalculate all addresses"
-        MainUnit_strRemoveFromGroup,    "Remove from group "
-        MainUnit_strEnableCheat,        "Enable cheat"
-        MainUnit_strDisableCheat,       "Disable cheat"
+        frmFindstaticsUnit_strScan,     "Scan"
+        frmFindstaticsUnit_strStop,     "Stop"
+        frmFindstaticsUnit_strStopping, "Stopping..."
+        frmLoadMemoryunit_strinvalidfile,       "This is a invalid memory region file. I'll assume this file has no header data"
+        AdvancedOptionsUnit_strnotreadable,     "This address is not readable"
+        AdvancedOptionsUnit_strNotWhatitshouldbe,       "The memory at this address is'nt what it should be! Continue?"
+        AdvancedOptionsUnit_stralreadyinthelist,        "This byte is already part of another opcode already present in the list"
+        AdvancedOptionsUnit_strPartOfOpcodeInTheList,   "At least one of these bytes is already in the list"
+        AdvancedOptionsUnit_strCECode,  "Cheat Engine code:"
+        AdvancedOptionsUnit_strNameCECode,      "What name do you want to give this code?"
+        AdvancedOptionsUnit_strChangeOf,        "Change of "
         MainUnit_strFindWhatWritesToPointer,    "Find out what writes to this pointer"
         MainUnit_strFindWhatWritesToPointer2,   "Find what reads from the address pointed at by this pointer"
@@ -625 +635 @@
         MainUnit_strUnhideAll,  "will bring all windows back"
         MainUnit_strhappybirthday,      "Let's sing Happy Birthday for Dark Byte today!"
-        MainUnit_strDeleteMoreGroups,   "Also delete the groups of the addresses you selected?"
-        MainUnit_strSelectedAddressIsAPointer,  "The selected address is a pointer. Are you sure? (the base pointer will get the address)"
-        MainUnit_strMorePointers,       "There are more pointers selected. Do you want to change them as well?"
-        MainUnit_strMorePointers2,      "You have selected one or more pointers. Do you want to change them as well?"
-        MainUnit_strNotAValidValue,     "This is not an valid value"
-        MainUnit_strdeleteall,  "Are you sure you want to delete all addresses?"
+        MainUnit_strXMess,      "Merry christmas and happy new year"
+        MainUnit_strNewyear,    "And what are your good intentions for this year? ;-)"
+        MainUnit_strfuture,     "Wow,I never imagined people would use Cheat Engine up to today"
+        MainUnit_strdontbother, "Don't even bother. Cheat Engine uses the main thread to receive messages when the scan is done, freeze it and CE will crash!"
+        MainUnit_strneeddebugger,       "To use this option the debugger must be attached to the game"
+        MainUnit_strfailuretosetspeed,  "Failure to set the speed"
         MainUnit_stralreadyin,  "This address is already in the list"
         MainUnit_stralreadyinlistmultiple,      "One or more addresses where already in the list"
@@ -641 +651 @@
         MainUnit_strUnfreezeAddressInList,      "Unfreeze the address in this list"
         MainUnit_strDeleteAddress,      "Delete this address"
-        MainUnit_strCantdoNextScan,     "You can't do a Next Scan with the current selected way of scanning!"
-        MainUnit_strClickToGoHome,      "Click here to go to the Cheat Engine homepage"
-        MainUnit_strChangeDescription1, "Description"
-        MainUnit_strChangeDescription2, "Change the description to:"
-        MainUnit_strNotTheSameSize1,    "The text you entered isn't the same size as the original. Continue?"
-        MainUnit_strNotTheSameSize2,    "Not the same size!"
+        MainUnit_strRecalculateAddress, "Recalculate address"
+        MainUnit_strRecalculateSelectedAddresses,       "Recalculate selected addresses"
+        MainUnit_strRecalculateAllAddresses,    "Recalculate all addresses"
+        MainUnit_strRemoveFromGroup,    "Remove from group "
+        MainUnit_strEnableCheat,        "Enable cheat"
+        MainUnit_strDisableCheat,       "Disable cheat"
         MainUnit_strAdd0,       "Do you want to add a '0'-terminator at the end?"
         MainUnit_strNotAValidNotation,  "This is not a valid notation"
@@ -657 +667 @@
         MainUnit_strDeleteMultipleAddresses,    "Delete these addresses?"
         MainUnit_strDelete1Group,       "Also delete the group this address is a member of?"
-        MainUnit_strAllowNegative,      "Allow negative changes"
-        MainUnit_strAllowPositive,      "Allow positive changes"
-        MainUnit_strNormalFreeze,       "Don't allow any change"
-        MainUnit_strAskToSave,  "You haven't saved your last changes yet. Save Now?"
-        MainUnit_strScantextcaptiontotext,      "Text:"
-        MainUnit_strScantextcaptiontoValue,     "Value:"
+        MainUnit_strDeleteMoreGroups,   "Also delete the groups of the addresses you selected?"
+        MainUnit_strSelectedAddressIsAPointer,  "The selected address is a pointer. Are you sure? (the base pointer will get the address)"
+        MainUnit_strMorePointers,       "There are more pointers selected. Do you want to change them as well?"
+        MainUnit_strMorePointers2,      "You have selected one or more pointers. Do you want to change them as well?"
+        MainUnit_strNotAValidValue,     "This is not an valid value"
+        MainUnit_strdeleteall,  "Are you sure you want to delete all addresses?"
         MainUnit_strsearchForText,      "Search for text"
         MainUnit_strSearchForArray,     "Search for this array"
@@ -673 +683 @@
         MainUnit_strfillInSomething,    "Please fill in something!"
         MainUnit_strFirstSelectAProcess,        "First select a process"
-        MainUnit2_strbiggerThan,        "Bigger than..."
-        MainUnit2_strSmallerThan,       "Smaller than..."
+        MainUnit_strCantdoNextScan,     "You can't do a Next Scan with the current selected way of scanning!"
+        MainUnit_strClickToGoHome,      "Click here to go to the Cheat Engine homepage"
+        MainUnit_strChangeDescription1, "Description"
+        MainUnit_strChangeDescription2, "Change the description to:"
+        MainUnit_strNotTheSameSize1,    "The text you entered isn't the same size as the original. Continue?"
+        MainUnit_strNotTheSameSize2,    "Not the same size!"
+        SynEditStrConst_SYNS_EDuplicateShortcut,        "Shortcut already exists"
+        SynEditStrConst_SYNS_FilterPascal,      "Pascal Files (*.pas;*.pp;*.dpr;*.dpk;*.inc)|*.pas;*.pp;*.dpr;*.dpk;*.inc"
+        SynEditStrConst_SYNS_FilterCPP, "C/C++ Files (*.c;*.cpp;*.h;*.hpp)|*.c;*.cpp;*.h;*.hpp"
+        SynEditStrConst_SYNS_LangCPP,   "C/C++"
+        SynEditStrConst_SYNS_LangPascal,        "Object Pascal"
+        SynEditTextBuffer_SListIndexOutOfBounds,        "Invalid stringlist index %d"
+        SynEditTextBuffer_SInvalidCapacity,     "Stringlist capacity cannot be smaller than count"
+        MainUnit_strWindowFailedToHide, "A window failed to hide"
+        MainUnit_strAccessed,   "The following opcodes accessed the selected address"
+        MainUnit_strOpcodeChanged,      "The following opcodes changed the selected address"
+        MainUnit_strAllowNegative,      "Allow negative changes"
+        MainUnit_strAllowPositive,      "Allow positive changes"
+        MainUnit_strNormalFreeze,       "Don't allow any change"
+        MainUnit_strAskToSave,  "You haven't saved your last changes yet. Save Now?"
+        MainUnit_strScantextcaptiontotext,      "Text:"
+        MainUnit_strScantextcaptiontoValue,     "Value:"
+        SynEditStrConst_SYNS_AttrAssembler,     "Assembler"
+        SynEditStrConst_SYNS_AttrCharacter,     "Character"
+        SynEditStrConst_SYNS_AttrComment,       "Comment"
+        SynEditStrConst_SYNS_AttrFloat, "Float"
+        SynEditStrConst_SYNS_AttrHexadecimal,   "Hexadecimal"
+        SynEditStrConst_SYNS_AttrIdentifier,    "Identifier"
+        SynEditStrConst_SYNS_AttrIllegalChar,   "Illegal Char"
+        SynEditStrConst_SYNS_AttrNumber,        "Number"
+        SynEditStrConst_SYNS_AttrOctal, "Octal"
+        SynEditStrConst_SYNS_AttrPreprocessor,  "Preprocessor"
+        SynEditStrConst_SYNS_AttrReservedWord,  "Reserved Word"
+        SynEditStrConst_SYNS_AttrSpace, "Space"
+        SynEditStrConst_SYNS_AttrString,        "String"
+        SynEditStrConst_SYNS_AttrSymbol,        "Symbol"
+        SynEditStrConst_SYNS_ScrollInfoFmt,     "%d - %d"
+        SynEditStrConst_SYNS_ScrollInfoFmtTop,  "Top Line: %d"
         MainUnit2_strIncreasedValue,    "Increased value"
         MainUnit2_strIncreasedValueBy,  "Increased value by ..."
@@ -685 +731 @@
         MainUnit2_strSameAsFirstScan,   "Same as first scan"
         MainUnit2_strtoolong,   "Too long"
-        FoundCodeUnit_strClose, "Close"
-        MainUnit_strWindowFailedToHide, "A window failed to hide"
-        MainUnit_strAccessed,   "The following opcodes accessed the selected address"
-        MainUnit_strOpcodeChanged,      "The following opcodes changed the selected address"
-        AdvancedOptionsUnit_strcouldntwrite,    "The memory at this address couldn't be written"
-        AdvancedOptionsUnit_StrSelectExeFor3D,  "Select the executable of the Direct-3D game"
-        AdvancedOptionsUnit_StrSelectExeForOpenGL3D,    "Select the executable of the OpenGL game"
-        formsettingsunit_strProcessWatcherWillPreventUnloader,  "Enabling the process watcher will prevent the unloader from working"
+        OpenSave_strunknowncomponent,   "There is a unknown component in the trainer! compnr="
+        OpenSave_strCorruptIcon,        "The icon has been corrupted"
+        OpenSave_strCantLoadFilepatcher,        "The file patcher can't be loaded by Cheat Engine!"
+        OpenSave_strNotACETrainer,      "This is not a trainer made by Cheat Engine (If it is a trainer at all!)"
+        OpenSave_strUnknownTrainerVersion,      "This version of Cheat Engine doesn't know how to read this trainer! Trainerversion="
+        OpenSave_strCantLoadProtectedfile,      "This trainer is protected from being opened by CE. Now go away!!!"
+        XMLConst_SMissingFileName,      "FileName cannot be blank"
+        XMLConst_SLine, "Line"
         MainUnit2_strStart,     "Start"
         MainUnit2_strStop,      "Stop"
@@ -705 +751 @@
         MainUnit2_strexact,     "Exact"
         MainUnit2_strexactvalue,        "Exact Value"
-        frmFindstaticsUnit_strStop,     "Stop"
-        frmFindstaticsUnit_strStopping, "Stopping..."
-        frmLoadMemoryunit_strinvalidfile,       "This is a invalid memory region file. I'll assume this file has no header data"
-        AdvancedOptionsUnit_strnotreadable,     "This address is not readable"
-        AdvancedOptionsUnit_strNotWhatitshouldbe,       "The memory at this address is'nt what it should be! Continue?"
-        AdvancedOptionsUnit_stralreadyinthelist,        "This byte is already part of another opcode already present in the list"
-        AdvancedOptionsUnit_strPartOfOpcodeInTheList,   "At least one of these bytes is already in the list"
-        AdvancedOptionsUnit_strCECode,  "Cheat Engine code:"
-        AdvancedOptionsUnit_strNameCECode,      "What name do you want to give this code?"
-        AdvancedOptionsUnit_strChangeOf,        "Change of "
-        AdvancedOptionsUnit_strCode,    "Code :"
-        AdvancedOptionsUnit_strFindWhatCodeaccesses,    "Find out what addresses this code accesses"
-        AdvancedOptionsUnit_strFindWhatCodeReads,       "Find out what addresses this code reads from"
-        AdvancedOptionsUnit_strFindWhatCodeWrites,      "Find out what addresses this code writes to"
-        AdvancedOptionsUnit_strcouldntrestorecode,      "Error when trying to restore this code!"
-        AdvancedOptionsUnit_strnotthesame,      "The memory at this address isn't what it should be! Continue?"
-        SynEditStrConst_SYNS_AttrOctal, "Octal"
-        SynEditStrConst_SYNS_AttrPreprocessor,  "Preprocessor"
-        SynEditStrConst_SYNS_AttrReservedWord,  "Reserved Word"
-        SynEditStrConst_SYNS_AttrSpace, "Space"
-        SynEditStrConst_SYNS_AttrString,        "String"
-        SynEditStrConst_SYNS_AttrSymbol,        "Symbol"
-        SynEditStrConst_SYNS_ScrollInfoFmt,     "%d - %d"
-        SynEditStrConst_SYNS_ScrollInfoFmtTop,  "Top Line: %d"
-        SynEditStrConst_SYNS_EDuplicateShortcut,        "Shortcut already exists"
-        SynEditStrConst_SYNS_FilterPascal,      "Pascal Files (*.pas;*.pp;*.dpr;*.dpk;*.inc)|*.pas;*.pp;*.dpr;*.dpk;*.inc"
-        SynEditStrConst_SYNS_FilterCPP, "C/C++ Files (*.c;*.cpp;*.h;*.hpp)|*.c;*.cpp;*.h;*.hpp"
-        SynEditStrConst_SYNS_LangCPP,   "C/C++"
-        SynEditStrConst_SYNS_LangPascal,        "Object Pascal"
-        SynEditTextBuffer_SListIndexOutOfBounds,        "Invalid stringlist index %d"
-        SynEditTextBuffer_SInvalidCapacity,     "Stringlist capacity cannot be smaller than count"
-        frmFindstaticsUnit_strScan,     "Scan"
-        XMLConst_SMissingFileName,      "FileName cannot be blank"
-        XMLConst_SLine, "Line"
-        OpenSave_strunknowncomponent,   "There is a unknown component in the trainer! compnr="
-        OpenSave_strCorruptIcon,        "The icon has been corrupted"
-        OpenSave_strCantLoadFilepatcher,        "The file patcher can't be loaded by Cheat Engine!"
-        OpenSave_strNotACETrainer,      "This is not a trainer made by Cheat Engine (If it is a trainer at all!)"
-        OpenSave_strUnknownTrainerVersion,      "This version of Cheat Engine doesn't know how to read this trainer! Trainerversion="
-        OpenSave_strCantLoadProtectedfile,      "This trainer is protected from being opened by CE. Now go away!!!"
-        SynEditStrConst_SYNS_AttrAssembler,     "Assembler"
-        SynEditStrConst_SYNS_AttrCharacter,     "Character"
-        SynEditStrConst_SYNS_AttrComment,       "Comment"
-        SynEditStrConst_SYNS_AttrFloat, "Float"
-        SynEditStrConst_SYNS_AttrHexadecimal,   "Hexadecimal"
-        SynEditStrConst_SYNS_AttrIdentifier,    "Identifier"
-        SynEditStrConst_SYNS_AttrIllegalChar,   "Illegal Char"
-        SynEditStrConst_SYNS_AttrNumber,        "Number"
+        MainUnit2_strbiggerThan,        "Bigger than..."
+        MainUnit2_strSmallerThan,       "Smaller than..."
         XMLConst_SDuplicateRegistration,        "\"%s\" DOMImplementation already registered"
         XMLConst_SNoMatchingDOMVendor,  "No matching DOM Vendor: \"%s\""

Cheat Engine/frmCScriptUnit.dfm

@@ -8 +8 @@
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -14
   Font.Name = 'MS Sans Serif'
   Font.Style = []
@@ -16 +16 @@
   OnClose = FormClose
   OnCreate = FormCreate
-  PixelsPerInch = 96
-  TextHeight = 13
+  PixelsPerInch = 120
+  TextHeight = 16
   object Panel1: TPanel
     Left = 0
-    Top = 311
-    Width = 504
-    Height = 24
+    Top = 290
+    Width = 494
+    Height = 29
     Align = alBottom
     BevelOuter = bvNone
@@ -30 +30 @@
       Left = 0
       Top = 0
-      Width = 497
+      Width = 612
       Height = 21
       TabOrder = 0
@@ -39 +39 @@
     Left = 0
     Top = 0
-    Width = 504
-    Height = 311
+    Width = 494
+    Height = 290
     Align = alClient
     ReadOnly = True

Cheat Engine/frmautoinjectunit.dfm

@@ -4 +4 @@
   Width = 431
   Height = 331
-  HelpContext = 18
+  HelpContext = 1089
   Caption = 'Auto assemble'
   Color = clBtnFace

Cheat Engine/frmautoinjectunit.pas

@@ -592 +592 @@
 var a,b: integer;
     aa:TCEAllocArray;
+    registeredsymbols: TStringlist;
 begin
 {$ifndef standalonetrainerwithassembler}
   {$ifndef net}
-  setlength(aa,1);
-  getenableanddisablepos(assemblescreen.Lines,a,b);
-  if (a=-1) and (b=-1) then raise exception.create('The code needs a [ENABLE] and a [DISABLE] section if you want to add it to a table');
-
-  if autoassemble(assemblescreen.lines,false,true,true,false,aa) and
-     autoassemble(assemblescreen.lines,false,false,true,false,aa) then
-  begin
-    //add a entry with type 255
-    mainform.AddAutoAssembleScript(assemblescreen.text);
-
-
-  end
-  else showmessage('Failed to add to table. Not all code is injectable');
+  registeredsymbols:=tstringlist.Create;
+  registeredsymbols.CaseSensitive:=false;
+  registeredsymbols.Duplicates:=dupIgnore;
+  
+  try
+    setlength(aa,0);
+    getenableanddisablepos(assemblescreen.Lines,a,b);
+    if (a=-1) and (b=-1) then raise exception.create('The code needs a [ENABLE] and a [DISABLE] section if you want to add it to a table');
+
+    if autoassemble(assemblescreen.lines,false,true,true,false,aa,registeredsymbols) and
+       autoassemble(assemblescreen.lines,false,false,true,false,aa,registeredsymbols) then
+    begin
+      //add a entry with type 255
+      mainform.AddAutoAssembleScript(assemblescreen.text);
+
+
+    end
+    else showmessage('Failed to add to table. Not all code is injectable');
+  finally
+    registeredsymbols.Free;
+  end;
   {$endif}
   {$endif}

Cheat Engine/memscan.pas

@@ -432 +432 @@
 var bytes: tbytes;
 begin
-  ConvertStringToBytes(st,false,bytes);
+  ConvertStringToBytes(st,true,bytes);
   result:=length(bytes);
 end;

Cheat Engine/plugin/cepluginsdk.h

@@ -68 +68 @@
 typedef struct _PLUGINTYPE4_INIT
 {
-  CEP_PLUGINTYPE4 callbackroutine; //pointer to a callback routine of the type 3 plugin
+  CEP_PLUGINTYPE4 callbackroutine; //pointer to a callback routine of the type 4 plugin
 } PLUGINTYPE4_INIT, POINTERREASSIGNMENTPLUGIN_INIT, *PPLUGINTYPE4_INIT, *PPOINTERREASSIGNMENTPLUGIN_INIT; 
 
@@ -86 +86 @@
 } PLUGINTYPE6_INIT, DISASSEMBLERCONTEXT_INIT, *PPLUGINTYPE6_INIT, *PDISASSEMBLERCONTEXT_INIT;
 
+typedef struct _PLUGINTYPE7_INIT
+{
+  CEP_PLUGINTYPE7 callbackroutine; //pointer to a callback routine of the type 7 plugin
+} PLUGINTYPE7_INIT, DISASSEMBLERLINEPLUGIN_INIT, *PPLUGINTYPE7_INIT, *PDISASSEMBLERLINEPLUGIN_INIT; 
+
+typedef struct _PLUGINTYPE8_INIT
+{
+  CEP_PLUGINTYPE8 callbackroutine; //pointer to a callback routine of the type 8 plugin
+} PLUGINTYPE8_INIT, AUTOASSEMBLERPLUGIN_INIT, *PPLUGINTYPE8_INIT, *PAUTOASSEMBLERPLUGIN_INIT; 
 
 typedef struct _REGISTERMODIFICATIONINFO
@@ -148 +157 @@
 typedef BOOL (__stdcall *CEP_LOADMODULE)(char *modulepath, char *exportlist, int *maxsize);
 typedef BOOL (__stdcall *CEP_DISASSEMBLEEX)(ULONG address, char *output, int maxsize);
-typedef VOID (__stdcall *CEP_AA_ADDCOMMAND)(void);
-typedef VOID (__stdcall *CEP_AA_DELCOMMAND)(void);
+typedef VOID (__stdcall *CEP_AA_ADDCOMMAND)(char *command);
+typedef VOID (__stdcall *CEP_AA_DELCOMMAND)(char *command);
 
 typedef struct _ExportedFunctions

Cheat Engine/pointerscannerfrm.pas

@@ -1241 +1241 @@
 
   listview1.Items.Count:=Pointerscanresults.count;
+
+  panel1.Caption:='pointercount:'+inttostr(Pointerscanresults.count);
+
   if (listview1.Items.Count=0) and (Pointerscanresults.count>100000000) then
   begin

Cheat Engine/underc.pas

@@ -200 +200 @@
 
 
-
-//  uc_init(nil,false);
-
+  //uc_init(pchar(' '),false);
+  Set8087CW($133f);
 
 
@@ -217 +216 @@
     exit;
 
- // uc_finis;
-//  freelibrary(underclibrary);
+  uc_finis;
+
   currentthreadid:=0;
   scriptEngineCS.leave;
 
   result:=true;
+
+  //Set8087CW($133f);
 end;
 
 function TScriptEngine.execute_command(command: string): boolean;
+var x: pchar;
 begin
   result:=false;
@@ -231 +233 @@
     exit;
 
-  result:=uc_exec(pchar(command));
+//  result:=uc_exec(pchar(command));
+
+getmem(x,256);
+  uc_compile(x,pchar(command));
+  freemem(x);
 end;