Misc: Move os_set_thread_name method

univrsal · Aug 20, 2022 · 828190f · 828190f
1 parent 8cfe277
commit 828190f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 25 deletions.
diff --git a/src/network/mg.cpp b/src/network/mg.cpp
@@ -9,31 +9,8 @@
 #include "../util/log.h"
 #include "../util/settings.h"
 
-#if _WIN32
-#include <windows.h>
-const DWORD MS_VC_EXCEPTION = 0x406D1388;
-#pragma pack(push, 8)
-typedef struct tagTHREADNAME_INFO {
-    DWORD dwType;     // Must be 0x1000.
-    LPCSTR szName;    // Pointer to name (in user addr space).
-    DWORD dwThreadID; // Thread ID (-1=caller thread).
-    DWORD dwFlags;    // Reserved for future use, must be zero.
-} THREADNAME_INFO;
-#pragma pack(pop)
-
-inline void os_set_thread_name(const char *name)
-{
-    THREADNAME_INFO info;
-    info.dwType = 0x1000;
-    info.szName = name;
-    info.dwThreadID = GetCurrentThreadId();
-    info.dwFlags = 0;
-
-    __try {
-        RaiseException(0x406D1388, 0, sizeof(info) / sizeof(DWORD), (const ULONG_PTR *)&info);
-    } __except (EXCEPTION_CONTINUE_EXECUTION) {
-    }
-}
+#ifdef _WIN32
+#include "../util/obs_util.hpp"
 #else
 #include <util/threading.h>
 #endif

diff --git a/src/util/obs_util.cpp b/src/util/obs_util.cpp
@@ -97,3 +97,30 @@ bool util_write_json(const QString &path, const QJsonDocument &doc)
     }
     return result;
 }
+
+#if _WIN32
+#include <windows.h>
+const DWORD MS_VC_EXCEPTION = 0x406D1388;
+#pragma pack(push, 8)
+typedef struct tagTHREADNAME_INFO {
+    DWORD dwType;     // Must be 0x1000.
+    LPCSTR szName;    // Pointer to name (in user addr space).
+    DWORD dwThreadID; // Thread ID (-1=caller thread).
+    DWORD dwFlags;    // Reserved for future use, must be zero.
+} THREADNAME_INFO;
+#pragma pack(pop)
+
+inline void os_set_thread_name(const char *name)
+{
+    THREADNAME_INFO info;
+    info.dwType = 0x1000;
+    info.szName = name;
+    info.dwThreadID = GetCurrentThreadId();
+    info.dwFlags = 0;
+
+    __try {
+        RaiseException(0x406D1388, 0, sizeof(info) / sizeof(DWORD), (const ULONG_PTR *)&info);
+    } __except (EXCEPTION_CONTINUE_EXECUTION) {
+    }
+}
+#endif
diff --git a/src/util/obs_util.hpp b/src/util/obs_util.hpp
@@ -56,3 +56,8 @@ QString util_get_data_file(const QString &file_name);
 extern void GetWindowList(std::vector<std::string> &windows);
 
 extern void GetCurrentWindowTitle(std::string &title);
+
+
+#if _WIN32
+extern void os_set_thread_name(const char *);
+#endif