wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Paul Gofman : winhttp: Move flags to websocket header.
by Alexandre Julliard 24 Nov '22

24 Nov '22

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

Paul Gofman : winhttp: Store connection in websocket.
by Alexandre Julliard 24 Nov '22

24 Nov '22

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 24 Nov '22

24 Nov '22

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/tests: Avoid race condition on closing connection in server_thread().
by Alexandre Julliard 24 Nov '22

24 Nov '22

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 24 Nov '22

24 Nov '22

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: Accept "><" as inequality operator.
by Alexandre Julliard 24 Nov '22

24 Nov '22

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

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

24 Nov '22

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

Robert Wilhelm : vbscript: Handle another variant of LTE/GTE tokens.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: 3a578022891714a83d5a981693b945cc0a16b63d URL: https://gitlab.winehq.org/wine/wine/-/commit/3a578022891714a83d5a981693b945… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Nov 24 08:10:58 2022 +0300 vbscript: Handle another variant of LTE/GTE tokens. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53670 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/lex.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 3374d4eafe1..f425b816cb0 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -422,7 +422,6 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) case ':': case ')': case ',': - case '=': case '+': case '*': case '/': @@ -477,6 +476,16 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) if(*++ctx->ptr == 'h' || *ctx->ptr == 'H') return parse_hex_literal(ctx, lval); return '&'; + case '=': + switch(*++ctx->ptr) { + case '<': + ctx->ptr++; + return tLTEQ; + case '>': + ctx->ptr++; + return tGTEQ; + } + return '='; case '<': switch(*++ctx->ptr) { case '>':

1 0

Rémi Bernon : ntdll: Pass a heap block pointer to initialize_block.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: 63b6ec5af312e552536a9da0b998e1b2d1fda9c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/63b6ec5af312e552536a9da0b998e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 14 09:56:37 2022 +0200 ntdll: Pass a heap block pointer to initialize_block. --- dlls/ntdll/heap.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 6b94f9bbb6e..cb1ff12c679 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -378,17 +378,21 @@ static inline void mark_block_tail( struct block *block, DWORD flags ) } /* initialize contents of a newly created block of memory */ -static inline void initialize_block( void *ptr, SIZE_T size, DWORD flags ) +static inline void initialize_block( struct block *block, SIZE_T old_size, SIZE_T size, DWORD flags ) { + char *data = (char *)(block + 1); + + if (size <= old_size) return; + if (flags & HEAP_ZERO_MEMORY) { - valgrind_make_writable( ptr, size ); - memset( ptr, 0, size ); + valgrind_make_writable( data + old_size, size - old_size ); + memset( data + old_size, 0, size - old_size ); } else if (flags & HEAP_FREE_CHECKING_ENABLED) { - valgrind_make_writable( ptr, size ); - memset( ptr, BLOCK_FILL_USED, size ); + valgrind_make_writable( data + old_size, size - old_size ); + memset( data + old_size, BLOCK_FILL_USED, size - old_size ); } } @@ -845,7 +849,7 @@ static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct { /* FIXME: we could remap zero-pages instead */ valgrind_notify_resize( data, old_size, size ); - if (size > old_size) initialize_block( data + old_size, size - old_size, flags ); + initialize_block( block, old_size, size, flags ); arena->data_size = size; valgrind_make_noaccess( (char *)block + sizeof(*block) + arena->data_size, @@ -1520,7 +1524,7 @@ static NTSTATUS heap_allocate( struct heap *heap, ULONG flags, SIZE_T block_size block_set_type( block, BLOCK_TYPE_USED ); block_set_flags( block, ~0, BLOCK_USER_FLAGS( flags ) ); shrink_used_block( heap, flags, subheap, block, old_block_size, block_size, size ); - initialize_block( block + 1, size, flags ); + initialize_block( block, 0, size, flags ); mark_block_tail( block, flags ); *ret = block + 1; @@ -1646,7 +1650,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, block_set_flags( block, BLOCK_FLAG_USER_MASK, BLOCK_USER_FLAGS( flags ) ); shrink_used_block( heap, flags, subheap, block, old_block_size, block_size, size ); - if (size > old_size) initialize_block( (char *)(block + 1) + old_size, size - old_size, flags ); + initialize_block( block, old_size, size, flags ); mark_block_tail( block, flags ); *ret = block + 1;

1 0

Rémi Bernon : ntdll: Compute block size before calling heap_(re)allocate.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: 1526ac755fafa54f7c2bd865d971253ad44254e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1526ac755fafa54f7c2bd865d97125… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 23 11:47:40 2022 +0100 ntdll: Compute block size before calling heap_(re)allocate. --- dlls/ntdll/heap.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 468fa11a547..6b94f9bbb6e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1481,7 +1481,7 @@ static SIZE_T heap_get_block_size( const struct heap *heap, ULONG flags, SIZE_T { static const ULONG padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS | HEAP_ADD_USER_INFO; static const ULONG check_flags = HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED | HEAP_CHECKING_ENABLED; - SIZE_T overhead; + SIZE_T overhead, block_size; if ((flags & check_flags)) overhead = BLOCK_ALIGN; else overhead = sizeof(struct block); @@ -1490,19 +1490,19 @@ static SIZE_T heap_get_block_size( const struct heap *heap, ULONG flags, SIZE_T if (flags & padd_flags) overhead += BLOCK_ALIGN; if (size < BLOCK_ALIGN) size = BLOCK_ALIGN; - return ROUND_SIZE( size + overhead, BLOCK_ALIGN - 1 ); + block_size = ROUND_SIZE( size + overhead, BLOCK_ALIGN - 1 ); + + if (block_size < size) return ~0U; /* overflow */ + if (block_size < HEAP_MIN_BLOCK_SIZE) block_size = HEAP_MIN_BLOCK_SIZE; + return block_size; } -static NTSTATUS heap_allocate( struct heap *heap, ULONG flags, SIZE_T size, void **ret ) +static NTSTATUS heap_allocate( struct heap *heap, ULONG flags, SIZE_T block_size, SIZE_T size, void **ret ) { - SIZE_T old_block_size, block_size; + SIZE_T old_block_size; struct block *block; SUBHEAP *subheap; - block_size = heap_get_block_size( heap, flags, size ); - if (block_size < size) return STATUS_NO_MEMORY; /* overflow */ - if (block_size < HEAP_MIN_BLOCK_SIZE) block_size = HEAP_MIN_BLOCK_SIZE; - if (block_size >= HEAP_MIN_LARGE_BLOCK_SIZE) { if (!(block = allocate_large_block( heap, flags, size ))) return STATUS_NO_MEMORY; @@ -1533,16 +1533,19 @@ static NTSTATUS heap_allocate( struct heap *heap, ULONG flags, SIZE_T size, void void *WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE handle, ULONG flags, SIZE_T size ) { struct heap *heap; + SIZE_T block_size; void *ptr = NULL; ULONG heap_flags; NTSTATUS status; if (!(heap = unsafe_heap_from_handle( handle, flags, &heap_flags ))) status = STATUS_INVALID_HANDLE; + else if ((block_size = heap_get_block_size( heap, heap_flags, size )) == ~0U) + status = STATUS_NO_MEMORY; else { heap_lock( heap, heap_flags ); - status = heap_allocate( heap, heap_flags, size, &ptr ); + status = heap_allocate( heap, heap_flags, block_size, size, &ptr ); heap_unlock( heap, heap_flags ); } @@ -1594,17 +1597,14 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * } -static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, SIZE_T size, void **ret ) +static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, + SIZE_T block_size, SIZE_T size, void **ret ) { - SIZE_T old_block_size, old_size, block_size; + SIZE_T old_block_size, old_size; struct block *next, *block; SUBHEAP *subheap; NTSTATUS status; - block_size = heap_get_block_size( heap, flags, size ); - if (block_size < size) return STATUS_NO_MEMORY; /* overflow */ - if (block_size < HEAP_MIN_BLOCK_SIZE) block_size = HEAP_MIN_BLOCK_SIZE; - if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; if (block_get_flags( block ) & BLOCK_FLAG_LARGE) { @@ -1632,7 +1632,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, SIZE else { if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; - if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, size, ret ))) return status; + if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, block_size, size, ret ))) return status; valgrind_notify_alloc( *ret, size, 0 ); memcpy( *ret, block + 1, old_size ); if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + old_size, 0, size - old_size ); @@ -1659,6 +1659,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, SIZE void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T size ) { struct heap *heap; + SIZE_T block_size; ULONG heap_flags; void *ret = NULL; NTSTATUS status; @@ -1667,10 +1668,12 @@ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T si if (!(heap = unsafe_heap_from_handle( handle, flags, &heap_flags ))) status = STATUS_INVALID_HANDLE; + else if ((block_size = heap_get_block_size( heap, heap_flags, size )) == ~0U) + status = STATUS_NO_MEMORY; else { heap_lock( heap, heap_flags ); - status = heap_reallocate( heap, heap_flags, ptr, size, &ret ); + status = heap_reallocate( heap, heap_flags, ptr, block_size, size, &ret ); heap_unlock( heap, heap_flags ); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022