- Wine-Commits - list.winehq.org

Alex Henrie : dmloader: Don't force a calling convention on internal functions.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: be666ef4228b156dec8946d4f5f3211783dcc153 URL: https://gitlab.winehq.org/wine/wine/-/commit/be666ef4228b156dec8946d4f5f321… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:54:30 2022 -0700 dmloader: Don't force a calling convention on internal functions. --- dlls/dmloader/container.c | 2 +- dlls/dmloader/dmloader_main.c | 2 +- dlls/dmloader/dmloader_private.h | 10 +++++----- dlls/dmloader/loader.c | 2 +- dlls/dmloader/loaderstream.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 111c0db4760..f2b284e1cb3 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -647,7 +647,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmcontainer(REFIID lpcGUID, void **ppobj) +HRESULT create_dmcontainer(REFIID lpcGUID, void **ppobj) { IDirectMusicContainerImpl* obj; HRESULT hr; diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index 61aa092b5f8..512e6102d86 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -40,7 +40,7 @@ LONG module_ref = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv); + HRESULT (*fnCreateInstance)(REFIID riid, void **ppv); } IClassFactoryImpl; /****************************************************************** diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 94bb9ddf1bd..47994a48c4e 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -62,11 +62,11 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; /***************************************************************************** * Creation helpers */ -extern HRESULT WINAPI create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicLoaderFileStream(void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream(void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream(void **ppobj) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicLoaderFileStream implementation structure diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0bb22a406ab..6c4b29ab5ea 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -903,7 +903,7 @@ static HRESULT DMUSIC_GetDefaultGMPath (WCHAR wszPath[MAX_PATH]) { } /* for ClassFactory */ -HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj) +HRESULT create_dmloader(REFIID lpcGUID, void **ppobj) { IDirectMusicLoaderImpl *obj; DMUS_OBJECTDESC Desc; diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 864c222e118..38862c0fec7 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -288,7 +288,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderFileStream_GetLoader_Vtb IDirectMusicLoaderFileStream_IDirectMusicGetLoader_GetLoader }; -HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID* ppobj) { +HRESULT DMUSIC_CreateDirectMusicLoaderFileStream (void** ppobj) { IDirectMusicLoaderFileStream *obj; TRACE("(%p)\n", ppobj); @@ -545,7 +545,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderResourceStream_GetLoader IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_GetLoader }; -HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID* ppobj) { +HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream (void** ppobj) { IDirectMusicLoaderResourceStream *obj; TRACE("(%p)\n", ppobj); @@ -797,7 +797,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderGenericStream_GetLoader_ IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_GetLoader }; -HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID* ppobj) { +HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream (void** ppobj) { IDirectMusicLoaderGenericStream *obj; TRACE("(%p)\n", ppobj);

1 0

Paul Gofman : winhttp: Move read buffer to websocket.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 50bea867d2ca6d657e3db8a8193204cf83311201 URL: https://gitlab.winehq.org/wine/wine/-/commit/50bea867d2ca6d657e3db8a8193204… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 15 18:48:55 2022 -0600 winhttp: Move read buffer to websocket. --- dlls/winhttp/request.c | 23 +++++++++++++++++++---- dlls/winhttp/winhttp_private.h | 2 ++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0af71b40fe9..9ff0c9202c5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3192,6 +3192,7 @@ static void socket_destroy( struct object_header *hdr ) netconn_release( socket->netconn ); release_object( &socket->request->hdr ); + free( socket->read_buffer ); free( socket->send_frame_buffer ); free( socket ); } @@ -3266,6 +3267,19 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.flags = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC; socket->keepalive_interval = 30000; socket->send_buffer_size = request->websocket_send_buffer_size; + if (request->read_size) + { + if (!(socket->read_buffer = malloc( request->read_size ))) + { + ERR( "No memory.\n" ); + free( socket ); + release_object( &request->hdr ); + return NULL; + } + socket->bytes_in_read_buffer = request->read_size; + memcpy( socket->read_buffer, request->read_buf + request->read_pos, request->read_size ); + request->read_pos = request->read_size = 0; + } InitializeSRWLock( &socket->send_lock ); init_queue( &socket->send_q ); init_queue( &socket->recv_q ); @@ -3674,11 +3688,12 @@ static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD * char *ptr = buf; int received; - if (socket->request->read_size) + if (socket->bytes_in_read_buffer) { - size = min( needed, socket->request->read_size ); - memcpy( ptr, socket->request->read_buf + socket->request->read_pos, size ); - remove_data( socket->request, size ); + size = min( needed, socket->bytes_in_read_buffer ); + memcpy( ptr, socket->read_buffer, size ); + memmove( socket->read_buffer, socket->read_buffer + size, socket->bytes_in_read_buffer - size ); + socket->bytes_in_read_buffer -= size; needed -= size; ptr += size; } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 934c9fd4492..9b94ce98de4 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -277,6 +277,8 @@ struct socket unsigned int send_remaining_size; unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; + char *read_buffer; + unsigned int bytes_in_read_buffer; SRWLOCK send_lock; volatile LONG pending_noncontrol_send; enum fragment_type sending_fragment_type;

1 0

Paul Gofman : winhttp: Do not reference request from socket.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 289d21a5d2207a03535d7b3539f0e243ab884e43 URL: https://gitlab.winehq.org/wine/wine/-/commit/289d21a5d2207a03535d7b3539f0e2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 15 15:26:10 2022 -0600 winhttp: Do not reference request from socket. --- dlls/winhttp/request.c | 4 ---- dlls/winhttp/tests/notification.c | 8 +++++--- dlls/winhttp/winhttp_private.h | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9ff0c9202c5..1a9b4e14ee8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3191,7 +3191,6 @@ static void socket_destroy( struct object_header *hdr ) stop_queue( &socket->recv_q ); netconn_release( socket->netconn ); - release_object( &socket->request->hdr ); free( socket->read_buffer ); free( socket->send_frame_buffer ); free( socket ); @@ -3286,9 +3285,6 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR netconn_addref( request->netconn ); socket->netconn = request->netconn; - addref_object( &request->hdr ); - socket->request = request; - netconn_set_timeout( socket->netconn, FALSE, socket->keepalive_interval ); if ((hsocket = alloc_handle( &socket->hdr ))) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 181bd35856b..a9f782f5e3d 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -671,7 +671,8 @@ static const struct notification websocket_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL }, - { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, + { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, @@ -680,7 +681,6 @@ static const struct notification websocket_test[] = { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NF_SIGNAL }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, }; @@ -911,6 +911,9 @@ static void test_websocket(BOOL secure) err = GetLastError(); ok( socket != NULL, "got %lu\n", err ); ok( err == ERROR_SUCCESS, "got %lu\n", err ); + + WinHttpCloseHandle( request ); + WaitForSingleObject( info.wait, INFINITE ); /* The send is executed synchronously (even if sending a reasonably big buffer exceeding SSL buffer size). @@ -1029,7 +1032,6 @@ static void test_websocket(BOOL secure) setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( socket ); - WinHttpCloseHandle( request ); WaitForSingleObject( info.wait, INFINITE ); end_test( &info, __LINE__ ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9b94ce98de4..0326a8fc1e3 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -256,7 +256,6 @@ enum fragment_type struct socket { struct object_header hdr; - struct request *request; struct netconn *netconn; int keepalive_interval; unsigned int send_buffer_size;

1 0

Paul Gofman : winhttp: Store connection in websocket.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 64abcf80b69845eadbb18f4d8b57cf90ef716520 URL: https://gitlab.winehq.org/wine/wine/-/commit/64abcf80b69845eadbb18f4d8b57cf… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 15 18:40:40 2022 -0600 winhttp: Store connection in websocket. --- dlls/winhttp/net.c | 5 +++++ dlls/winhttp/request.c | 15 +++++++++------ dlls/winhttp/winhttp_private.h | 2 ++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 76700a9a32a..1be78d126d4 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -278,6 +278,11 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock return ERROR_SUCCESS; } +void netconn_addref( struct netconn *conn ) +{ + InterlockedIncrement( &conn->refs ); +} + void netconn_release( struct netconn *conn ) { if (InterlockedDecrement( &conn->refs )) return; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1507b958946..5a5e627a5ef 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3164,7 +3164,7 @@ static void socket_handle_closing( struct object_header *hdr ) pending_tasks = cancel_queue( &socket->recv_q ) || pending_tasks; if (pending_tasks) - netconn_cancel_io( socket->request->netconn ); + netconn_cancel_io( socket->netconn ); } static BOOL socket_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) @@ -3190,6 +3190,7 @@ static void socket_destroy( struct object_header *hdr ) stop_queue( &socket->send_q ); stop_queue( &socket->recv_q ); + netconn_release( socket->netconn ); release_object( &socket->request->hdr ); free( socket->send_frame_buffer ); free( socket ); @@ -3212,7 +3213,7 @@ static BOOL socket_set_option( struct object_header *hdr, DWORD option, void *bu return FALSE; } socket->keepalive_interval = interval; - netconn_set_timeout( socket->request->netconn, FALSE, socket->keepalive_interval ); + netconn_set_timeout( socket->netconn, FALSE, socket->keepalive_interval ); SetLastError( ERROR_SUCCESS ); TRACE( "WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL %lu.\n", interval); return TRUE; @@ -3267,11 +3268,13 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR InitializeSRWLock( &socket->send_lock ); init_queue( &socket->send_q ); init_queue( &socket->recv_q ); + netconn_addref( request->netconn ); + socket->netconn = request->netconn; addref_object( &request->hdr ); socket->request = request; - netconn_set_timeout( socket->request->netconn, FALSE, socket->keepalive_interval ); + netconn_set_timeout( socket->netconn, FALSE, socket->keepalive_interval ); if ((hsocket = alloc_handle( &socket->hdr ))) { @@ -3289,7 +3292,7 @@ static DWORD send_bytes( struct socket *socket, char *bytes, int len, int *sent, { int count; DWORD err; - err = netconn_send( socket->request->netconn, bytes, len, &count, ovr ); + err = netconn_send( socket->netconn, bytes, len, &count, ovr ); if (sent) *sent = count; if (err) return err; return (count == len || (ovr && count)) ? ERROR_SUCCESS : ERROR_INTERNAL_ERROR; @@ -3401,7 +3404,7 @@ static DWORD complete_send_frame( struct socket *socket, WSAOVERLAPPED *ovr, con { DWORD ret, len, i; - if (!netconn_wait_overlapped_result( socket->request->netconn, ovr, &len )) + if (!netconn_wait_overlapped_result( socket->netconn, ovr, &len )) return WSAGetLastError(); if (socket->bytes_in_send_frame_buffer) @@ -3680,7 +3683,7 @@ static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD * } while (size != len) { - if ((err = netconn_recv( socket->request->netconn, ptr, needed, 0, &received ))) return err; + if ((err = netconn_recv( socket->netconn, ptr, needed, 0, &received ))) return err; if (!received) break; size += received; if (!read_full_buffer) break; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 211e2134012..934c9fd4492 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -257,6 +257,7 @@ struct socket { struct object_header hdr; struct request *request; + struct netconn *netconn; int keepalive_interval; unsigned int send_buffer_size; enum socket_state state; @@ -371,6 +372,7 @@ void close_connection( struct request * ) DECLSPEC_HIDDEN; void init_queue( struct queue *queue ) DECLSPEC_HIDDEN; void stop_queue( struct queue * ) DECLSPEC_HIDDEN; +void netconn_addref( struct netconn * ) DECLSPEC_HIDDEN; void netconn_release( struct netconn * ) DECLSPEC_HIDDEN; DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN;

1 0

Paul Gofman : winhttp: Send connection close notifications in finished_reading().
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 34b3d212a8e5691e1902bd2fe7a90326baaa5902 URL: https://gitlab.winehq.org/wine/wine/-/commit/34b3d212a8e5691e1902bd2fe7a903… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 17 13:31:01 2022 -0600 winhttp: Send connection close notifications in finished_reading(). --- dlls/winhttp/request.c | 15 ++++++++++++--- dlls/winhttp/tests/notification.c | 28 ++++++---------------------- 2 files changed, 18 insertions(+), 25 deletions(-)

1 0

Paul Gofman : winhttp: Move flags to websocket header.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: e50df0fa1c613b88b4b0eb9bba69c9f68bf945aa URL: https://gitlab.winehq.org/wine/wine/-/commit/e50df0fa1c613b88b4b0eb9bba69c9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 15 18:46:53 2022 -0600 winhttp: Move flags to websocket header. --- dlls/winhttp/request.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5a5e627a5ef..0af71b40fe9 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3263,6 +3263,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.callback = request->hdr.callback; socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; + socket->hdr.flags = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC; socket->keepalive_interval = 30000; socket->send_buffer_size = request->websocket_send_buffer_size; InitializeSRWLock( &socket->send_lock ); @@ -3587,7 +3588,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ return ERROR_INVALID_OPERATION; } - if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if (socket->hdr.flags & WINHTTP_FLAG_ASYNC) { BOOL async_send, complete_async = FALSE; struct socket_send *s; @@ -3762,7 +3763,7 @@ static void task_socket_send_pong( void *ctx, BOOL abort ) static DWORD socket_send_pong( struct socket *socket ) { - if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if (socket->hdr.flags & WINHTTP_FLAG_ASYNC) { BOOL async_send, complete_async = FALSE; struct socket_send *s; @@ -4024,7 +4025,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D return ERROR_INVALID_OPERATION; } - if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if (socket->hdr.flags & WINHTTP_FLAG_ASYNC) { struct socket_receive *r; @@ -4094,7 +4095,7 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v if (socket->state < SOCKET_STATE_SHUTDOWN) socket->state = SOCKET_STATE_SHUTDOWN; - if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if (socket->hdr.flags & WINHTTP_FLAG_ASYNC) { BOOL async_send, complete_async = FALSE; struct socket_shutdown *s; @@ -4252,7 +4253,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas prev_state = socket->state; socket->state = SOCKET_STATE_CLOSED; - if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if (socket->hdr.flags & WINHTTP_FLAG_ASYNC) { pending_receives = InterlockedIncrement( &socket->hdr.pending_receives ); cancel_queue( &socket->recv_q ); @@ -4263,12 +4264,12 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if (pending_receives == 1 && socket->close_frame_received) { - if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if (socket->hdr.flags & WINHTTP_FLAG_ASYNC) socket_close_complete( socket, socket->close_frame_receive_err ); goto done; } - if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if (socket->hdr.flags & WINHTTP_FLAG_ASYNC) { struct socket_shutdown *s;

1 0

Nikolay Sivov : vbscript: Accept "><" as inequality operator.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 9f77009aa54a998feb988c2427f5947360bfc940 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f77009aa54a998feb988c2427f594… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 24 08:26:28 2022 +0300 vbscript: Accept "><" as inequality operator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/lex.c | 6 +++++- dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index f425b816cb0..38ee4a5fd4b 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -500,9 +500,13 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) } return '<'; case '>': - if(*++ctx->ptr == '=') { + switch(*++ctx->ptr) { + case '=': ctx->ptr++; return tGTEQ; + case '<': + ctx->ptr++; + return tNEQ; } return '>'; default: diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a2622f59bd9..0e8dae4049f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -181,6 +181,10 @@ Call ok(1 <= 2, "! 1 <= 2") Call ok(2 <= 2, "! 2 <= 2") Call ok(1 =< 2, "! 1 =< 2") Call ok(2 =< 2, "! 2 =< 2") +Call ok(not (2 >< 2), "2 >< 2") +Call ok(2 >< 1, "! 2 >< 1") +Call ok(not (2 <> 2), "2 <> 2") +Call ok(2 <> 1, "! 2 <> 1") Call ok(isNull(0 = null), "'(0 = null)' is not null") Call ok(isNull(null = 1), "'(null = 1)' is not null")

1 0

Paul Gofman : winhttp/tests: Avoid race condition on closing connection in server_thread().
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: f75a8b3555a8db6276a2edea587d1a1a043b36df URL: https://gitlab.winehq.org/wine/wine/-/commit/f75a8b3555a8db6276a2edea587d1a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 17 14:58:38 2022 -0600 winhttp/tests: Avoid race condition on closing connection in server_thread(). The connection may be cached and checked for availability for request before the server thread closes it. --- dlls/winhttp/tests/notification.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index cab297d3f4c..48b0b77ca7c 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1401,7 +1401,7 @@ struct server_info }; static int server_socket; -static HANDLE server_socket_available, server_socket_done; +static HANDLE server_socket_available, server_socket_closed, server_socket_done; static DWORD CALLBACK server_thread(LPVOID param) { @@ -1436,7 +1436,7 @@ static DWORD CALLBACK server_thread(LPVOID param) do { if (c == -1) c = accept(s, NULL, NULL); - + ResetEvent(server_socket_closed); memset(buffer, 0, sizeof buffer); for(i = 0; i < sizeof buffer - 1; i++) { @@ -1463,6 +1463,7 @@ static DWORD CALLBACK server_thread(LPVOID param) } shutdown(c, 2); closesocket(c); + SetEvent(server_socket_closed); c = -1; } while (!last_request); @@ -1749,6 +1750,7 @@ static void test_persistent_connection(int port) SetEvent( server_socket_done ); CloseHandle( info.wait ); + WaitForSingleObject( server_socket_closed, INFINITE ); } struct test_recursion_context @@ -1929,6 +1931,7 @@ START_TEST (notification) ok( thread != NULL, "failed to create thread %lu\n", GetLastError() ); server_socket_available = CreateEventW( NULL, 0, 0, NULL ); + server_socket_closed = CreateEventW( NULL, 0, 0, NULL ); server_socket_done = CreateEventW( NULL, 0, 0, NULL ); ret = WaitForSingleObject( si.event, 10000 ); @@ -1948,4 +1951,5 @@ START_TEST (notification) CloseHandle( thread ); CloseHandle( server_socket_available ); CloseHandle( server_socket_done ); + CloseHandle( server_socket_closed ); }

1 0

Paul Gofman : winhttp: Add reference counting for connection.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 645a65cbcf6aa49431fc0a70a29b9101e8c435ab URL: https://gitlab.winehq.org/wine/wine/-/commit/645a65cbcf6aa49431fc0a70a29b91… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 17 12:24:20 2022 -0600 winhttp: Add reference counting for connection. --- dlls/winhttp/net.c | 5 ++++- dlls/winhttp/request.c | 16 ++++++++-------- dlls/winhttp/winhttp_private.h | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a3ccf40cb65..76700a9a32a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -214,6 +214,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock winsock_init(); if (!(conn = calloc( 1, sizeof(*conn) ))) return ERROR_OUTOFMEMORY; + conn->refs = 1; conn->host = host; conn->sockaddr = *sockaddr; if ((conn->socket = WSASocketW( sockaddr->ss_family, SOCK_STREAM, 0, NULL, 0, WSA_FLAG_OVERLAPPED )) == -1) @@ -277,8 +278,10 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock return ERROR_SUCCESS; } -void netconn_close( struct netconn *conn ) +void netconn_release( struct netconn *conn ) { + if (InterlockedDecrement( &conn->refs )) return; + TRACE( "Closing connection %p.\n", conn ); if (conn->secure) { free( conn->peek_msg_mem ); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e977070e87c..dbee446783a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1449,7 +1449,7 @@ static void CALLBACK connection_collector( TP_CALLBACK_INSTANCE *instance, void { TRACE("freeing %p\n", netconn); list_remove(&netconn->entry); - netconn_close(netconn); + netconn_release(netconn); } else remaining_connections++; } @@ -1591,7 +1591,7 @@ static DWORD open_connection( struct request *request ) if (netconn_is_alive( netconn )) break; TRACE("connection %p no longer alive, closing\n", netconn); - netconn_close( netconn ); + netconn_release( netconn ); netconn = NULL; } @@ -1654,7 +1654,7 @@ static DWORD open_connection( struct request *request ) { request->netconn = NULL; free( addressW ); - netconn_close( netconn ); + netconn_release( netconn ); return ret; } } @@ -1668,7 +1668,7 @@ static DWORD open_connection( struct request *request ) { request->netconn = NULL; free( addressW ); - netconn_close( netconn ); + netconn_release( netconn ); return ret; } } @@ -1687,7 +1687,7 @@ static DWORD open_connection( struct request *request ) if (netconn->secure && !(request->server_cert = netconn_get_certificate( netconn ))) { free( addressW ); - netconn_close( netconn ); + netconn_release( netconn ); return ERROR_WINHTTP_SECURE_FAILURE; } @@ -1705,7 +1705,7 @@ void close_connection( struct request *request ) if (!request->netconn) return; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 0 ); - netconn_close( request->netconn ); + netconn_release( request->netconn ); request->netconn = NULL; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 ); } @@ -1884,7 +1884,7 @@ static void finished_reading( struct request *request ) else if (!wcscmp( request->version, L"HTTP/1.0" )) close = TRUE; if (close) - netconn_close( request->netconn ); + netconn_release( request->netconn ); else cache_connection( request->netconn ); request->netconn = NULL; @@ -2715,7 +2715,7 @@ static DWORD handle_redirect( struct request *request, DWORD status ) goto end; } - netconn_close( request->netconn ); + netconn_release( request->netconn ); request->netconn = NULL; request->content_length = request->content_read = 0; request->read_pos = request->read_size = 0; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index a6946d5e366..211e2134012 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -106,6 +106,7 @@ struct connect struct netconn { struct list entry; + LONG refs; int socket; struct sockaddr_storage sockaddr; BOOL secure; /* SSL active on connection? */ @@ -370,7 +371,7 @@ void close_connection( struct request * ) DECLSPEC_HIDDEN; void init_queue( struct queue *queue ) DECLSPEC_HIDDEN; void stop_queue( struct queue * ) DECLSPEC_HIDDEN; -void netconn_close( struct netconn * ) DECLSPEC_HIDDEN; +void netconn_release( struct netconn * ) DECLSPEC_HIDDEN; DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( struct netconn * ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : vbscript/tests: Add some tests for lte/gte tokens.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 6f1d38bdba5ce1696ad2cc45f195e2feca673138 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f1d38bdba5ce1696ad2cc45f195e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 24 08:22:36 2022 +0300 vbscript/tests: Add some tests for lte/gte tokens. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/tests/lang.vbs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 529f995e764..a2622f59bd9 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -167,6 +167,8 @@ call ok(false imp null, "false imp null is false?") Call ok(2 >= 1, "! 2 >= 1") Call ok(2 >= 2, "! 2 >= 2") +Call ok(2 => 1, "! 2 => 1") +Call ok(2 => 2, "! 2 => 2") Call ok(not(true >= 2), "true >= 2 ?") Call ok(2 > 1, "! 2 > 1") Call ok(false > true, "! false < true") @@ -177,6 +179,8 @@ Call ok(1 < 2, "! 1 < 2") Call ok(1 = 1 < 0, "! 1 = 1 < 0") Call ok(1 <= 2, "! 1 <= 2") Call ok(2 <= 2, "! 2 <= 2") +Call ok(1 =< 2, "! 1 =< 2") +Call ok(2 =< 2, "! 2 =< 2") Call ok(isNull(0 = null), "'(0 = null)' is not null") Call ok(isNull(null = 1), "'(null = 1)' is not null")

1 0