summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mir_core/threads.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mir_core/threads.cpp b/src/mir_core/threads.cpp
index 58f7086676..b1d6a23ebd 100644
--- a/src/mir_core/threads.cpp
+++ b/src/mir_core/threads.cpp
@@ -88,7 +88,7 @@ struct THREAD_WAIT_ENTRY
DWORD dwThreadId; // valid if hThread isn't signalled
HANDLE hThread;
HINSTANCE hOwner;
- void *pObject;
+ void *pObject, *pEntryPoint;
};
static LIST<THREAD_WAIT_ENTRY> threads(10, NumericKeySortT);
@@ -230,7 +230,7 @@ static void CALLBACK KillAllThreads(HWND, UINT, UINT_PTR, DWORD)
THREAD_WAIT_ENTRY *p = threads[j];
char szModuleName[MAX_PATH];
GetModuleFileNameA(p->hOwner, szModuleName, sizeof(szModuleName));
- Netlib_Logf(0, "Killing thread %s:%p", szModuleName, p->dwThreadId);
+ Netlib_Logf(0, "Killing thread %s:%p (%p)", szModuleName, p->dwThreadId, p->pEntryPoint);
TerminateThread(p->hThread, 9999);
CloseHandle(p->hThread);
mir_free(p);
@@ -295,6 +295,7 @@ MIR_CORE_DLL(INT_PTR) Thread_Push(HINSTANCE hInst, void* pOwner)
p->hOwner = hInst;
else
p->hOwner = GetInstByAddress((hInst != NULL) ? (PVOID)hInst : GetCurrentThreadEntryPoint());
+ p->pEntryPoint = hInst;
threads.insert(p);