Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 14:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LDR] Add debug logging when we encountered an exception in dll/tls callbacks.

Browse source 
CORE-14532
This commit is contained in:
Mark Jansen 2018-07-29 17:13:42 +02:00
parent dfff8ed0d8
commit 55053f0099
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
4 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dll/ntdll/include/ntdllp.h
View file

@ -62,9 +62,9 @@ VOID NTAPI LdrpInitializeThread(IN PCONTEXT Context);
NTSTATUS NTAPI LdrpInitializeTls(VOID); NTSTATUS NTAPI LdrpInitializeTls(VOID);
NTSTATUS NTAPI LdrpAllocateTls(VOID); NTSTATUS NTAPI LdrpAllocateTls(VOID);
VOID NTAPI LdrpFreeTls(VOID); VOID NTAPI LdrpFreeTls(VOID);
VOID NTAPI LdrpCallTlsInitializers(PVOID BaseAddress, ULONG Reason); VOID NTAPI LdrpCallTlsInitializers(IN PLDR_DATA_TABLE_ENTRY LdrEntry, IN ULONG Reason);
BOOLEAN NTAPI LdrpCallInitRoutine(PDLL_INIT_ROUTINE EntryPoint, PVOID BaseAddress, ULONG Reason, PVOID Context); BOOLEAN NTAPI LdrpCallInitRoutine(IN PDLL_INIT_ROUTINE EntryPoint, IN PVOID BaseAddress, IN ULONG Reason, IN PVOID Context);
NTSTATUS NTAPI LdrpInitializeProcess(PCONTEXT Context, PVOID SystemArgument1); NTSTATUS NTAPI LdrpInitializeProcess(IN PCONTEXT Context, IN PVOID SystemArgument1);
VOID NTAPI LdrpInitFailure(NTSTATUS Status); VOID NTAPI LdrpInitFailure(NTSTATUS Status);
VOID NTAPI LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry); VOID NTAPI LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry);
VOID NTAPI LdrpEnsureLoaderLockIsHeld(VOID); VOID NTAPI LdrpEnsureLoaderLockIsHeld(VOID);

3
dll/ntdll/ldr/ldrapi.c
View file

@ -1485,7 +1485,8 @@ LdrUnloadDll(IN PVOID BaseAddress)
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
/* Do nothing */ DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_PROCESS_DETACH) for %wZ\n",
_SEH2_GetExceptionCode(), &LdrEntry->BaseDllName);
} }
_SEH2_END; _SEH2_END;

27
dll/ntdll/ldr/ldrinit.c
View file

@ -561,7 +561,7 @@ LdrpInitializeThread(IN PCONTEXT Context)
if (!LdrpShutdownInProgress) if (!LdrpShutdownInProgress)
{ {
/* Call TLS */ /* Call TLS */
LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_ATTACH); LdrpCallTlsInitializers(LdrEntry, DLL_THREAD_ATTACH);
} }
} }
@ -581,7 +581,8 @@ LdrpInitializeThread(IN PCONTEXT Context)
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
/* Do nothing */ DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_THREAD_ATTACH) for %wZ\n",
_SEH2_GetExceptionCode(), &LdrEntry->BaseDllName);
} }
_SEH2_END; _SEH2_END;
@ -610,7 +611,7 @@ LdrpInitializeThread(IN PCONTEXT Context)
_SEH2_TRY _SEH2_TRY
{ {
/* Do TLS callbacks */ /* Do TLS callbacks */
LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_ATTACH); LdrpCallTlsInitializers(LdrpImageEntry, DLL_THREAD_ATTACH);
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
@ -818,7 +819,7 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL)
if (LdrEntry->TlsIndex && Context) if (LdrEntry->TlsIndex && Context)
{ {
/* Call TLS */ /* Call TLS */
LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_ATTACH); LdrpCallTlsInitializers(LdrEntry, DLL_PROCESS_ATTACH);
} }
/* Call the Entrypoint */ /* Call the Entrypoint */
@ -835,6 +836,8 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL)
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
DllStatus = FALSE; DllStatus = FALSE;
DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_PROCESS_ATTACH) for %wZ\n",
_SEH2_GetExceptionCode(), &LdrEntry->BaseDllName);
} }
_SEH2_END; _SEH2_END;
@ -889,7 +892,7 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL)
_SEH2_TRY _SEH2_TRY
{ {
/* Do TLS callbacks */ /* Do TLS callbacks */
LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); LdrpCallTlsInitializers(LdrpImageEntry, DLL_PROCESS_ATTACH);
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
@ -996,7 +999,7 @@ LdrShutdownProcess(VOID)
if (LdrEntry->TlsIndex) if (LdrEntry->TlsIndex)
{ {
/* Call TLS */ /* Call TLS */
LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_DETACH); LdrpCallTlsInitializers(LdrEntry, DLL_PROCESS_DETACH);
} }
/* Call the Entrypoint */ /* Call the Entrypoint */
@ -1009,7 +1012,8 @@ LdrShutdownProcess(VOID)
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
/* Do nothing */ DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_PROCESS_DETACH) for %wZ\n",
_SEH2_GetExceptionCode(), &LdrEntry->BaseDllName);
} }
_SEH2_END; _SEH2_END;
@ -1034,7 +1038,7 @@ LdrShutdownProcess(VOID)
_SEH2_TRY _SEH2_TRY
{ {
/* Do TLS callbacks */ /* Do TLS callbacks */
LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); LdrpCallTlsInitializers(LdrpImageEntry, DLL_PROCESS_DETACH);
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
@ -1123,7 +1127,7 @@ LdrShutdownThread(VOID)
if (!LdrpShutdownInProgress) if (!LdrpShutdownInProgress)
{ {
/* Call TLS */ /* Call TLS */
LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_DETACH); LdrpCallTlsInitializers(LdrEntry, DLL_THREAD_DETACH);
} }
} }
@ -1141,7 +1145,8 @@ LdrShutdownThread(VOID)
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
/* Do nothing */ DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_THREAD_DETACH) for %wZ\n",
_SEH2_GetExceptionCode(), &LdrEntry->BaseDllName);
} }
_SEH2_END; _SEH2_END;
@ -1167,7 +1172,7 @@ LdrShutdownThread(VOID)
_SEH2_TRY _SEH2_TRY
{ {
/* Do TLS callbacks */ /* Do TLS callbacks */
LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_DETACH); LdrpCallTlsInitializers(LdrpImageEntry, DLL_THREAD_DETACH);
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {

13
dll/ntdll/ldr/ldrutils.c
View file

@ -470,7 +470,7 @@ LdrpUpdateLoadCount2(IN PLDR_DATA_TABLE_ENTRY LdrEntry,
VOID VOID
NTAPI NTAPI
LdrpCallTlsInitializers(IN PVOID BaseAddress, LdrpCallTlsInitializers(IN PLDR_DATA_TABLE_ENTRY LdrEntry,
IN ULONG Reason) IN ULONG Reason)
{ {
PIMAGE_TLS_DIRECTORY TlsDirectory; PIMAGE_TLS_DIRECTORY TlsDirectory;
@ -478,7 +478,7 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress,
ULONG Size; ULONG Size;
/* Get the TLS Directory */ /* Get the TLS Directory */
TlsDirectory = RtlImageDirectoryEntryToData(BaseAddress, TlsDirectory = RtlImageDirectoryEntryToData(LdrEntry->DllBase,
TRUE, TRUE,
IMAGE_DIRECTORY_ENTRY_TLS, IMAGE_DIRECTORY_ENTRY_TLS,
&Size); &Size);
@ -497,7 +497,7 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress,
if (ShowSnaps) if (ShowSnaps)
{ {
DPRINT1("LDR: Tls Callbacks Found. Imagebase %p Tls %p CallBacks %p\n", DPRINT1("LDR: Tls Callbacks Found. Imagebase %p Tls %p CallBacks %p\n",
BaseAddress, TlsDirectory, Array); LdrEntry->DllBase, TlsDirectory, Array);
} }
/* Loop the array */ /* Loop the array */
@ -510,12 +510,12 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress,
if (ShowSnaps) if (ShowSnaps)
{ {
DPRINT1("LDR: Calling Tls Callback Imagebase %p Function %p\n", DPRINT1("LDR: Calling Tls Callback Imagebase %p Function %p\n",
BaseAddress, Callback); LdrEntry->DllBase, Callback);
} }
/* Call it */ /* Call it */
LdrpCallInitRoutine((PDLL_INIT_ROUTINE)Callback, LdrpCallInitRoutine((PDLL_INIT_ROUTINE)Callback,
BaseAddress, LdrEntry->DllBase,
Reason, Reason,
NULL); NULL);
} }
@ -524,7 +524,8 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress,
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
/* Do nothing */ DPRINT1("LDR: Exception 0x%x during Tls Callback(%u) for %wZ\n",
_SEH2_GetExceptionCode(), Reason, &LdrEntry->BaseDllName);
} }
_SEH2_END; _SEH2_END;
} }