system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-20 06:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntdll: Always restore the %gs register from the saved value in thread data.

Browse source
This commit is contained in:
Alexandre Julliard 2008-07-08 20:54:40 +02:00
parent 4ea173ef9b
commit 13fbba6847
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
dlls/ntdll/signal_i386.c
View file

@ -582,10 +582,10 @@ typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context );
* init_handler * init_handler
* *
* Handler initialization when the full context is not needed. * Handler initialization when the full context is not needed.
* Return the stack pointer to use for pushing the exception data.
*/ */
static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs ) static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs )
{ {
void *stack = (void *)(ESP_sig(sigcontext) & ~3);
TEB *teb = get_current_teb(); TEB *teb = get_current_teb();
struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SystemReserved2; struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SystemReserved2;
@ -602,8 +602,8 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *
#endif #endif
wine_set_fs( thread_data->fs ); wine_set_fs( thread_data->fs );
wine_set_gs( thread_data->gs );
/* now restore a proper %gs for the fault handler */
if (!wine_ldt_is_system(CS_sig(sigcontext)) || if (!wine_ldt_is_system(CS_sig(sigcontext)) ||
!wine_ldt_is_system(SS_sig(sigcontext))) /* 16-bit mode */ !wine_ldt_is_system(SS_sig(sigcontext))) /* 16-bit mode */
{ {
@ -614,24 +614,9 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *
* SS is still non-system segment. This is why both CS and SS * SS is still non-system segment. This is why both CS and SS
* are checked. * are checked.
*/ */
wine_set_gs( thread_data->gs ); return teb->WOW32Reserved;
stack = teb->WOW32Reserved;
} }
#ifdef __HAVE_VM86 return (void *)(ESP_sig(sigcontext) & ~3);
else if ((void *)EIP_sig(sigcontext) == vm86_return) /* vm86 mode */
{
unsigned int *int_stack = stack;
/* fetch the saved %gs from the stack */
wine_set_gs( int_stack[0] );
}
#endif
else /* 32-bit mode */
{
#ifdef GS_sig
wine_set_gs( GS_sig(sigcontext) );
#endif
}
return stack;
} }
@ -1553,6 +1538,8 @@ void signal_init_thread(void)
ss.ss_flags = 0; ss.ss_flags = 0;
if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" ); if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" );
#endif /* HAVE_SIGALTSTACK */ #endif /* HAVE_SIGALTSTACK */
ntdll_get_thread_data()->gs = wine_get_gs();
} }
/********************************************************************** /**********************************************************************