Skip to content

Commit

Permalink
some gui improvements and try to fix a debug issue with win10 (dr6 is…
Browse files Browse the repository at this point in the history
… fffe0ff0 instead of ffff0ff0)
  • Loading branch information
cheat-engine committed Sep 24, 2016
1 parent c7e9f43 commit 6c3e3ca
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Cheat Engine/debughelper.pas
Expand Up @@ -1028,7 +1028,7 @@ procedure TDebuggerThread.UnsetBreakpoint(breakpoint: PBreakpoint; specificConte

if CurrentDebuggerInterface is TWindowsDebuggerInterface then
begin
if (currentthread.context.Dr6<>0) and (currentthread.context.dr6<>$ffff0ff0) then
if (currentthread.context.Dr6<>0) and (word(currentthread.context.dr6)<>$0ff0) then
begin
//the breakpoint in this thread can not be deactivated yet. Leave it activated
//(touching the DR registers with setthreadcontext clears DR6 in win7 )
Expand Down Expand Up @@ -1738,6 +1738,7 @@ function TDebuggerthread.FindWhatCodeAccesses(address: uint_ptr; foundCodeDialog
end;

frmchangedaddresses:=tfrmChangedAddresses.Create(application) ;
frmchangedaddresses.address:=address;
tempaddress:=address;
s:=disassemble(tempaddress); //tempaddress gets changed by this, so don't use the real one
i:=pos('[',s)+1;
Expand Down
6 changes: 4 additions & 2 deletions Cheat Engine/frmStackViewUnit.lfm
@@ -1,7 +1,7 @@
object frmStackView: TfrmStackView
Left = 976
Left = 368
Height = 211
Top = 644
Top = 522
Width = 374
BorderStyle = bsSizeToolWin
Caption = 'Stack View'
Expand Down Expand Up @@ -115,6 +115,8 @@ object frmStackView: TfrmStackView
end
end
object FindDialog1: TFindDialog
Width = 480
Height = 136
Options = [frDown, frHideMatchCase, frHideWholeWord, frHideUpDown, frHideEntireScope, frHidePromptOnReplace]
OnFind = FindDialog1Find
left = 208
Expand Down
1 change: 1 addition & 0 deletions Cheat Engine/frmStackViewUnit.pas
Expand Up @@ -218,6 +218,7 @@ procedure TfrmStackView.miSetColorClick(Sender: TObject);

procedure TfrmStackView.miFindClick(Sender: TObject);
begin

finddialog1.execute;
end;

Expand Down
2 changes: 1 addition & 1 deletion Cheat Engine/stacktrace2.pas
Expand Up @@ -94,7 +94,7 @@ procedure ce_stacktrace(esp: ptrUint; ebp: ptrUint; eip: ptrUint; stack: Pbytear
offsetstring:='('+pref+'bp+'+inttohex(offset,1)+')';
end;

address:=inttohex(esp,8)+offsetstring;
address:=inttohex(esp,8)+' '+offsetstring;


if processhandler.is64bit then
Expand Down

0 comments on commit 6c3e3ca

Please sign in to comment.