Changeset 314

Timestamp:

02/04/10 15:36:02 (5 weeks ago)

Author:

dark_byte

Message:

commiting all minor fixes

Location:

Cheat Engine

Files:

• CEFuncProc.pas (modified) (6 diffs)
• CheatEngine.res (modified) (previous)
• MainUnit.dfm (modified) (4 diffs)
• OpenSave.pas (modified) (4 diffs)
• ProcessWindowUnit.dfm (modified) (1 diff)
• ProcessWindowUnit.pas (modified) (5 diffs)
• Release/Cheat Engine.iss (modified) (4 diffs)
• Release/readme.txt (modified) (1 diff)
• autoassembler.pas (modified) (6 diffs)
• cheatengine.dof (modified) (2 diffs)
• cheatengine.drc (modified) (7 diffs)
• formMemoryModifier.dfm (modified) (1 diff)
• formMemoryModifier.pas (modified) (1 diff)
• formsettingsunit.dfm (modified) (14 diffs)
• frmExcludeHideUnit.dfm (modified) (3 diffs)
• frmExcludeHideUnit.pas (modified) (3 diffs)
• help/cheat engine.sh6 (modified) (previous)
• memscan.pas (modified) (3 diffs)
• pointerscannerfrm.dfm (modified) (1 diff)
• pointerscannerfrm.pas (modified) (3 diffs)
• standalone/MemoryTrainerUnit.pas (modified) (1 diff)
• standalone/trainerwithassembler.dof (modified) (2 diffs)
• standaloneunit.dfm (modified) (6 diffs)
• standaloneunit.pas (modified) (1 diff)
• symbolhandler.pas (modified) (1 diff)

Cheat Engine/CEFuncProc.pas

@@ -130 +130 @@
 procedure GetProcessList(ProcessList: TListBox); overload;
 procedure GetProcessList(ProcessList: TStrings); overload;
-procedure GetWindowList(ProcessList: TListBox{; var ArrIcons: TBytes});
+procedure GetWindowList(ProcessList: TListBox; showInvisible: boolean=true);
 function AvailMem:dword;
 function isreadable(address:dword):boolean;
@@ -680 +680 @@
 
 {$ifndef standalonetrainer}
-uses disassembler,debugger,symbolhandler,frmProcessWatcherUnit,kerneldebugger;
+uses disassembler,debugger,symbolhandler,frmProcessWatcherUnit,kerneldebugger, formsettingsunit;
 {$else}
 uses symbolhandler;
@@ -2514 +2514 @@
 end;
 
-procedure GetWindowList(ProcessList: TListBox{; var ArrIcons: TBytes});
+procedure GetWindowList(ProcessList: TListBox; showInvisible: boolean=true);
 var previouswinhandle, winhandle: Hwnd;
     winprocess: Dword;
@@ -2521 +2521 @@
 
     x: tstringlist;
-    i:integer;
+    i,j:integer;
 
     ProcessListInfo: PProcessListInfo;
+    tempdword: dword;
 begin
   getmem(temp,101);
@@ -2531 +2532 @@
     for i:=0 to processlist.items.count-1 do
       if processlist.items.Objects[i]<>nil then
-        freemem(pointer(processlist.items.Objects[i]));
+      begin
+        ProcessListInfo:=PProcessListInfo(processlist.items.Objects[i]);
+        if ProcessListInfo.processIcon>0 then
+          DestroyIcon(ProcessListInfo.processIcon);
+
+        freemem(ProcessListInfo);
+      end;
     processlist.clear;
 
@@ -2539 +2546 @@
     while (winhandle<>0) and (i<10000) do
     begin
-      GetWindowThreadProcessId(winhandle,addr(winprocess));
-      temp[0]:=#0;
-      getwindowtext(winhandle,temp,100);
-      temp[100]:=#0;
-      wintitle:=temp;
-
-      if length(wintitle)>0 then
+      if showInvisible or IsWindowVisible(winhandle) then
       begin
-        getmem(ProcessListInfo,sizeof(TProcessListInfo));
-        ProcessListInfo.processID:=winprocess;
-        ProcessListInfo.processIcon:=SendMessage(winhandle,WM_GETICON,ICON_SMALL,0);
-        if ProcessListInfo.processIcon=0 then
-          ProcessListInfo.processIcon:=SendMessage(winhandle,WM_GETICON,ICON_BIG,0);
-
-        x.AddObject(IntTohex(winprocess,8)+'-'+wintitle,TObject(ProcessListInfo));
+        GetWindowThreadProcessId(winhandle,addr(winprocess));
+        temp[0]:=#0;
+        getwindowtext(winhandle,temp,100);
+        temp[100]:=#0;
+        wintitle:=temp;
+
+
+
+        if length(wintitle)>0 then
+        begin
+          getmem(ProcessListInfo,sizeof(TProcessListInfo));
+          ProcessListInfo.processID:=winprocess;
+          ProcessListInfo.processIcon:=0;
+  {$ifndef standalonetrainer}
+          if formsettings.cbProcessIcons.checked then
+          begin
+            tempdword:=0;
+            if SendMessageTimeout(winhandle,WM_GETICON,ICON_SMALL,0,SMTO_ABORTIFHUNG, 100, tempdword )<>0 then
+            begin
+              ProcessListInfo.processIcon:=tempdword;
+              if ProcessListInfo.processIcon=0 then
+              begin
+                if SendMessageTimeout(winhandle,WM_GETICON,ICON_SMALL2,0,SMTO_ABORTIFHUNG, 100, tempdword       )<>0 then
+                  ProcessListInfo.processIcon:=tempdword;
+
+                if ProcessListInfo.processIcon=0 then
+                  if SendMessageTimeout(winhandle,WM_GETICON,ICON_BIG,0,SMTO_ABORTIFHUNG, 100, tempdword        )<>0 then
+                    ProcessListInfo.processIcon:=tempdword;
+              end;
+            end else
+            begin
+              inc(i,100); //at worst case scenario this causes the list to wait 10 seconds
+            end;
+          end;
+  {$endif}
+
+          x.AddObject(IntTohex(winprocess,8)+'-'+wintitle,TObject(ProcessListInfo));
+        end;
       end;
 

Cheat Engine/MainUnit.dfm

@@ -2901 +2901 @@
     Top = 72
     object File1: TMenuItem
-      Caption = 'File'
+      Caption = '&File'
       OnClick = File1Click
       object New1: TMenuItem
@@ -2920 +2920 @@
     end
     object Edit3: TMenuItem
-      Caption = 'Edit'
+      Caption = '&Edit'
       object Settings1: TMenuItem
         Caption = 'Settings'
@@ -2927 +2927 @@
     end
     object Process1: TMenuItem
-      Caption = 'Process'
+      Caption = '&Process'
       OnClick = Process1Click
       object OpenProcess1: TMenuItem
@@ -2957 +2957 @@
     end
     object ools1: TMenuItem
-      Caption = 'Tools'
+      Caption = '&Tools'
     end
     object Plugins2: TMenuItem
-      Caption = 'Plugins'
+      Caption = 'P&lugins'
       Visible = False
     end
     object Help1: TMenuItem
-      Caption = 'Help'
+      Caption = '&Help'
       object Helpindex1: TMenuItem
         Caption = 'Cheat Engine Help'

Cheat Engine/OpenSave.pas

@@ -365 +365 @@
       inc(filecount);
 
+      //size
       trainer.ReadBuffer(temp,4);
       getmem(x,temp);
@@ -372 +373 @@
       f.free;
 
-      frmMemorytrainerpreview.Image1.Picture.LoadFromFile(temps);
       if leftimage<>nil then
-        leftimage.Free;
-      leftimage:=tmemorystream.Create;
-      leftimage.LoadFromFile(temps);
+        freeandnil(leftimage);
+
+      if temp<>0 then //not size 0
+      begin
+        frmMemorytrainerpreview.Image1.Picture.LoadFromFile(temps);
+        leftimage:=tmemorystream.Create;
+        leftimage.LoadFromFile(temps);
+      end;
 
       DeleteFile(temps);
@@ -3841 +3846 @@
 
   frmMemoryModifier:=TFrmMemoryModifier.create(nil);
+  frmMemoryModifier.SaveDialog1.filename:=filename;
   frmMemoryModifier.show;
 
@@ -3847 +3853 @@
   if (hi=0) or (hi=1) then
   begin
-    frmMemorymodifier.Free;
-    raise exception.Create(strCorruptIcon);
+    hi:=0;
   end;
 
   frmMemoryModifier.Icon.Picture.Icon.Handle:=hi;
   frmMemoryTrainerPreview.Icon:=frmMemoryModifier.Icon.Picture.Icon;
-
   frmMemoryModifier.CurrentIcon.LoadFromHandle(hi);
+
 
   trainer:=tfilestream.Create(filename,fmopenread);

Cheat Engine/ProcessWindowUnit.dfm

@@ -157 +157 @@
       OnClick = Filter1Click
     end
+    object Showinvisiblewindows1: TMenuItem
+      Caption = 'Show invisible windows'
+      ShortCut = 16457
+      OnClick = Showinvisiblewindows1Click
+    end
   end
 end

Cheat Engine/ProcessWindowUnit.pas

@@ -37 +37 @@
     OKButton: TButton;
     btnProcessListLong: TButton;
+    Showinvisiblewindows1: TMenuItem;
     procedure CancelButtonClick(Sender: TObject);
     procedure OKButtonClick(Sender: TObject);
@@ -53 +54 @@
       Rect: TRect; State: TOwnerDrawState);
     procedure FormShow(Sender: TObject);
+    procedure Showinvisiblewindows1Click(Sender: TObject);
   private
     { Private declarations }
@@ -315 +317 @@
     found: boolean;
 begin
-
+  Showinvisiblewindows1.visible:=false;
   oldselectionindex:=processlist.ItemIndex;
 
@@ -361 +363 @@
 begin
   currentlist:=1;
-
-  getwindowlist(processlist{,icons});
+  Showinvisiblewindows1.visible:=true;
+  getwindowlist(processlist,Showinvisiblewindows1.Checked);
   filterlist;
 
@@ -591 +593 @@
 end;
 
+procedure TProcessWindow.Showinvisiblewindows1Click(Sender: TObject);
+begin
+  if Showinvisiblewindows1.Visible then
+  begin
+    Showinvisiblewindows1.Checked:=not Showinvisiblewindows1.Checked;
+    button2.Click;
+  end;
+end;
+
 end.
 

Cheat Engine/Release/Cheat Engine.iss

@@ -3 +3 @@
 
 [Setup]
-AppName=Cheat Engine 5.6 BETA 8
-AppVerName=Cheat Engine 5.6 BETA 8
+AppName=Cheat Engine 5.6
+AppVerName=Cheat Engine 5.6
 AppPublisher=Dark Byte
 AppPublisherURL=http://www.cheatengine.org/
 AppSupportURL=http://www.cheatengine.org/
 AppUpdatesURL=http://www.cheatengine.org/
-DefaultDirName={pf}\Cheat Engine Beta8
-DefaultGroupName=Cheat Engine 5.6 BETA 8
+DefaultDirName={pf}\Cheat Engine
+DefaultGroupName=Cheat Engine 5.6
 AllowNoIcons=yes
 LicenseFile=..\Release\License.txt
 InfoAfterFile=..\Release\readme.txt
-OutputBaseFilename=CheatEngine56Beta8
+OutputBaseFilename=CheatEngine56
 PrivilegesRequired=admin
 ChangesAssociations=yes
@@ -148 +148 @@
 Source: "..\bin\Kernelmoduleunloader.exe"; DestDir: "{app}"; DestName: "Kernelmoduleunloader.exe"; Flags: ignoreversion
 ;Source: "..\driver.dat"; DestDir: "{app}"; DestName: "driver.dat"; Flags: ignoreversion
-;comment the next 2 lines for the baby version
+;comment the next 3 lines for the baby version
 Source: "..\bin\dbk32.dll"; DestDir: "{app}"; DestName: "dbk32.dll"; Flags: ignoreversion
 Source: "..\bin\dbk32.sys"; DestDir: "{app}"; DestName: "dbk32.sys"; Flags: ignoreversion; BeforeInstall: UninstallDriver
@@ -236 +236 @@
 
 [Icons]
-Name: "{group}\Cheat Engine 5.6 Beta"; Filename: "{app}\Cheat Engine.exe"
+Name: "{group}\Cheat Engine 5.6"; Filename: "{app}\Cheat Engine.exe"
 Name: "{group}\Cheat Engine tutorial"; Filename: "{app}\Tutorial.exe"
 Name: "{group}\Cheat Engine help"; Filename: "{app}\CheatEngine.chm"
@@ -248 +248 @@
 
 [Run]
-Filename: "{app}\Cheat Engine.exe"; Description: "Launch Cheat Engine 5.6 Beta 8"; Flags: nowait postinstall skipifsilent runascurrentuser
+Filename: "{app}\Cheat Engine.exe"; Description: "Launch Cheat Engine 5.6"; Flags: nowait postinstall skipifsilent runascurrentuser

Cheat Engine/Release/readme.txt

@@ -17 +17 @@
 New heaplist that works based on dll injection instead of toolhelp32
 Dissectcode now helps finding referenced strings
-Added a new Auto assembler command "aobscan(varname, arrayofbytestring)"
+Added a new Auto assembler command "aobscan(varname, arrayofbyte)"
 Added a new Auto assembler command "assert(address, arrayofbyte)" which will make an script fail if the bytes aren't what they should be
 Dissect data now works with offsets instead of sizes
 Added the ability to follow pointers easily with Dissect Data
-There's now a stacktrace visible during debugging
+There's now a stacktrace visible during debugging (2 different types)
 The registerview is gone as long as you're not debugging
 CE now suppresses the "No disk" message when the systems searchpath is invalid

Cheat Engine/autoassembler.pas

@@ -4 +4 @@
 
 uses assemblerunit, classes,{$ifndef autoassemblerdll}cefuncproc,{$endif}
-windows,symbolhandler,sysutils,dialogs,controls, NewKernelHandler, plugin;
+windows,symbolhandler,sysutils,dialogs,controls, NewKernelHandler{$ifndef standalonetrainerwithassemblerandaobscanner}, plugin{$endif};
 
 {$ifdef autoassemblerdll}
@@ -349 +349 @@
   symhandler.waitforsymbolsloaded;
 
-
+{$ifndef standalonetrainer}
   pluginhandler.handleAutoAssemblerPlugin(@currentlinep, 0); //tell the plugins that an autoassembler script is about to get executed
+{$endif}
 
 //2 pass scanner
@@ -396 +397 @@
 
           //plugins
+          {$ifndef standalonetrainer}
           currentlinep:=@currentline[1];
           pluginhandler.handleAutoAssemblerPlugin(@currentlinep, 1);
           currentline:=currentlinep;
+          {$endif}
 
           //if the newline is empty then it has been handled and the plugin doesn't want it to be added for phase2
@@ -1207 +1210 @@
       currentline:=assemblerlines[i];
 
+{$ifndef standalonetrainer}
       //plugin
       if length(currentline)>0 then
@@ -1217 +1221 @@
       end;
       //plugin
+{$endif}
 
 
@@ -1570 +1575 @@
     tokens.free;
 
-
+{$ifndef standalonetrainer}
     pluginhandler.handleAutoAssemblerPlugin(@currentlinep, 3); //tell the plugins to free their data
+{$endif}    
   end;
 end;

Cheat Engine/cheatengine.dof

@@ -189 +189 @@
 MinorVer=6
 Release=0
-Build=58
+Build=66
 Debug=0
 PreRelease=0
@@ -200 +200 @@
 CompanyName=
 FileDescription=Cheat Engine 5.6
-FileVersion=5.6.0.58
+FileVersion=5.6.0.66
 InternalName=CheatEngine
 LegalCopyright=none

Cheat Engine/cheatengine.drc

@@ -9 +9 @@
 */
 
-#define MainUnit2_strIncreasedValue 64944
-#define MainUnit2_strIncreasedValueBy 64945
-#define MainUnit2_strDecreasedValue 64946
-#define MainUnit2_strDecreasedValueBy 64947
-#define MainUnit2_strValueBetween 64948
-#define MainUnit2_strChangedValue 64949
-#define MainUnit2_strUnchangedValue 64950
-#define MainUnit2_strUnknownInitialValue 64951
-#define MainUnit2_strSameAsFirstScan 64952
-#define MainUnit2_strtoolong 64953
-#define FoundCodeUnit_strClose 64954
-#define AdvancedOptionsUnit_StrSelectExeForOpenGL3D 64960
-#define formsettingsunit_strProcessWatcherWillPreventUnloader 64961
-#define MainUnit2_strStart 64962
-#define MainUnit2_strStop 64963
-#define MainUnit2_strOK 64964
-#define MainUnit2_strBug 64965
-#define MainUnit2_strAutoAssemble 64966
-#define MainUnit2_strAddressHasToBeReadable 64967
-#define MainUnit2_strNewScan 64968
-#define MainUnit2_strFirstScan 64969
-#define MainUnit2_strNoDescription 64970
-#define MainUnit2_strNeedNewerWindowsVersion 64971
-#define MainUnit2_strexact 64972
-#define MainUnit2_strexactvalue 64973
-#define MainUnit2_strbiggerThan 64974
-#define MainUnit2_strSmallerThan 64975
-#define frmLoadMemoryunit_strinvalidfile 64976
-#define AdvancedOptionsUnit_strnotreadable 64977
-#define AdvancedOptionsUnit_strNotWhatitshouldbe 64978
-#define AdvancedOptionsUnit_stralreadyinthelist 64979
-#define AdvancedOptionsUnit_strPartOfOpcodeInTheList 64980
-#define AdvancedOptionsUnit_strCECode 64981
-#define AdvancedOptionsUnit_strNameCECode 64982
-#define AdvancedOptionsUnit_strChangeOf 64983
-#define AdvancedOptionsUnit_strCode 64984
-#define AdvancedOptionsUnit_strFindWhatCodeaccesses 64985
-#define AdvancedOptionsUnit_strFindWhatCodeReads 64986
-#define AdvancedOptionsUnit_strFindWhatCodeWrites 64987
-#define AdvancedOptionsUnit_strcouldntrestorecode 64988
-#define AdvancedOptionsUnit_strnotthesame 64989
-#define AdvancedOptionsUnit_strcouldntwrite 64990
-#define AdvancedOptionsUnit_StrSelectExeFor3D 64991
-#define MainUnit_strUnhideAll 64992
-#define MainUnit_strhappybirthday 64993
-#define MainUnit_strXMess 64994
-#define MainUnit_strNewyear 64995
-#define MainUnit_strfuture 64996
-#define MainUnit_strdontbother 64997
-#define MainUnit_strneeddebugger 64998
-#define MainUnit_strfailuretosetspeed 64999
-#define MainUnit_strIncorrectspeed 65000
-#define MainUnit_strCantSetSpeed 65001
-#define MainUnit_strHyperscanFailed 65002
-#define MainUnit_strUnknownExtension 65003
-#define MainUnit_strCustomScanConfig 65004
-#define frmFindstaticsUnit_strScan 65005
-#define frmFindstaticsUnit_strStop 65006
-#define frmFindstaticsUnit_strStopping 65007
-#define MainUnit_strUnfreezeAddressInList 65008
-#define MainUnit_strDeleteAddress 65009
-#define MainUnit_strRecalculateAddress 65010
-#define MainUnit_strRecalculateSelectedAddresses 65011
-#define MainUnit_strRecalculateAllAddresses 65012
-#define MainUnit_strRemoveFromGroup 65013
-#define MainUnit_strEnableCheat 65014
-#define MainUnit_strDisableCheat 65015
-#define MainUnit_strFindWhatWritesToPointer 65016
-#define MainUnit_strFindWhatWritesToPointer2 65017
-#define MainUnit_strcantdebugnow 65018
-#define MainUnit_strpointercantberead 65019
-#define MainUnit_strconfirmUndo 65020
-#define MainUnit_strHideForeground 65021
-#define MainUnit_strHideAll 65022
-#define MainUnit_strUnHideForeground 65023
-#define MainUnit_strDeleteMultipleAddresses 65024
-#define MainUnit_strDelete1Group 65025
-#define MainUnit_strDeleteMoreGroups 65026
-#define MainUnit_strSelectedAddressIsAPointer 65027
-#define MainUnit_strMorePointers 65028
-#define MainUnit_strMorePointers2 65029
-#define MainUnit_strNotAValidValue 65030
-#define MainUnit_strdeleteall 65031
-#define MainUnit_stralreadyin 65032
-#define MainUnit_stralreadyinlistmultiple 65033
-#define MainUnit_strsethotkey 65034
-#define MainUnit_strshowasdecimal 65035
-#define MainUnit_strshowashex 65036
-#define MainUnit_strFreezeAddressInList 65037
-#define MainUnit_strFreezeAllAddresses 65038
-#define MainUnit_strUnfreezeAllAddresses 65039
-#define MainUnit_strfillInSomething 65040
-#define MainUnit_strFirstSelectAProcess 65041
-#define MainUnit_strCantdoNextScan 65042
-#define MainUnit_strClickToGoHome 65043
-#define MainUnit_strChangeDescription1 65044
-#define MainUnit_strChangeDescription2 65045
-#define MainUnit_strNotTheSameSize1 65046
-#define MainUnit_strNotTheSameSize2 65047
-#define MainUnit_strAdd0 65048
-#define MainUnit_strNotAValidNotation 65049
-#define MainUnit_strNotSameAmmountofBytes 65050
-#define MainUnit_strNotAValidBinaryNotation 65051
-#define MainUnit_strValue 65052
-#define MainUnit_strChange1Value 65053
-#define MainUnit_strChangeMoreValues 65054
-#define MainUnit_strDelete1Address 65055
-#define MainUnit_strAccessed 65056
-#define MainUnit_strOpcodeChanged 65057
-#define MainUnit_strAllowNegative 65058
-#define MainUnit_strAllowPositive 65059
-#define MainUnit_strNormalFreeze 65060
-#define MainUnit_strAskToSave 65061
-#define MainUnit_strScantextcaptiontotext 65062
-#define MainUnit_strScantextcaptiontoValue 65063
-#define MainUnit_strsearchForText 65064
-#define MainUnit_strSearchForArray 65065
-#define MainUnit_strConfirmProcessTermination 65066
-#define MainUnit_strError 65067
-#define MainUnit_strErrorwhileOpeningProcess 65068
-#define MainUnit_strKeepList 65069
-#define MainUnit_strInfoAboutTable 65070
-#define MainUnit_strPhysicalMemory 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 MainUnit_strWindowFailedToHide 65087
+#define MainUnit_strNewyear 64944
+#define MainUnit_strfuture 64945
+#define MainUnit_strdontbother 64946
+#define MainUnit_strneeddebugger 64947
+#define MainUnit_strfailuretosetspeed 64948
+#define MainUnit_strIncorrectspeed 64949
+#define MainUnit_strCantSetSpeed 64950
+#define MainUnit_strHyperscanFailed 64951
+#define MainUnit_strUnknownExtension 64952
+#define MainUnit_strCustomScanConfig 64953
+#define MainUnit_strRecalculateSelectedAddresses 64960
+#define MainUnit_strRecalculateAllAddresses 64961
+#define MainUnit_strRemoveFromGroup 64962
+#define MainUnit_strEnableCheat 64963
+#define MainUnit_strDisableCheat 64964
+#define MainUnit_strFindWhatWritesToPointer 64965
+#define MainUnit_strFindWhatWritesToPointer2 64966
+#define MainUnit_strcantdebugnow 64967
+#define MainUnit_strpointercantberead 64968
+#define MainUnit_strconfirmUndo 64969
+#define MainUnit_strHideForeground 64970
+#define MainUnit_strHideAll 64971
+#define MainUnit_strUnHideForeground 64972
+#define MainUnit_strUnhideAll 64973
+#define MainUnit_strhappybirthday 64974
+#define MainUnit_strXMess 64975
+#define MainUnit_strSelectedAddressIsAPointer 64976
+#define MainUnit_strMorePointers 64977
+#define MainUnit_strMorePointers2 64978
+#define MainUnit_strNotAValidValue 64979
+#define MainUnit_strdeleteall 64980
+#define MainUnit_stralreadyin 64981
+#define MainUnit_stralreadyinlistmultiple 64982
+#define MainUnit_strsethotkey 64983
+#define MainUnit_strshowasdecimal 64984
+#define MainUnit_strshowashex 64985
+#define MainUnit_strFreezeAddressInList 64986
+#define MainUnit_strFreezeAllAddresses 64987
+#define MainUnit_strUnfreezeAllAddresses 64988
+#define MainUnit_strUnfreezeAddressInList 64989
+#define MainUnit_strDeleteAddress 64990
+#define MainUnit_strRecalculateAddress 64991
+#define MainUnit_strClickToGoHome 64992
+#define MainUnit_strChangeDescription1 64993
+#define MainUnit_strChangeDescription2 64994
+#define MainUnit_strNotTheSameSize1 64995
+#define MainUnit_strNotTheSameSize2 64996
+#define MainUnit_strAdd0 64997
+#define MainUnit_strNotAValidNotation 64998
+#define MainUnit_strNotSameAmmountofBytes 64999
+#define MainUnit_strNotAValidBinaryNotation 65000
+#define MainUnit_strValue 65001
+#define MainUnit_strChange1Value 65002
+#define MainUnit_strChangeMoreValues 65003
+#define MainUnit_strDelete1Address 65004
+#define MainUnit_strDeleteMultipleAddresses 65005
+#define MainUnit_strDelete1Group 65006
+#define MainUnit_strDeleteMoreGroups 65007
+#define MainUnit_strAllowPositive 65008
+#define MainUnit_strNormalFreeze 65009
+#define MainUnit_strAskToSave 65010
+#define MainUnit_strScantextcaptiontotext 65011
+#define MainUnit_strScantextcaptiontoValue 65012
+#define MainUnit_strsearchForText 65013
+#define MainUnit_strSearchForArray 65014
+#define MainUnit_strConfirmProcessTermination 65015
+#define MainUnit_strError 65016
+#define MainUnit_strErrorwhileOpeningProcess 65017
+#define MainUnit_strKeepList 65018
+#define MainUnit_strInfoAboutTable 65019
+#define MainUnit_strPhysicalMemory 65020
+#define MainUnit_strfillInSomething 65021
+#define MainUnit_strFirstSelectAProcess 65022
+#define MainUnit_strCantdoNextScan 65023
+#define MainUnit2_strSmallerThan 65024
+#define MainUnit2_strIncreasedValue 65025
+#define MainUnit2_strIncreasedValueBy 65026
+#define MainUnit2_strDecreasedValue 65027
+#define MainUnit2_strDecreasedValueBy 65028
+#define MainUnit2_strValueBetween 65029
+#define MainUnit2_strChangedValue 65030
+#define MainUnit2_strUnchangedValue 65031
+#define MainUnit2_strUnknownInitialValue 65032
+#define MainUnit2_strSameAsFirstScan 65033
+#define MainUnit2_strtoolong 65034
+#define FoundCodeUnit_strClose 65035
+#define MainUnit_strWindowFailedToHide 65036
+#define MainUnit_strAccessed 65037
+#define MainUnit_strOpcodeChanged 65038
+#define MainUnit_strAllowNegative 65039
+#define AdvancedOptionsUnit_StrSelectExeFor3D 65040
+#define AdvancedOptionsUnit_StrSelectExeForOpenGL3D 65041
+#define formsettingsunit_strProcessWatcherWillPreventUnloader 65042
+#define MainUnit2_strStart 65043
+#define MainUnit2_strStop 65044
+#define MainUnit2_strOK 65045
+#define MainUnit2_strBug 65046
+#define MainUnit2_strAutoAssemble 65047
+#define MainUnit2_strAddressHasToBeReadable 65048
+#define MainUnit2_strNewScan 65049
+#define MainUnit2_strFirstScan 65050
+#define MainUnit2_strNoDescription 65051
+#define MainUnit2_strNeedNewerWindowsVersion 65052
+#define MainUnit2_strexact 65053
+#define MainUnit2_strexactvalue 65054
+#define MainUnit2_strbiggerThan 65055
+#define frmFindstaticsUnit_strStopping 65056
+#define frmLoadMemoryunit_strinvalidfile 65057
+#define AdvancedOptionsUnit_strnotreadable 65058
+#define AdvancedOptionsUnit_strNotWhatitshouldbe 65059
+#define AdvancedOptionsUnit_stralreadyinthelist 65060
+#define AdvancedOptionsUnit_strPartOfOpcodeInTheList 65061
+#define AdvancedOptionsUnit_strCECode 65062
+#define AdvancedOptionsUnit_strNameCECode 65063
+#define AdvancedOptionsUnit_strChangeOf 65064
+#define AdvancedOptionsUnit_strCode 65065
+#define AdvancedOptionsUnit_strFindWhatCodeaccesses 65066
+#define AdvancedOptionsUnit_strFindWhatCodeReads 65067
+#define AdvancedOptionsUnit_strFindWhatCodeWrites 65068
+#define AdvancedOptionsUnit_strcouldntrestorecode 65069
+#define AdvancedOptionsUnit_strnotthesame 65070
+#define AdvancedOptionsUnit_strcouldntwrite 65071
+#define SynEditStrConst_SYNS_AttrPreprocessor 65072
+#define SynEditStrConst_SYNS_AttrReservedWord 65073
+#define SynEditStrConst_SYNS_AttrSpace 65074
+#define SynEditStrConst_SYNS_AttrString 65075
+#define SynEditStrConst_SYNS_AttrSymbol 65076
+#define SynEditStrConst_SYNS_ScrollInfoFmt 65077
+#define SynEditStrConst_SYNS_ScrollInfoFmtTop 65078
+#define SynEditStrConst_SYNS_EDuplicateShortcut 65079
+#define SynEditStrConst_SYNS_FilterPascal 65080
+#define SynEditStrConst_SYNS_FilterCPP 65081
+#define SynEditStrConst_SYNS_LangCPP 65082
+#define SynEditStrConst_SYNS_LangPascal 65083
+#define SynEditTextBuffer_SListIndexOutOfBounds 65084
+#define SynEditTextBuffer_SInvalidCapacity 65085
+#define frmFindstaticsUnit_strScan 65086
+#define frmFindstaticsUnit_strStop 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 OpenSave_strCantLoadFilepatcher 65091
+#define OpenSave_strNotACETrainer 65092
+#define OpenSave_strUnknownTrainerVersion 65093
+#define OpenSave_strCantLoadProtectedfile 65094
+#define SynEditStrConst_SYNS_AttrAssembler 65095
+#define SynEditStrConst_SYNS_AttrCharacter 65096
+#define SynEditStrConst_SYNS_AttrComment 65097
+#define SynEditStrConst_SYNS_AttrFloat 65098
+#define SynEditStrConst_SYNS_AttrHexadecimal 65099
+#define SynEditStrConst_SYNS_AttrIdentifier 65100
+#define SynEditStrConst_SYNS_AttrIllegalChar 65101
+#define SynEditStrConst_SYNS_AttrNumber 65102
+#define SynEditStrConst_SYNS_AttrOctal 65103
 #define XMLConst_SDuplicateRegistration 65104
 #define XMLConst_SNoMatchingDOMVendor 65105
@@ -598 +597 @@
 STRINGTABLE
 BEGIN
+        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_strIncorrectspeed,     "The speed value is incorrect"
+        MainUnit_strCantSetSpeed,       "I can't set this speed. (must be bigger than 0)"
+        MainUnit_strHyperscanFailed,    "The hyperthread failed to respond with the right answer"
+        MainUnit_strUnknownExtension,   "Unknown extension"
+        MainUnit_strCustomScanConfig,   "Custom scan config"
+        MainUnit_strRecalculateSelectedAddresses,       "Recalculate selected addresses"
+        MainUnit_strRecalculateAllAddresses,    "Recalculate all addresses"
+        MainUnit_strRemoveFromGroup,    "Remove from group "
+        MainUnit_strEnableCheat,        "Enable cheat"
+        MainUnit_strDisableCheat,       "Disable cheat"
+        MainUnit_strFindWhatWritesToPointer,    "Find out what writes to this pointer"
+        MainUnit_strFindWhatWritesToPointer2,   "Find what reads from the address pointed at by this pointer"
+        MainUnit_strcantdebugnow,       "You can't use this function while you are debugging the application yourself. (Close the memory view window)"
+        MainUnit_strpointercantberead,  "The pointer can't be completly read"
+        MainUnit_strconfirmUndo,        "Do you really want to go back to the results of the previous scan?"
+        MainUnit_strHideForeground,     "will hide the foreground window"
+        MainUnit_strHideAll,    "will hide all windows"
+        MainUnit_strUnHideForeground,   "will bring the foreground window back"
+        MainUnit_strUnhideAll,  "will bring all windows back"
+        MainUnit_strhappybirthday,      "Let's sing Happy Birthday for Dark Byte today!"
+        MainUnit_strXMess,      "Merry christmas and happy new year"
+        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_stralreadyin,  "This address is already in the list"
+        MainUnit_stralreadyinlistmultiple,      "One or more addresses where already in the list"
+        MainUnit_strsethotkey,  "Set a hotkey"
+        MainUnit_strshowasdecimal,      "Show as decimal value"
+        MainUnit_strshowashex,  "Show as hexadecimal value"
+        MainUnit_strFreezeAddressInList,        "Freeze the address in this list"
+        MainUnit_strFreezeAllAddresses, "Freeze all addresses in this list"
+        MainUnit_strUnfreezeAllAddresses,       "Unfreeze all addresses in this list"
+        MainUnit_strUnfreezeAddressInList,      "Unfreeze the address in this list"
+        MainUnit_strDeleteAddress,      "Delete this address"
+        MainUnit_strRecalculateAddress, "Recalculate address"
+        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_strAdd0,       "Do you want to add a '0'-terminator at the end?"
+        MainUnit_strNotAValidNotation,  "This is not a valid notation"
+        MainUnit_strNotSameAmmountofBytes,      "The number of bytes you typed is not the same as the previous ammount. Continue?"
+        MainUnit_strNotAValidBinaryNotation,    " is not a valid binary notation!"
+        MainUnit_strValue,      "Value"
+        MainUnit_strChange1Value,       "Change this value to:"
+        MainUnit_strChangeMoreValues,   "Change these values to:"
+        MainUnit_strDelete1Address,     "Delete this address?"
+        MainUnit_strDeleteMultipleAddresses,    "Delete these addresses?"
+        MainUnit_strDelete1Group,       "Also delete the group this address is a member of?"
+        MainUnit_strDeleteMoreGroups,   "Also delete the groups of the addresses you selected?"
+        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_strsearchForText,      "Search for text"
+        MainUnit_strSearchForArray,     "Search for this array"
+        MainUnit_strConfirmProcessTermination,  "This will close the current process. Are you sure you want to do this?"
+        MainUnit_strError,      "Error"
+        MainUnit_strErrorwhileOpeningProcess,   "Error while opening this process"
+        MainUnit_strKeepList,   "Keep the current address list/code list?"
+        MainUnit_strInfoAboutTable,     "Info about this table:"
+        MainUnit_strPhysicalMemory,     "Physical Memory"
+        MainUnit_strfillInSomething,    "Please fill in something!"
+        MainUnit_strFirstSelectAProcess,        "First select a process"
+        MainUnit_strCantdoNextScan,     "You can't do a Next Scan with the current selected way of scanning!"
+        MainUnit2_strSmallerThan,       "Smaller than..."
         MainUnit2_strIncreasedValue,    "Increased value"
         MainUnit2_strIncreasedValueBy,  "Increased value by ..."
@@ -609 +683 @@
         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"
+        MainUnit_strAllowNegative,      "Allow negative changes"
+        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"
@@ -624 +703 @@
         MainUnit2_strexactvalue,        "Exact Value"
         MainUnit2_strbiggerThan,        "Bigger than..."
-        MainUnit2_strSmallerThan,       "Smaller than..."
+        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"
@@ -640 +719 @@
         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"
-        MainUnit_strUnhideAll,  "will bring all windows back"
-        MainUnit_strhappybirthday,      "Let's sing Happy Birthday for Dark Byte today!"
-        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_strIncorrectspeed,     "The speed value is incorrect"
-        MainUnit_strCantSetSpeed,       "I can't set this speed. (must be bigger than 0)"
-        MainUnit_strHyperscanFailed,    "The hyperthread failed to respond with the right answer"
-        MainUnit_strUnknownExtension,   "Unknown extension"
-        MainUnit_strCustomScanConfig,   "Custom scan config"
-        frmFindstaticsUnit_strScan,     "Scan"
-        frmFindstaticsUnit_strStop,     "Stop"
-        frmFindstaticsUnit_strStopping, "Stopping..."
-        MainUnit_strUnfreezeAddressInList,      "Unfreeze the address in this list"
-        MainUnit_strDeleteAddress,      "Delete this address"
-        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_strFindWhatWritesToPointer,    "Find out what writes to this pointer"
-        MainUnit_strFindWhatWritesToPointer2,   "Find what reads from the address pointed at by this pointer"
-        MainUnit_strcantdebugnow,       "You can't use this function while you are debugging the application yourself. (Close the memory view window)"
-        MainUnit_strpointercantberead,  "The pointer can't be completly read"
-        MainUnit_strconfirmUndo,        "Do you really want to go back to the results of the previous scan?"
-        MainUnit_strHideForeground,     "will hide the foreground window"
-        MainUnit_strHideAll,    "will hide all windows"
-        MainUnit_strUnHideForeground,   "will bring the foreground window back"
-        MainUnit_strDeleteMultipleAddresses,    "Delete these addresses?"
-        MainUnit_strDelete1Group,       "Also delete the group this address is a member of?"
-        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_stralreadyin,  "This address is already in the list"
-        MainUnit_stralreadyinlistmultiple,      "One or more addresses where already in the list"
-        MainUnit_strsethotkey,  "Set a hotkey"
-        MainUnit_strshowasdecimal,      "Show as decimal value"
-        MainUnit_strshowashex,  "Show as hexadecimal value"
-        MainUnit_strFreezeAddressInList,        "Freeze the address in this list"
-        MainUnit_strFreezeAllAddresses, "Freeze all addresses in this list"
-        MainUnit_strUnfreezeAllAddresses,       "Unfreeze all addresses in this list"
-        MainUnit_strfillInSomething,    "Please fill in something!"
-        MainUnit_strFirstSelectAProcess,        "First select a process"
-        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_strAdd0,       "Do you want to add a '0'-terminator at the end?"
-        MainUnit_strNotAValidNotation,  "This is not a valid notation"
-        MainUnit_strNotSameAmmountofBytes,      "The number of bytes you typed is not the same as the previous ammount. Continue?"
-        MainUnit_strNotAValidBinaryNotation,    " is not a valid binary notation!"
-        MainUnit_strValue,      "Value"
-        MainUnit_strChange1Value,       "Change this value to:"
-        MainUnit_strChangeMoreValues,   "Change these values to:"
-        MainUnit_strDelete1Address,     "Delete this address?"
-        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:"
-        MainUnit_strsearchForText,      "Search for text"
-        MainUnit_strSearchForArray,     "Search for this array"
-        MainUnit_strConfirmProcessTermination,  "This will close the current process. Are you sure you want to do this?"
-        MainUnit_strError,      "Error"
-        MainUnit_strErrorwhileOpeningProcess,   "Error while opening this process"
-        MainUnit_strKeepList,   "Keep the current address list/code list?"
-        MainUnit_strInfoAboutTable,     "Info about this table:"
-        MainUnit_strPhysicalMemory,     "Physical Memory"
-        SynEditStrConst_SYNS_AttrOctal, "Octal"
         SynEditStrConst_SYNS_AttrPreprocessor,  "Preprocessor"
         SynEditStrConst_SYNS_AttrReservedWord,  "Reserved Word"
@@ -736 +733 @@
         SynEditTextBuffer_SListIndexOutOfBounds,        "Invalid stringlist index %d"
         SynEditTextBuffer_SInvalidCapacity,     "Stringlist capacity cannot be smaller than count"
-        MainUnit_strWindowFailedToHide, "A window failed to hide"
+        frmFindstaticsUnit_strScan,     "Scan"
+        frmFindstaticsUnit_strStop,     "Stop"
         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!)"
@@ -753 +750 @@
         SynEditStrConst_SYNS_AttrIllegalChar,   "Illegal Char"
         SynEditStrConst_SYNS_AttrNumber,        "Number"
+        SynEditStrConst_SYNS_AttrOctal, "Octal"
         XMLConst_SDuplicateRegistration,        "\"%s\" DOMImplementation already registered"
         XMLConst_SNoMatchingDOMVendor,  "No matching DOM Vendor: \"%s\""

Cheat Engine/formMemoryModifier.dfm

@@ -371 +371 @@
   object OpenPictureDialog1: TOpenPictureDialog
     DefaultExt = 'bmp'
-    Filter = 'bmp (*.bmp)|*.bmp'
+    Filter = 
+      'bmp (*.bmp)|*.bmp|jpg (*.jpg)|*.jpg|Images (*.bmp, *.jpg)|*.jpg;' +
+      '*.bmp'
+    FilterIndex = 3
     Left = 288
   end

Cheat Engine/formMemoryModifier.pas

@@ -454 +454 @@
       trainer.WriteBuffer(leftimageext[1],temp);
 
-      temp:=leftimage.Size;
+      if leftimage<>nil then
+        temp:=leftimage.Size
+      else
+        temp:=0;
+
       trainer.WriteBuffer(temp,4);
-      leftimage.SaveToStream(trainer);
+
+      if leftimage<>nil then
+        leftimage.SaveToStream(trainer);
 
 

Cheat Engine/formsettingsunit.dfm

@@ -59 +59 @@
       Width = 617
       Height = 480
-      ActivePage = Extra
+      ActivePage = GeneralSettings
       Align = alClient
       Style = tsFlatButtons
@@ -131 +131 @@
         end
         object Label24: TLabel
-          Left = 404
+          Left = 408
           Top = 345
           Width = 141
@@ -286 +286 @@
         end
         object EditAutoAttach: TEdit
-          Left = 255
+          Left = 259
           Top = 340
           Width = 143
@@ -651 +651 @@
           Top = 0
           Width = 97
-          Height = 471
+          Height = 446
           Align = alRight
           BevelOuter = bvNone
@@ -678 +678 @@
           Top = 0
           Width = 512
-          Height = 471
+          Height = 446
           Align = alClient
           BevelOuter = bvNone
@@ -685 +685 @@
             Left = 0
             Top = 0
-            Width = 210
+            Width = 512
             Height = 16
             Align = alTop
@@ -694 +694 @@
             Top = 16
             Width = 512
-            Height = 455
+            Height = 430
             Align = alClient
             ItemHeight = 16
@@ -707 +707 @@
           Left = 0
           Top = 0
-          Width = 592
+          Width = 609
           Height = 48
           Align = alTop
@@ -781 +781 @@
         object cbHandleBreakpoints: TCheckBox
           Left = 0
-          Top = 206
+          Top = 208
           Width = 602
           Height = 21
@@ -884 +884 @@
           Left = 0
           Top = 430
-          Width = 609
+          Width = 424
           Height = 16
           Align = alBottom
@@ -1003 +1003 @@
           Top = 26
           Width = 228
-          Height = 445
+          Height = 420
           Align = alRight
           BevelOuter = bvNone
@@ -1108 +1108 @@
           Top = 26
           Width = 381
-          Height = 445
+          Height = 420
           Align = alClient
           BevelOuter = bvNone
@@ -1114 +1114 @@
           object Panel4: TPanel
             Left = 0
-            Top = 417
+            Top = 392
             Width = 381
             Height = 28
@@ -1143 +1143 @@
             Top = 0
             Width = 381
-            Height = 417
+            Height = 392
             Align = alClient
             Columns = <

Cheat Engine/frmExcludeHideUnit.dfm

@@ -1 +1 @@
 object frmExcludeHide: TfrmExcludeHide
-  Left = 915
-  Top = 553
-  Width = 365
-  Height = 320
+  Left = 893
+  Top = 158
+  Width = 453
+  Height = 398
   Caption = 'Show/Hide settings'
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -14
   Font.Name = 'MS Sans Serif'
   Font.Style = []
@@ -14 +14 @@
   Position = poOwnerFormCenter
   OnCreate = FormCreate
-  PixelsPerInch = 96
-  TextHeight = 13
-  object Label1: TLabel
-    Left = 0
-    Top = 64
-    Width = 353
-    Height = 33
-    AutoSize = False
-    Caption = 
-      'Select the processes you want to exclude from being hidden. Doub' +
-      'leclick the process to add it to the list. (Or remove it from th' +
-      'e list)'
-    Enabled = False
-    WordWrap = True
-  end
-  object Label2: TLabel
-    Left = 45
-    Top = 96
-    Width = 89
-    Height = 13
-    Caption = 'Current process list'
-    Enabled = False
-  end
-  object Label3: TLabel
-    Left = 188
-    Top = 96
-    Width = 158
-    Height = 13
-    Caption = 'List of processes that will not hide'
-    Enabled = False
-  end
+  PixelsPerInch = 120
+  TextHeight = 16
   object Label4: TLabel
     Left = 0
     Top = 0
-    Width = 353
-    Height = 33
+    Width = 435
+    Height = 41
+    Align = alTop
     AutoSize = False
     Caption = 
@@ -57 +29 @@
     WordWrap = True
   end
-  object ListBox1: TListBox
-    Left = 4
-    Top = 112
-    Width = 171
-    Height = 137
-    Enabled = False
-    ItemHeight = 13
+  object Panel1: TPanel
+    Left = 0
+    Top = 41
+    Width = 435
+    Height = 312
+    Align = alClient
+    BevelOuter = bvNone
     TabOrder = 0
-    OnDblClick = ListBox1DblClick
-  end
-  object ListBox2: TListBox
-    Left = 182
-    Top = 112
-    Width = 171
-    Height = 137
-    Enabled = False
-    ItemHeight = 13
-    TabOrder = 1
-    OnDblClick = ListBox2DblClick
-  end
-  object Button1: TButton
-    Left = 100
-    Top = 256
-    Width = 75
-    Height = 25
-    Caption = 'OK'
-    Default = True
-    TabOrder = 2
-    OnClick = Button1Click
-  end
-  object Button2: TButton
-    Left = 182
-    Top = 256
-    Width = 75
-    Height = 25
-    Cancel = True
-    Caption = 'Cancel'
-    ModalResult = 2
-    TabOrder = 3
-  end
-  object RadioButton1: TRadioButton
-    Left = 0
-    Top = 32
-    Width = 353
-    Height = 17
-    Caption = 'Only hide/show the foreground window'
-    Checked = True
-    TabOrder = 4
-    TabStop = True
-    OnClick = RadioButton1Click
-  end
-  object RadioButton2: TRadioButton
-    Left = 0
-    Top = 48
-    Width = 353
-    Height = 17
-    Caption = 'Hide/show ALL windows'
-    TabOrder = 5
-    OnClick = RadioButton1Click
+    OnResize = Panel1Resize
+    DesignSize = (
+      435
+      312)
+    object Label1: TLabel
+      Left = 0
+      Top = 39
+      Width = 430
+      Height = 40
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      Caption = 
+        'Select the processes you want to exclude from being hidden. Doub' +
+        'leclick the process to add it to the list. (Or remove it from th' +
+        'e list)'
+      Enabled = False
+      WordWrap = True
+    end
+    object RadioButton1: TRadioButton
+      Left = 0
+      Top = -1
+      Width = 434
+      Height = 21
+      Caption = 'Only hide/show the foreground window'
+      Checked = True
+      TabOrder = 0
+      TabStop = True
+      OnClick = RadioButton1Click
+    end
+    object RadioButton2: TRadioButton
+      Left = 0
+      Top = 19
+      Width = 434
+      Height = 21
+      Caption = 'Hide/show ALL windows'
+      TabOrder = 1
+      OnClick = RadioButton1Click
+    end
+    object Panel2: TPanel
+      Left = 0
+      Top = 80
+      Width = 214
+      Height = 185
+      BevelOuter = bvNone
+      TabOrder = 2
+      object Label2: TLabel
+        Left = 0
+        Top = 0
+        Width = 214
+        Height = 16
+        Align = alTop
+        Caption = 'Current process list'
+        Enabled = False
+      end
+      object ListBox1: TListBox
+        Left = 0
+        Top = 16
+        Width = 214
+        Height = 169
+        Align = alClient
+        Enabled = False
+        ItemHeight = 16
+        TabOrder = 0
+        OnDblClick = ListBox1DblClick
+      end
+    end
+    object Panel3: TPanel
+      Left = 219
+      Top = 80
+      Width = 214
+      Height = 185
+      BevelOuter = bvNone
+      TabOrder = 3
+      object Label3: TLabel
+        Left = 0
+        Top = 0
+        Width = 214
+        Height = 16
+        Align = alTop
+        Caption = 'List of processes that will not hide'
+        Enabled = False
+      end
+      object ListBox2: TListBox
+        Left = 0
+        Top = 16
+        Width = 214
+        Height = 169
+        Align = alClient
+        Enabled = False
+        ItemHeight = 16
+        TabOrder = 0
+        OnDblClick = ListBox2DblClick
+      end
+    end
+    object Panel4: TPanel
+      Left = 120
+      Top = 272
+      Width = 195
+      Height = 41
+      BevelOuter = bvNone
+      TabOrder = 4
+      object Button2: TButton
+        Left = 101
+        Top = 2
+        Width = 92
+        Height = 31
+        Cancel = True
+        Caption = 'Cancel'
+        ModalResult = 2
+        TabOrder = 0
+      end
+      object Button1: TButton
+        Left = 5
+        Top = 2
+        Width = 92
+        Height = 31
+        Caption = 'OK'
+        Default = True
+        TabOrder = 1
+        OnClick = Button1Click
+      end
+    end
   end
 end

Cheat Engine/frmExcludeHideUnit.pas

@@ -5 +5 @@
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls,cefuncproc;
+  Dialogs, StdCtrls,cefuncproc, ExtCtrls;
 
 type
   TfrmExcludeHide = class(TForm)
+    Label4: TLabel;
+    Panel1: TPanel;
     Label1: TLabel;
+    RadioButton1: TRadioButton;
+    RadioButton2: TRadioButton;
+    Panel2: TPanel;
+    Label2: TLabel;
     ListBox1: TListBox;
+    Panel3: TPanel;
+    Label3: TLabel;
     ListBox2: TListBox;
-    Label2: TLabel;
-    Label3: TLabel;
+    Panel4: TPanel;
+    Button2: TButton;
     Button1: TButton;
-    Button2: TButton;
-    RadioButton1: TRadioButton;
-    Label4: TLabel;
-    RadioButton2: TRadioButton;
     procedure FormCreate(Sender: TObject);
     procedure ListBox1DblClick(Sender: TObject);
@@ -24 +28 @@
     procedure ListBox2DblClick(Sender: TObject);
     procedure RadioButton1Click(Sender: TObject);
+    procedure Panel1Resize(Sender: TObject);
   private
     { Private declarations }
@@ -85 +90 @@
 end;
 
+procedure TfrmExcludeHide.Panel1Resize(Sender: TObject);
+begin
+  panel2.Left:=0;
+  panel2.Width:=(panel1.ClientWidth div 2)-2;
+  panel3.Left:=panel2.Width+2;
+  panel3.Width:=(panel1.ClientWidth div 2)-2;
+
+  panel4.Left:=(panel1.ClientWidth div 2) - (panel4.Width div 2);
+end;
+
 end.

Cheat Engine/memscan.pas

@@ -9 +9 @@
 
 uses windows,sysutils, classes,ComCtrls,dialogs, cefuncproc,
-     newkernelhandler, math, SyncObjs, windows7taskbar
+     newkernelhandler, math, SyncObjs
 {$ifndef standalonetrainerwithassemblerandaobscanner}
-     ,SaveFirstScan, firstscanhandler, autoassembler, symbolhandler
+     , windows7taskbar,SaveFirstScan, firstscanhandler, autoassembler, symbolhandler
 {$endif}
 ;
@@ -2781 +2781 @@
   begin
     OwningMemScan.progressbar.Position:=OwningMemScan.GetProgress(totaladdressestoscan,currentlyscanned);
+{$ifndef standalonetrainerwithassemblerandaobscanner}
     SetProgressValue(OwningMemScan.progressbar.Position, OwningMemScan.progressbar.Max);
+{$endif}    
   end;
 end;
@@ -3829 +3831 @@
 constructor TScanController.create(suspended: boolean);
 begin
+{$ifndef standalonetrainerwithassemblerandaobscanner}
   SetProgressstate(tbpsNormal);
+{$endif}
   
   isdoneevent:=TEvent.create(nil,true,false,'');

Cheat Engine/pointerscannerfrm.dfm

@@ -1 +1 @@
 object frmPointerScanner: TfrmPointerScanner
-  Left = 474
-  Top = 282
+  Left = 447
+  Top = 331
   Width = 622
   Height = 432

Cheat Engine/pointerscannerfrm.pas

@@ -1105 +1105 @@
     tn,tn2: TTreenode;
 begin
+  if listview1.Visible then
+    listview1.repaint;
+
   if pointerlisthandler<>nil then
     label6.caption:='Address specifiers found in the whole process:'+inttostr(pointerlisthandler.count);
@@ -1744 +1747 @@
   end;
 
+  new1.Click;
+
   if pointerlisthandler<>nil then
     freeandnil(pointerlisthandler);
+
 
   action:=cafree; //on close free itself
@@ -1797 +1803 @@
   caption:='CE Injected Pointerscan';
   {$endif}
-
+  listview1.DoubleBuffered:=true;
 end;
 

Cheat Engine/standalone/MemoryTrainerUnit.pas

@@ -1129 +1129 @@
     f.free;
 
-    image1.Picture.LoadFromFile(temps);
+
+    if temp<>0 then //size=0
+      image1.Picture.LoadFromFile(temps);
 
     DeleteFile(temps);

Cheat Engine/standalone/trainerwithassembler.dof

@@ -114 +114 @@
 AutoIncBuild=0
 MajorVer=1
-MinorVer=7
+MinorVer=8
 Release=0
 Build=0
@@ -127 +127 @@
 CompanyName=
 FileDescription=
-FileVersion=1.7.0.0
+FileVersion=1.8.0.0
 InternalName=Cheat Engine Trainer
 LegalCopyright=

Cheat Engine/standaloneunit.dfm

@@ -5 +5 @@
   BorderStyle = bsDialog
   Caption = 'Stand Alone game trainer builder:Filename.exe'
-  ClientHeight = 125
-  ClientWidth = 305
+  ClientHeight = 154
+  ClientWidth = 375
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -14
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   OldCreateOrder = False
   Position = poScreenCenter
-  PixelsPerInch = 96
-  TextHeight = 13
+  PixelsPerInch = 120
+  TextHeight = 16
   object Button1: TButton
-    Left = 128
-    Top = 96
-    Width = 75
-    Height = 25
+    Left = 158
+    Top = 118
+    Width = 92
+    Height = 31
     Caption = 'OK'
     Default = True
@@ -28 +28 @@
   end
   object Button2: TButton
-    Left = 224
-    Top = 96
-    Width = 75
-    Height = 25
+    Left = 276
+    Top = 118
+    Width = 92
+    Height = 31
     Cancel = True
     Caption = 'Cancel'
@@ -38 +38 @@
   end
   object RadioButton3: TRadioButton
-    Left = 8
+    Left = 10
     Top = 0
-    Width = 233
-    Height = 17
+    Width = 287
+    Height = 21
     Caption = 'Open existing trainer made by Cheat Engine'
     TabOrder = 2
@@ -47 +47 @@
   end
   object RadioButton4: TRadioButton
-    Left = 8
-    Top = 16
-    Width = 145
-    Height = 17
+    Left = 10
+    Top = 20
+    Width = 178
+    Height = 21
     Caption = 'Create a new trainer that'
     Checked = True
@@ -58 +58 @@
   end
   object GroupBox1: TGroupBox
-    Left = 8
-    Top = 40
-    Width = 289
-    Height = 49
+    Left = 10
+    Top = 49
+    Width = 356
+    Height = 61
     TabOrder = 4
     object RadioButton2: TRadioButton
-      Left = 8
-      Top = 8
-      Width = 273
-      Height = 17
+      Left = 10
+      Top = 10
+      Width = 336
+      Height = 21
       Caption = 'will run during the game/application, and modify data'
       Checked = True
@@ -74 +74 @@
     end
     object RadioButton1: TRadioButton
-      Left = 8
-      Top = 24
-      Width = 113
-      Height = 17
+      Left = 10
+      Top = 30
+      Width = 139
+      Height = 20
       Caption = 'will patch some files'
       TabOrder = 1

Cheat Engine/standaloneunit.pas

@@ -62 +62 @@
     hide;
     frmMemoryModifier:=TFrmMemoryModifier.create(self);
+    frmMemoryModifier.SaveDialog1.FileName:=filename;
     frmMemoryModifier.showmodal;
   end;

Cheat Engine/symbolhandler.pas

@@ -510 +510 @@
 
         userdefinedsymbols[i].address:=dword(p);
+        userdefinedsymbols[i].addressstring:=inttohex(dword(p),8);        
         userdefinedsymbols[i].allocsize:=size;
         userdefinedsymbols[i].processid:=processid;