Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
cheat-engine committed Mar 28, 2021
2 parents 799dca3 + a49f685 commit 5e9cb56
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("CSCompiler")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CSCompiler")]
[assembly: AssemblyCopyright("Copyright © 2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("85253900-3465-4e0e-b7c1-f6921a9b24cb")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ typedef uint64_t QWORD;

void ErrorThrow(void)
{

OutputDebugString("ErrorThrow 2");

// while (1);

throw std::invalid_argument("Access violation caught");
}

Expand Down Expand Up @@ -89,7 +84,7 @@ void ErrorFilter(int signr, siginfo_t *info, void *uap)

CPipeServer::CPipeServer(void)
{
OutputDebugString("CPipeServer::CPipeServer");
//OutputDebugString("CPipeServer::CPipeServer");
attached = FALSE;
#ifdef _WINDOWS
swprintf(datapipename, 256, L"\\\\.\\pipe\\cemonodc_pid%d", GetCurrentProcessId());
Expand Down Expand Up @@ -2128,11 +2123,13 @@ void CPipeServer::Start(void)

try
{
#ifndef _WINDOWS
if (setjmp(onError))
{
OutputDebugString("setjmp returned 1");
throw("Error during execution");
}
#endif

while (TRUE)
{
Expand Down
4 changes: 4 additions & 0 deletions Cheat Engine/disassemblerviewunit.pas
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,10 @@ procedure TDisassemblerview.synchronizeDisassembler;
visibleDisassembler.showmodules:=symhandler.showModules;
visibleDisassembler.showsymbols:=symhandler.showsymbols;
visibleDisassembler.showsections:=symhandler.showsections;

currentDisassembler.showmodules:=symhandler.showModules;
currentDisassembler.showsymbols:=symhandler.showsymbols;
currentDisassembler.showsections:=symhandler.showsections;
end;

procedure TDisassemblerview.StatusInfoLabelCopy(sender: TObject);
Expand Down

0 comments on commit 5e9cb56

Please sign in to comment.