backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-07-13 01:07:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove WinAPI types from thread naming

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-14 06:32:13 +11:00
parent 2180aaa4bc
commit 123877d887
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.World/Util/C4JThread.h
View file

@ -1,4 +1,5 @@
#pragma once
#include <cstdint>
#include <queue>
typedef int (C4JThreadStartFunc)(void* lpThreadParameter);
@ -221,5 +222,4 @@ private:
static DWORD WINAPI entryPoint(LPVOID lpParam);
#endif
};
void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName );
void SetThreadName(std::uint32_t threadId, const char *threadName);

19
Minecraft.World/Util/ThreadName.cpp
View file

@ -1,28 +1,29 @@
#include "../Platform/stdafx.h"
#include <cstdint>
// From Xbox documentation
typedef struct tagTHREADNAME_INFO {
DWORD dwType; // Must be 0x1000
LPCSTR szName; // Pointer to name (in user address space)
DWORD dwThreadID; // Thread ID (-1 for caller thread)
DWORD dwFlags; // Reserved for future use; must be zero
std::uint32_t dwType; // Must be 0x1000
const char *szName; // Pointer to name (in user address space)
std::uint32_t dwThreadID; // Thread ID (-1 for caller thread)
std::uint32_t dwFlags; // Reserved for future use; must be zero
} THREADNAME_INFO;
void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName )
void SetThreadName(std::uint32_t threadId, const char *threadName)
{
#ifndef __PS3__
THREADNAME_INFO info;
info.dwType = 0x1000;
info.szName = szThreadName;
info.dwThreadID = dwThreadID;
info.szName = threadName;
info.dwThreadID = threadId;
info.dwFlags = 0;
#if ( defined _WINDOWS64 | defined _DURANGO )
__try
{
RaiseException( 0x406D1388, 0, sizeof(info)/sizeof(DWORD), (ULONG_PTR *)&info );
RaiseException(0x406D1388, 0, sizeof(info) / sizeof(std::uint32_t), reinterpret_cast<ULONG_PTR *>(&info));
}
__except( GetExceptionCode()==0x406D1388 ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_EXECUTE_HANDLER )
{
@ -31,7 +32,7 @@ void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName )
#ifdef _XBOX
__try
{
RaiseException( 0x406D1388, 0, sizeof(info)/sizeof(DWORD), (DWORD *)&info );
RaiseException(0x406D1388, 0, sizeof(info) / sizeof(std::uint32_t), reinterpret_cast<std::uint32_t *>(&info));
}
__except( GetExceptionCode()==0x406D1388 ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_EXECUTE_HANDLER )
{

3
Minecraft.World/Util/ThreadName.h
View file

@ -1,3 +1,4 @@
#pragma once
#include <cstdint>
void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName );
void SetThreadName(std::uint32_t threadId, const char *threadName);