diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 21:33:57 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 21:33:57 +0200 |
| commit | 7c4d50dccf3080965c202f63aa56439e3824eaf3 (patch) | |
| tree | 59026bd0f554a24878db82841a508c8fa7ca8356 /nsprpub/pr/src/md/windows/ntthread.c | |
| parent | fba28f19754f62b5227650143d5441fc86d4c7d7 (diff) | |
| download | UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.tar UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.tar.gz UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.tar.lz UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.tar.xz UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.zip | |
Revert "Update NSPR to 4.18"
This reverts commit 8781f745556be5d7402d0f3adc67ecfe32fe04a0.
Diffstat (limited to 'nsprpub/pr/src/md/windows/ntthread.c')
| -rw-r--r-- | nsprpub/pr/src/md/windows/ntthread.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/nsprpub/pr/src/md/windows/ntthread.c b/nsprpub/pr/src/md/windows/ntthread.c index 1fdf0e93b..fead1236d 100644 --- a/nsprpub/pr/src/md/windows/ntthread.c +++ b/nsprpub/pr/src/md/windows/ntthread.c @@ -27,9 +27,6 @@ PRUint32 _nt_idleCount; extern __declspec(thread) PRThread *_pr_io_restarted_io; extern DWORD _pr_io_restartedIOIndex; -typedef HRESULT (WINAPI *SETTHREADDESCRIPTION)(HANDLE, PCWSTR); -static SETTHREADDESCRIPTION sSetThreadDescription = NULL; - /* Must check the restarted_io *before* decrementing no_sched to 0 */ #define POST_SWITCH_WORK() \ PR_BEGIN_MACRO \ @@ -82,8 +79,6 @@ _nt_handle_restarted_io(PRThread *restarted_io) void _PR_MD_EARLY_INIT() { - HMODULE hModule; - _MD_NEW_LOCK( &_nt_idleLock ); _nt_idleCount = 0; PR_INIT_CLIST(&_nt_idleList); @@ -103,15 +98,6 @@ _PR_MD_EARLY_INIT() _pr_intsOffIndex = TlsAlloc(); _pr_io_restartedIOIndex = TlsAlloc(); } - - // SetThreadDescription is Windows 10 build 1607+ - hModule = GetModuleHandleW(L"kernel32.dll"); - if (hModule) { - sSetThreadDescription = - (SETTHREADDESCRIPTION) GetProcAddress( - hModule, - "SetThreadDescription"); - } } void _PR_MD_CLEANUP_BEFORE_EXIT(void) @@ -307,16 +293,7 @@ _PR_MD_SET_CURRENT_THREAD_NAME(const char *name) { #ifdef _MSC_VER THREADNAME_INFO info; -#endif - - if (sSetThreadDescription) { - WCHAR wideName[MAX_PATH]; - if (MultiByteToWideChar(CP_ACP, 0, name, -1, wideName, MAX_PATH)) { - sSetThreadDescription(GetCurrentThread(), wideName); - } - } -#ifdef _MSC_VER if (!IsDebuggerPresent()) return; |