call nfy_delmodule in freelibrary and don't call a getmessage hook fo…

…r task messages (#1289)
otya128 · Apr 9, 2023 · e4a9621 · e4a9621
1 parent 56fa4cb
commit e4a9621
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/krnl386/ne_module.c b/krnl386/ne_module.c
@@ -1645,8 +1645,11 @@ static BOOL16 NE_FreeModule( HMODULE16 hModule, BOOL call_wep, BOOL cleanup )
 
     /* Free the objects owned by the DLL module */
     if (cleanup)
+    {
+        if (pModule->ne_flags & NE_FFLAGS_LIBMODULE)
+            TOOLHELP_CallNotify(NFY_DELMODULE, hModule);
         NE_CallUserSignalProc( hModule, USIG16_DLL_UNLOAD, 0, 0, 0 );
-
+    }
 
     if (call_wep && !(pModule->ne_flags & NE_FFLAGS_WIN32))
     {

diff --git a/user/hook.c b/user/hook.c
@@ -532,6 +532,8 @@ static LRESULT CALLBACK call_WH_GETMESSAGE( INT code, WPARAM wp, LPARAM lp, BOOL
     LRESULT result;
     CallNextHookEx(get_hhook(WH_GETMESSAGE, global), code, wp, lp);
 
+    if (global && !msg->hwnd) return 1; // XXX: a thread message can cause the hook to be called in the wrong context
+
     params.time   = msg->time;
     params.pt.x   = msg->pt.x;
     params.pt.y   = msg->pt.y;