diff options
Diffstat (limited to 'dll.c')
| -rw-r--r-- | dll.c | 117 |
1 files changed, 10 insertions, 107 deletions
@@ -27,22 +27,9 @@ #include "pthread.h" #include "implement.h" - -/* - * Function pointer to TryEnterCriticalSection if it exists; otherwise NULL - */ -BOOL (WINAPI *ptw32_try_enter_critical_section)(LPCRITICAL_SECTION) = NULL; - -/* - * We use this to double-check that TryEnterCriticalSection works. - */ -CRITICAL_SECTION cs; - -/* - * Handle to kernel32.dll - */ -static HINSTANCE ptw32_h_kernel32; - +#if 1 +#include <stdio.h> +#endif #ifdef _MSC_VER /* @@ -79,110 +66,26 @@ DllMain ( { case DLL_PROCESS_ATTACH: - /* - * The DLL is being mapped into the process's address space - */ - result = ptw32_processInitialize (); - - /* Load KERNEL32 and try to get address of TryEnterCriticalSection */ - ptw32_h_kernel32 = LoadLibrary(TEXT("KERNEL32.DLL")); - ptw32_try_enter_critical_section = - (BOOL (PT_STDCALL *)(LPCRITICAL_SECTION)) - -#if defined(NEED_UNICODE_CONSTS) - GetProcAddress(ptw32_h_kernel32, - (const TCHAR *)TEXT("TryEnterCriticalSection")); -#else - GetProcAddress(ptw32_h_kernel32, - (LPCSTR) "TryEnterCriticalSection"); -#endif - - if (ptw32_try_enter_critical_section != NULL) - { - InitializeCriticalSection(&cs); - if ((*ptw32_try_enter_critical_section)(&cs)) - { - LeaveCriticalSection(&cs); - } - else - { - /* - * Not really supported (Win98?). - */ - ptw32_try_enter_critical_section = NULL; - } - DeleteCriticalSection(&cs); - } - - if (ptw32_try_enter_critical_section == NULL) - { - /* - * If TryEnterCriticalSection is not being used, then free - * the kernel32.dll handle now, rather than leaving it until - * DLL_PROCESS_DETACH. - * - * Note: this is not a pedantic exercise in freeing unused - * resources! It is a work-around for a bug in Windows 95 - * (see microsoft knowledge base article, Q187684) which - * does Bad Things when FreeLibrary is called within - * the DLL_PROCESS_DETACH code, in certain situations. - * Since w95 just happens to be a platform which does not - * provide TryEnterCriticalSection, the bug will be - * effortlessly avoided. - */ - (void) FreeLibrary(ptw32_h_kernel32); - ptw32_h_kernel32 = 0; - } + result = pthread_win32_process_attach_np(); break; case DLL_THREAD_ATTACH: /* * A thread is being created */ - result = TRUE; + result = pthread_win32_thread_attach_np(); break; case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: /* * A thread is exiting cleanly - * NOTE: The "main" thread detaches using - * DLL_PROCESS_DETACH */ - { - pthread_t self; - - if (ptw32_processInitialized) - { - self = (pthread_t) pthread_getspecific (ptw32_selfThreadKey); - - /* - * Detached threads have their resources automatically - * cleaned up upon exit (others must be 'joined'). - */ - if (self != NULL && - self->detachState == PTHREAD_CREATE_DETACHED) - { - pthread_setspecific (ptw32_selfThreadKey, NULL); - ptw32_threadDestroy (self); - } - - if (fdwReason == DLL_PROCESS_DETACH) - { - /* - * The DLL is being unmapped into the process's address space - */ - ptw32_processTerminate (); - - if (ptw32_h_kernel32) - { - (void) FreeLibrary(ptw32_h_kernel32); - } - } - } + result = pthread_win32_thread_detach_np(); + break; - result = TRUE; - } + case DLL_PROCESS_DETACH: + (void) pthread_win32_thread_detach_np(); + result = pthread_win32_process_detach_np(); break; } return (result); |