flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed issues with 64-bit MSVC compilation.

Browse Source
This commit is contained in:
madmaxoft 2014-04-11 13:09:19 +02:00
parent 22d56d1a3f
commit f44a291da8
3 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/OSSupport/IsThread.cpp
View File

@ -18,26 +18,33 @@
// Usage: SetThreadName (-1, "MainThread"); // Usage: SetThreadName (-1, "MainThread");
// //
static void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName) // Code adapted from MSDN: http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
const DWORD MS_VC_EXCEPTION = 0x406D1388;
#pragma pack(push, 8)
typedef struct tagTHREADNAME_INFO
{ {
struct DWORD dwType; // Must be 0x1000.
{ LPCSTR szName; // Pointer to name (in user addr space).
DWORD dwType; // must be 0x1000 DWORD dwThreadID; // Thread ID (-1 = caller thread).
LPCSTR szName; // pointer to name (in user addr space) DWORD dwFlags; // Reserved for future use, must be zero.
DWORD dwThreadID; // thread ID (-1=caller thread) } THREADNAME_INFO;
DWORD dwFlags; // reserved for future use, must be zero #pragma pack(pop)
} info;
static void SetThreadName(DWORD dwThreadID, const char * threadName)
{
THREADNAME_INFO info;
info.dwType = 0x1000; info.dwType = 0x1000;
info.szName = szThreadName; info.szName = threadName;
info.dwThreadID = dwThreadID; info.dwThreadID = dwThreadID;
info.dwFlags = 0; info.dwFlags = 0;
__try __try
{ {
RaiseException(0x406D1388, 0, sizeof(info) / sizeof(DWORD), (DWORD *)&info); RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR *)&info);
} }
__except(EXCEPTION_CONTINUE_EXECUTION) __except (EXCEPTION_EXECUTE_HANDLER)
{ {
} }
} }

2
src/OSSupport/IsThread.h
View File

@ -62,7 +62,7 @@ protected:
HANDLE m_Handle; HANDLE m_Handle;
static DWORD_PTR __stdcall thrExecute(LPVOID a_Param) static DWORD __stdcall thrExecute(LPVOID a_Param)
{ {
// Create a window so that the thread can be identified by 3rd party tools: // Create a window so that the thread can be identified by 3rd party tools:
HWND IdentificationWnd = CreateWindow("STATIC", ((cIsThread *)a_Param)->m_ThreadName.c_str(), 0, 0, 0, 0, WS_OVERLAPPED, NULL, NULL, NULL, NULL); HWND IdentificationWnd = CreateWindow("STATIC", ((cIsThread *)a_Param)->m_ThreadName.c_str(), 0, 0, 0, 0, WS_OVERLAPPED, NULL, NULL, NULL, NULL);

23
src/OSSupport/Thread.cpp
View File

@ -10,27 +10,34 @@
// //
// Usage: SetThreadName (-1, "MainThread"); // Usage: SetThreadName (-1, "MainThread");
// //
// Code adapted from MSDN: http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
const DWORD MS_VC_EXCEPTION = 0x406D1388;
#pragma pack(push, 8)
typedef struct tagTHREADNAME_INFO typedef struct tagTHREADNAME_INFO
{ {
DWORD dwType; // must be 0x1000 DWORD dwType; // Must be 0x1000.
LPCSTR szName; // pointer to name (in user addr space) LPCSTR szName; // Pointer to name (in user addr space).
DWORD dwThreadID; // thread ID (-1=caller thread) DWORD dwThreadID; // Thread ID (-1 = caller thread).
DWORD dwFlags; // reserved for future use, must be zero DWORD dwFlags; // Reserved for future use, must be zero.
} THREADNAME_INFO; } THREADNAME_INFO;
#pragma pack(pop)
void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName) static void SetThreadName(DWORD dwThreadID, const char * threadName)
{ {
THREADNAME_INFO info; THREADNAME_INFO info;
info.dwType = 0x1000; info.dwType = 0x1000;
info.szName = szThreadName; info.szName = threadName;
info.dwThreadID = dwThreadID; info.dwThreadID = dwThreadID;
info.dwFlags = 0; info.dwFlags = 0;
__try __try
{ {
RaiseException( 0x406D1388, 0, sizeof(info)/sizeof(DWORD), (DWORD*)&info ); RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR *)&info);
} }
__except(EXCEPTION_CONTINUE_EXECUTION) __except (EXCEPTION_EXECUTE_HANDLER)
{ {
} }
} }