wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Hans Leidekker : winhttp: Simplify secure_proxy_connect.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: wine Branch: master Commit: dffb4705c59ff648cf6efb4c9c3ffe0e45da4ae2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dffb4705c59ff648cf6efb4c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 12:38:53 2018 +0100 winhttp: Simplify secure_proxy_connect. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 143 ++++++++++++++++--------------------------------- 1 file changed, 47 insertions(+), 96 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a5be242..7f3ef4c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1337,122 +1337,73 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla return ret; } -static LPWSTR concatenate_string_list( LPCWSTR *list, int len ) +static WCHAR *build_proxy_connect_string( request_t *request ) { - LPCWSTR *t; - LPWSTR str; - - for( t = list; *t ; t++ ) - len += strlenW( *t ); - len++; - - str = heap_alloc( len * sizeof(WCHAR) ); - if (!str) return NULL; - *str = 0; + static const WCHAR fmtW[] = {'%','s',':','%','u',0}; + static const WCHAR connectW[] = {'C','O','N','N','E','C','T', 0}; + static const WCHAR spaceW[] = {' ',0}, crlfW[] = {'\r','\n',0}, colonW[] = {':',' ',0}; + static const WCHAR twocrlfW[] = {'\r','\n','\r','\n',0}; + WCHAR *ret, *host; + unsigned int i; + int len; - for( t = list; *t ; t++ ) - strcatW( str, *t ); + if (!(host = heap_alloc( (strlenW( request->connect->hostname ) + 7) * sizeof(WCHAR) ))) return NULL; + len = sprintfW( host, fmtW, request->connect->hostname, request->connect->hostport ); - return str; -} + len += ARRAY_SIZE(connectW); + len += ARRAY_SIZE(http1_1); -static LPWSTR build_header_request_string( request_t *request, LPCWSTR verb, - LPCWSTR path, LPCWSTR version ) -{ - static const WCHAR crlf[] = {'\r','\n',0}; - static const WCHAR space[] = { ' ',0 }; - static const WCHAR colon[] = { ':',' ',0 }; - static const WCHAR twocrlf[] = {'\r','\n','\r','\n', 0}; - LPWSTR requestString; - DWORD len, n; - LPCWSTR *req; - UINT i; - LPWSTR p; - - /* allocate space for an array of all the string pointers to be added */ - len = (request->num_headers) * 4 + 10; - req = heap_alloc( len * sizeof(LPCWSTR) ); - if (!req) return NULL; - - /* add the verb, path and HTTP version string */ - n = 0; - req[n++] = verb; - req[n++] = space; - req[n++] = path; - req[n++] = space; - req[n++] = version; - - /* Append custom request headers */ for (i = 0; i < request->num_headers; i++) { if (request->headers[i].is_request) - { - req[n++] = crlf; - req[n++] = request->headers[i].field; - req[n++] = colon; - req[n++] = request->headers[i].value; - - TRACE("Adding custom header %s (%s)\n", - debugstr_w(request->headers[i].field), - debugstr_w(request->headers[i].value)); - } + len += strlenW( request->headers[i].field ) + strlenW( request->headers[i].value ) + 4; /* '\r\n: ' */ } + len += 4; /* '\r\n\r\n' */ - if( n >= len ) - ERR("oops. buffer overrun\n"); - - req[n] = NULL; - requestString = concatenate_string_list( req, 4 ); - heap_free( req ); - if (!requestString) return NULL; + if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + strcpyW( ret, connectW ); + strcatW( ret, spaceW ); + strcatW( ret, host ); + strcatW( ret, spaceW ); + strcatW( ret, http1_1 ); - /* - * Set (header) termination string for request - * Make sure there are exactly two new lines at the end of the request - */ - p = &requestString[strlenW(requestString)-1]; - while ( (*p == '\n') || (*p == '\r') ) - p--; - strcpyW( p+1, twocrlf ); + for (i = 0; i < request->num_headers; i++) + { + if (request->headers[i].is_request) + { + strcatW( ret, crlfW ); + strcatW( ret, request->headers[i].field ); + strcatW( ret, colonW ); + strcatW( ret, request->headers[i].value ); + } + } + strcatW( ret, twocrlfW ); + } - return requestString; + heap_free( host ); + return ret; } static BOOL read_reply( request_t *request ); static BOOL secure_proxy_connect( request_t *request ) { - static const WCHAR verbConnect[] = {'C','O','N','N','E','C','T',0}; - static const WCHAR fmt[] = {'%','s',':','%','u',0}; - BOOL ret = FALSE; - LPWSTR path; - connect_t *connect = request->connect; - - path = heap_alloc( (strlenW( connect->hostname ) + 13) * sizeof(WCHAR) ); - if (path) - { - LPWSTR requestString; + WCHAR *str; + char *strA; + int len, bytes_sent; + BOOL ret; - sprintfW( path, fmt, connect->hostname, connect->hostport ); - requestString = build_header_request_string( request, verbConnect, - path, http1_1 ); - heap_free( path ); - if (requestString) - { - LPSTR req_ascii = strdupWA( requestString ); + if (!(str = build_proxy_connect_string( request ))) return FALSE; + strA = strdupWA( str ); + heap_free( str ); + if (!strA) return FALSE; - heap_free( requestString ); - if (req_ascii) - { - int len = strlen( req_ascii ), bytes_sent; + len = strlen( strA ); + ret = netconn_send( request->netconn, strA, len, &bytes_sent ); + heap_free( strA ); + if (ret) ret = read_reply( request ); - ret = netconn_send( request->netconn, req_ascii, len, &bytes_sent ); - heap_free( req_ascii ); - if (ret) - ret = read_reply( request ); - } - } - } return ret; }

1 0

Hans Leidekker : winhttp: Skip the hostname part when escaping an absolute URL.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: wine Branch: master Commit: 60a8bb68ec2f31381e8741b6227d683798f3d53a URL: https://source.winehq.org/git/wine.git/?a=commit;h=60a8bb68ec2f31381e8741b6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 12:38:52 2018 +0100 winhttp: Skip the hostname part when escaping an absolute URL. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index adc039d..a5be242 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -541,7 +541,7 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD return ret; } -static WCHAR *build_absolute_request_path( request_t *request ) +static WCHAR *build_absolute_request_path( request_t *request, const WCHAR **path ) { static const WCHAR http[] = {'h','t','t','p',0}; static const WCHAR https[] = {'h','t','t','p','s',0}; @@ -555,16 +555,17 @@ static WCHAR *build_absolute_request_path( request_t *request ) len = strlenW( scheme ) + strlenW( request->connect->hostname ) + 4; /* '://' + nul */ if (request->connect->hostport) len += 6; /* ':' between host and port, up to 5 for port */ - if (request->path) len += strlenW( request->path ); + len += strlenW( request->path ); if ((ret = heap_alloc( len * sizeof(WCHAR) ))) { len = sprintfW( ret, fmt, scheme, request->connect->hostname ); if (request->connect->hostport) { static const WCHAR port_fmt[] = {':','%','u',0}; - sprintfW( ret + len, port_fmt, request->connect->hostport ); + len += sprintfW( ret + len, port_fmt, request->connect->hostport ); } - if (request->path) strcatW( ret, request->path ); + strcpyW( ret + len, request->path ); + if (path) *path = ret + len; } return ret; @@ -578,7 +579,7 @@ static WCHAR *build_request_string( request_t *request ) unsigned int i, len; if (!strcmpiW( request->connect->hostname, request->connect->servername )) path = request->path; - else if (!(path = build_absolute_request_path( request ))) return NULL; + else if (!(path = build_absolute_request_path( request, NULL ))) return NULL; len = strlenW( request->verb ) + 1 /* ' ' */; len += strlenW( path ) + 1 /* ' ' */; @@ -2125,16 +2126,16 @@ static DWORD str_to_wire( const WCHAR *src, int src_len, char *dst, enum escape_ static char *build_wire_path( request_t *request, DWORD *ret_len ) { WCHAR *full_path; - const WCHAR *path, *query = NULL; + const WCHAR *start, *path, *query = NULL; DWORD len, len_path = 0, len_query = 0; enum escape_flags path_flags, query_flags; char *ret; - if (!strcmpiW( request->connect->hostname, request->connect->servername )) full_path = request->path; - else if (!(full_path = build_absolute_request_path( request ))) return NULL; + if (!strcmpiW( request->connect->hostname, request->connect->servername )) start = full_path = request->path; + else if (!(full_path = build_absolute_request_path( request, &start ))) return NULL; len = strlenW( full_path ); - if ((path = strchrW( full_path, '/' ))) + if ((path = strchrW( start, '/' ))) { len_path = strlenW( path ); if ((query = strchrW( path, '?' )))

1 0

Hans Leidekker : winhttp: Get rid of hostdata_t.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: wine Branch: master Commit: a6edca34b5d83fa449132aa204cf8b381ce258c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6edca34b5d83fa449132aa2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 12:38:51 2018 +0100 winhttp: Get rid of hostdata_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 10 +++++----- dlls/winhttp/winhttp_private.h | 11 ++++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 8f66847..1db3916 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -179,7 +179,7 @@ static void set_blocking( netconn_t *conn, BOOL blocking ) ioctlsocket( conn->socket, FIONBIO, &state ); } -netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sockaddr, int timeout ) +netconn_t *netconn_create( struct hostdata *host, const struct sockaddr_storage *sockaddr, int timeout ) { netconn_t *conn; unsigned int addr_len; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9a2c0ef..adc039d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1487,7 +1487,7 @@ static CRITICAL_SECTION connection_pool_cs = { &connection_pool_debug, -1, 0, 0, static struct list connection_pool = LIST_INIT( connection_pool ); -void release_host( hostdata_t *host ) +void release_host( struct hostdata *host ) { LONG ref; @@ -1507,7 +1507,7 @@ static DWORD WINAPI connection_collector(void *arg) { unsigned int remaining_connections; netconn_t *netconn, *next_netconn; - hostdata_t *host, *next_host; + struct hostdata *host, *next_host; ULONGLONG now; do @@ -1519,7 +1519,7 @@ static DWORD WINAPI connection_collector(void *arg) EnterCriticalSection(&connection_pool_cs); - LIST_FOR_EACH_ENTRY_SAFE(host, next_host, &connection_pool, hostdata_t, entry) + LIST_FOR_EACH_ENTRY_SAFE(host, next_host, &connection_pool, struct hostdata, entry) { LIST_FOR_EACH_ENTRY_SAFE(netconn, next_netconn, &host->connections, netconn_t, entry) { @@ -1617,7 +1617,7 @@ static BOOL ensure_cred_handle( session_t *session ) static BOOL open_connection( request_t *request ) { BOOL is_secure = request->hdr.flags & WINHTTP_FLAG_SECURE; - hostdata_t *host = NULL, *iter; + struct hostdata *host = NULL, *iter; netconn_t *netconn = NULL; connect_t *connect; WCHAR *addressW = NULL; @@ -1631,7 +1631,7 @@ static BOOL open_connection( request_t *request ) EnterCriticalSection( &connection_pool_cs ); - LIST_FOR_EACH_ENTRY( iter, &connection_pool, hostdata_t, entry ) + LIST_FOR_EACH_ENTRY( iter, &connection_pool, struct hostdata, entry ) { if (iter->port == port && !strcmpW( connect->servername, iter->hostname ) && !is_secure == !iter->secure) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index c2f10e3..999f3d7 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -65,14 +65,15 @@ struct object_header struct list children; }; -typedef struct { +struct hostdata +{ struct list entry; LONG ref; WCHAR *hostname; INTERNET_PORT port; BOOL secure; struct list connections; -} hostdata_t; +}; typedef struct { @@ -116,7 +117,7 @@ typedef struct int socket; struct sockaddr_storage sockaddr; BOOL secure; /* SSL active on connection? */ - hostdata_t *host; + struct hostdata *host; ULONGLONG keep_until; CtxtHandle ssl_ctx; SecPkgContext_StreamSizes ssl_sizes; @@ -270,7 +271,7 @@ void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDD void close_connection( request_t * ) DECLSPEC_HIDDEN; void netconn_close( netconn_t * ) DECLSPEC_HIDDEN; -netconn_t *netconn_create( hostdata_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; +netconn_t *netconn_create( struct hostdata *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; @@ -289,7 +290,7 @@ void destroy_cookies( session_t * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; -void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; +void release_host( struct hostdata *host ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : winhttp: Get rid of object_header_t and object_vtbl_t.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: wine Branch: master Commit: eb78033a22a71d25379b2f0d106b840cd056a094 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb78033a22a71d25379b2f0d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 12:38:50 2018 +0100 winhttp: Get rid of object_header_t and object_vtbl_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/handle.c | 18 +++++++++--------- dlls/winhttp/session.c | 40 ++++++++++++++++++++-------------------- dlls/winhttp/winhttp_private.h | 33 ++++++++++++++++----------------- 3 files changed, 45 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb78033a22a71d25379b…

1 0

Hans Leidekker : winhttp: Get rid of write_data_t.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: wine Branch: master Commit: cf22c2c16c50707b85b6700721ca146dd376b01a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf22c2c16c50707b85b67007… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 12:38:49 2018 +0100 winhttp: Get rid of write_data_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 6 +++--- dlls/winhttp/winhttp_private.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 158cb13..9a2c0ef 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3030,7 +3030,7 @@ static BOOL write_data( request_t *request, LPCVOID buffer, DWORD to_write, LPDW static void task_write_data( struct task_header *task ) { - write_data_t *w = (write_data_t *)task; + struct write_data *w = (struct write_data *)task; write_data( w->hdr.request, w->buffer, w->to_write, w->written, TRUE ); } @@ -3058,9 +3058,9 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { - write_data_t *w; + struct write_data *w; - if (!(w = heap_alloc( sizeof(write_data_t) ))) return FALSE; + if (!(w = heap_alloc( sizeof(struct write_data) ))) return FALSE; w->hdr.request = request; w->hdr.proc = task_write_data; w->buffer = buffer; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b29cddf..7c41351 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -251,13 +251,13 @@ struct read_data DWORD *read; }; -typedef struct +struct write_data { struct task_header hdr; - LPCVOID buffer; + const void *buffer; DWORD to_write; - LPDWORD written; -} write_data_t; + DWORD *written; +}; object_header_t *addref_object( object_header_t * ) DECLSPEC_HIDDEN; object_header_t *grab_object( HINTERNET ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : winhttp: Get rid of read_data_t.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: wine Branch: master Commit: 6fb0c79022323a820d122943745f9aa60a346aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fb0c79022323a820d122943… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 12:38:48 2018 +0100 winhttp: Get rid of read_data_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 6 +++--- dlls/winhttp/winhttp_private.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7b47ed9..158cb13 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2958,7 +2958,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) static void task_read_data( struct task_header *task ) { - read_data_t *r = (read_data_t *)task; + struct read_data *r = (struct read_data *)task; read_data( r->hdr.request, r->buffer, r->to_read, r->read, TRUE ); } @@ -2986,9 +2986,9 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { - read_data_t *r; + struct read_data *r; - if (!(r = heap_alloc( sizeof(read_data_t) ))) return FALSE; + if (!(r = heap_alloc( sizeof(struct read_data) ))) return FALSE; r->hdr.request = request; r->hdr.proc = task_read_data; r->buffer = buffer; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 1f33ea4..b29cddf 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -243,13 +243,13 @@ struct query_data DWORD *available; }; -typedef struct +struct read_data { struct task_header hdr; - LPVOID buffer; + void *buffer; DWORD to_read; - LPDWORD read; -} read_data_t; + DWORD *read; +}; typedef struct {

1 0

Hans Leidekker : winhttp: Get rid of query_data_t.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: wine Branch: master Commit: 41c72bff6faa86891721d605c99b426855fc012f URL: https://source.winehq.org/git/wine.git/?a=commit;h=41c72bff6faa86891721d605… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 12:38:47 2018 +0100 winhttp: Get rid of query_data_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 6 +++--- dlls/winhttp/winhttp_private.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f51f34b..7b47ed9 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2910,7 +2910,7 @@ done: static void task_query_data_available( struct task_header *task ) { - query_data_t *q = (query_data_t *)task; + struct query_data *q = (struct query_data *)task; query_data_available( q->hdr.request, q->available, TRUE ); } @@ -2938,9 +2938,9 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { - query_data_t *q; + struct query_data *q; - if (!(q = heap_alloc( sizeof(query_data_t) ))) return FALSE; + if (!(q = heap_alloc( sizeof(struct query_data) ))) return FALSE; q->hdr.request = request; q->hdr.proc = task_query_data_available; q->available = available; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index a27241b..1f33ea4 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -237,11 +237,11 @@ struct receive_response struct task_header hdr; }; -typedef struct +struct query_data { struct task_header hdr; - LPDWORD available; -} query_data_t; + DWORD *available; +}; typedef struct {

1 0

Hans Leidekker : winhttp: Get rid of receive_response_t.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: wine Branch: master Commit: 690046e3d2340acb8cc51d7b310e9c6f399aa46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=690046e3d2340acb8cc51d7b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 12:38:46 2018 +0100 winhttp: Get rid of receive_response_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 6 +++--- dlls/winhttp/winhttp_private.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 77d5315..f51f34b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2839,7 +2839,7 @@ static BOOL receive_response( request_t *request, BOOL async ) static void task_receive_response( struct task_header *task ) { - receive_response_t *r = (receive_response_t *)task; + struct receive_response *r = (struct receive_response *)task; receive_response( r->hdr.request, TRUE ); } @@ -2867,9 +2867,9 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { - receive_response_t *r; + struct receive_response *r; - if (!(r = heap_alloc( sizeof(receive_response_t) ))) return FALSE; + if (!(r = heap_alloc( sizeof(struct receive_response) ))) return FALSE; r->hdr.request = request; r->hdr.proc = task_receive_response; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index cbf9a36..a27241b 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -232,10 +232,10 @@ struct send_request DWORD_PTR context; }; -typedef struct +struct receive_response { struct task_header hdr; -} receive_response_t; +}; typedef struct {

1 0

André Hentschel : ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable on ARM64.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: wine Branch: master Commit: ebc80ad1c41084b5a4fb94b460283d0a31975d33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc80ad1c41084b5a4fb94b4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 15 00:08:48 2018 +0100 ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46143 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 4 ++-- dlls/kernel32/kernel32.spec | 4 ++-- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_arm64.c | 19 +++++++++++++++++++ include/winnt.h | 3 +++ 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 428fd06..1c5744d 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -1,9 +1,9 @@ -@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory -@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5c2e426..85fce37 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1284,12 +1284,12 @@ @ stdcall ResolveLocaleName(wstr ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) -@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory -@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3486a78..1b0bd7f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -433,7 +433,7 @@ # @ stub RtlAddCompoundAce @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange -@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) @@ -543,7 +543,7 @@ @ stdcall RtlDeleteCriticalSection(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl -@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) +@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 91a7e3b..0ab402e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -947,6 +947,25 @@ void signal_init_process(void) } +/********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_PTR addr ) +{ + FIXME( "%p %u %lx: stub\n", table, count, addr ); + return TRUE; +} + + +/********************************************************************** + * RtlDeleteFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) +{ + FIXME( "%p: stub\n", table ); + return TRUE; +} + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index 035d5bd..742b47b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1875,6 +1875,9 @@ typedef struct _CONTEXT DWORD64 Wvr[ARM64_MAX_WATCHPOINTS]; /* 380 */ } CONTEXT; +BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,ULONG_PTR); +BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); + #endif /* __aarch64__ */

1 0

Józef Kucia : vkd3d: Use VkDeviceSize for buffer view offset and range (Coverity).
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: vkd3d Branch: master Commit: 06c3d1779e42dc12ddf29697a3f797c58df26c25 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=06c3d1779e42dc12ddf2969… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 15 16:32:41 2018 +0100 vkd3d: Use VkDeviceSize for buffer view offset and range (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index bfbbad5..56af010 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1482,8 +1482,8 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format; + VkDeviceSize element_size; struct vkd3d_view *object; - unsigned int element_size; VkBufferView vk_view; if (view_format == DXGI_FORMAT_R32_TYPELESS && (flags & VKD3D_VIEW_RAW_BUFFER))

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
96
Older →

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 2018