From: Jacek Caban Subject: [PATCH 2/2] winemac.drv: Added ThreadDetach entry point and use it instead of DllMain. Message-Id: <504a3a53-5aa8-0131-7262-511ab66606a6@codeweavers.com> Date: Thu, 25 Aug 2016 14:36:54 +0200 Signed-off-by: Jacek Caban --- dlls/winemac.drv/macdrv_main.c | 8 +++----- dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2ce78d1..3b11751 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -290,9 +290,9 @@ static BOOL process_attach(void) /*********************************************************************** - * thread_detach + * ThreadDetach (MACDRV.@) */ -static void thread_detach(void) +void CDECL macdrv_ThreadDetach(void) { struct macdrv_thread_data *data = macdrv_thread_data(); @@ -382,12 +382,10 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); macdrv_module = hinst; ret = process_attach(); break; - case DLL_THREAD_DETACH: - thread_detach(); - break; } return ret; } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index aed05d9..2e29722 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -42,6 +42,7 @@ @ cdecl ShowWindow(long long ptr long) macdrv_ShowWindow @ cdecl SysCommand(long long long) macdrv_SysCommand @ cdecl SystemParametersInfo(long long ptr long) macdrv_SystemParametersInfo +@ cdecl ThreadDetach() macdrv_ThreadDetach @ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx @ cdecl UnregisterHotKey(long long long) macdrv_UnregisterHotKey @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow