user32: Introduced ThreadDetach driver entry point.

The problem was diagnosed by Ken Thomases. Currently drivers use DllMain(DLL_THREAD_DETACH) to release thread data. The problem is that DLLs (like native urlmon.dll, esp. reproducible in IE8) may still do user32 calls after driver detaches thread. Loader ensures that since user32.dll was loaded before dependent DLLs, user32's DllMain will be called in the right moment. Due to lazy loading of drivers, we have no control over them. We may use a new entry point to make sure that we detach user32 and driver at the same time. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Introduced ThreadDetach driver entry point.
f0e7bd24 · Jacek Caban · Alexandre Julliard · 505406fc · f0e7bd24 · f0e7bd24
Commit f0e7bd24 authored Aug 25, 2016 by Jacek Caban Committed by Alexandre Julliard Aug 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

driver.c dlls/user32/driver.c +11 -2

user_main.c dlls/user32/user_main.c +1 -0

user_private.h dlls/user32/user_private.h +2 -0

No files found.
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -155,6 +155,7 @@ static const USER_DRIVER *load_driver(void)
        GET_USER_FUNC(WindowPosChanging);
        GET_USER_FUNC(WindowPosChanged);
        GET_USER_FUNC(SystemParametersInfo);
+        GET_USER_FUNC(ThreadDetach);
 #undef GET_USER_FUNC
    }

@@ -512,6 +513,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
    return FALSE;
 }

+static void CDECL nulldrv_ThreadDetach( void )
+{
+}
+
 static USER_DRIVER null_driver =
 {
    /* keyboard functions */
@@ -572,7 +577,9 @@ static USER_DRIVER null_driver =
    nulldrv_WindowPosChanging,
    nulldrv_WindowPosChanged,
    /* system parameters */
-    nulldrv_SystemParametersInfo
+    nulldrv_SystemParametersInfo,
+    /* thread management */
+    nulldrv_ThreadDetach
 };


@@ -827,5 +834,7 @@ static USER_DRIVER lazy_load_driver =
    nulldrv_WindowPosChanging,
    nulldrv_WindowPosChanged,
    /* system parameters */
-    nulldrv_SystemParametersInfo
+    nulldrv_SystemParametersInfo,
+    /* thread management */
+    nulldrv_ThreadDetach
 };
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -303,6 +303,7 @@ static void thread_detach(void)
    exiting_thread_id = GetCurrentThreadId();

    WDML_NotifyThreadDetach();
+    USER_Driver->pThreadDetach();

    if (thread_info->top_window) WIN_DestroyThreadWindows( thread_info->top_window );
    if (thread_info->msg_window) WIN_DestroyThreadWindows( thread_info->msg_window );

--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -117,6 +117,8 @@ typedef struct tagUSER_DRIVER {
    void   (CDECL *pWindowPosChanged)(HWND,HWND,UINT,const RECT *,const RECT *,const RECT *,const RECT *,struct window_surface*);
    /* system parameters */
    BOOL   (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);
+    /* thread management */
+    void   (CDECL *pThreadDetach)(void);
 } USER_DRIVER;

 extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN;