November 2018 - Wine-commits

Henri Verbeet : d3d9: Disallow creating managed index buffers on d3d9ex devices.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: d9db221f0db83c3489862500727035cb16b7a266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9db221f0db83c3489862500… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 15:21:07 2018 +0330 d3d9: Disallow creating managed index buffers on d3d9ex devices. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 6 ++++++ dlls/d3d9/tests/d3d9ex.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 557ec91..219ee43 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -585,6 +585,12 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de if (pool == D3DPOOL_SCRATCH) return D3DERR_INVALIDCALL; + if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) + { + WARN("Managed resources are not supported by d3d9ex devices.\n"); + return D3DERR_INVALIDCALL; + } + /* In d3d9, buffers can't be used as rendertarget or depth/stencil buffer. */ if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) return D3DERR_INVALIDCALL; diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 759790c..2a3adc7 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4500,10 +4500,9 @@ static void test_resource_access(void) hr = IDirect3DDevice9Ex_CreateIndexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib, NULL); - todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED - || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED + || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue;

1 0

Henri Verbeet : d3d9: Disallow creating managed 3D textures on d3d9ex devices.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: 8d567bc9e2984b6a57de4fab20f2ff4d1b982066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d567bc9e2984b6a57de4fab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 15:21:08 2018 +0330 d3d9: Disallow creating managed 3D textures on d3d9ex devices. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 7 +++---- dlls/d3d9/texture.c | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2a3adc7..5387296 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4459,10 +4459,9 @@ static void test_resource_access(void) hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED) - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED - ? D3D_OK : D3DERR_INVALIDCALL), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 84a1bd8..456e41e 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1451,6 +1451,12 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev struct wined3d_resource_desc desc; HRESULT hr; + if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) + { + WARN("Managed resources are not supported by d3d9ex devices.\n"); + return D3DERR_INVALIDCALL; + } + /* In d3d9, 3D textures can't be used as rendertarget or depth/stencil buffer. */ if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) return D3DERR_INVALIDCALL;

1 0

Hans Leidekker : winhttp: Get rid of session_t.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: a1cee8920a062f66d525b95f3aae128eb66a765b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1cee8920a062f66d525b95f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 22 21:15:51 2018 +0100 winhttp: Get rid of session_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 10 +++++----- dlls/winhttp/request.c | 4 ++-- dlls/winhttp/session.c | 28 ++++++++++++++-------------- dlls/winhttp/winhttp_private.h | 18 +++++++++--------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 88365f5..143091b 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -45,7 +45,7 @@ struct domain struct list cookies; }; -static struct domain *add_domain( session_t *session, WCHAR *name ) +static struct domain *add_domain( struct session *session, WCHAR *name ) { struct domain *domain; @@ -117,7 +117,7 @@ static void delete_domain( struct domain *domain ) heap_free( domain ); } -void destroy_cookies( session_t *session ) +void destroy_cookies( struct session *session ) { struct list *item, *next; struct domain *domain; @@ -129,7 +129,7 @@ void destroy_cookies( session_t *session ) } } -static BOOL add_cookie( session_t *session, struct cookie *cookie, WCHAR *domain_name, WCHAR *path ) +static BOOL add_cookie( struct session *session, struct cookie *cookie, WCHAR *domain_name, WCHAR *path ) { struct domain *domain = NULL; struct cookie *old_cookie; @@ -268,7 +268,7 @@ BOOL set_cookies( request_t *request, const WCHAR *cookies ) WCHAR *buffer, *p; WCHAR *cookie_domain = NULL, *cookie_path = NULL; struct attr *attr, *domain = NULL, *path = NULL; - session_t *session = request->connect->session; + struct session *session = request->connect->session; struct cookie *cookie; int len, used; @@ -324,7 +324,7 @@ end: BOOL add_cookie_headers( request_t *request ) { struct list *domain_cursor; - session_t *session = request->connect->session; + struct session *session = request->connect->session; EnterCriticalSection( &session->cs ); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7f3ef4c..8add6c9 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1538,7 +1538,7 @@ static DWORD map_secure_protocols( DWORD mask ) return ret; } -static BOOL ensure_cred_handle( session_t *session ) +static BOOL ensure_cred_handle( struct session *session ) { SECURITY_STATUS status = SEC_E_OK; @@ -2176,7 +2176,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len BOOL ret = FALSE; connect_t *connect = request->connect; - session_t *session = connect->session; + struct session *session = connect->session; char *wire_req; int bytes_sent; DWORD len, i, flags; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8804346..76074d3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -88,7 +88,7 @@ BOOL WINAPI WinHttpCheckPlatform( void ) */ static void session_destroy( struct object_header *hdr ) { - session_t *session = (session_t *)hdr; + struct session *session = (struct session *)hdr; TRACE("%p\n", session); @@ -108,7 +108,7 @@ static void session_destroy( struct object_header *hdr ) static BOOL session_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { - session_t *session = (session_t *)hdr; + struct session *session = (struct session *)hdr; switch (option) { @@ -159,7 +159,7 @@ static BOOL session_query_option( struct object_header *hdr, DWORD option, void static BOOL session_set_option( struct object_header *hdr, DWORD option, void *buffer, DWORD buflen ) { - session_t *session = (session_t *)hdr; + struct session *session = (struct session *)hdr; switch (option) { @@ -258,12 +258,12 @@ static const struct object_vtbl session_vtbl = */ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWSTR bypass, DWORD flags ) { - session_t *session; + struct session *session; HINTERNET handle = NULL; TRACE("%s, %u, %s, %s, 0x%08x\n", debugstr_w(agent), access, debugstr_w(proxy), debugstr_w(bypass), flags); - if (!(session = heap_alloc_zero( sizeof(session_t) ))) return NULL; + if (!(session = heap_alloc_zero( sizeof(struct session) ))) return NULL; session->hdr.type = WINHTTP_HANDLE_TYPE_SESSION; session->hdr.vtbl = &session_vtbl; @@ -447,7 +447,7 @@ static BOOL domain_matches(LPCWSTR server, LPCWSTR domain) /* Matches INTERNET_MAX_HOST_NAME_LENGTH in wininet.h, also RFC 1035 */ #define MAX_HOST_NAME_LENGTH 256 -static BOOL should_bypass_proxy(session_t *session, LPCWSTR server) +static BOOL should_bypass_proxy(struct session *session, LPCWSTR server) { LPCWSTR ptr; BOOL ret = FALSE; @@ -480,7 +480,7 @@ static BOOL should_bypass_proxy(session_t *session, LPCWSTR server) BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) { - session_t *session = connect->session; + struct session *session = connect->session; BOOL ret = TRUE; if (session->proxy_server && !should_bypass_proxy(session, server)) @@ -546,7 +546,7 @@ end: HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PORT port, DWORD reserved ) { connect_t *connect; - session_t *session; + struct session *session; HINTERNET hconnect = NULL; TRACE("%p, %s, %u, %x\n", hsession, debugstr_w(server), port, reserved); @@ -556,7 +556,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO set_last_error( ERROR_INVALID_PARAMETER ); return NULL; } - if (!(session = (session_t *)grab_object( hsession ))) + if (!(session = (struct session *)grab_object( hsession ))) { set_last_error( ERROR_INVALID_HANDLE ); return NULL; @@ -1003,7 +1003,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } case WINHTTP_OPTION_PROXY_USERNAME: { - session_t *session = request->connect->session; + struct session *session = request->connect->session; heap_free( session->proxy_username ); if (!(session->proxy_username = buffer_to_str( buffer, buflen ))) return FALSE; @@ -1011,7 +1011,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } case WINHTTP_OPTION_PROXY_PASSWORD: { - session_t *session = request->connect->session; + struct session *session = request->connect->session; heap_free( session->proxy_password ); if (!(session->proxy_password = buffer_to_str( buffer, buflen ))) return FALSE; @@ -1886,14 +1886,14 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO { WCHAR *detected_pac_url = NULL; const WCHAR *pac_url; - session_t *session; + struct session *session; char *script; DWORD size; BOOL ret = FALSE; TRACE("%p, %s, %p, %p\n", hsession, debugstr_w(url), options, info); - if (!(session = (session_t *)grab_object( hsession ))) + if (!(session = (struct session *)grab_object( hsession ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -2114,7 +2114,7 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int } case WINHTTP_HANDLE_TYPE_SESSION: { - session_t *session = (session_t *)hdr; + struct session *session = (struct session *)hdr; session->connect_timeout = connect; if (resolve < 0) resolve = 0; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 999f3d7..9e838ee 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -75,32 +75,32 @@ struct hostdata struct list connections; }; -typedef struct +struct session { struct object_header hdr; CRITICAL_SECTION cs; - LPWSTR agent; + WCHAR *agent; DWORD access; int resolve_timeout; int connect_timeout; int send_timeout; int receive_timeout; int receive_response_timeout; - LPWSTR proxy_server; - LPWSTR proxy_bypass; - LPWSTR proxy_username; - LPWSTR proxy_password; + WCHAR *proxy_server; + WCHAR *proxy_bypass; + WCHAR *proxy_username; + WCHAR *proxy_password; struct list cookie_cache; HANDLE unload_event; CredHandle cred_handle; BOOL cred_handle_initialized; DWORD secure_protocols; -} session_t; +}; typedef struct { struct object_header hdr; - session_t *session; + struct session *session; LPWSTR hostname; /* final destination of the request */ LPWSTR servername; /* name of the server we directly connect to */ LPWSTR username; @@ -286,7 +286,7 @@ int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN; BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; -void destroy_cookies( session_t * ) DECLSPEC_HIDDEN; +void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : winhttp: Get rid of connect_t.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: dad2439d01b4a22bcf9cb7592adf5c3cd089e55f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dad2439d01b4a22bcf9cb759… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 22 21:15:52 2018 +0100 winhttp: Get rid of connect_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 8 ++++---- dlls/winhttp/session.c | 18 +++++++++--------- dlls/winhttp/winhttp_private.h | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8add6c9..3e499ce 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1571,7 +1571,7 @@ static BOOL open_connection( request_t *request ) BOOL is_secure = request->hdr.flags & WINHTTP_FLAG_SECURE; struct hostdata *host = NULL, *iter; netconn_t *netconn = NULL; - connect_t *connect; + struct connect *connect; WCHAR *addressW = NULL; INTERNET_PORT port; DWORD len; @@ -1751,7 +1751,7 @@ static BOOL add_host_header( request_t *request, DWORD modifier ) DWORD len; WCHAR *host; static const WCHAR fmt[] = {'%','s',':','%','u',0}; - connect_t *connect = request->connect; + struct connect *connect = request->connect; INTERNET_PORT port; port = connect->hostport ? connect->hostport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); @@ -2175,7 +2175,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len static const WCHAR length_fmt[] = {'%','l','d',0}; BOOL ret = FALSE; - connect_t *connect = request->connect; + struct connect *connect = request->connect; struct session *session = connect->session; char *wire_req; int bytes_sent; @@ -2623,7 +2623,7 @@ static BOOL handle_redirect( request_t *request, DWORD status ) BOOL ret = FALSE; DWORD len, len_loc; URL_COMPONENTS uc; - connect_t *connect = request->connect; + struct connect *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location; int index; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 76074d3..84a27b7 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -322,7 +322,7 @@ end: */ static void connect_destroy( struct object_header *hdr ) { - connect_t *connect = (connect_t *)hdr; + struct connect *connect = (struct connect *)hdr; TRACE("%p\n", connect); @@ -337,7 +337,7 @@ static void connect_destroy( struct object_header *hdr ) static BOOL connect_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { - connect_t *connect = (connect_t *)hdr; + struct connect *connect = (struct connect *)hdr; switch (option) { @@ -478,7 +478,7 @@ static BOOL should_bypass_proxy(struct session *session, LPCWSTR server) return ret; } -BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) +BOOL set_server_for_hostname( struct connect *connect, const WCHAR *server, INTERNET_PORT port ) { struct session *session = connect->session; BOOL ret = TRUE; @@ -545,7 +545,7 @@ end: */ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PORT port, DWORD reserved ) { - connect_t *connect; + struct connect *connect; struct session *session; HINTERNET hconnect = NULL; @@ -567,7 +567,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return NULL; } - if (!(connect = heap_alloc_zero( sizeof(connect_t) ))) + if (!(connect = heap_alloc_zero( sizeof(struct connect) ))) { release_object( &session->hdr ); return NULL; @@ -987,7 +987,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b case WINHTTP_OPTION_USERNAME: { - connect_t *connect = request->connect; + struct connect *connect = request->connect; heap_free( connect->username ); if (!(connect->username = buffer_to_str( buffer, buflen ))) return FALSE; @@ -995,7 +995,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } case WINHTTP_OPTION_PASSWORD: { - connect_t *connect = request->connect; + struct connect *connect = request->connect; heap_free( connect->password ); if (!(connect->password = buffer_to_str( buffer, buflen ))) return FALSE; @@ -1110,7 +1110,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o LPCWSTR referrer, LPCWSTR *types, DWORD flags ) { request_t *request; - connect_t *connect; + struct connect *connect; HINTERNET hrequest = NULL; TRACE("%p, %s, %s, %s, %s, %p, 0x%08x\n", hconnect, debugstr_w(verb), debugstr_w(object), @@ -1123,7 +1123,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o for (iter = types; *iter; iter++) TRACE(" %s\n", debugstr_w(*iter)); } - if (!(connect = (connect_t *)grab_object( hconnect ))) + if (!(connect = (struct connect *)grab_object( hconnect ))) { set_last_error( ERROR_INVALID_HANDLE ); return NULL; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9e838ee..78b1d15 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -97,19 +97,19 @@ struct session DWORD secure_protocols; }; -typedef struct +struct connect { struct object_header hdr; struct session *session; - LPWSTR hostname; /* final destination of the request */ - LPWSTR servername; /* name of the server we directly connect to */ - LPWSTR username; - LPWSTR password; + WCHAR *hostname; /* final destination of the request */ + WCHAR *servername; /* name of the server we directly connect to */ + WCHAR *username; + WCHAR *password; INTERNET_PORT hostport; INTERNET_PORT serverport; struct sockaddr_storage sockaddr; BOOL resolved; -} connect_t; +}; typedef struct { @@ -171,7 +171,7 @@ struct authinfo typedef struct { struct object_header hdr; - connect_t *connect; + struct connect *connect; LPWSTR verb; LPWSTR path; LPWSTR version; @@ -287,7 +287,7 @@ BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; -BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; +BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; void release_host( struct hostdata *host ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : winhttp: Get rid of netconn_t.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: 4607d5ba595c21e1461b271c9e27c2ca80d0b102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4607d5ba595c21e1461b271c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 22 21:15:53 2018 +0100 winhttp: Get rid of netconn_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 28 ++++++++++++++-------------- dlls/winhttp/request.c | 10 +++++----- dlls/winhttp/winhttp_private.h | 26 +++++++++++++------------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 1db3916..004933f 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -173,15 +173,15 @@ static void winsock_init(void) InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); } -static void set_blocking( netconn_t *conn, BOOL blocking ) +static void set_blocking( struct netconn *conn, BOOL blocking ) { ULONG state = !blocking; ioctlsocket( conn->socket, FIONBIO, &state ); } -netconn_t *netconn_create( struct hostdata *host, const struct sockaddr_storage *sockaddr, int timeout ) +struct netconn *netconn_create( struct hostdata *host, const struct sockaddr_storage *sockaddr, int timeout ) { - netconn_t *conn; + struct netconn *conn; unsigned int addr_len; BOOL ret = FALSE; @@ -241,7 +241,7 @@ netconn_t *netconn_create( struct hostdata *host, const struct sockaddr_storage return conn; } -void netconn_close( netconn_t *conn ) +void netconn_close( struct netconn *conn ) { if (conn->secure) { @@ -255,7 +255,7 @@ void netconn_close( netconn_t *conn ) heap_free(conn); } -BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, +BOOL netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, BOOL check_revocation) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; @@ -389,7 +389,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_fl return TRUE; } -static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) +static BOOL send_ssl_chunk(struct netconn *conn, const void *msg, size_t size) { SecBuffer bufs[4] = { {conn->ssl_sizes.cbHeader, SECBUFFER_STREAM_HEADER, conn->ssl_buf}, @@ -415,7 +415,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return TRUE; } -BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) +BOOL netconn_send( struct netconn *conn, const void *msg, size_t len, int *sent ) { if (conn->secure) { @@ -439,7 +439,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) return ((*sent = sock_send( conn->socket, msg, len, 0 )) != -1); } -static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) +static BOOL read_ssl_chunk(struct netconn *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) { const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; SecBuffer bufs[4]; @@ -530,7 +530,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * return TRUE; } -BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd ) +BOOL netconn_recv( struct netconn *conn, void *buf, size_t len, int flags, int *recvd ) { *recvd = 0; if (!len) return TRUE; @@ -582,12 +582,12 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd return ((*recvd = sock_recv( conn->socket, buf, len, flags )) != -1); } -ULONG netconn_query_data_available( netconn_t *conn ) +ULONG netconn_query_data_available( struct netconn *conn ) { return conn->secure ? conn->peek_len : 0; } -DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) +DWORD netconn_set_timeout( struct netconn *netconn, BOOL send, int value ) { int opt = send ? SO_SNDTIMEO : SO_RCVTIMEO; if (setsockopt( netconn->socket, SOL_SOCKET, opt, (void *)&value, sizeof(value) ) == -1) @@ -599,7 +599,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) return ERROR_SUCCESS; } -BOOL netconn_is_alive( netconn_t *netconn ) +BOOL netconn_is_alive( struct netconn *netconn ) { int len; char b; @@ -696,7 +696,7 @@ BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_stora return TRUE; } -const void *netconn_get_certificate( netconn_t *conn ) +const void *netconn_get_certificate( struct netconn *conn ) { const CERT_CONTEXT *ret; SECURITY_STATUS res; @@ -706,7 +706,7 @@ const void *netconn_get_certificate( netconn_t *conn ) return res == SEC_E_OK ? ret : NULL; } -int netconn_get_cipher_strength( netconn_t *conn ) +int netconn_get_cipher_strength( struct netconn *conn ) { SecPkgContext_ConnectionInfo conn_info; SECURITY_STATUS res; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3e499ce..f5fe769 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1458,7 +1458,7 @@ static BOOL connection_collector_running; static DWORD WINAPI connection_collector(void *arg) { unsigned int remaining_connections; - netconn_t *netconn, *next_netconn; + struct netconn *netconn, *next_netconn; struct hostdata *host, *next_host; ULONGLONG now; @@ -1473,7 +1473,7 @@ static DWORD WINAPI connection_collector(void *arg) 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) + LIST_FOR_EACH_ENTRY_SAFE(netconn, next_netconn, &host->connections, struct netconn, entry) { if (netconn->keep_until < now) { @@ -1496,7 +1496,7 @@ static DWORD WINAPI connection_collector(void *arg) FreeLibraryAndExitThread( winhttp_instance, 0 ); } -static void cache_connection( netconn_t *netconn ) +static void cache_connection( struct netconn *netconn ) { TRACE( "caching connection %p\n", netconn ); @@ -1570,7 +1570,7 @@ static BOOL open_connection( request_t *request ) { BOOL is_secure = request->hdr.flags & WINHTTP_FLAG_SECURE; struct hostdata *host = NULL, *iter; - netconn_t *netconn = NULL; + struct netconn *netconn = NULL; struct connect *connect; WCHAR *addressW = NULL; INTERNET_PORT port; @@ -1622,7 +1622,7 @@ static BOOL open_connection( request_t *request ) EnterCriticalSection( &connection_pool_cs ); if (!list_empty( &host->connections )) { - netconn = LIST_ENTRY( list_head( &host->connections ), netconn_t, entry ); + netconn = LIST_ENTRY( list_head( &host->connections ), struct netconn, entry ); list_remove( &netconn->entry ); } LeaveCriticalSection( &connection_pool_cs ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 78b1d15..8bd7d0b 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -111,7 +111,7 @@ struct connect BOOL resolved; }; -typedef struct +struct netconn { struct list entry; int socket; @@ -127,7 +127,7 @@ typedef struct char *peek_msg; char *peek_msg_mem; size_t peek_len; -} netconn_t; +}; struct header { @@ -178,7 +178,7 @@ typedef struct LPWSTR raw_headers; void *optional; DWORD optional_len; - netconn_t *netconn; + struct netconn *netconn; DWORD security_flags; BOOL check_revocation; const CERT_CONTEXT *server_cert; @@ -270,18 +270,18 @@ DWORD get_last_error( void ) DECLSPEC_HIDDEN; void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( request_t * ) DECLSPEC_HIDDEN; -void netconn_close( netconn_t * ) DECLSPEC_HIDDEN; -netconn_t *netconn_create( struct hostdata *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; +void netconn_close( struct netconn * ) DECLSPEC_HIDDEN; +struct netconn *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; +ULONG netconn_query_data_available( struct netconn * ) DECLSPEC_HIDDEN; +BOOL netconn_recv( struct netconn *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; -BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; -DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; -BOOL netconn_is_alive( netconn_t * ) DECLSPEC_HIDDEN; -const void *netconn_get_certificate( netconn_t * ) DECLSPEC_HIDDEN; -int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; +BOOL netconn_send( struct netconn *, const void *, size_t, int * ) DECLSPEC_HIDDEN; +DWORD netconn_set_timeout( struct netconn *, BOOL, int ) DECLSPEC_HIDDEN; +BOOL netconn_is_alive( struct netconn * ) DECLSPEC_HIDDEN; +const void *netconn_get_certificate( struct netconn * ) DECLSPEC_HIDDEN; +int netconn_get_cipher_strength( struct netconn * ) DECLSPEC_HIDDEN; BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : winhttp: Get rid of request_t.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: ce9ad420569f77caa253833c0cfaf85943aa6ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9ad420569f77caa253833c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 22 21:15:54 2018 +0100 winhttp: Get rid of request_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 4 +- dlls/winhttp/handle.c | 2 +- dlls/winhttp/request.c | 128 +++++++++++++++++++++-------------------- dlls/winhttp/session.c | 14 ++--- dlls/winhttp/winhttp_private.h | 24 ++++---- 5 files changed, 87 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce9ad420569f77caa253…

1 0

Hans Leidekker : winhttp: Get rid of get/set_last_error.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: 3fb5d2f98dc9b85c90c0050a95c787ba6934bddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb5d2f98dc9b85c90c0050a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 22 21:15:55 2018 +0100 winhttp: Get rid of get/set_last_error. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 8 +-- dlls/winhttp/request.c | 146 +++++++++++++++++++-------------------- dlls/winhttp/session.c | 152 +++++++++++++++++++---------------------- dlls/winhttp/url.c | 24 +++---- dlls/winhttp/winhttp_private.h | 2 - 5 files changed, 159 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3fb5d2f98dc9b85c90c0…

1 0

Hans Leidekker : winhttp/tests: Get rid of workarounds for Windows 2000.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: 2a4d6273f586bf44db14a0eeccb2f9a4bf3b5dd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a4d6273f586bf44db14a0ee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 22 21:15:56 2018 +0100 winhttp/tests: Get rid of workarounds for Windows 2000. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 70d0b4c..4779cfd 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1198,11 +1198,6 @@ static void test_request_parameter_defaults(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - if (!ret && GetLastError() == ERROR_WINHTTP_INVALID_SERVER_RESPONSE) /* win2k */ - { - win_skip("invalid response\n"); - goto done; - } ok(ret, "failed to receive response %u\n", GetLastError()); status = 0xdeadbeef; @@ -4420,14 +4415,12 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) WCHAR *url; DWORD error; -if (0) /* crashes on some win2k systems */ -{ SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( 0, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); -} + url = NULL; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( 0, &url ); @@ -4435,14 +4428,12 @@ if (0) /* crashes on some win2k systems */ ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); -if (0) /* crashes on some win2k systems */ -{ SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); -} + url = (WCHAR *)0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url );

1 0

Hans Leidekker : winhttp: Return an error from WinHttpReceiveResponse if there's no connection.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: bcf885bda20bc8445397fa5312668c2c3a5a9207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcf885bda20bc8445397fa53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 22 21:15:57 2018 +0100 winhttp: Return an error from WinHttpReceiveResponse if there's no connection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46175 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/tests/winhttp.c | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 54173f1..27628c3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2736,6 +2736,12 @@ static BOOL receive_response( struct request *request, BOOL async ) BOOL ret; DWORD size, query, status; + if (!request->netconn) + { + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); + return FALSE; + } + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); for (;;) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4779cfd..3f91251 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2086,6 +2086,11 @@ static void test_resolve_timeout(void) ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); + ret = WinHttpReceiveResponse( req, NULL ); + ok( !ret && (GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || + GetLastError() == ERROR_WINHTTP_OPERATION_CANCELLED /* < win7 */), + "got %u\n", GetLastError() ); + WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses);

1 0

Huw Davies : winspool: Skip the old printer check if it has a NULL port name.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: 0c5ce58505e24bf07cbd4c09752ef2f949d64fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c5ce58505e24bf07cbd4c09… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 22 08:53:39 2018 +0000 winspool: Skip the old printer check if it has a NULL port name. Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33502 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7c4ee9a..fb268a0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1572,6 +1572,8 @@ static void old_printer_check( BOOL delete_phase ) EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num ); for (i = 0; i < num; i++) { + if (!pi[i].pPortName) continue; + if (strncmpW( pi[i].pPortName, CUPS_Port, strlenW(CUPS_Port) ) && strncmpW( pi[i].pPortName, LPR_Port, strlenW(LPR_Port) )) continue;

1 0