June 2021 - Wine-commits - list.winehq.org

Zebediah Figura : ws2_32: Explicitly stub setsockopt(SO_ERROR).
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: a72d97dc4363ab0cff98ad8800ab6dcbb3d00122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a72d97dc4363ab0cff98ad88… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:13 2021 -0500 ws2_32: Explicitly stub setsockopt(SO_ERROR). This returns ENOPROTOOPT on Linux, but succeeds on Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b183b85b0b3..2dd3cf20752 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3548,6 +3548,11 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_BROADCAST: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, optval, optlen ); + case WS_SO_ERROR: + FIXME( "SO_ERROR, stub!\n" ); + SetLastError( WSAENOPROTOOPT ); + return -1; + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3603,7 +3608,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, /* The options listed here don't need any special handling. Thanks to * the conversion happening above, options from there will fall through * to this, too.*/ - case WS_SO_ERROR: case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: /* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics.

1 0

Zebediah Figura : ws2_32: Move the getsockopt(SO_KEEPALIVE) implementation to ntdll.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 8aaef4cafd2a6bb968b62cd067416dcb522577cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aaef4cafd2a6bb968b62cd0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:14 2021 -0500 ws2_32: Move the getsockopt(SO_KEEPALIVE) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 959f0e7bc00..e23997bc476 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1607,6 +1607,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_SO_BROADCAST: return do_setsockopt( handle, io, SOL_SOCKET, SO_BROADCAST, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_SO_KEEPALIVE: + return do_getsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2dd3cf20752..4381c4f0408 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2090,7 +2090,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: case WS_SO_RCVBUF: case WS_SO_REUSEADDR: @@ -2225,6 +2224,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_ERROR: return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen ); + case WS_SO_KEEPALIVE: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_KEEPALIVE, optval, optlen ); + case WS_SO_LINGER: { struct linger lingval; diff --git a/include/wine/afd.h b/include/wine/afd.h index 0ccd248e614..93e1b2c1b1c 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -163,6 +163,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(SO_KEEPALIVE) implementation to ntdll.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: a7f39e3fbb88ca7f9c9bce1c1c13ecf104f5774a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f39e3fbb88ca7f9c9bce1c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:15 2021 -0500 ws2_32: Move the setsockopt(SO_KEEPALIVE) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e23997bc476..7b62c5aef68 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1610,6 +1610,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_SO_KEEPALIVE: return do_getsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_SO_KEEPALIVE: + return do_setsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4381c4f0408..c35972c1d27 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3555,6 +3555,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, SetLastError( WSAENOPROTOOPT ); return -1; + case WS_SO_KEEPALIVE: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen ); + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3610,7 +3613,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, /* The options listed here don't need any special handling. Thanks to * the conversion happening above, options from there will fall through * to this, too.*/ - case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: /* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics. * however, using it the BSD way fixes bug 8513 and seems to be what diff --git a/include/wine/afd.h b/include/wine/afd.h index 93e1b2c1b1c..616ba27b679 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -164,6 +164,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Alexandre Julliard : server: Add a native_machine global variable.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 2ff7a7676c721c2fd5fb8097b38f17f3f5fd1faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff7a7676c721c2fd5fb8097… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 23 11:32:40 2021 +0200 server: Add a native_machine global variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/debugger.c | 2 +- server/mapping.c | 2 +- server/object.h | 1 + server/process.c | 2 +- server/registry.c | 4 +++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 9b814469b19..b718c7c283f 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -134,7 +134,7 @@ static const struct object_ops debug_obj_ops = /* get a pointer to TEB->ArbitraryUserPointer in the client address space */ static client_ptr_t get_teb_user_ptr( struct thread *thread ) { - unsigned int ptr_size = is_machine_64bit( supported_machines[0] ) ? 8 : 4; + unsigned int ptr_size = is_machine_64bit( native_machine ) ? 8 : 4; return thread->teb + 5 * ptr_size; } diff --git a/server/mapping.c b/server/mapping.c index cd918224caa..529ce43bac9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -717,7 +717,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: - if (!is_machine_64bit( supported_machines[0] )) return STATUS_INVALID_IMAGE_WIN_64; + if (!is_machine_64bit( native_machine )) return STATUS_INVALID_IMAGE_WIN_64; if (!is_machine_64bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; diff --git a/server/object.h b/server/object.h index e9d9a87875e..039bf4e7d4e 100644 --- a/server/object.h +++ b/server/object.h @@ -240,6 +240,7 @@ extern void generate_startup_debug_events( struct process *process ); extern unsigned int supported_machines_count; extern unsigned short supported_machines[8]; +extern unsigned short native_machine; extern void init_registry(void); extern void flush_registry(void); diff --git a/server/process.c b/server/process.c index 5b271b12328..24b7abb49d5 100644 --- a/server/process.c +++ b/server/process.c @@ -1088,7 +1088,7 @@ int set_process_debug_flag( struct process *process, int flag ) char data = (flag != 0); client_ptr_t peb32 = 0; - if (!is_machine_64bit( process->machine ) && is_machine_64bit( supported_machines[0] )) + if (!is_machine_64bit( process->machine ) && is_machine_64bit( native_machine )) peb32 = process->peb + 0x1000; /* BeingDebugged flag is the byte at offset 2 in the PEB */ diff --git a/server/registry.c b/server/registry.c index 68ec4f9e39a..f36760e6cc1 100644 --- a/server/registry.c +++ b/server/registry.c @@ -147,6 +147,7 @@ static struct save_branch_info save_branch_info[MAX_SAVE_BRANCH_INFO]; unsigned int supported_machines_count = 0; unsigned short supported_machines[8]; +unsigned short native_machine = 0; /* information about a file being loaded */ struct file_load_info @@ -1790,6 +1791,7 @@ static void init_supported_machines(void) #error Unsupported machine #endif supported_machines_count = count; + native_machine = supported_machines[0]; } /* registry initialisation */ @@ -2071,7 +2073,7 @@ void flush_registry(void) /* determine if the thread is wow64 (32-bit client running on 64-bit prefix) */ static int is_wow64_thread( struct thread *thread ) { - return (is_machine_64bit( supported_machines[0] ) && !is_machine_64bit( thread->process->machine )); + return (is_machine_64bit( native_machine ) && !is_machine_64bit( thread->process->machine )); }

1 0

Alexandre Julliard : server: Use separate handles for thread and context in get_thread_context.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: f626349c0a84bb4b163054b5f7f5bc1307475561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f626349c0a84bb4b163054b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 23 11:41:21 2021 +0200 server: Use separate handles for thread and context in get_thread_context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 7 ++++--- include/wine/server_protocol.h | 2 +- server/protocol.def | 3 ++- server/request.h | 3 ++- server/thread.c | 13 +++++++------ server/trace.c | 1 + 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 3c9e375d665..65f80a392da 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1316,6 +1316,7 @@ NTSTATUS set_thread_context( HANDLE handle, const void *context, BOOL *self, USH NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT machine ) { NTSTATUS ret; + HANDLE context_handle; context_t server_context; unsigned int flags = get_server_context_flags( context, machine ); @@ -1326,17 +1327,17 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma wine_server_set_reply( req, &server_context, sizeof(server_context) ); ret = wine_server_call( req ); *self = reply->self; - handle = wine_server_ptr_handle( reply->handle ); + context_handle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; if (ret == STATUS_PENDING) { - NtWaitForSingleObject( handle, FALSE, NULL ); + NtWaitForSingleObject( context_handle, FALSE, NULL ); SERVER_START_REQ( get_thread_context ) { - req->handle = wine_server_obj_handle( handle ); + req->context = wine_server_obj_handle( context_handle ); req->flags = flags; wine_server_set_reply( req, &server_context, sizeof(server_context) ); ret = wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 095c2ac7d04..5135b1e5e06 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2460,8 +2460,8 @@ struct get_thread_context_request { struct request_header __header; obj_handle_t handle; + obj_handle_t context; unsigned int flags; - char __pad_20[4]; }; struct get_thread_context_reply { diff --git a/server/protocol.def b/server/protocol.def index 343febda6c5..22b03d0c91b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1882,7 +1882,8 @@ struct process_info /* Retrieve the current context of a thread */ @REQ(get_thread_context) - obj_handle_t handle; /* thread or context handle */ + obj_handle_t handle; /* thread handle */ + obj_handle_t context; /* context handle */ unsigned int flags; /* context flags */ @REPLY int self; /* was it a handle to the current thread? */ diff --git a/server/request.h b/server/request.h index d38ddae6c5e..2106e3a3224 100644 --- a/server/request.h +++ b/server/request.h @@ -1253,7 +1253,8 @@ C_ASSERT( FIELD_OFFSET(struct get_timer_info_reply, when) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_timer_info_reply, signaled) == 16 ); C_ASSERT( sizeof(struct get_timer_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, flags) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, context) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, flags) == 20 ); C_ASSERT( sizeof(struct get_thread_context_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_reply, self) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_reply, handle) == 12 ); diff --git a/server/thread.c b/server/thread.c index 0c7f11c0da1..70e0b3fad15 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1797,14 +1797,15 @@ DECL_HANDLER(get_thread_context) return; } - if ((thread_context = (struct context *)get_handle_obj( current->process, req->handle, 0, &context_ops ))) + if (req->context) { - close_handle( current->process, req->handle ); /* avoid extra server call */ - system_flags = get_context_system_regs( thread_context->regs.machine ); + if (!(thread_context = (struct context *)get_handle_obj( current->process, req->context, 0, &context_ops ))) + return; + close_handle( current->process, req->context ); /* avoid extra server call */ } - else if ((thread = get_thread_from_handle( req->handle, THREAD_GET_CONTEXT ))) + else { - clear_error(); + if (!(thread = get_thread_from_handle( req->handle, THREAD_GET_CONTEXT ))) return; system_flags = get_context_system_regs( thread->process->machine ); if (thread->state == RUNNING) { @@ -1831,8 +1832,8 @@ DECL_HANDLER(get_thread_context) } else set_error( STATUS_UNSUCCESSFUL ); release_object( thread ); + if (!thread_context) return; } - if (get_error() || !thread_context) return; set_error( thread_context->status ); if (!thread_context->status && (context = set_reply_data_size( sizeof(context_t) ))) diff --git a/server/trace.c b/server/trace.c index 81b482b8338..49d97f77d08 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2534,6 +2534,7 @@ static void dump_get_timer_info_reply( const struct get_timer_info_reply *req ) static void dump_get_thread_context_request( const struct get_thread_context_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", context=%04x", req->context ); fprintf( stderr, ", flags=%08x", req->flags ); }

1 0

Alexandre Julliard : server: Simplify the naming of the YMM regs.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 6b86b419121901420f2583a2f60049ab458aeb76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b86b419121901420f2583a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 24 21:40:21 2021 +0200 server: Simplify the naming of the YMM regs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 20 ++++++++------------ include/wine/server_protocol.h | 2 +- server/protocol.def | 2 +- server/trace.c | 8 ++++---- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 65f80a392da..628cc19418f 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -215,8 +215,7 @@ static NTSTATUS context_to_server( context_t *to, const void *src, USHORT machin const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset); to->flags |= SERVER_CTX_YMM_REGISTERS; - if (xs->Mask & 4) - memcpy( &to->ymm.ymm_high_regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); + if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); } return STATUS_SUCCESS; } @@ -283,8 +282,7 @@ static NTSTATUS context_to_server( context_t *to, const void *src, USHORT machin const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset); to->flags |= SERVER_CTX_YMM_REGISTERS; - if (xs->Mask & 4) - memcpy( &to->ymm.ymm_high_regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); + if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); } return STATUS_SUCCESS; } @@ -526,11 +524,10 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma xs->Mask &= ~4; if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004; - for (i = 0; i < ARRAY_SIZE( from->ymm.ymm_high_regs.ymm_high); i++) + for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) { - if (!from->ymm.ymm_high_regs.ymm_high[i].low && !from->ymm.ymm_high_regs.ymm_high[i].high) - continue; - memcpy( &xs->YmmContext, &from->ymm.ymm_high_regs, sizeof(xs->YmmContext) ); + if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; + memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) ); xs->Mask |= 4; break; } @@ -604,11 +601,10 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma xs->Mask &= ~4; if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004; - for (i = 0; i < ARRAY_SIZE( from->ymm.ymm_high_regs.ymm_high); i++) + for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) { - if (!from->ymm.ymm_high_regs.ymm_high[i].low && !from->ymm.ymm_high_regs.ymm_high[i].high) - continue; - memcpy( &xs->YmmContext, &from->ymm.ymm_high_regs, sizeof(xs->YmmContext) ); + if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; + memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) ); xs->Mask |= 4; break; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5135b1e5e06..4463b8fa380 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -156,7 +156,7 @@ typedef struct } ext; union { - struct { struct { unsigned __int64 low, high; } ymm_high[16]; } ymm_high_regs; + struct { struct { unsigned __int64 low, high; } ymm_high[16]; } regs; } ymm; } context_t; diff --git a/server/protocol.def b/server/protocol.def index 22b03d0c91b..6a11dfac77d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -172,7 +172,7 @@ typedef struct } ext; /* selected by SERVER_CTX_EXTENDED_REGISTERS */ union { - struct { struct { unsigned __int64 low, high; } ymm_high[16]; } ymm_high_regs; + struct { struct { unsigned __int64 low, high; } ymm_high[16]; } regs; } ymm; /* selected by SERVER_CTX_YMM_REGISTERS */ } context_t; diff --git a/server/trace.c b/server/trace.c index 49d97f77d08..d0c5f6b670b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -666,8 +666,8 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) dump_uints( ",extended=", (const unsigned int *)ctx.ext.i386_regs, sizeof(ctx.ext.i386_regs) / sizeof(int) ); if (ctx.flags & SERVER_CTX_YMM_REGISTERS) - dump_uints( ",ymm_high=", (const unsigned int *)ctx.ymm.ymm_high_regs.ymm_high, - sizeof(ctx.ymm.ymm_high_regs) / sizeof(int) ); + dump_uints( ",ymm_high=", (const unsigned int *)ctx.ymm.regs.ymm_high, + sizeof(ctx.ymm.regs) / sizeof(int) ); break; case IMAGE_FILE_MACHINE_AMD64: fprintf( stderr, "%s{machine=x86_64", prefix ); @@ -719,8 +719,8 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) (unsigned int)ctx.fp.x86_64_regs.fpregs[i].low ); } if (ctx.flags & SERVER_CTX_YMM_REGISTERS) - dump_uints( ",ymm_high=", (const unsigned int *)ctx.ymm.ymm_high_regs.ymm_high, - sizeof(ctx.ymm.ymm_high_regs) / sizeof(int) ); + dump_uints( ",ymm_high=", (const unsigned int *)ctx.ymm.regs.ymm_high, + sizeof(ctx.ymm.regs) / sizeof(int) ); break; case IMAGE_FILE_MACHINE_ARMNT: fprintf( stderr, "%s{machine=arm", prefix );

1 0

Alexandre Julliard : server: Trace extended registers as 128-bit entities.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 6e2ca647bac48fad688613bb7fbdd421d0404ff2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e2ca647bac48fad688613bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 24 21:44:49 2021 +0200 server: Trace extended registers as 128-bit entities. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/trace.c | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/server/trace.c b/server/trace.c index d0c5f6b670b..87ed4862e88 100644 --- a/server/trace.c +++ b/server/trace.c @@ -103,6 +103,22 @@ static void dump_uint64( const char *prefix, const unsigned __int64 *val ) fprintf( stderr, "%s%08x", prefix, (unsigned int)*val ); } +static void dump_uint128( const char *prefix, const unsigned __int64 val[2] ) +{ + unsigned __int64 low = val[0], high = val[1]; + + if ((unsigned int)high != high) + fprintf( stderr, "%s%x%08x%08x%08x", prefix, (unsigned int)(high >> 32), (unsigned int)high, + (unsigned int)(low >> 32), (unsigned int)low ); + else if (high) + fprintf( stderr, "%s%x%08x%08x", prefix, (unsigned int)high, + (unsigned int)(low >> 32), (unsigned int)low ); + else if ((unsigned int)low != low) + fprintf( stderr, "%s%x%08x", prefix, (unsigned int)(low >> 32), (unsigned int)low ); + else + fprintf( stderr, "%s%x", prefix, (unsigned int)low ); +} + static void dump_rectangle( const char *prefix, const rectangle_t *rect ) { fprintf( stderr, "%s{%d,%d;%d,%d}", prefix, @@ -666,8 +682,11 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) dump_uints( ",extended=", (const unsigned int *)ctx.ext.i386_regs, sizeof(ctx.ext.i386_regs) / sizeof(int) ); if (ctx.flags & SERVER_CTX_YMM_REGISTERS) - dump_uints( ",ymm_high=", (const unsigned int *)ctx.ymm.regs.ymm_high, - sizeof(ctx.ymm.regs) / sizeof(int) ); + for (i = 0; i < 16; i++) + { + fprintf( stderr, ",ymm%u=", i ); + dump_uint128( "", (const unsigned __int64 *)&ctx.ymm.regs.ymm_high[i] ); + } break; case IMAGE_FILE_MACHINE_AMD64: fprintf( stderr, "%s{machine=x86_64", prefix ); @@ -710,17 +729,17 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) dump_uint64( ",dr7=", &ctx.debug.x86_64_regs.dr7 ); } if (ctx.flags & SERVER_CTX_FLOATING_POINT) - { for (i = 0; i < 32; i++) - fprintf( stderr, ",fp%u=%08x%08x%08x%08x", i, - (unsigned int)(ctx.fp.x86_64_regs.fpregs[i].high >> 32), - (unsigned int)ctx.fp.x86_64_regs.fpregs[i].high, - (unsigned int)(ctx.fp.x86_64_regs.fpregs[i].low >> 32), - (unsigned int)ctx.fp.x86_64_regs.fpregs[i].low ); - } + { + fprintf( stderr, ",fp%u=", i ); + dump_uint128( "", (const unsigned __int64 *)&ctx.fp.x86_64_regs.fpregs[i] ); + } if (ctx.flags & SERVER_CTX_YMM_REGISTERS) - dump_uints( ",ymm_high=", (const unsigned int *)ctx.ymm.regs.ymm_high, - sizeof(ctx.ymm.regs) / sizeof(int) ); + for (i = 0; i < 16; i++) + { + fprintf( stderr, ",ymm%u=", i ); + dump_uint128( "", (const unsigned __int64 *)&ctx.ymm.regs.ymm_high[i] ); + } break; case IMAGE_FILE_MACHINE_ARMNT: fprintf( stderr, "%s{machine=arm", prefix );

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces in d2d_bitmap_create_shared.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: af64b4c119921ede3fdea14391af88508b8af12f URL: https://source.winehq.org/git/wine.git/?a=commit;h=af64b4c119921ede3fdea143… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 09:35:31 2021 +0200 d2d1: Use D3D11 interfaces in d2d_bitmap_create_shared. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 0b5f3e6dc5a..03982924efa 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -414,7 +414,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) { struct d2d_bitmap *src_impl = unsafe_impl_from_ID2D1Bitmap(data); - ID3D10Device *device; + ID3D11Device *device; HRESULT hr = S_OK; if (src_impl->factory != context->factory) @@ -423,9 +423,9 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - ID3D10Resource_GetDevice(src_impl->resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + ID3D11Resource_GetDevice(src_impl->d3d11_resource, &device); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d11_device) { hr = D2DERR_UNSUPPORTED_OPERATION; goto failed; @@ -466,28 +466,37 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, { DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface = data; - ID3D10Resource *resource; + ID3D11Resource *resource; + ID3D10Resource *d3d10_resource; D2D1_SIZE_U pixel_size; - ID3D10Device *device; + ID3D11Device *device; HRESULT hr; - if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&resource))) + if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D11Resource, (void **)&resource))) { WARN("Failed to get d3d resource from dxgi surface.\n"); return E_FAIL; } - ID3D10Resource_GetDevice(resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + if (FAILED(hr = ID3D11Resource_QueryInterface(resource, &IID_ID3D10Resource, (void **)&d3d10_resource))) { - ID3D10Resource_Release(resource); + ERR("Failed to query ID3D10Resource interface, hr %#x.\n", hr); + ID3D11Resource_Release(resource); + return hr; + } + + ID3D11Resource_GetDevice(resource, &device); + ID3D11Resource_Release(resource); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d11_device) + { + ID3D10Resource_Release(d3d10_resource); return D2DERR_UNSUPPORTED_OPERATION; } if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - ID3D10Resource_Release(resource); + ID3D10Resource_Release(d3d10_resource); return E_OUTOFMEMORY; } @@ -495,7 +504,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) { WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10Resource_Release(resource); + ID3D10Resource_Release(d3d10_resource); return hr; } @@ -522,8 +531,8 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - d2d_bitmap_init(*bitmap, context, resource, pixel_size, &d); - ID3D10Resource_Release(resource); + d2d_bitmap_init(*bitmap, context, d3d10_resource, pixel_size, &d); + ID3D10Resource_Release(d3d10_resource); TRACE("Created bitmap %p.\n", *bitmap); return S_OK;

1 0

Rémi Bernon : d2d1: Accept ID3D11Resource in d2d_bitmap_init.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 00fea2696248f315bf95d82b679cb708b59422e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00fea2696248f315bf95d82b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 09:35:32 2021 +0200 d2d1: Accept ID3D11Resource in d2d_bitmap_init. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 03982924efa..43c1b6f8d44 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -279,20 +279,20 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) } static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context *context, - ID3D10Resource *d3d10_resource, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) + ID3D11Resource *resource, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { - ID3D11Resource *resource; + ID3D10Resource *d3d10_resource; ID3D11Device *d3d_device; HRESULT hr; - if (FAILED(hr = ID3D10Resource_QueryInterface(d3d10_resource, &IID_ID3D11Resource, (void **)&resource))) - WARN("Failed to query ID3D11Resource interface, hr %#x.\n", hr); + if (FAILED(hr = ID3D11Resource_QueryInterface(resource, &IID_ID3D10Resource, (void **)&d3d10_resource))) + WARN("Failed to query ID3D10Resource interface, hr %#x.\n", hr); bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; ID2D1Factory_AddRef(bitmap->factory = context->factory); - ID3D10Resource_AddRef(bitmap->resource = d3d10_resource); - bitmap->d3d11_resource = resource; + ID3D11Resource_AddRef(bitmap->d3d11_resource = resource); + bitmap->resource = d3d10_resource; bitmap->pixel_size = size; bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; @@ -336,7 +336,6 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, D2D1_BITMAP_PROPERTIES1 bitmap_desc; D3D11_TEXTURE2D_DESC texture_desc; ID3D11Texture2D *texture; - ID3D10Resource *resource; HRESULT hr; if (!format_supported(&desc->pixelFormat)) @@ -388,20 +387,12 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, return hr; } - if (FAILED(hr = ID3D11Texture2D_QueryInterface(texture, &IID_ID3D10Resource, (void **)&resource))) - { - ERR("Failed to query ID3D10Resource interface, hr %#x.\n", hr); - ID3D11Texture2D_Release(texture); - return hr; - } - if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - d2d_bitmap_init(*bitmap, context, resource, size, desc); + d2d_bitmap_init(*bitmap, context, (ID3D11Resource *)texture, size, desc); TRACE("Created bitmap %p.\n", *bitmap); } ID3D11Texture2D_Release(texture); - ID3D10Resource_Release(resource); return *bitmap ? S_OK : E_OUTOFMEMORY; } @@ -455,7 +446,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - d2d_bitmap_init(*bitmap, context, src_impl->resource, src_impl->pixel_size, desc); + d2d_bitmap_init(*bitmap, context, src_impl->d3d11_resource, src_impl->pixel_size, desc); TRACE("Created bitmap %p.\n", *bitmap); failed: @@ -467,7 +458,6 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface = data; ID3D11Resource *resource; - ID3D10Resource *d3d10_resource; D2D1_SIZE_U pixel_size; ID3D11Device *device; HRESULT hr; @@ -478,25 +468,17 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, return E_FAIL; } - if (FAILED(hr = ID3D11Resource_QueryInterface(resource, &IID_ID3D10Resource, (void **)&d3d10_resource))) - { - ERR("Failed to query ID3D10Resource interface, hr %#x.\n", hr); - ID3D11Resource_Release(resource); - return hr; - } - ID3D11Resource_GetDevice(resource, &device); - ID3D11Resource_Release(resource); ID3D11Device_Release(device); if (device != (ID3D11Device *)context->d3d11_device) { - ID3D10Resource_Release(d3d10_resource); + ID3D11Resource_Release(resource); return D2DERR_UNSUPPORTED_OPERATION; } if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - ID3D10Resource_Release(d3d10_resource); + ID3D11Resource_Release(resource); return E_OUTOFMEMORY; } @@ -504,7 +486,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) { WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10Resource_Release(d3d10_resource); + ID3D11Resource_Release(resource); return hr; } @@ -531,8 +513,8 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - d2d_bitmap_init(*bitmap, context, d3d10_resource, pixel_size, &d); - ID3D10Resource_Release(d3d10_resource); + d2d_bitmap_init(*bitmap, context, resource, pixel_size, &d); + ID3D11Resource_Release(resource); TRACE("Created bitmap %p.\n", *bitmap); return S_OK;

1 0

Rémi Bernon : d2d1: Remove pointer indirections in d2d_gradient_create.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 692f205a3e5715cd225ef4fa93d45e99a32b1731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=692f205a3e5715cd225ef4fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 09:35:33 2021 +0200 d2d1: Remove pointer indirections in d2d_gradient_create. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 1fe9b5e8f70..67c7d701b82 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -128,17 +128,19 @@ static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = }; HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D2D1_GRADIENT_STOP *stops, - UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, struct d2d_gradient **gradient) + UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, struct d2d_gradient **out) { D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; D3D10_SUBRESOURCE_DATA buffer_data; ID3D10ShaderResourceView *view; + struct d2d_gradient *gradient; D3D10_BUFFER_DESC buffer_desc; struct d2d_vec4 *data; ID3D10Buffer *buffer; unsigned int i; HRESULT hr; + *out = NULL; if (!(data = heap_calloc(stop_count, 2 * sizeof(*data)))) { ERR("Failed to allocate data.\n"); @@ -185,7 +187,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D return hr; } - if (!(*gradient = heap_alloc_zero(sizeof(**gradient)))) + if (!(gradient = heap_alloc_zero(sizeof(*gradient)))) { ID3D10ShaderResourceView_Release(view); return E_OUTOFMEMORY; @@ -196,21 +198,22 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D if (extend_mode != D2D1_EXTEND_MODE_CLAMP) FIXME("Ignoring extend mode %#x.\n", extend_mode); - (*gradient)->ID2D1GradientStopCollection_iface.lpVtbl = &d2d_gradient_vtbl; - (*gradient)->refcount = 1; - ID2D1Factory_AddRef((*gradient)->factory = factory); - (*gradient)->view = view; + gradient->ID2D1GradientStopCollection_iface.lpVtbl = &d2d_gradient_vtbl; + gradient->refcount = 1; + ID2D1Factory_AddRef(gradient->factory = factory); + gradient->view = view; - (*gradient)->stop_count = stop_count; - if (!((*gradient)->stops = heap_calloc(stop_count, sizeof(*stops)))) + gradient->stop_count = stop_count; + if (!(gradient->stops = heap_calloc(stop_count, sizeof(*stops)))) { ID3D10ShaderResourceView_Release(view); - heap_free(*gradient); + heap_free(gradient); return E_OUTOFMEMORY; } - memcpy((*gradient)->stops, stops, stop_count * sizeof(*stops)); + memcpy(gradient->stops, stops, stop_count * sizeof(*stops)); - TRACE("Created gradient %p.\n", *gradient); + TRACE("Created gradient %p.\n", gradient); + *out = gradient; return S_OK; }

1 0