some bugfixes and made a start for ultimap2

Cheat Engine/MainUnit.lfm

@@ -1,9 +1,9 @@
 object MainForm: TMainForm
   Tag = 2
-  Left = 1108
+  Left = 562
   Height = 557
   Hint = ' '
-  Top = 365
+  Top = 190
   Width = 577
   HelpContext = 3
   HorzScrollBar.Visible = False
@@ -1603,6 +1603,11 @@ object MainForm: TMainForm
       ShortCut = 16450
       OnClick = Browsethismemoryregion1Click
     end
+    object miDisassemble: TMenuItem
+      Caption = 'Disassemble this memory region'
+      ShortCut = 16452
+      OnClick = miDisassembleClick
+    end
     object miShowAsSigned: TMenuItem
       Caption = 'Show as signed'
       OnClick = miShowAsSignedClick

Cheat Engine/MainUnit.lrt

@@ -100,6 +100,7 @@ TMAINFORM.VALUE1.CAPTION=Value
 TMAINFORM.MIUNDOVALUE.CAPTION=Undo last edit
 TMAINFORM.SMARTEDITADDRESSES1.CAPTION=Smart edit address(es)
 TMAINFORM.BROWSETHISMEMORYREGION1.CAPTION=Browse this memory region
+TMAINFORM.MIDISASSEMBLE.CAPTION=Disassemble this memory region
 TMAINFORM.MISHOWASSIGNED.CAPTION=Show as signed
 TMAINFORM.SHOWASHEXADECIMAL1.CAPTION=Show as hexadecimal
 TMAINFORM.MIZEROTERMINATE.CAPTION=Zero-Terminate string

Cheat Engine/MainUnit.pas

@@ -211,6 +211,7 @@   TMainForm = class(TForm)
     cbFloatSimple: TCheckBox;
     cbPauseWhileScanning: TCheckBox;
     cbWritable: TCheckBox;
+    CheckBox1: TCheckBox;
     ColorDialog1: TColorDialog;
     CreateGroup: TMenuItem;
     edtAlignment: TEdit;
@@ -224,6 +225,7 @@   TMainForm = class(TForm)
     MenuItem1: TMenuItem;
     MenuItem10: TMenuItem;
     MenuItem11: TMenuItem;
+    miDisassemble: TMenuItem;
     miBindDeactivation: TMenuItem;
     miScanDirtyOnly: TMenuItem;
     miScanPagedOnly: TMenuItem;
@@ -458,6 +460,7 @@   TMainForm = class(TForm)
     procedure Label57Click(Sender: TObject);
     procedure lblcompareToSavedScanClick(Sender: TObject);
     procedure miBindDeactivationClick(Sender: TObject);
+    procedure miDisassembleClick(Sender: TObject);
     procedure miScanDirtyOnlyClick(Sender: TObject);
     procedure miCompressionClick(Sender: TObject);
     procedure miGeneratePointermapClick(Sender: TObject);
@@ -3591,6 +3594,15 @@ procedure TMainForm.miBindDeactivationClick(Sender: TObject);
   end;
 end;
 
+procedure TMainForm.miDisassembleClick(Sender: TObject);
+begin
+  if addresslist.selectedrecord <> nil then
+  begin
+    memorybrowser.disassemblerview.SelectedAddress := addresslist.selectedrecord.GetRealAddress;
+    memorybrowser.Show;
+  end;
+end;
+
 
 
 procedure TMainForm.miHideChildrenClick(Sender: TObject);
@@ -6172,6 +6184,8 @@ procedure TMainForm.PopupMenu2Popup(Sender: TObject);
   Smarteditaddresses1.visible := (addresslist.selectedrecord <> nil) and (not addresslist.selectedRecord.isGroupHeader);
 
   BrowseThisMemoryRegion1.Visible :=(addresslist.selectedRecord <> nil) and (not addresslist.selectedRecord.isGroupHeader) and (not (addresslist.selectedRecord.vartype = vtAutoAssembler));
+  miDisassemble.Visible:=Browsethismemoryregion1.Visible;
+
   ShowAsHexadecimal1.Visible :=
     (addresslist.selectedRecord <> nil) and (addresslist.selectedRecord.VarType in
     [vtByte, vtWord, vtDword, vtQword, vtSingle, vtDouble, vtCustom, vtByteArray]) and
@@ -8102,13 +8116,15 @@ procedure TMainForm.d3dclicktest(overlayid: integer; x, y: integer);
 
 procedure TMainForm.Label3Click(Sender: TObject);
 begin
-  dbk_disableUltimap2();
+  ultimap2_disable;
 end;
 
 
 procedure TMainForm.Label59Click(Sender: TObject);
+var ranges: TPRangeDynArray;
 begin
-  dbk_ultimap2(processid, 16*1024*1024);
+  setlength(ranges,0);
+  ultimap2(processid, 16*1024*1024, 'd:\bla',ranges);
 end;
 
 procedure ChangeIcon(hModule: HModule; restype: PChar; resname: PChar;

Cheat Engine/MemoryBrowserFormUnit.lfm

@@ -1,7 +1,7 @@
 object MemoryBrowser: TMemoryBrowser
-  Left = 867
+  Left = 879
   Height = 587
-  Top = 247
+  Top = 259
   Width = 716
   HelpContext = 12
   Caption = 'Memory Viewer'
@@ -16,7 +16,7 @@ object MemoryBrowser: TMemoryBrowser
   OnResize = FormResize
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.3'
+  LCLVersion = '1.6.0.4'
   object Splitter1: TSplitter
     Cursor = crVSplit
     Left = 0
@@ -1358,6 +1358,11 @@ object MemoryBrowser: TMemoryBrowser
         ShortCut = 49237
         OnClick = MenuItem14Click
       end
+      object MenuItem26: TMenuItem
+        Caption = 'Ultimap 2'
+        ShortCut = 24661
+        OnClick = MenuItem26Click
+      end
       object MenuItem22: TMenuItem
         Caption = 'Watch memory page access'
         ShortCut = 24641

Cheat Engine/MemoryBrowserFormUnit.lrt

@@ -191,6 +191,7 @@ TMEMORYBROWSER.N12.CAPTION=-
 TMEMORYBROWSER.DISSECTDATA1.CAPTION=Pointer scan
 TMEMORYBROWSER.MIPOINTERSPIDER.CAPTION=Structure spider
 TMEMORYBROWSER.MENUITEM14.CAPTION=Ultimap
+TMEMORYBROWSER.MENUITEM26.CAPTION=Ultimap 2
 TMEMORYBROWSER.MENUITEM22.CAPTION=Watch memory page access
 TMEMORYBROWSER.WATCHMEMORYALLOCATIONS1.CAPTION=Watch memory allocations
 TMEMORYBROWSER.FINDSTATICPOINTERS1.CAPTION=Find static addresses

Cheat Engine/MemoryBrowserFormUnit.pas

@@ -42,6 +42,7 @@   TMemoryBrowser = class(TForm)
     MenuItem23: TMenuItem;
     MenuItem24: TMenuItem;
     MenuItem25: TMenuItem;
+    MenuItem26: TMenuItem;
     miGNUAssembler: TMenuItem;
     miBinutilsSelect: TMenuItem;
     miBinUtils: TMenuItem;
@@ -272,6 +273,7 @@   TMemoryBrowser = class(TForm)
     procedure MenuItem20Click(Sender: TObject);
     procedure MenuItem22Click(Sender: TObject);
     procedure MenuItem25Click(Sender: TObject);
+    procedure MenuItem26Click(Sender: TObject);
     procedure miGNUAssemblerClick(Sender: TObject);
     procedure miBinutilsSelectClick(Sender: TObject);
     procedure SetBookmarkClick(Sender: TObject);
@@ -617,6 +619,7 @@ implementation
   frmStringpointerscanUnit,
   frmFilePatcherUnit,
   frmUltimapUnit,
+  frmUltimap2Unit,
   frmAssemblyScanUnit,
   MemoryQuery,
   AccessedMemory,
@@ -1106,6 +1109,14 @@ procedure TMemoryBrowser.MenuItem25Click(Sender: TObject);
 
 end;
 
+procedure TMemoryBrowser.MenuItem26Click(Sender: TObject);
+begin
+  if frmUltimap2=nil then
+    frmUltimap2:=TfrmUltimap2.create(application);
+
+  frmUltimap2.show;
+end;
+
 procedure TMemoryBrowser.miGNUAssemblerClick(Sender: TObject);
 var gnua: TfrmAutoInject;
 begin
@@ -1358,7 +1369,7 @@ procedure TMemoryBrowser.MenuItem2Click(Sender: TObject);
 
 
       //look for ret, int3 or nop
-      if (d.LastDisassembleData.opcode='??') or (d.LastDisassembleData.opcode='ret') or (d.LastDisassembleData.opcode='int 3') or (d.LastDisassembleData.opcode='nop') then
+      if (d.LastDisassembleData.opcode='??') or (d.LastDisassembleData.opcode='ret') or (d.LastDisassembleData.opcode='int 3') then
       begin
         start:=a; //start from next instruction
         break;
@@ -1865,8 +1876,12 @@ procedure TMemoryBrowser.Goto1Click(Sender: TObject);
     old: ptruint;
 begin
   panel4.setfocus;
-  old:=memoryaddress;
-  newaddress:=inputboxtop(rsGotoAddress, rsFillInTheAddressYouWantToGoTo, IntTohex(memoryaddress, 8), true, canceled, memorybrowserHistory);
+//  old:=memoryaddress;
+
+  old:=hexview.SelectionStart;
+  if old=0 then old:=memoryaddress;
+
+  newaddress:=inputboxtop(rsGotoAddress, rsFillInTheAddressYouWantToGoTo, IntTohex(old, 8), true, canceled, memorybrowserHistory);
 
   hexview.address:=getaddress(newaddress);
 

Cheat Engine/bin/autorun/ultimap2.lua

@@ -167,6 +167,8 @@ function setupToPA(size)
       local size=sizePerCPU+extra;
       ultimap2.ToPABuffers[i]={}
       ultimap2.ToPABuffers[i].Memory=allocateKernelMemory(size)
+      if (ultimap2.ToPABuffers[i].Memory==0) then error("Failure allocating memory") end
+
       ultimap2.ToPABuffers[i].MemorySize=size
       ultimap2.ToPABuffers[i].Layout={}  
       ultimap2.ToPABuffers[i].ToPAHeaders={}