sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/ThreadImpl: Fix GetThreadDescription link error on older Windows

Browse Source
This commit is contained in:
SirLynix
2023-07-21 09:01:15 +02:00
parent fbf4da3c4f
commit ef669d8c9a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Core/Win32/ThreadImpl.cpp
View File

@@ -12,7 +12,8 @@ namespace Nz::PlatformImpl
#ifndef NAZARA_COMPILER_MINGW #ifndef NAZARA_COMPILER_MINGW
namespace NAZARA_ANONYMOUS_NAMESPACE namespace NAZARA_ANONYMOUS_NAMESPACE
{ {
// Windows 10, version 1607 added SetThreadDescription in order to name a thread // Windows 10, version 1607 added GetThreadDescription and SetThreadDescription in order to name a thread
using GetThreadDescriptionFunc = HRESULT(WINAPI*)(HANDLE hThread, PWSTR* ppszThreadDescription);
using SetThreadDescriptionFunc = HRESULT(WINAPI*)(HANDLE hThread, PCWSTR lpThreadDescription); using SetThreadDescriptionFunc = HRESULT(WINAPI*)(HANDLE hThread, PCWSTR lpThreadDescription);
#ifdef NAZARA_COMPILER_MSVC #ifdef NAZARA_COMPILER_MSVC
@@ -46,7 +47,12 @@ namespace Nz::PlatformImpl
std::string GetThreadName(ThreadHandle threadHandle) std::string GetThreadName(ThreadHandle threadHandle)
{ {
#ifndef NAZARA_COMPILER_MINGW #ifndef NAZARA_COMPILER_MINGW
// Use GetThreadDescription if available
PWSTR namePtr; PWSTR namePtr;
static GetThreadDescriptionFunc GetThreadDescription = reinterpret_cast<GetThreadDescriptionFunc>(::GetProcAddress(::GetModuleHandleW(L"Kernel32.dll"), "GetThreadDescription"));
if (!GetThreadDescription)
return "<GetThreadDescription not supported>";
HRESULT hr = ::GetThreadDescription(threadHandle, &namePtr); HRESULT hr = ::GetThreadDescription(threadHandle, &namePtr);
if (FAILED(hr)) if (FAILED(hr))
return "<GetThreadDescription failed: " + std::to_string(HRESULT_CODE(hr)) + ">"; return "<GetThreadDescription failed: " + std::to_string(HRESULT_CODE(hr)) + ">";