May 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Export RtlWow64Get/SetThreadContext() on all 64-bit platforms.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: ee0b909f878ae56cd24025336ba9f6e7ef445697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee0b909f878ae56cd2402533… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 10:24:28 2021 +0200 ntdll: Export RtlWow64Get/SetThreadContext() on all 64-bit platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/process.c | 18 ++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 18 ------------------ dlls/ntdll/unix/thread.c | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 06ca3d3957c..f05e9c39a88 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1073,9 +1073,9 @@ @ stdcall -arch=win64 RtlWow64GetCpuAreaInfo(ptr long ptr) @ stdcall RtlWow64GetCurrentMachine() @ stdcall RtlWow64GetProcessMachines(long ptr ptr) -@ stdcall -arch=x86_64 RtlWow64GetThreadContext(long ptr) +@ stdcall -arch=win64 RtlWow64GetThreadContext(long ptr) @ stdcall RtlWow64IsWowGuestMachineSupported(long ptr) -@ stdcall -arch=x86_64 RtlWow64SetThreadContext(long ptr) +@ stdcall -arch=win64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 82b1b69c4ea..3ed31e22100 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -142,6 +142,24 @@ NTSTATUS WINAPI RtlWow64GetCpuAreaInfo( WOW64_CPURESERVED *cpu, ULONG reserved, return STATUS_INVALID_PARAMETER; } + +/****************************************************************************** + * RtlWow64GetThreadContext (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context ) +{ + return NtQueryInformationThread( handle, ThreadWow64Context, context, sizeof(*context), NULL ); +} + + +/****************************************************************************** + * RtlWow64SetThreadContext (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *context ) +{ + return NtSetInformationThread( handle, ThreadWow64Context, context, sizeof(*context) ); +} + #endif /********************************************************************** diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0396433cb32..55975093174 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -343,24 +343,6 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "fxsave 0x100(%rcx)\n\t" /* context->FltSave */ "ret" ); -/****************************************************************************** - * RtlWow64GetThreadContext (NTDLL.@) - */ -NTSTATUS WINAPI RtlWow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context ) -{ - return NtQueryInformationThread( handle, ThreadWow64Context, context, sizeof(*context), NULL ); -} - - -/****************************************************************************** - * RtlWow64SetThreadContext (NTDLL.@) - */ -NTSTATUS WINAPI RtlWow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *context ) -{ - return NtSetInformationThread( handle, ThreadWow64Context, context, sizeof(*context) ); -} - - static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 639031059c6..d8fd0767da8 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1666,7 +1666,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadWow64Context: { -#ifdef __x86_64__ +#ifdef _WIN64 BOOL self; WOW64_CONTEXT *context = data; @@ -1861,7 +1861,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadWow64Context: { -#ifdef __x86_64__ +#ifdef _WIN64 BOOL self; const WOW64_CONTEXT *context = data;

1 0

Paul Gofman : wbemprox: Partially implement Win32_Process.Create method.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 85abea6070a4d7cf22a48971b97b43733178236e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85abea6070a4d7cf22a48971… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 18 09:49:45 2021 +0200 wbemprox: Partially implement Win32_Process.Create method. Fixes FunCom launcher failure to launch games. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 14 ++++- dlls/wbemprox/process.c | 110 ++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 123 ++++++++++++++++++++++++++++++++++++++- dlls/wbemprox/wbemprox_private.h | 1 + 4 files changed, 244 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85abea6070a4d7cf22a4…

1 0

Zebediah Figura : winegstreamer: Make the file_size field of struct parser into a local variable.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 3c7bcb830fc87d0d08b8b295c632fa159f038aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c7bcb830fc87d0d08b8b295… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 23:38:55 2021 -0500 winegstreamer: Make the file_size field of struct parser into a local variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index e12a0c49eb3..5f9535659b4 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -50,8 +50,6 @@ struct parser unsigned int source_count; BOOL enum_sink_first; - LONGLONG file_size; - struct wg_parser *wg_parser; /* FIXME: It would be nice to avoid duplicating these with strmbase. @@ -947,20 +945,20 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *pmt) { struct parser *filter = impl_from_strmbase_sink(iface); + LONGLONG file_size, unused; HRESULT hr = S_OK; - LONGLONG unused; unsigned int i; filter->reader = NULL; if (FAILED(hr = IPin_QueryInterface(peer, &IID_IAsyncReader, (void **)&filter->reader))) return hr; - IAsyncReader_Length(filter->reader, &filter->file_size, &unused); + IAsyncReader_Length(filter->reader, &file_size, &unused); filter->sink_connected = true; filter->read_thread = CreateThread(NULL, 0, read_thread, filter, 0, NULL); - if (FAILED(hr = unix_funcs->wg_parser_connect(filter->wg_parser, filter->file_size))) + if (FAILED(hr = unix_funcs->wg_parser_connect(filter->wg_parser, file_size))) goto err; if (!filter->init_gst(filter))

1 0

Zebediah Figura : winegstreamer: Shut down the read thread before releasing the IMFByteStream.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 2e265566431bfb7e2d2aeed5e23f898a978f36b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e265566431bfb7e2d2aeed5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 23:38:54 2021 -0500 winegstreamer: Shut down the read thread before releasing the IMFByteStream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 90efc9aaed2..e153c8e9161 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1211,6 +1211,13 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) unix_funcs->wg_parser_disconnect(source->wg_parser); + if (source->read_thread) + { + source->read_thread_shutdown = true; + WaitForSingleObject(source->read_thread, INFINITE); + CloseHandle(source->read_thread); + } + if (source->pres_desc) IMFPresentationDescriptor_Release(source->pres_desc); if (source->event_queue) @@ -1234,13 +1241,6 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) IMFMediaStream_Release(&stream->IMFMediaStream_iface); } - if (source->read_thread) - { - source->read_thread_shutdown = true; - WaitForSingleObject(source->read_thread, INFINITE); - CloseHandle(source->read_thread); - } - unix_funcs->wg_parser_destroy(source->wg_parser); if (source->stream_count)

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_CONNECT.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 4256253419998b433ef3143603c32798dc3fccb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4256253419998b433ef31436… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 21:29:59 2021 -0500 server: Introduce IOCTL_AFD_WINE_CONNECT. I was able to reverse-engineer a native CONNECT ioctl, with code 0x801; but I was not able to find a valid set of parameters which would allow us to implement either connect() or ConnectEx(). In particular, I could not find a way to make the ioctl respect nonblocking mode, and I could not find a way to specify an initial buffer to be sent. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 9 ++++ server/sock.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index e890020ca88..b085981b6c0 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -36,6 +36,7 @@ struct afd_listen_params #define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_CONNECT CTL_CODE(FILE_DEVICE_NETWORK, 203, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -51,4 +52,12 @@ struct afd_accept_into_params unsigned int recv_len, local_len; }; +struct afd_connect_params +{ + int addr_len; + int synchronous; + /* VARARG(addr, struct sockaddr, addr_len); */ + /* VARARG(data, bytes); */ +}; + #endif diff --git a/server/sock.c b/server/sock.c index 565fb4c5a2c..9896810def1 100644 --- a/server/sock.c +++ b/server/sock.c @@ -106,6 +106,14 @@ struct accept_req unsigned int recv_len, local_len; }; +struct connect_req +{ + struct async *async; + struct iosb *iosb; + struct sock *sock; + unsigned int addr_len, send_len, send_cursor; +}; + struct sock { struct object obj; /* object header */ @@ -141,10 +149,12 @@ struct sock struct async_queue write_q; /* queue for asynchronous writes */ struct async_queue ifchange_q; /* queue for interface change notifications */ struct async_queue accept_q; /* queue for asynchronous accepts */ + struct async_queue connect_q; /* queue for asynchronous connects */ struct object *ifchange_obj; /* the interface change notification object */ struct list ifchange_entry; /* entry in ifchange notification list */ struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ + struct connect_req *connect_req; /* pending connection request */ }; static void sock_dump( struct object *obj, int verbose ); @@ -558,6 +568,58 @@ static void complete_async_accept_recv( struct accept_req *req ) fill_accept_output( req ); } +static void free_connect_req( void *private ) +{ + struct connect_req *req = private; + + req->sock->connect_req = NULL; + release_object( req->async ); + release_object( req->iosb ); + release_object( req->sock ); + free( req ); +} + +static void complete_async_connect( struct sock *sock ) +{ + struct connect_req *req = sock->connect_req; + const char *in_buffer; + struct iosb *iosb; + size_t len; + int ret; + + if (debug_level) fprintf( stderr, "completing connect request for socket %p\n", sock ); + + sock->pending_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); + sock->reported_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); + sock->state |= FD_WINE_CONNECTED; + sock->state &= ~(FD_CONNECT | FD_WINE_LISTENING); + + if (!req->send_len) + { + set_error( STATUS_SUCCESS ); + return; + } + + iosb = req->iosb; + in_buffer = (const char *)iosb->in_data + sizeof(struct afd_connect_params) + req->addr_len; + len = req->send_len - req->send_cursor; + + ret = send( get_unix_fd( sock->fd ), in_buffer + req->send_cursor, len, 0 ); + if (ret < 0 && errno != EWOULDBLOCK) + set_error( sock_get_ntstatus( errno ) ); + else if (ret == len) + { + iosb->result = req->send_len; + iosb->status = STATUS_SUCCESS; + set_error( STATUS_ALERTED ); + } + else + { + req->send_cursor += ret; + set_error( STATUS_PENDING ); + } +} + static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if (event & (POLLIN | POLLPRI)) @@ -583,6 +645,13 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) } } + if ((event & POLLOUT) && sock->connect_req && sock->connect_req->iosb->status == STATUS_PENDING) + { + complete_async_connect( sock ); + if (get_error() != STATUS_PENDING) + async_terminate( sock->connect_req->async, get_error() ); + } + if (is_fd_overlapped( sock->fd )) { if (event & (POLLIN|POLLPRI) && async_waiting( &sock->read_q )) @@ -617,6 +686,9 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) if (sock->accept_recv_req && sock->accept_recv_req->iosb->status == STATUS_PENDING) async_terminate( sock->accept_recv_req->async, status ); + + if (sock->connect_req) + async_terminate( sock->connect_req->async, status ); } return event; @@ -865,6 +937,9 @@ static int sock_close_handle( struct object *obj, struct process *process, obj_h LIST_FOR_EACH_ENTRY_SAFE( req, next, &sock->accept_list, struct accept_req, entry ) async_terminate( req->async, STATUS_CANCELLED ); + + if (sock->connect_req) + async_terminate( sock->connect_req->async, STATUS_CANCELLED ); } return 1; @@ -887,6 +962,7 @@ static void sock_destroy( struct object *obj ) free_async_queue( &sock->write_q ); free_async_queue( &sock->ifchange_q ); free_async_queue( &sock->accept_q ); + free_async_queue( &sock->connect_q ); if (sock->event) release_object( sock->event ); if (sock->fd) { @@ -919,10 +995,12 @@ static struct sock *create_socket(void) sock->deferred = NULL; sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; + sock->connect_req = NULL; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); init_async_queue( &sock->accept_q ); + init_async_queue( &sock->connect_q ); memset( sock->errors, 0, sizeof(sock->errors) ); list_init( &sock->accept_list ); return sock; @@ -1318,6 +1396,7 @@ static int sock_get_ntstatus( int err ) case EPIPE: case ECONNRESET: return STATUS_CONNECTION_RESET; case ECONNABORTED: return STATUS_CONNECTION_ABORTED; + case EISCONN: return STATUS_CONNECTION_ACTIVE; case 0: return STATUS_SUCCESS; default: @@ -1486,6 +1565,79 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_CONNECT: + { + const struct afd_connect_params *params = get_req_data(); + const struct sockaddr *addr; + struct connect_req *req; + int send_len, ret; + + if (get_req_data_size() < sizeof(*params) || + get_req_data_size() - sizeof(*params) < params->addr_len) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + send_len = get_req_data_size() - sizeof(*params) - params->addr_len; + addr = (const struct sockaddr *)(params + 1); + + if (sock->accept_recv_req) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + if (sock->connect_req) + { + set_error( params->synchronous ? STATUS_INVALID_PARAMETER : STATUS_CONNECTION_ACTIVE ); + return 0; + } + + ret = connect( unix_fd, addr, params->addr_len ); + if (ret < 0 && errno != EINPROGRESS) + { + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + + sock->pending_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); + sock->reported_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); + + if (!ret) + { + sock->state |= FD_WINE_CONNECTED | FD_READ | FD_WRITE; + sock->state &= ~FD_CONNECT; + + if (!send_len) return 1; + } + + if (!(req = mem_alloc( sizeof(*req) ))) + return 0; + + sock->state |= FD_CONNECT; + + if (params->synchronous && (sock->state & FD_WINE_NONBLOCKING)) + { + sock_reselect( sock ); + set_error( STATUS_DEVICE_NOT_READY ); + return 0; + } + + req->async = (struct async *)grab_object( async ); + req->iosb = async_get_iosb( async ); + req->sock = (struct sock *)grab_object( sock ); + req->addr_len = params->addr_len; + req->send_len = send_len; + req->send_cursor = 0; + + async_set_completion_callback( async, free_connect_req, req ); + sock->connect_req = req; + queue_async( &sock->connect_q, async ); + sock_reselect( sock ); + set_error( STATUS_PENDING ); + return 1; + } + case IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) {

1 0

Hans Leidekker : webservices: Add async support in WsCloseChannel.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 81bedbf661d9000b246856195a21f1500ebffef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81bedbf661d9000b24685619… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 18 17:19:44 2021 +0200 webservices: Add async support in WsCloseChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 539a7813605..458815ea7cc 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -894,17 +894,47 @@ static void close_channel( struct channel *channel ) channel->state = WS_CHANNEL_STATE_CLOSED; } +struct close_channel +{ + struct task task; + struct channel *channel; + WS_ASYNC_CONTEXT ctx; +}; + +static void close_channel_proc( struct task *task ) +{ + struct close_channel *c = (struct close_channel *)task; + + close_channel( c->channel ); + + TRACE( "calling %p(S_OK)\n", c->ctx.callback ); + c->ctx.callback( S_OK, WS_LONG_CALLBACK, c->ctx.callbackState ); + TRACE( "%p returned\n", c->ctx.callback ); +} + +static HRESULT queue_close_channel( struct channel *channel, const WS_ASYNC_CONTEXT *ctx ) +{ + struct close_channel *c; + + if (!(c = heap_alloc( sizeof(*c) ))) return E_OUTOFMEMORY; + c->task.proc = close_channel_proc; + c->channel = channel; + c->ctx = *ctx; + return queue_task( &channel->send_q, &c->task ); +} + /************************************************************************** * WsCloseChannel [webservices.@] */ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - HRESULT hr = S_OK; + WS_ASYNC_CONTEXT ctx_local; + struct async async; + HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel) return E_INVALIDARG; @@ -916,7 +946,13 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, return E_INVALIDARG; } - close_channel( channel ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_close_channel( channel, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr );

1 0

Alexandre Julliard : kernelbase: Fix PEB address for Wow64.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: ea767728c679f2d0e3ab5fc7e9f20cff2a7434a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea767728c679f2d0e3ab5fc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 21:20:27 2021 +0200 kernelbase: Fix PEB address for Wow64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51151 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 2 +- dlls/psapi/tests/psapi_main.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 5d83e692222..207c04da50c 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -782,7 +782,7 @@ static BOOL init_module_iterator( struct module_iterator *iter, HANDLE process ) DWORD ldr_data32, first_module; PEB32 *peb32; - peb32 = (PEB32 *)(DWORD_PTR)pbi.PebBaseAddress; + peb32 = (PEB32 *)((char *)pbi.PebBaseAddress + 0x1000); if (!ReadProcessMemory( process, &peb32->LdrData, &ldr_data32, sizeof(ldr_data32), NULL )) return FALSE; ldr_data32_ptr = (PEB_LDR_DATA32 *)(DWORD_PTR) ldr_data32; diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 8f94e0b5798..2b263d0acff 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -161,7 +161,6 @@ static void test_EnumProcessModules(void) ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); ok(ret, "got error %u\n", GetLastError()); -todo_wine ok(!strcmp(name, buffer), "got %s\n", name); ret = GetModuleInformation(pi.hProcess, hMod, &info, sizeof(info));

1 0

Zebediah Figura : ntdll/tests: Fix a copy-paste error in an ok message.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: f47a09b91746d807791df6bfb63364980d2ece53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f47a09b91746d807791df6bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 23:44:19 2021 -0500 ntdll/tests: Fix a copy-paste error in an ok message. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2c604408943..453e77f9063 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3026,7 +3026,7 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, todo_wine ok( context->SegEs == context->SegSs, "%u: es %#x does not match ss %#x\n", entry, context->SegEs, context->SegSs ); todo_wine ok( context->SegGs == context->SegSs, - "%u: ds %#x does not match ss %#x\n", entry, context->SegGs, context->SegSs ); + "%u: gs %#x does not match ss %#x\n", entry, context->SegGs, context->SegSs ); todo_wine ok( context->SegFs && context->SegFs != context->SegSs, "%u: got fs %#x\n", entry, context->SegFs );

1 0

Zebediah Figura : server: Allow polling on an fd after it was removed.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 737fe1f99337ab999cf67fb1acdf96f70020b3d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=737fe1f99337ab999cf67fb1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 21:29:58 2021 -0500 server: Allow polling on an fd after it was removed. In particular, so that we can wait for POLLOUT on a connecting socket multiple times, in case the first connection fails, without polling on it while it is unconnected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/fd.c b/server/fd.c index 481e9a88f0f..e7253ec8f51 100644 --- a/server/fd.c +++ b/server/fd.c @@ -549,7 +549,6 @@ static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) } else if (pollfd[user].fd == -1) { - if (pollfd[user].events) return; /* stopped waiting on it, don't restart */ ctl = EPOLL_CTL_ADD; } else @@ -658,7 +657,6 @@ static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) } else if (pollfd[user].fd == -1) { - if (pollfd[user].events) return; /* stopped waiting on it, don't restart */ ev[0].flags |= EV_ADD | ((events & POLLIN) ? EV_ENABLE : EV_DISABLE); ev[1].flags |= EV_ADD | ((events & POLLOUT) ? EV_ENABLE : EV_DISABLE); } @@ -767,7 +765,6 @@ static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) } else if (pollfd[user].fd == -1) { - if (pollfd[user].events) return; /* stopped waiting on it, don't restart */ ret = port_associate( port_fd, PORT_SOURCE_FD, fd->unix_fd, events, (void *)user ); } else @@ -1647,7 +1644,7 @@ void set_fd_events( struct fd *fd, int events ) pollfd[user].events = POLLERR; pollfd[user].revents = 0; } - else if (pollfd[user].fd != -1 || !pollfd[user].events) + else { pollfd[user].fd = fd->unix_fd; pollfd[user].events = events;

1 0

Hans Leidekker : webservices: Add async support in WsShutdownSessionChannel.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 6bc9748a6fc1b1a0278e1808cb18897f9230a6bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc9748a6fc1b1a0278e1808… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 18 17:19:43 2021 +0200 webservices: Add async support in WsShutdownSessionChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 76b0c1a96e2..539a7813605 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -820,14 +820,45 @@ static HRESULT shutdown_session( struct channel *channel ) } } +struct shutdown_session +{ + struct task task; + struct channel *channel; + WS_ASYNC_CONTEXT ctx; +}; + +static void shutdown_session_proc( struct task *task ) +{ + struct shutdown_session *s = (struct shutdown_session *)task; + HRESULT hr; + + hr = shutdown_session( s->channel ); + + TRACE( "calling %p(%08x)\n", s->ctx.callback, hr ); + s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState ); + TRACE( "%p returned\n", s->ctx.callback ); +} + +static HRESULT queue_shutdown_session( struct channel *channel, const WS_ASYNC_CONTEXT *ctx ) +{ + struct shutdown_session *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return E_OUTOFMEMORY; + s->task.proc = shutdown_session_proc; + s->channel = channel; + s->ctx = *ctx; + return queue_task( &channel->send_q, &s->task ); +} + HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel) return E_INVALIDARG; @@ -844,7 +875,13 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT return WS_E_INVALID_OPERATION; } - hr = shutdown_session( channel ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_shutdown_session( channel, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr );

1 0