ntdll: When an exception happens in DllMain(), print the code.

Also print exceptions from TLS callbacks. Useful for debugging exceptions that prevent DLLs from loading. Signed-off-by: Chip Davis <cdavis@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: When an exception happens in DllMain(), print the code.
e6c6874e · Chip Davis · Alexandre Julliard · d4e0f0a1 · e6c6874e
Commit e6c6874e authored Aug 20, 2018 by Chip Davis Committed by Alexandre Julliard Aug 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

loader.c dlls/ntdll/loader.c +4 -4

No files found.
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -1175,8 +1175,8 @@ static void call_tls_callbacks( HMODULE module, UINT reason )
        }
        __EXCEPT_ALL
        {
-            TRACE_(relay)("\1exception in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n",
-                          callback, module, reason_names[reason] );
+            TRACE_(relay)("\1exception %08x in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n",
+                          GetExceptionCode(), callback, module, reason_names[reason] );
            return;
        }
        __ENDTRY
@@ -1222,9 +1222,9 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved 
    }
    __EXCEPT_ALL
    {
-        TRACE_(relay)("\1exception in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n",
-                      entry, module, reason_names[reason], lpReserved );
        status = GetExceptionCode();
+        TRACE_(relay)("\1exception %08x in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n",
+                      status, entry, module, reason_names[reason], lpReserved );
    }
    __ENDTRY