From d8f1c974528897e63f0a0b3c873e6e30a319f88f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jun 2012 20:43:00 +0000 Subject: - hook calls were too optimized; - correct Thread_SetName prototype git-svn-id: http://svn.miranda-ng.org/main/trunk@688 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Mir_core/modules.cpp | 2 +- plugins/Mir_core/threads.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/Mir_core') diff --git a/plugins/Mir_core/modules.cpp b/plugins/Mir_core/modules.cpp index bd8636ccb8..121ed1282b 100644 --- a/plugins/Mir_core/modules.cpp +++ b/plugins/Mir_core/modules.cpp @@ -236,7 +236,7 @@ static bool checkHook(HANDLE hHook) { if (p->secretSignature != HOOK_SECRET_SIGNATURE) ret = false; - else if (p->subscriberCount == 0) + else if (p->subscriberCount == 0 && p->pfnHook == NULL) ret = false; else ret = true; diff --git a/plugins/Mir_core/threads.cpp b/plugins/Mir_core/threads.cpp index 68fb526f5d..90dcdaaf5d 100644 --- a/plugins/Mir_core/threads.cpp +++ b/plugins/Mir_core/threads.cpp @@ -354,12 +354,12 @@ typedef struct tagTHREADNAME_INFO } THREADNAME_INFO; #pragma pack(pop) -MIR_CORE_DLL(void) Thread_SetName(DWORD dwThreadID, const char *szThreadName) +MIR_CORE_DLL(void) Thread_SetName(const char *szThreadName) { THREADNAME_INFO info; info.dwType = 0x1000; info.szName = szThreadName; - info.dwThreadID = dwThreadID; + info.dwThreadID = GetCurrentThreadId(); info.dwFlags = 0; __try -- cgit v1.2.3