marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Store the unhandled exception filter at startup to avoid race conditions.

oldstable
Alexandre Julliard 2008-02-12 22:39:19 +01:00
parent b3115fc60e
commit 78fba54ab7
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ntdll/loader.c
View File

@ -2533,6 +2533,9 @@ void __wine_process_init(void)
MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
exit(1);
}
RtlInitAnsiString( &func_name, "UnhandledExceptionFilter" );
LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, 0, (void **)&unhandled_exception_filter );
RtlInitAnsiString( &func_name, "__wine_kernel_init" );
if ((status = LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name,
0, (void **)&init_func )) != STATUS_SUCCESS)

3
dlls/ntdll/ntdll_misc.h
View File

@ -94,6 +94,9 @@ extern void SNOOP_SetupDLL( HMODULE hmod );
extern UNICODE_STRING windows_dir;
extern UNICODE_STRING system_dir;
typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS);
extern PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter;
/* redefine these to make sure we don't reference kernel symbols */
#define GetProcessHeap() (NtCurrentTeb()->Peb->ProcessHeap)
#define GetCurrentProcessId() (HandleToULong(NtCurrentTeb()->ClientId.UniqueProcess))

27
dlls/ntdll/thread.c
View File

@ -48,6 +48,8 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
struct _KUSER_SHARED_DATA *user_shared_data = NULL;
PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL;
/* info passed to a starting thread */
struct startup_info
{
@ -339,27 +341,6 @@ HANDLE thread_init(void)
return exe_file;
}
typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS);
static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void)
{
static PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter;
static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0};
UNICODE_STRING module_name;
ANSI_STRING func_name;
HMODULE kernel32_handle;
if (unhandled_exception_filter) return unhandled_exception_filter;
RtlInitUnicodeString(&module_name, kernel32W);
RtlInitAnsiString( &func_name, "UnhandledExceptionFilter" );
if (LdrGetDllHandle( 0, 0, &module_name, &kernel32_handle ) == STATUS_SUCCESS)
LdrGetProcedureAddress( kernel32_handle, &func_name, 0,
(void **)&unhandled_exception_filter );
return unhandled_exception_filter;
}
#ifdef __i386__
/* wrapper for apps that don't declare the thread function correctly */
extern DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg );
@ -465,13 +446,13 @@ static void start_thread( struct wine_pthread_thread_info *info )
/* NOTE: Windows does not have an exception handler around the call to
* the thread attach. We do for ease of debugging */
if (get_unhandled_exception_filter())
if (unhandled_exception_filter)
{
__TRY
{
call_thread_func( func, arg );
}
__EXCEPT(get_unhandled_exception_filter())
__EXCEPT(unhandled_exception_filter)
{
NtTerminateThread( GetCurrentThread(), GetExceptionCode() );
}