July 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Set the visible rect in the set_window_pos request again.
by Alexandre Julliard July 4, 2008

July 4, 2008

Module: wine Branch: master Commit: 0f9484a1240fdc4d95e53b3a3b7c13a02b608a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9484a1240fdc4d95e53b3a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 20:33:12 2008 +0200 server: Set the visible rect in the set_window_pos request again. This essentially reverts 2f69329a370954188af401f8270c89e626c5b3fd. We really need the visible rect to be set atomically with the rest of the window position info. --- dlls/user32/winpos.c | 31 +++----------- include/wine/server_protocol.h | 20 +--------- server/protocol.def | 9 ---- server/request.h | 2 - server/trace.c | 15 +------ server/window.c | 86 ++++++++-------------------------------- 6 files changed, 26 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f9484a1240fdc4d95e53…

1 0

Massimo Del Fedele : opengl32: glGetString() should return NULL on NULL context.
by Alexandre Julliard July 4, 2008

July 4, 2008

Module: wine Branch: master Commit: d6a6b88f1904783157245cae0b3f5a8d3de1ec20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a6b88f1904783157245cae0… Author: Massimo Del Fedele <max(a)veneto.com> Date: Wed Jul 2 16:51:26 2008 +0200 opengl32: glGetString() should return NULL on NULL context. --- dlls/opengl32/wgl.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6fbdeb4..a07fcf3 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -632,6 +632,11 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ) const GLubyte *ret; const char* GL_Extensions = NULL; + /* this is for buggy nvidia driver, crashing if called from a different + thread with no context */ + if(wglGetCurrentContext() == NULL) + return NULL; + if (GL_EXTENSIONS != name) { ENTER_GL(); ret = glGetString(name);

1 0

Alexandre Julliard : ntdll: Split the signal setup into process-wide and thread-specific routines.
by Alexandre Julliard July 4, 2008

July 4, 2008

Module: wine Branch: master Commit: 531ff0be2601f1e25f01822f0bb0fcd2a655664e URL: http://source.winehq.org/git/wine.git/?a=commit;h=531ff0be2601f1e25f01822f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 20:18:23 2008 +0200 ntdll: Split the signal setup into process-wide and thread-specific routines. --- dlls/ntdll/ntdll_misc.h | 3 ++- dlls/ntdll/server.c | 2 +- dlls/ntdll/signal_i386.c | 25 ++++++++++++++----------- dlls/ntdll/signal_powerpc.c | 17 ++++++++++++----- dlls/ntdll/signal_sparc.c | 16 ++++++++++++---- dlls/ntdll/signal_x86_64.c | 16 ++++++++++++---- dlls/ntdll/thread.c | 2 +- 7 files changed, 54 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 6f428e0..3317a6a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -53,7 +53,8 @@ extern NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handl const LARGE_INTEGER *timeout, HANDLE signal_object ); /* init routines */ -extern BOOL SIGNAL_Init(void); +extern void signal_init_thread(void); +extern void signal_init_process(void); extern size_t get_signal_stack_total_size(void); extern void version_init( const WCHAR *appname ); extern void debug_init(void); diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 3d8beee..6e41eb5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -985,7 +985,7 @@ NTSTATUS server_init_process_done(void) * We do need the handlers in place by the time the request is over, so * we set them up here. If we segfault between here and the server call * something is very wrong... */ - if (!SIGNAL_Init()) exit(1); + signal_init_process(); /* Signal the parent process to continue */ SERVER_START_REQ( init_process_done ) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9edbaa1..4351844 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1533,12 +1533,10 @@ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) /********************************************************************** - * SIGNAL_Init + * signal_init_thread */ -BOOL SIGNAL_Init(void) +void signal_init_thread(void) { - struct sigaction sig_act; - #ifdef HAVE_SIGALTSTACK stack_t ss; @@ -1553,12 +1551,16 @@ BOOL SIGNAL_Init(void) ss.ss_sp = get_signal_stack(); ss.ss_size = signal_stack_size; ss.ss_flags = 0; - if (sigaltstack(&ss, NULL) == -1) - { - perror( "sigaltstack" ); - return FALSE; - } + if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" ); #endif /* HAVE_SIGALTSTACK */ +} + +/********************************************************************** + * signal_init_process + */ +void signal_init_process(void) +{ + struct sigaction sig_act; sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART; @@ -1594,11 +1596,12 @@ BOOL SIGNAL_Init(void) if (sigaction( SIGUSR2, &sig_act, NULL ) == -1) goto error; #endif - return TRUE; + signal_init_thread(); + return; error: perror("sigaction"); - return FALSE; + exit(1); } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index a468754..e65591b 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -648,9 +648,16 @@ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) /********************************************************************** - * SIGNAL_Init + * signal_init_thread */ -BOOL SIGNAL_Init(void) +void signal_init_thread(void) +{ +} + +/********************************************************************** + * signal_init_process + */ +void signal_init_process(void) { if (set_handler( SIGINT, (void (*)())int_handler ) == -1) goto error; if (set_handler( SIGFPE, (void (*)())fpe_handler ) == -1) goto error; @@ -665,12 +672,12 @@ BOOL SIGNAL_Init(void) #ifdef SIGTRAP if (set_handler( SIGTRAP, (void (*)())trap_handler ) == -1) goto error; #endif - - return TRUE; + signal_init_thread(); + return; error: perror("sigaction"); - return FALSE; + exit(1); } diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index d72269a..d3896f3 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -457,9 +457,16 @@ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) /********************************************************************** - * SIGNAL_Init + * signal_init_thread */ -BOOL SIGNAL_Init(void) +void signal_init_thread(void) +{ +} + +/********************************************************************** + * signal_init_process + */ +void signal_init_process(void) { if (set_handler( SIGINT, (void (*)())int_handler ) == -1) goto error; if (set_handler( SIGFPE, (void (*)())fpe_handler ) == -1) goto error; @@ -476,11 +483,12 @@ BOOL SIGNAL_Init(void) this is correct, because that is what x86 does, or it is harmful because it could obscure problems in user code */ asm("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ - return TRUE; + signal_init_thread(); + return; error: perror("sigaction"); - return FALSE; + exit(1); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 8225c6a..a7a0d3b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -481,9 +481,16 @@ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) /********************************************************************** - * SIGNAL_Init + * signal_init_thread */ -BOOL SIGNAL_Init(void) +void signal_init_thread(void) +{ +} + +/********************************************************************** + * signal_init_process + */ +void signal_init_process(void) { if (set_handler( SIGINT, (void (*)())int_handler ) == -1) goto error; if (set_handler( SIGFPE, (void (*)())fpe_handler ) == -1) goto error; @@ -498,11 +505,12 @@ BOOL SIGNAL_Init(void) #ifdef SIGTRAP if (set_handler( SIGTRAP, (void (*)())trap_handler ) == -1) goto error; #endif - return TRUE; + signal_init_thread(); + return; error: perror("sigaction"); - return FALSE; + exit(1); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 4298e95..9411db1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -424,7 +424,7 @@ static void start_thread( struct wine_pthread_thread_info *info ) thread_data->debug_info = &debug_info; pthread_functions.init_current_teb( info ); - SIGNAL_Init(); + signal_init_thread(); server_init_thread( info->pid, info->tid, func ); pthread_functions.init_thread( info ); virtual_alloc_thread_stack( info->stack_base, info->stack_size );

1 0

Alexandre Julliard : kernel32: Use a proper structure for thunks instead of an array of WORDs.
by Alexandre Julliard July 4, 2008

July 4, 2008

Module: wine Branch: master Commit: f3bf2a7045e6c165e01fd7419f6a96d20b60fa41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3bf2a7045e6c165e01fd7419… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 18:15:03 2008 +0200 kernel32: Use a proper structure for thunks instead of an array of WORDs. --- dlls/kernel32/task.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/task.c b/dlls/kernel32/task.c index 03913d7..b2f1ae6 100644 --- a/dlls/kernel32/task.c +++ b/dlls/kernel32/task.c @@ -49,6 +49,14 @@ WINE_DECLARE_DEBUG_CHANNEL(toolhelp); #include "pshpack1.h" +struct thunk +{ + BYTE movw; + HANDLE16 instance; + BYTE ljmp; + FARPROC16 func; +}; + /* Segment containing MakeProcInstance() thunks */ typedef struct { @@ -56,7 +64,7 @@ typedef struct WORD magic; /* Thunks signature */ WORD unused; WORD free; /* Head of the free list */ - WORD thunks[4]; /* Each thunk is 4 words long */ + struct thunk thunks[1]; } THUNKS; #include "poppack.h" @@ -163,20 +171,15 @@ static void TASK_UnlinkTask( HTASK16 hTask ) static void TASK_CreateThunks( HGLOBAL16 handle, WORD offset, WORD count ) { int i; - WORD free; THUNKS *pThunk; pThunk = (THUNKS *)((BYTE *)GlobalLock16( handle ) + offset); pThunk->next = 0; pThunk->magic = THUNK_MAGIC; - pThunk->free = (int)&pThunk->thunks - (int)pThunk; - free = pThunk->free; + pThunk->free = FIELD_OFFSET( THUNKS, thunks ); for (i = 0; i < count-1; i++) - { - free += 8; /* Offset of next thunk */ - pThunk->thunks[4*i] = free; - } - pThunk->thunks[4*i] = 0; /* Last thunk */ + *(WORD *)&pThunk->thunks[i] = FIELD_OFFSET( THUNKS, thunks[i+1] ); + *(WORD *)&pThunk->thunks[i] = 0; /* Last thunk */ } @@ -845,7 +848,8 @@ HTASK16 WINAPI KERNEL_490( HTASK16 someTask ) */ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance ) { - BYTE *thunk,*lfunc; + struct thunk *thunk; + BYTE *lfunc; SEGPTR thunkaddr; WORD hInstanceSelector; @@ -891,11 +895,10 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance ) WARN("This was the (in)famous \"thunk useless\" warning. We thought we have to overwrite with nop;nop;, but this isn't true.\n"); } - *thunk++ = 0xb8; /* movw instance, %ax */ - *thunk++ = (BYTE)(hInstanceSelector & 0xff); - *thunk++ = (BYTE)(hInstanceSelector >> 8); - *thunk++ = 0xea; /* ljmp func */ - *(DWORD *)thunk = (DWORD)func; + thunk->movw = 0xb8; /* movw instance, %ax */ + thunk->instance = hInstanceSelector; + thunk->ljmp = 0xea; /* ljmp func */ + thunk->func = func; return (FARPROC16)thunkaddr; /* CX reg indicates if thunkaddr != NULL, implement if needed */ }

1 0

Alexandre Julliard : makedep: Add dependencies on wine/exception. h for widl-generated files.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: d8202087c7acba58c022b374dd8b52b06a27ad97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8202087c7acba58c022b374d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 12:59:50 2008 +0200 makedep: Add dependencies on wine/exception.h for widl-generated files. --- tools/makedep.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index dd084aa..2571359 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -693,10 +693,12 @@ static void parse_generated_idl( INCL_FILE *source ) { add_include( source, "objbase.h", 0, 1 ); add_include( source, "rpcproxy.h", 0, 1 ); + add_include( source, "wine/exception.h", 0, 1 ); add_include( source, header, 0, 0 ); } else if (strendswith( source->name, "_s.c" )) { + add_include( source, "wine/exception.h", 0, 1 ); add_include( source, header, 0, 0 ); } else if (!strcmp( source->name, "dlldata.c" ))

1 0

Alexandre Julliard : widl: Add support for exception handling in the generated proxy code.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: d6e76274d952e78a8185408f3e4c931c439827d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e76274d952e78a8185408f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 12:59:37 2008 +0200 widl: Add support for exception handling in the generated proxy code. --- tools/widl/proxy.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index ee8db39..60ee3c0 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -109,6 +109,65 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( "\n"); print_proxy( "#include \"%s\"\n", header_name); print_proxy( "\n"); + print_proxy( "#ifndef USE_COMPILER_EXCEPTIONS\n"); + print_proxy( "\n"); + print_proxy( "#include \"wine/exception.h\"\n"); + print_proxy( "#undef RpcTryExcept\n"); + print_proxy( "#undef RpcExcept\n"); + print_proxy( "#undef RpcEndExcept\n"); + print_proxy( "#undef RpcExceptionCode\n"); + print_proxy( "\n"); + print_proxy( "struct __proxy_frame\n"); + print_proxy( "{\n"); + print_proxy( " EXCEPTION_REGISTRATION_RECORD frame;\n"); + print_proxy( " sigjmp_buf jmp;\n"); + print_proxy( " DWORD code;\n"); + print_proxy( " MIDL_STUB_MESSAGE *stub;\n"); + print_proxy( "};\n"); + print_proxy( "\n"); + print_proxy( "static DWORD __proxy_exception_handler( EXCEPTION_RECORD *record,\n"); + print_proxy( " EXCEPTION_REGISTRATION_RECORD *frame,\n"); + print_proxy( " CONTEXT *context,\n"); + print_proxy( " EXCEPTION_REGISTRATION_RECORD **pdispatcher )\n"); + print_proxy( "{\n"); + print_proxy( " struct __proxy_frame *proxy_frame = (struct __proxy_frame *)frame;\n"); + print_proxy( "\n"); + print_proxy( " if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))\n"); + print_proxy( " return ExceptionContinueSearch;\n"); + print_proxy( " if (proxy_frame->stub->dwStubPhase == PROXY_SENDRECEIVE)\n"); + print_proxy( " return ExceptionContinueSearch;\n"); + print_proxy( "\n"); + print_proxy( " proxy_frame->code = record->ExceptionCode;\n"); + print_proxy( " __wine_rtl_unwind( frame, record );\n"); + print_proxy( " __wine_pop_frame( frame );\n"); + print_proxy( " siglongjmp( proxy_frame->jmp, 1 );\n"); + print_proxy( "}\n"); + print_proxy( "\n"); + print_proxy( "#define RpcTryExcept \\\n"); + print_proxy( " do { \\\n"); + print_proxy( " struct __proxy_frame __proxy_frame; \\\n"); + print_proxy( " __proxy_frame.frame.Handler = __proxy_exception_handler; \\\n"); + print_proxy( " __proxy_frame.stub = &_StubMsg; \\\n"); + print_proxy( " if (!sigsetjmp( __proxy_frame.jmp, 0 )) \\\n"); + print_proxy( " { \\\n"); + print_proxy( " __wine_push_frame( &__proxy_frame.frame ); \\\n"); + print_proxy( " {\n"); + print_proxy( "\n"); + print_proxy( "#define RpcExcept(expr) \\\n"); + print_proxy( " } \\\n"); + print_proxy( " __wine_pop_frame( &__proxy_frame.frame ); \\\n"); + print_proxy( " } \\\n"); + print_proxy( " else \\\n"); + print_proxy( " {\n"); + print_proxy( "\n"); + print_proxy( "#define RpcEndExcept \\\n"); + print_proxy( " } \\\n"); + print_proxy( " } while(0);\n"); + print_proxy( "\n"); + print_proxy( "#define RpcExceptionCode() (__proxy_frame.code)\n"); + print_proxy( "\n"); + print_proxy( "#endif /* USE_COMPILER_EXCEPTIONS */\n"); + print_proxy( "\n"); write_formatstringsdecl(proxy, indent, stmts, need_proxy); write_stubdescproto(); }

1 0

Alexandre Julliard : widl: Add support for exception handling in the generated server code.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 900bc5697e493c290a3640c31f7a2176819a60fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=900bc5697e493c290a3640c31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 12:59:33 2008 +0200 widl: Add support for exception handling in the generated server code. --- tools/widl/server.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 3581fdc..94fe099 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -382,7 +382,63 @@ static void init_server(void) print_server("#include <string.h>\n"); fprintf(server, "\n"); print_server("#include \"%s\"\n", header_name); - fprintf(server, "\n"); + print_server("\n"); + print_server("#ifndef USE_COMPILER_EXCEPTIONS\n"); + print_server("\n"); + print_server("#include \"wine/exception.h\"\n"); + print_server("#undef RpcTryExcept\n"); + print_server("#undef RpcExcept\n"); + print_server("#undef RpcEndExcept\n"); + print_server("#undef RpcExceptionCode\n"); + print_server("\n"); + print_server( "struct __server_frame\n"); + print_server( "{\n"); + print_server( " EXCEPTION_REGISTRATION_RECORD frame;\n"); + print_server( " sigjmp_buf jmp;\n"); + print_server( "};\n"); + print_server( "\n"); + print_server("static DWORD __server_exception_handler( EXCEPTION_RECORD *record,\n"); + print_server(" EXCEPTION_REGISTRATION_RECORD *frame,\n"); + print_server(" CONTEXT *context,\n"); + print_server(" EXCEPTION_REGISTRATION_RECORD **pdispatcher )\n"); + print_server("{\n"); + print_server(" struct __server_frame *server_frame = (struct __server_frame *)frame;\n"); + print_server("\n"); + print_server(" if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))\n"); + print_server(" return ExceptionContinueSearch;\n"); + print_server("\n"); + print_server(" if (record->ExceptionCode != STATUS_ACCESS_VIOLATION &&\n"); + print_server(" record->ExceptionCode != STATUS_DATATYPE_MISALIGNMENT &&\n"); + print_server(" record->ExceptionCode != RPC_X_BAD_STUB_DATA &&\n"); + print_server(" record->ExceptionCode != RPC_S_INVALID_BOUND)\n"); + print_server(" return ExceptionContinueSearch;\n"); + print_server("\n"); + print_server(" __wine_rtl_unwind( frame, record );\n"); + print_server(" __wine_pop_frame( frame );\n"); + print_server(" siglongjmp( server_frame->jmp, 1 );\n"); + print_server("}\n"); + print_server("#define RpcTryExcept \\\n"); + print_server(" do { \\\n"); + print_server(" struct __server_frame __server_frame; \\\n"); + print_server(" __server_frame.frame.Handler = __server_exception_handler; \\\n"); + print_server(" if (!sigsetjmp( __server_frame.jmp, 0 )) \\\n"); + print_server(" { \\\n"); + print_server(" __wine_push_frame( &__server_frame.frame ); \\\n"); + print_server(" {\n"); + print_server("\n"); + print_server("#define RpcExcept(expr) \\\n"); + print_server(" } \\\n"); + print_server(" __wine_pop_frame( &__server_frame.frame ); \\\n"); + print_server(" } \\\n"); + print_server(" else \\\n"); + print_server(" {\n"); + print_server("\n"); + print_server("#define RpcEndExcept \\\n"); + print_server(" } \\\n"); + print_server(" } while(0);\n"); + print_server("\n"); + print_server("#endif /* USE_COMPILER_EXCEPTIONS */\n"); + print_server("\n"); }

1 0

Alexandre Julliard : rpc.h: Use the correct exception definitions when USE_COMPILER_EXCEPTIONS is set.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 336a7dc1827c168559adcbea881c75c0fd53412d URL: http://source.winehq.org/git/wine.git/?a=commit;h=336a7dc1827c168559adcbea8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 12:58:57 2008 +0200 rpc.h: Use the correct exception definitions when USE_COMPILER_EXCEPTIONS is set. --- include/rpc.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/rpc.h b/include/rpc.h index c157c6d..6c92ecc 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -64,6 +64,19 @@ typedef void* I_RPC_HANDLE; #include <rpcasync.h> #endif +#ifdef USE_COMPILER_EXCEPTIONS + +#define RpcTryExcept __try { +#define RpcExcept(expr) } __except (expr) { +#define RpcEndExcept } +#define RpcTryFinally __try { +#define RpcFinally } __finally { +#define RpcEndFinally } +#define RpcExceptionCode() GetExceptionCode() +#define RpcAbnormalTermination() AbnormalTermination() + +#else /* USE_COMPILER_EXCEPTIONS */ + /* ignore exception handling for now */ #define RpcTryExcept if (1) { #define RpcExcept(expr) } else { @@ -74,4 +87,6 @@ typedef void* I_RPC_HANDLE; #define RpcExceptionCode() 0 /* #define RpcAbnormalTermination() abort() */ +#endif /* USE_COMPILER_EXCEPTIONS */ + #endif /*__WINE_RPC_H */

1 0

Alexandre Julliard : exception.h: Make the RtlUnwind wrapper available separately.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 94e217891c5ac2b501cdeb5ff6acf54385f36d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e217891c5ac2b501cdeb5ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 12:57:43 2008 +0200 exception.h: Make the RtlUnwind wrapper available separately. Also avoid dependency on winternl.h. --- dlls/kernel32/thread.c | 1 + dlls/ntdll/sec.c | 2 +- include/wine/exception.h | 52 ++++++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index b280693..bddeba7 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -34,6 +34,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" #include "wine/winbase16.h" #include "wine/exception.h" #include "wine/library.h" diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 79a356b..7dad537 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -35,8 +35,8 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" -#include "wine/exception.h" #include "ntdll_misc.h" +#include "wine/exception.h" #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/include/wine/exception.h b/include/wine/exception.h index d716bf0..de2f95c 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -23,7 +23,6 @@ #include <setjmp.h> #include <windef.h> -#include <winternl.h> #include <excpt.h> /* The following definitions allow using exceptions in Wine and Winelib code @@ -187,8 +186,8 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGIST return prev; #else NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - frame->Prev = (void *)teb->ExceptionList; - teb->ExceptionList = (void *)frame; + frame->Prev = teb->ExceptionList; + teb->ExceptionList = frame; return frame->Prev; #endif } @@ -202,7 +201,7 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTR #else NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - teb->ExceptionList = (void *)frame->Prev; + teb->ExceptionList = frame->Prev; return frame->Prev; #endif } @@ -230,6 +229,30 @@ extern void __wine_enter_vm86( CONTEXT *context ); #ifndef USE_COMPILER_EXCEPTIONS +extern void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); + +/* wrapper for RtlUnwind since it clobbers registers on Windows */ +static inline void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record ) +{ +#if defined(__GNUC__) && defined(__i386__) + int dummy1, dummy2, dummy3; + __asm__ __volatile__("pushl %%ebp\n\t" + "pushl %%ebx\n\t" + "pushl $0\n\t" + "pushl %2\n\t" + "pushl $0\n\t" + "pushl %1\n\t" + "call *%0\n\t" + "popl %%ebx\n\t" + "popl %%ebp" + : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) + : "0" (RtlUnwind), "1" (frame), "2" (record) + : "ecx", "edx", "memory" ); +#else + RtlUnwind( frame, 0, record, 0 ); +#endif +} + static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame ) { @@ -239,26 +262,7 @@ static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *reco wine_frame->ExceptionCode = record->ExceptionCode; wine_frame->ExceptionRecord = wine_frame; -#if defined(__GNUC__) && defined(__i386__) - { - /* RtlUnwind clobbers registers on Windows */ - int dummy1, dummy2, dummy3; - __asm__ __volatile__("pushl %%ebp\n\t" - "pushl %%ebx\n\t" - "pushl $0\n\t" - "pushl %2\n\t" - "pushl $0\n\t" - "pushl %1\n\t" - "call *%0\n\t" - "popl %%ebx\n\t" - "popl %%ebp" - : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) - : "0" (RtlUnwind), "1" (frame), "2" (record) - : "ecx", "edx", "memory" ); - } -#else - RtlUnwind( frame, 0, record, 0 ); -#endif + __wine_rtl_unwind( frame, record ); __wine_pop_frame( frame ); siglongjmp( wine_frame->jmp, 1 ); }

1 0

Alexandre Julliard : oleaut32: Include the system jpeg and png headers before the Windows headers.
by Alexandre Julliard July 3, 2008

July 3, 2008

Module: wine Branch: master Commit: 1894d708a43f469607d0deb86b5abc30c856b84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1894d708a43f469607d0deb86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 12:39:28 2008 +0200 oleaut32: Include the system jpeg and png headers before the Windows headers. --- dlls/oleaut32/olepicture.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 05a2934..cad5b7b 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -45,6 +45,22 @@ #include <stdio.h> #include <string.h> +#ifdef SONAME_LIBJPEG +/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ +#define XMD_H +#define UINT8 JPEG_UINT8 +#define UINT16 JPEG_UINT16 +#define boolean jpeg_boolean +# include <jpeglib.h> +#undef UINT8 +#undef UINT16 +#undef boolean +#endif + +#ifdef HAVE_PNG_H +#include <png.h> +#endif + /* Must be before wine includes, the header has things conflicting with * WINE headers. */ @@ -67,23 +83,6 @@ #include "wine/wingdi16.h" -#ifdef SONAME_LIBJPEG -/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ -#define XMD_H -#define UINT8 JPEG_UINT8 -#define UINT16 JPEG_UINT16 -#undef FAR -#define boolean jpeg_boolean -# include <jpeglib.h> -#undef jpeg_boolean -#undef UINT16 -#endif - -#ifdef HAVE_PNG_H -#undef FAR -#include <png.h> -#endif - #include "ungif.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -1008,7 +1007,7 @@ static void *load_libjpeg(void) /* for the jpeg decompressor source manager. */ static void _jpeg_init_source(j_decompress_ptr cinfo) { } -static boolean _jpeg_fill_input_buffer(j_decompress_ptr cinfo) { +static jpeg_boolean _jpeg_fill_input_buffer(j_decompress_ptr cinfo) { ERR("(), should not get here.\n"); return FALSE; } @@ -1019,7 +1018,7 @@ static void _jpeg_skip_input_data(j_decompress_ptr cinfo,long num_bytes) { cinfo->src->bytes_in_buffer -= num_bytes; } -static boolean _jpeg_resync_to_restart(j_decompress_ptr cinfo, int desired) { +static jpeg_boolean _jpeg_resync_to_restart(j_decompress_ptr cinfo, int desired) { ERR("(desired=%d), should not get here.\n",desired); return FALSE; }

1 0