June 2020 - Wine-Commits - list.winehq.org

Daniel Lehman : vcruntime140_1: Don't terminate on state of -1.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 7d2675d19972ce294d37dc145f85ee8c0fc8d88d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d2675d19972ce294d37dc14… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 3 11:09:31 2020 +0200 vcruntime140_1: Don't terminate on state of -1. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 42eab3b046..627e9694ec 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -426,7 +426,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, TRACE("current level: %d, last level: %d\n", trylevel, last_level); - if (trylevel<0 || trylevel>=descr->unwind_count) + if (trylevel<-1 || trylevel>=descr->unwind_count) { ERR("invalid trylevel %d\n", trylevel); terminate();

1 0

Daniel Lehman : vcruntime140_1: Unwind state 0.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: b33e1d4cb73cde216d00e15f041ffca3175162b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b33e1d4cb73cde216d00e15f… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 3 11:09:40 2020 +0200 vcruntime140_1: Unwind state 0. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 627e9694ec..4203373294 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -435,7 +435,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, if (trylevel <= last_level) return; unwind_data = rva_to_ptr(descr->unwind_map, dispatch->ImageBase); - last = unwind_data; + last = unwind_data - 1; for (i = 0; i < trylevel; i++) { BYTE *addr = unwind_data;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in arbfp_blit_supported().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 9af34f9aea2e4f0d6064450b64fb162affca5561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af34f9aea2e4f0d6064450b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:07 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in arbfp_blit_supported(). The idea is to get rid of the WINED3DFMT_FLAG_DEPTH and WINED3DFMT_FLAG_STENCIL format flags, and instead introduce a flag similar to WINED3DFMT_FLAG_RENDERTARGET that indicates whether the format can be used with WINED3D_BIND_DEPTH_STENCIL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e6daa88afd..4724e5c959 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7722,7 +7722,7 @@ static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wine if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_format->depth_size || dst_format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT;

1 0

Alexandre Julliard : ntdll: Move the thread creation code to the Unix library.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 35b063a404457fdf956d1913738a3c8a66266cb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35b063a404457fdf956d1913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 21:09:13 2020 +0200 ntdll: Move the thread creation code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 8 ---- dlls/ntdll/thread.c | 106 ++++------------------------------------- dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/thread.c | 94 ++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 7 ++- dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 7 +-- 7 files changed, 110 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35b063a404457fdf956d…

1 0

Alexandre Julliard : ntdll: Move more of the thread exit code to the Unix library.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: f1d40d4824b568389cbc328cebb5734430b52e44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d40d4824b568389cbc328c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 21:26:47 2020 +0200 ntdll: Move more of the thread exit code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 17 ----------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/thread.c | 14 ++++++++++++++ dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 3 +-- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index d7386f2ab1..d5e34cae3b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -284,9 +284,6 @@ TEB *thread_init(void) */ void WINAPI RtlExitUserThread( ULONG status ) { - static void *prev_teb; - TEB *teb; - if (status) /* send the exit code to the server (0 is already the default) */ { SERVER_START_REQ( terminate_thread ) @@ -306,20 +303,6 @@ void WINAPI RtlExitUserThread( ULONG status ) LdrShutdownThread(); RtlFreeThreadActivationContextStack(); - - pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - - if ((teb = InterlockedExchangePointer( &prev_teb, NtCurrentTeb() ))) - { - struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - - if (thread_data->pthread_id) - { - pthread_join( thread_data->pthread_id, NULL ); - unix_funcs->virtual_free_teb( teb ); - } - } - for (;;) unix_funcs->exit_thread( status ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 30e1fa61b4..1297c451a1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1017,7 +1017,6 @@ static struct unix_funcs unix_funcs = virtual_get_system_info, virtual_create_builtin_view, virtual_alloc_first_teb, - virtual_free_teb, virtual_alloc_thread_stack, virtual_handle_fault, virtual_locked_server_call, diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index eaed27f4b2..205a1312e9 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -218,7 +218,21 @@ void CDECL abort_thread( int status ) */ void CDECL exit_thread( int status ) { + static void *prev_teb; + TEB *teb; + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); + + if ((teb = InterlockedExchangePointer( &prev_teb, NtCurrentTeb() ))) + { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; + + if (thread_data->pthread_id) + { + pthread_join( thread_data->pthread_id, NULL ); + virtual_free_teb( teb ); + } + } signal_exit_thread( status, pthread_exit_wrapper ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index eeadf33f1c..14c4ee4cd9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -63,7 +63,6 @@ extern NTSTATUS CDECL virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsig extern void CDECL virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_create_builtin_view( void *module ) DECLSPEC_HIDDEN; extern TEB * CDECL virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; -extern void CDECL virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; extern unsigned int CDECL virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; @@ -134,6 +133,7 @@ extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOO extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; +extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_threading(void) DECLSPEC_HIDDEN; extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b32a004dae..58ecaa6fc4 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2628,7 +2628,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) /*********************************************************************** * virtual_free_teb */ -void CDECL virtual_free_teb( TEB *teb ) +void virtual_free_teb( TEB *teb ) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; SIZE_T size; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index a72cd72dc7..67c63fd926 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 18 +#define NTDLL_UNIXLIB_VERSION 19 struct unix_funcs { @@ -92,7 +92,6 @@ struct unix_funcs void (CDECL *virtual_get_system_info)( SYSTEM_BASIC_INFORMATION *info ); NTSTATUS (CDECL *virtual_create_builtin_view)( void *module ); TEB * (CDECL *virtual_alloc_first_teb)(void); - void (CDECL *virtual_free_teb)( TEB *teb ); NTSTATUS (CDECL *virtual_alloc_thread_stack)( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ); NTSTATUS (CDECL *virtual_handle_fault)( LPCVOID addr, DWORD err, BOOL on_signal_stack ); unsigned int (CDECL *virtual_locked_server_call)( void *req_ptr );

1 0

Alexandre Julliard : kernel32: Move SetConsoleCtrlHandler() implementation to kernelbase.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 11217ee628a675c8dfe62fe1280e36be83d8dc7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11217ee628a675c8dfe62fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 10:20:09 2020 +0200 kernel32: Move SetConsoleCtrlHandler() implementation to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 148 +--------------------------------------- dlls/kernel32/kernel32.spec | 4 +- dlls/kernelbase/console.c | 105 ++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 +- 4 files changed, 111 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11217ee628a675c8dfe6…

1 0

Alexandre Julliard : ntdll: Move the thread startup code to the Unix library.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: be0eb9c92eb7a4fcd9d0d48568c8ed5e8326ef0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0eb9c92eb7a4fcd9d0d485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:32:02 2020 +0200 ntdll: Move the thread startup code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 26 ---- dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 2 +- dlls/ntdll/signal_arm.c | 106 --------------- dlls/ntdll/signal_arm64.c | 144 --------------------- dlls/ntdll/signal_i386.c | 276 ---------------------------------------- dlls/ntdll/signal_powerpc.c | 90 ------------- dlls/ntdll/signal_x86_64.c | 130 ------------------- dlls/ntdll/thread.c | 74 ++++++++++- dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/signal_arm.c | 63 +++++++++ dlls/ntdll/unix/signal_arm64.c | 103 +++++++++++++++ dlls/ntdll/unix/signal_i386.c | 88 +++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 84 ++++++++++++ dlls/ntdll/unix/thread.c | 33 ++++- dlls/ntdll/unix/unix_private.h | 8 +- dlls/ntdll/unix/virtual.c | 15 +++ dlls/ntdll/unixlib.h | 5 +- dlls/ntdll/virtual.c | 27 ---- 19 files changed, 467 insertions(+), 812 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be0eb9c92eb7a4fcd9d0…

1 0

Alexandre Julliard : ntdll: Move the virtual memory functions to the Unix library.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: c96ef78b6d6d9184d8ec4cd18924a3049d388583 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96ef78b6d6d9184d8ec4cd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 17:08:59 2020 +0200 ntdll: Move the virtual memory functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 18 +- dlls/ntdll/loader.c | 12 +- dlls/ntdll/nt.c | 2 +- dlls/ntdll/signal_arm.c | 4 +- dlls/ntdll/signal_arm64.c | 4 +- dlls/ntdll/signal_i386.c | 22 +- dlls/ntdll/signal_powerpc.c | 4 +- dlls/ntdll/signal_x86_64.c | 10 +- dlls/ntdll/thread.c | 12 +- dlls/ntdll/unix/loader.c | 43 +- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/thread.c | 19 - dlls/ntdll/unix/unix_private.h | 28 +- dlls/ntdll/unix/virtual.c | 3897 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unixlib.h | 63 +- dlls/ntdll/virtual.c | 3801 ++------------------------------------- 16 files changed, 4134 insertions(+), 3807 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c96ef78b6d6d9184d8ec…

1 0

Alexandre Julliard : ntdll: Use the local server_send_fd() function in the Unix library.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 9fe61171e515e7c77720675ecbe69731219b549c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fe61171e515e7c77720675e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 17:39:28 2020 +0200 ntdll: Use the local server_send_fd() function in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 5843cde23f..17b23e58d2 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1053,7 +1053,7 @@ NTSTATUS CDECL server_fd_to_handle( int fd, unsigned int access, unsigned int at NTSTATUS ret; *handle = 0; - wine_server_send_fd( fd ); + server_send_fd( fd ); SERVER_START_REQ( alloc_file_handle ) { @@ -1494,8 +1494,8 @@ size_t CDECL server_init_thread( void *entry_point, BOOL *suspend, unsigned int /* create the server->client communication pipes */ if (server_pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" ); if (server_pipe( ntdll_get_thread_data()->wait_fd ) == -1) server_protocol_perror( "pipe" ); - wine_server_send_fd( reply_pipe[1] ); - wine_server_send_fd( ntdll_get_thread_data()->wait_fd[1] ); + server_send_fd( reply_pipe[1] ); + server_send_fd( ntdll_get_thread_data()->wait_fd[1] ); ntdll_get_thread_data()->reply_fd = reply_pipe[0]; close( reply_pipe[1] );

1 0

Alexandre Julliard : ntdll: Move NtGetContextThread() implementation to the Unix library.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 7c32b2dd9368137eca3cf0202360bbe0db62efbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c32b2dd9368137eca3cf020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 14:05:42 2020 +0200 ntdll: Move NtGetContextThread() implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/signal_arm.c | 142 ----------------------- dlls/ntdll/signal_arm64.c | 130 --------------------- dlls/ntdll/signal_i386.c | 171 ++------------------------- dlls/ntdll/signal_powerpc.c | 241 --------------------------------------- dlls/ntdll/signal_x86_64.c | 195 ------------------------------- dlls/ntdll/thread.c | 12 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/signal_arm.c | 88 ++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 86 ++++++++++++++ dlls/ntdll/unix/signal_i386.c | 150 ++++++++++++++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 141 +++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 128 +++++++++++++++++++++ dlls/ntdll/unix/thread.c | 40 +++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 +- 16 files changed, 660 insertions(+), 870 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c32b2dd9368137eca3c…

1 0