x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

DBG: Standardize assert function names

This commit is contained in:
Nukem 2015-10-18 14:09:50 -04:00
parent 00a028bb7c
commit 2a43e32820
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbg/thread.cpp
View File

@ -158,6 +158,7 @@ DWORD ThreadGetLastError(DWORD ThreadId)
if(threadList.find(ThreadId) != threadList.end())
return ThreadGetLastErrorTEB(threadList[ThreadId].ThreadLocalBase);
ASSERT_ALWAYS("Trying to get last error of a thread that doesn't exist!");
return 0;
}
@ -185,6 +186,7 @@ HANDLE ThreadGetHandle(DWORD ThreadId)
if(threadList.find(ThreadId) != threadList.end())
return threadList[ThreadId].Handle;
ASSERT_ALWAYS("Trying to get handle of a thread that doesn't exist!");
return nullptr;
}
@ -207,9 +209,7 @@ DWORD ThreadGetId(HANDLE Thread)
int ThreadSuspendAll()
{
//
// SuspendThread does not modify any internal variables
//
SHARED_ACQUIRE(LockThreads);
int count = 0;
@ -224,9 +224,7 @@ int ThreadSuspendAll()
int ThreadResumeAll()
{
//
// ResumeThread does not modify any internal variables
//
SHARED_ACQUIRE(LockThreads);
int count = 0;

22
src/dbg_assert.h
View File

@ -41,22 +41,22 @@
#define ASSERT_FALSE2(expr, message) assert(!(expr) && (message))
// Trigger an exception if expression is zero
#define assert_zero(...) \
__DBG_MACRO_DISPATCH(assert_zero, __VA_ARGS__)(__VA_ARGS__)
#define assert_zero1(expr) assert(expr)
#define assert_zero2(expr, message) assert(((expr) == 0) && (message))
#define ASSERT_ZERO(...) \
__DBG_MACRO_DISPATCH(ASSERT_ZERO, __VA_ARGS__)(__VA_ARGS__)
#define ASSERT_ZERO1(expr) assert(expr)
#define ASSERT_ZERO2(expr, message) assert(((expr) == 0) && (message))
// Trigger an exception if expression is non-zero
#define assert_nonzero(...) \
#define ASSERT_NONZERO(...) \
__DBG_MACRO_DISPATCH(ASSERT_TRUE, __VA_ARGS__)(__VA_ARGS__)
#define assert_nonzero1(expr) assert_nonzero(expr)
#define assert_nonzero2(expr, message) assert(((expr) != 0) && (message))
#define ASSERT_NONZERO1(expr) ASSERT_NONZERO(expr)
#define ASSERT_NONZERO2(expr, message) assert(((expr) != 0) && (message))
// Trigger an exception if expression is a nullptr
#define assert_null(...) \
__DBG_MACRO_DISPATCH(assert_null, __VA_ARGS__)(__VA_ARGS__)
#define assert_null1(expr) assert(expr)
#define assert_null2(expr, message) assert(((expr) == nullptr) && (message))
#define ASSERT_NULL(...) \
__DBG_MACRO_DISPATCH(ASSERT_NULL, __VA_ARGS__)(__VA_ARGS__)
#define ASSERT_NULL1(expr) assert(expr)
#define ASSERT_NULL2(expr, message) assert(((expr) == nullptr) && (message))
// Trigger an exception if expression is not a nullptr
#define ASSERT_NONNULL(...) \