From 3c1f14194905bf3368c9b582cbfceed00283baea Mon Sep 17 00:00:00 2001 From: mrexodia Date: Tue, 29 Dec 2015 15:29:53 +0100 Subject: [PATCH] renaming fest started... --- GleeBug/Debugger.Breakpoint.h | 26 ++++++------- GleeBug/Debugger.Dll.h | 6 +-- GleeBug/Debugger.Global.h | 6 +-- GleeBug/Debugger.Loop.Exception.cpp | 10 ++--- GleeBug/Debugger.Process.Breakpoint.cpp | 14 +++---- GleeBug/Debugger.Process.h | 20 +++++----- .../Debugger.Thread.HardwareBreakpoint.cpp | 38 +++++++++---------- GleeBug/Debugger.Thread.Registers.Flag.h | 6 +-- GleeBug/Debugger.Thread.Registers.Register.h | 6 +-- GleeBug/Debugger.Thread.Registers.h | 6 +-- GleeBug/Debugger.Thread.h | 10 ++--- GleeBug/Debugger.h | 6 +-- GleeBug/GleeBug.h | 6 +-- GleeBug/Static.BufferFile.h | 6 +-- GleeBug/Static.File.h | 6 +-- GleeBug/Static.Global.h | 6 +-- GleeBug/Static.Pe.h | 6 +-- GleeBug/Static.Region.h | 6 +-- MyDebugger/MyDebugger.h | 10 ++--- TitanEngineEmulator/Emulator.h | 26 ++++++------- TitanEngineEmulator/TitanEngine.h | 32 ++++++++-------- 21 files changed, 129 insertions(+), 129 deletions(-) diff --git a/GleeBug/Debugger.Breakpoint.h b/GleeBug/Debugger.Breakpoint.h index fd8dbce..669e7b8 100644 --- a/GleeBug/Debugger.Breakpoint.h +++ b/GleeBug/Debugger.Breakpoint.h @@ -1,5 +1,5 @@ -#ifndef _DEBUGGER_BREAKPOINT_H -#define _DEBUGGER_BREAKPOINT_H +#ifndef DEBUGGER_BREAKPOINT_H +#define DEBUGGER_BREAKPOINT_H #include "Debugger.Global.h" @@ -12,12 +12,12 @@ namespace GleeBug Memory }; - enum class SoftwareBreakpointType + enum class SoftwareType { ShortInt3 }; - enum class HardwareBreakpointSlot + enum class HardwareSlot { Dr0 = 0, Dr1 = 1, @@ -25,14 +25,14 @@ namespace GleeBug Dr3 = 3 }; - enum class HardwareBreakpointType + enum class HardwareType { Access, Write, Execute }; - enum class HardwareBreakpointSize + enum class HardwareSize { SizeByte = 1, SizeWord = 2, @@ -42,7 +42,7 @@ namespace GleeBug #endif //_WIN64 }; - enum class MemoryBreakpointType + enum class MemoryType { Acess, Write, @@ -58,20 +58,20 @@ namespace GleeBug { struct { - SoftwareBreakpointType type; + SoftwareType type; ptr size; uint8 newbytes[2]; uint8 oldbytes[2]; } software; struct { - HardwareBreakpointSlot slot; - HardwareBreakpointType type; - HardwareBreakpointSize size; + HardwareSlot slot; + HardwareType type; + HardwareSize size; } hardware; struct { - MemoryBreakpointType type; + MemoryType type; ptr size; } memory; }; @@ -90,4 +90,4 @@ namespace GleeBug }; }; -#endif //_DEBUGGER_BREAKPOINT_H \ No newline at end of file +#endif //DEBUGGER_BREAKPOINT_H \ No newline at end of file diff --git a/GleeBug/Debugger.Dll.h b/GleeBug/Debugger.Dll.h index 4e69709..1bc4e9d 100644 --- a/GleeBug/Debugger.Dll.h +++ b/GleeBug/Debugger.Dll.h @@ -1,5 +1,5 @@ -#ifndef _DEBUGGER_DLL_H -#define _DEBUGGER_DLL_H +#ifndef DEBUGGER_DLL_H +#define DEBUGGER_DLL_H #include "Debugger.Global.h" @@ -25,4 +25,4 @@ namespace GleeBug }; }; -#endif //_DEBUGGER_DLL_H \ No newline at end of file +#endif //DEBUGGER_DLL_H \ No newline at end of file diff --git a/GleeBug/Debugger.Global.h b/GleeBug/Debugger.Global.h index 355005c..6611829 100644 --- a/GleeBug/Debugger.Global.h +++ b/GleeBug/Debugger.Global.h @@ -1,5 +1,5 @@ -#ifndef _DEBUGGER_GLOBAL_H -#define _DEBUGGER_GLOBAL_H +#ifndef DEBUGGER_GLOBAL_H +#define DEBUGGER_GLOBAL_H #include "GleeBug.h" @@ -38,4 +38,4 @@ namespace GleeBug typedef std::vector StepCallbackVector; }; -#endif //_DEBUGGER_GLOBAL_H \ No newline at end of file +#endif //DEBUGGER_GLOBAL_H \ No newline at end of file diff --git a/GleeBug/Debugger.Loop.Exception.cpp b/GleeBug/Debugger.Loop.Exception.cpp index 97cefd9..cc4092f 100644 --- a/GleeBug/Debugger.Loop.Exception.cpp +++ b/GleeBug/Debugger.Loop.Exception.cpp @@ -86,27 +86,27 @@ namespace GleeBug { //determine the hardware breakpoint triggered ptr dr6 = _registers->Dr6(); - HardwareBreakpointSlot breakpointSlot; + HardwareSlot breakpointSlot; ptr breakpointAddress; if (exceptionAddress == _registers->Dr0() || dr6 & 0x1) { breakpointAddress = _registers->Dr0(); - breakpointSlot = HardwareBreakpointSlot::Dr0; + breakpointSlot = HardwareSlot::Dr0; } else if (exceptionAddress == _registers->Dr1() || dr6 & 0x2) { breakpointAddress = _registers->Dr1(); - breakpointSlot = HardwareBreakpointSlot::Dr1; + breakpointSlot = HardwareSlot::Dr1; } else if (exceptionAddress == _registers->Dr2() || dr6 & 0x4) { breakpointAddress = _registers->Dr2(); - breakpointSlot = HardwareBreakpointSlot::Dr2; + breakpointSlot = HardwareSlot::Dr2; } else if (exceptionAddress == _registers->Dr3() || dr6 & 0x8) { breakpointAddress = _registers->Dr3(); - breakpointSlot = HardwareBreakpointSlot::Dr3; + breakpointSlot = HardwareSlot::Dr3; } else return; //not a hardware breakpoint diff --git a/GleeBug/Debugger.Process.Breakpoint.cpp b/GleeBug/Debugger.Process.Breakpoint.cpp index 96542c5..3b384a1 100644 --- a/GleeBug/Debugger.Process.Breakpoint.cpp +++ b/GleeBug/Debugger.Process.Breakpoint.cpp @@ -2,7 +2,7 @@ namespace GleeBug { - bool ProcessInfo::SetBreakpoint(ptr address, bool singleshoot, SoftwareBreakpointType type) + bool ProcessInfo::SetBreakpoint(ptr address, bool singleshoot, SoftwareType type) { //check the address if (!MemIsValidPtr(address) || @@ -19,7 +19,7 @@ namespace GleeBug //determine breakpoint byte and size from the type switch (type) { - case SoftwareBreakpointType::ShortInt3: + case SoftwareType::ShortInt3: info.internal.software.newbytes[0] = 0xCC; info.internal.software.size = 1; break; @@ -43,7 +43,7 @@ namespace GleeBug return true; } - bool ProcessInfo::SetBreakpoint(ptr address, const BreakpointCallback & cbBreakpoint, bool singleshoot, SoftwareBreakpointType type) + bool ProcessInfo::SetBreakpoint(ptr address, const BreakpointCallback & cbBreakpoint, bool singleshoot, SoftwareType type) { //check if a callback on this address was already found if (breakpointCallbacks.find({ BreakpointType::Software, address }) != breakpointCallbacks.end()) @@ -79,21 +79,21 @@ namespace GleeBug return true; } - bool ProcessInfo::GetFreeHardwareBreakpointSlot(HardwareBreakpointSlot & slot) const + bool ProcessInfo::GetFreeHardwareBreakpointSlot(HardwareSlot & slot) const { //find a free hardware breakpoint slot for (int i = 0; i < HWBP_COUNT; i++) { if (!hardwareBreakpoints[i].enabled) { - slot = HardwareBreakpointSlot(i); + slot = HardwareSlot(i); return true; } } return false; } - bool ProcessInfo::SetHardwareBreakpoint(ptr address, HardwareBreakpointSlot slot, HardwareBreakpointType type, HardwareBreakpointSize size, bool singleshoot) + bool ProcessInfo::SetHardwareBreakpoint(ptr address, HardwareSlot slot, HardwareType type, HardwareSize size, bool singleshoot) { //check the address if (!MemIsValidPtr(address) || @@ -138,7 +138,7 @@ namespace GleeBug return true; } - bool ProcessInfo::SetHardwareBreakpoint(ptr address, HardwareBreakpointSlot slot, const BreakpointCallback & cbBreakpoint, HardwareBreakpointType type, HardwareBreakpointSize size, bool singleshoot) + bool ProcessInfo::SetHardwareBreakpoint(ptr address, HardwareSlot slot, const BreakpointCallback & cbBreakpoint, HardwareType type, HardwareSize size, bool singleshoot) { //check if a callback on this address was already found if (breakpointCallbacks.find({ BreakpointType::Hardware, address }) != breakpointCallbacks.end()) diff --git a/GleeBug/Debugger.Process.h b/GleeBug/Debugger.Process.h index 5e5b744..0692031 100644 --- a/GleeBug/Debugger.Process.h +++ b/GleeBug/Debugger.Process.h @@ -1,5 +1,5 @@ -#ifndef _DEBUGGER_PROCESS_H -#define _DEBUGGER_PROCESS_H +#ifndef DEBUGGER_PROCESS_H +#define DEBUGGER_PROCESS_H #include "Debugger.Global.h" #include "Debugger.Thread.h" @@ -90,7 +90,7 @@ namespace GleeBug \param type (Optional) The software breakpoint type. \return true if the breakpoint was set, false otherwise. */ - bool SetBreakpoint(ptr address, bool singleshoot = false, SoftwareBreakpointType type = SoftwareBreakpointType::ShortInt3); + bool SetBreakpoint(ptr address, bool singleshoot = false, SoftwareType type = SoftwareType::ShortInt3); /** \brief Sets a software breakpoint. @@ -100,7 +100,7 @@ namespace GleeBug \param type (Optional) The software breakpoint type. \return true if the breakpoint was set, false otherwise. */ - bool SetBreakpoint(ptr address, const BreakpointCallback & cbBreakpoint, bool singleshoot = false, SoftwareBreakpointType type = SoftwareBreakpointType::ShortInt3); + bool SetBreakpoint(ptr address, const BreakpointCallback & cbBreakpoint, bool singleshoot = false, SoftwareType type = SoftwareType::ShortInt3); /** \brief Sets a software breakpoint. @@ -113,7 +113,7 @@ namespace GleeBug \return true if the breakpoint was set, false otherwise. */ template - bool SetBreakpoint(ptr address, T* debugger, void(T::*callback)(const BreakpointInfo & info), bool singleshoot = false, SoftwareBreakpointType type = SoftwareBreakpointType::ShortInt3) + bool SetBreakpoint(ptr address, T* debugger, void(T::*callback)(const BreakpointInfo & info), bool singleshoot = false, SoftwareType type = SoftwareType::ShortInt3) { static_cast(static_cast(debugger)); return SetBreakpoint(address, std::bind(callback, debugger, std::placeholders::_1), singleshoot, type); @@ -131,7 +131,7 @@ namespace GleeBug \param [out] slot First free slot found, has no meaning when the function fails. \return true if a free slot was found, false otherwise. */ - bool GetFreeHardwareBreakpointSlot(HardwareBreakpointSlot & slot) const; + bool GetFreeHardwareBreakpointSlot(HardwareSlot & slot) const; /** \brief Sets a hardware breakpoint. @@ -142,7 +142,7 @@ namespace GleeBug \param singleshoot (Optional) True to remove the breakpoint after the first hit. \return true if the hardware breakpoint was set, false otherwise. */ - bool SetHardwareBreakpoint(ptr address, HardwareBreakpointSlot slot, HardwareBreakpointType type = HardwareBreakpointType::Execute, HardwareBreakpointSize size = HardwareBreakpointSize::SizeByte, bool singleshoot = false); + bool SetHardwareBreakpoint(ptr address, HardwareSlot slot, HardwareType type = HardwareType::Execute, HardwareSize size = HardwareSize::SizeByte, bool singleshoot = false); /** \brief Sets a hardware breakpoint. @@ -154,7 +154,7 @@ namespace GleeBug \param singleshoot (Optional) True to remove the breakpoint after the first hit. \return true if the hardware breakpoint was set, false otherwise. */ - bool SetHardwareBreakpoint(ptr address, HardwareBreakpointSlot slot, const BreakpointCallback & cbBreakpoint, HardwareBreakpointType type = HardwareBreakpointType::Execute, HardwareBreakpointSize size = HardwareBreakpointSize::SizeByte, bool singleshoot = false); + bool SetHardwareBreakpoint(ptr address, HardwareSlot slot, const BreakpointCallback & cbBreakpoint, HardwareType type = HardwareType::Execute, HardwareSize size = HardwareSize::SizeByte, bool singleshoot = false); /** \brief Sets a hardware breakpoint. @@ -169,7 +169,7 @@ namespace GleeBug \return true if the hardware breakpoint was set, false otherwise. */ template - bool SetHardwareBreakpoint(ptr address, HardwareBreakpointSlot slot, T* debugger, void(T::*callback)(const BreakpointInfo & info), HardwareBreakpointType type = HardwareBreakpointType::Execute, HardwareBreakpointSize size = HardwareBreakpointSize::SizeByte, bool singleshoot = false) + bool SetHardwareBreakpoint(ptr address, HardwareSlot slot, T* debugger, void(T::*callback)(const BreakpointInfo & info), HardwareType type = HardwareType::Execute, HardwareSize size = HardwareSize::SizeByte, bool singleshoot = false) { static_cast(static_cast(debugger)); return SetHardwareBreakpoint(address, slot, std::bind(callback, debugger, std::placeholders::_1), type, size, singleshoot); @@ -191,4 +191,4 @@ namespace GleeBug }; }; -#endif //_DEBUGGER_PROCESS_H \ No newline at end of file +#endif //DEBUGGER_PROCESS_H \ No newline at end of file diff --git a/GleeBug/Debugger.Thread.HardwareBreakpoint.cpp b/GleeBug/Debugger.Thread.HardwareBreakpoint.cpp index 3b7dabc..9ff9e63 100644 --- a/GleeBug/Debugger.Thread.HardwareBreakpoint.cpp +++ b/GleeBug/Debugger.Thread.HardwareBreakpoint.cpp @@ -146,18 +146,18 @@ namespace GleeBug return result; } - static inline DR7_SIZE size_dr7(HardwareBreakpointSize size) + static inline DR7_SIZE size_dr7(HardwareSize size) { switch (size) { - case HardwareBreakpointSize::SizeByte: + case HardwareSize::SizeByte: return SIZE_1; - case HardwareBreakpointSize::SizeWord: + case HardwareSize::SizeWord: return SIZE_2; - case HardwareBreakpointSize::SizeDword: + case HardwareSize::SizeDword: return SIZE_4; #ifdef _WIN64 - case HardwareBreakpointSize::SizeQword: + case HardwareSize::SizeQword: return SIZE_8; #endif //_WIN64 default: @@ -165,22 +165,22 @@ namespace GleeBug } } - static inline DR7_TYPE type_dr7(HardwareBreakpointType type) + static inline DR7_TYPE type_dr7(HardwareType type) { switch (type) { - case HardwareBreakpointType::Access: + case HardwareType::Access: return TYPE_READWRITE; - case HardwareBreakpointType::Write: + case HardwareType::Write: return TYPE_WRITE; - case HardwareBreakpointType::Execute: + case HardwareType::Execute: return TYPE_EXECUTE; default: return TYPE_EXECUTE; } } - bool ThreadInfo::SetHardwareBreakpoint(ptr address, HardwareBreakpointSlot slot, HardwareBreakpointType type, HardwareBreakpointSize size) + bool ThreadInfo::SetHardwareBreakpoint(ptr address, HardwareSlot slot, HardwareType type, HardwareSize size) { //check if the alignment is correct if ((address % int(size) != 0)) @@ -189,16 +189,16 @@ namespace GleeBug //set the address register switch (slot) { - case HardwareBreakpointSlot::Dr0: + case HardwareSlot::Dr0: registers.Dr0 = address; break; - case HardwareBreakpointSlot::Dr1: + case HardwareSlot::Dr1: registers.Dr1 = address; break; - case HardwareBreakpointSlot::Dr2: + case HardwareSlot::Dr2: registers.Dr2 = address; break; - case HardwareBreakpointSlot::Dr3: + case HardwareSlot::Dr3: registers.Dr3 = address; break; default: @@ -216,21 +216,21 @@ namespace GleeBug return true; } - bool ThreadInfo::DeleteHardwareBreakpoint(HardwareBreakpointSlot slot) + bool ThreadInfo::DeleteHardwareBreakpoint(HardwareSlot slot) { //zero the address register switch (slot) { - case HardwareBreakpointSlot::Dr0: + case HardwareSlot::Dr0: registers.Dr0 = 0; break; - case HardwareBreakpointSlot::Dr1: + case HardwareSlot::Dr1: registers.Dr1 = 0; break; - case HardwareBreakpointSlot::Dr2: + case HardwareSlot::Dr2: registers.Dr2 = 0; break; - case HardwareBreakpointSlot::Dr3: + case HardwareSlot::Dr3: registers.Dr3 = 0; break; default: diff --git a/GleeBug/Debugger.Thread.Registers.Flag.h b/GleeBug/Debugger.Thread.Registers.Flag.h index f5d360e..bf99bcc 100644 --- a/GleeBug/Debugger.Thread.Registers.Flag.h +++ b/GleeBug/Debugger.Thread.Registers.Flag.h @@ -1,5 +1,5 @@ -#ifndef _DEBUGGER_THREAD_REGISTERS_FLAG_H -#define _DEBUGGER_THREAD_REGISTERS_FLAG_H +#ifndef DEBUGGER_THREAD_REGISTERS_FLAG_H +#define DEBUGGER_THREAD_REGISTERS_FLAG_H #include "Debugger.Thread.Registers.h" @@ -111,4 +111,4 @@ private: Registers* _registers; }; -#endif //_DEBUGGER_THREAD_REGISTERS_FLAG_H \ No newline at end of file +#endif //DEBUGGER_THREAD_REGISTERS_FLAG_H \ No newline at end of file diff --git a/GleeBug/Debugger.Thread.Registers.Register.h b/GleeBug/Debugger.Thread.Registers.Register.h index 4aafa01..3d7da7f 100644 --- a/GleeBug/Debugger.Thread.Registers.Register.h +++ b/GleeBug/Debugger.Thread.Registers.Register.h @@ -1,5 +1,5 @@ -#ifndef _DEBUGGER_THREAD_REGISTERS_REGISTER_H -#define _DEBUGGER_THREAD_REGISTERS_REGISTER_H +#ifndef DEBUGGER_THREAD_REGISTERS_REGISTER_H +#define DEBUGGER_THREAD_REGISTERS_REGISTER_H #include "Debugger.Thread.Registers.h" @@ -288,4 +288,4 @@ private: Registers* _registers; }; -#endif //_DEBUGGER_THREAD_REGISTERS_REGISTER_H \ No newline at end of file +#endif //DEBUGGER_THREAD_REGISTERS_REGISTER_H \ No newline at end of file diff --git a/GleeBug/Debugger.Thread.Registers.h b/GleeBug/Debugger.Thread.Registers.h index 9f709e7..2d74aa1 100644 --- a/GleeBug/Debugger.Thread.Registers.h +++ b/GleeBug/Debugger.Thread.Registers.h @@ -1,5 +1,5 @@ -#ifndef _DEBUGGER_THREAD_REGISTERS_H -#define _DEBUGGER_THREAD_REGISTERS_H +#ifndef DEBUGGER_THREAD_REGISTERS_H +#define DEBUGGER_THREAD_REGISTERS_H #include "Debugger.Global.h" @@ -160,4 +160,4 @@ namespace GleeBug }; }; -#endif //_DEBUGGER_THREAD_REGISTERS_H \ No newline at end of file +#endif //DEBUGGER_THREAD_REGISTERS_H \ No newline at end of file diff --git a/GleeBug/Debugger.Thread.h b/GleeBug/Debugger.Thread.h index 0ee7eb7..079a68c 100644 --- a/GleeBug/Debugger.Thread.h +++ b/GleeBug/Debugger.Thread.h @@ -1,5 +1,5 @@ -#ifndef _DEBUGGER_THREAD_H -#define _DEBUGGER_THREAD_H +#ifndef DEBUGGER_THREAD_H +#define DEBUGGER_THREAD_H #include "Debugger.Global.h" #include "Debugger.Thread.Registers.h" @@ -108,18 +108,18 @@ namespace GleeBug \param size The hardware breakpoint size. \return true if the hardware breakpoint was set, false otherwise. */ - bool SetHardwareBreakpoint(ptr address, HardwareBreakpointSlot slot, HardwareBreakpointType type, HardwareBreakpointSize size); + bool SetHardwareBreakpoint(ptr address, HardwareSlot slot, HardwareType type, HardwareSize size); /** \brief Deletes a hardware breakpoint. \param slot The slot to remove the hardware breakpoint from. \return true if the hardware breakpoint was deleted, false otherwise. */ - bool DeleteHardwareBreakpoint(HardwareBreakpointSlot slot); + bool DeleteHardwareBreakpoint(HardwareSlot slot); private: CONTEXT _oldContext; }; }; -#endif //_DEBUGGER_THREADS_H \ No newline at end of file +#endif //DEBUGGER_THREADS_H \ No newline at end of file diff --git a/GleeBug/Debugger.h b/GleeBug/Debugger.h index 1eed499..d9c4314 100644 --- a/GleeBug/Debugger.h +++ b/GleeBug/Debugger.h @@ -1,5 +1,5 @@ -#ifndef _DEBUGGER_H -#define _DEBUGGER_H +#ifndef DEBUGGER_H +#define DEBUGGER_H #include "Debugger.Global.h" #include "Debugger.Process.h" @@ -268,4 +268,4 @@ namespace GleeBug }; }; -#endif //_DEBUGGER_H \ No newline at end of file +#endif //DEBUGGER_H \ No newline at end of file diff --git a/GleeBug/GleeBug.h b/GleeBug/GleeBug.h index c4faa4e..cb0de7f 100644 --- a/GleeBug/GleeBug.h +++ b/GleeBug/GleeBug.h @@ -1,5 +1,5 @@ -#ifndef _GLEEBUG_H -#define _GLEEBUG_H +#ifndef GLEEBUG_H +#define GLEEBUG_H #include #include @@ -54,4 +54,4 @@ namespace GleeBug }; } -#endif //_GLEEBUG_H \ No newline at end of file +#endif //GLEEBUG_H \ No newline at end of file diff --git a/GleeBug/Static.BufferFile.h b/GleeBug/Static.BufferFile.h index 590ce9e..d922642 100644 --- a/GleeBug/Static.BufferFile.h +++ b/GleeBug/Static.BufferFile.h @@ -1,5 +1,5 @@ -#ifndef _STATIC_BUFFERFILE_H -#define _STATIC_BUFFERFILE_H +#ifndef STATIC_BUFFERFILE_H +#define STATIC_BUFFERFILE_H #include "Static.File.h" @@ -64,4 +64,4 @@ namespace GleeBug }; }; -#endif //_STATIC_BUFFERFILE_H \ No newline at end of file +#endif //STATIC_BUFFERFILE_H \ No newline at end of file diff --git a/GleeBug/Static.File.h b/GleeBug/Static.File.h index 493c3ac..31c929c 100644 --- a/GleeBug/Static.File.h +++ b/GleeBug/Static.File.h @@ -1,5 +1,5 @@ -#ifndef _STATIC_FILE_H -#define _STATIC_FILE_H +#ifndef STATIC_FILE_H +#define STATIC_FILE_H #include "Static.Global.h" @@ -89,4 +89,4 @@ namespace GleeBug }; }; -#endif //_STATIC_FILE_H +#endif //STATIC_FILE_H diff --git a/GleeBug/Static.Global.h b/GleeBug/Static.Global.h index 2493b39..087ec98 100644 --- a/GleeBug/Static.Global.h +++ b/GleeBug/Static.Global.h @@ -1,5 +1,5 @@ -#ifndef _STATIC_GLOBAL_H -#define _STATIC_GLOBAL_H +#ifndef STATIC_GLOBAL_H +#define STATIC_GLOBAL_H #include "GleeBug.h" @@ -11,4 +11,4 @@ namespace GleeBug const uint32 INVALID_VALUE = GLEEBUG_INVALID_VALUE; }; -#endif //_STATIC_GLOBAL_H \ No newline at end of file +#endif //STATIC_GLOBAL_H \ No newline at end of file diff --git a/GleeBug/Static.Pe.h b/GleeBug/Static.Pe.h index dc84b70..1aec21e 100644 --- a/GleeBug/Static.Pe.h +++ b/GleeBug/Static.Pe.h @@ -1,5 +1,5 @@ -#ifndef _STATIC_PE_H -#define _STATIC_PE_H +#ifndef STATIC_PE_H +#define STATIC_PE_H #include "Static.File.h" #include "Static.Region.h" @@ -68,4 +68,4 @@ namespace GleeBug }; }; -#endif //_STATIC_PE_H \ No newline at end of file +#endif //STATIC_PE_H \ No newline at end of file diff --git a/GleeBug/Static.Region.h b/GleeBug/Static.Region.h index 7955679..8c566d4 100644 --- a/GleeBug/Static.Region.h +++ b/GleeBug/Static.Region.h @@ -1,5 +1,5 @@ -#ifndef _STATIC_REGION_H -#define _STATIC_REGION_H +#ifndef STATIC_REGION_H +#define STATIC_REGION_H #include "Static.Global.h" @@ -116,4 +116,4 @@ namespace GleeBug }; }; -#endif //_STATIC_REGION_H \ No newline at end of file +#endif //STATIC_REGION_H \ No newline at end of file diff --git a/MyDebugger/MyDebugger.h b/MyDebugger/MyDebugger.h index 2acf7e8..de6e992 100644 --- a/MyDebugger/MyDebugger.h +++ b/MyDebugger/MyDebugger.h @@ -1,5 +1,5 @@ -#ifndef _MYDEBUGGER_H -#define _MYDEBUGGER_H +#ifndef MYDEBUGGER_H +#define MYDEBUGGER_H #include @@ -50,10 +50,10 @@ protected: printf("Process %d created with entry 0x%p\n", _debugEvent.dwProcessId, entry); - /*HardwareBreakpointSlot slot; + /*HardwareSlot slot; if (_process->GetFreeHardwareBreakpointSlot(slot)) { - if (_process->SetHardwareBreakpoint(entry, slot, this, &MyDebugger::cbEntryHardwareBreakpoint, HardwareBreakpointType::Execute, HardwareBreakpointSize::SizeByte)) + if (_process->SetHardwareBreakpoint(entry, slot, this, &MyDebugger::cbEntryHardwareBreakpoint, HardwareType::Execute, HardwareSize::SizeByte)) printf("Hardware breakpoint set at 0x%p!\n", entry); else printf("Failed to set hardware breakpoint at 0x%p\n", entry); @@ -164,4 +164,4 @@ protected: } }; -#endif //_MYDEBUGGER_H \ No newline at end of file +#endif //MYDEBUGGER_H \ No newline at end of file diff --git a/TitanEngineEmulator/Emulator.h b/TitanEngineEmulator/Emulator.h index 8ad448b..b4fdb43 100644 --- a/TitanEngineEmulator/Emulator.h +++ b/TitanEngineEmulator/Emulator.h @@ -417,7 +417,7 @@ public: if (!_process) return false; return _process->SetHardwareBreakpoint(bpxAddress, - (HardwareBreakpointSlot)IndexOfRegister, [bpxCallBack](const BreakpointInfo & info) + (HardwareSlot)IndexOfRegister, [bpxCallBack](const BreakpointInfo & info) { (HWBPCALLBACK(bpxCallBack))((const void*)info.address); }, hwtypeFromTitan(bpxType), hwsizeFromTitan(bpxSize)); @@ -435,7 +435,7 @@ public: { if (!_process || !RegisterIndex) return false; - HardwareBreakpointSlot slot; + HardwareSlot slot; bool result = _process->GetFreeHardwareBreakpointSlot(slot); if (result) *RegisterIndex = (DWORD)slot; @@ -583,37 +583,37 @@ private: //functions return _process; } - static inline HardwareBreakpointType hwtypeFromTitan(DWORD type) + static inline HardwareType hwtypeFromTitan(DWORD type) { switch (type) { case UE_HARDWARE_EXECUTE: - return HardwareBreakpointType::Execute; + return HardwareType::Execute; case UE_HARDWARE_WRITE: - return HardwareBreakpointType::Write; + return HardwareType::Write; case UE_HARDWARE_READWRITE: - return HardwareBreakpointType::Access; + return HardwareType::Access; default: - return HardwareBreakpointType::Access; + return HardwareType::Access; } } - static inline HardwareBreakpointSize hwsizeFromTitan(DWORD size) + static inline HardwareSize hwsizeFromTitan(DWORD size) { switch (size) { case UE_HARDWARE_SIZE_1: - return HardwareBreakpointSize::SizeByte; + return HardwareSize::SizeByte; case UE_HARDWARE_SIZE_2: - return HardwareBreakpointSize::SizeWord; + return HardwareSize::SizeWord; case UE_HARDWARE_SIZE_4: - return HardwareBreakpointSize::SizeDword; + return HardwareSize::SizeDword; #ifdef _WIN64 case UE_HARDWARE_SIZE_8: - return HardwareBreakpointSize::SizeQword; + return HardwareSize::SizeQword; #endif //_WIN64 default: - return HardwareBreakpointSize::SizeByte; + return HardwareSize::SizeByte; } } diff --git a/TitanEngineEmulator/TitanEngine.h b/TitanEngineEmulator/TitanEngine.h index 55d01c2..7e4fea1 100644 --- a/TitanEngineEmulator/TitanEngine.h +++ b/TitanEngineEmulator/TitanEngine.h @@ -62,25 +62,25 @@ #define UE_OPTION_REMOVEALLDISABLED 3 #define UE_OPTION_REMOVEALLENABLED 4 -#define UE_STATIC_DECRYPTOR_XOR 1 -#define UE_STATIC_DECRYPTOR_SUB 2 -#define UE_STATIC_DECRYPTOR_ADD 3 +#define UESTATIC_DECRYPTOR_XOR 1 +#define UESTATIC_DECRYPTOR_SUB 2 +#define UESTATIC_DECRYPTOR_ADD 3 -#define UE_STATIC_DECRYPTOR_FOREWARD 1 -#define UE_STATIC_DECRYPTOR_BACKWARD 2 +#define UESTATIC_DECRYPTOR_FOREWARD 1 +#define UESTATIC_DECRYPTOR_BACKWARD 2 -#define UE_STATIC_KEY_SIZE_1 1 -#define UE_STATIC_KEY_SIZE_2 2 -#define UE_STATIC_KEY_SIZE_4 4 -#define UE_STATIC_KEY_SIZE_8 8 +#define UESTATIC_KEY_SIZE_1 1 +#define UESTATIC_KEY_SIZE_2 2 +#define UESTATIC_KEY_SIZE_4 4 +#define UESTATIC_KEY_SIZE_8 8 -#define UE_STATIC_APLIB 1 -#define UE_STATIC_APLIB_DEPACK 2 -#define UE_STATIC_LZMA 3 +#define UESTATIC_APLIB 1 +#define UESTATIC_APLIB_DEPACK 2 +#define UESTATIC_LZMA 3 -#define UE_STATIC_HASH_MD5 1 -#define UE_STATIC_HASH_SHA1 2 -#define UE_STATIC_HASH_CRC32 3 +#define UESTATIC_HASH_MD5 1 +#define UESTATIC_HASH_SHA1 2 +#define UESTATIC_HASH_CRC32 3 #define UE_RESOURCE_LANGUAGE_ANY -1 @@ -504,7 +504,7 @@ typedef struct HOOK_ENTRY #define UE_FIELD_OK 0 #define UE_FIELD_BROKEN_NON_FIXABLE 1 #define UE_FIELD_BROKEN_NON_CRITICAL 2 -#define UE_FIELD_BROKEN_FIXABLE_FOR_STATIC_USE 3 +#define UE_FIELD_BROKEN_FIXABLE_FORSTATIC_USE 3 #define UE_FIELD_BROKEN_BUT_CAN_BE_EMULATED 4 #define UE_FIELD_FIXABLE_NON_CRITICAL 5 #define UE_FIELD_FIXABLE_CRITICAL 6