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

Nikolay Sivov : secur32: Use 64-bit integer to store session pointer.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: fe9c2ab349ad5eec2badbc2185d9f1fd68b2e1b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe9c2ab349ad5eec2badbc21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 10:35:43 2022 +0300 secur32: Use 64-bit integer to store session pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 42 ++++++++++++++++++++++++------------------ dlls/secur32/secur32_priv.h | 2 +- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7c6a0bc0cfc..cfc7907bef4 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -136,6 +136,11 @@ MAKE_FUNCPTR(gnutls_x509_privkey_deinit); #define GNUTLS_ALPN_SERVER_PRECEDENCE (1<<1) #endif +static inline gnutls_session_t session_from_handle(UINT64 handle) +{ + return (gnutls_session_t)(ULONG_PTR)handle; +} + static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher) { switch(cipher) { @@ -369,7 +374,7 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; - gnutls_session_t s = (gnutls_session_t)t->session; + gnutls_session_t s = session_from_handle(t->session); SIZE_T len = buff_len; char *b; @@ -390,7 +395,7 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; - gnutls_session_t s = (gnutls_session_t)t->session; + gnutls_session_t s = session_from_handle(t->session); SIZE_T len = buff_len; char *b; @@ -547,7 +552,7 @@ static NTSTATUS schan_create_session( void *args ) static NTSTATUS schan_dispose_session( void *args ) { const struct session_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); pgnutls_deinit(s); return STATUS_SUCCESS; } @@ -555,7 +560,7 @@ static NTSTATUS schan_dispose_session( void *args ) static NTSTATUS schan_set_session_target( void *args ) { const struct set_session_target_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); pgnutls_server_name_set( s, GNUTLS_NAME_DNS, params->target, strlen(params->target) ); return STATUS_SUCCESS; } @@ -563,7 +568,7 @@ static NTSTATUS schan_set_session_target( void *args ) static NTSTATUS schan_handshake( void *args ) { const struct handshake_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); int err; @@ -709,20 +714,21 @@ static ALG_ID get_kx_algid(int kx) static NTSTATUS schan_get_session_cipher_block_size( void *args ) { const struct session_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); return pgnutls_cipher_get_block_size(pgnutls_cipher_get(s)); } static NTSTATUS schan_get_max_message_size( void *args ) { const struct session_params *params = args; - return pgnutls_record_get_max_size((gnutls_session_t)params->session); + gnutls_session_t s = session_from_handle(params->session); + return pgnutls_record_get_max_size(s); } static NTSTATUS schan_get_connection_info( void *args ) { const struct get_connection_info_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); SecPkgContext_ConnectionInfo *info = params->info; gnutls_protocol_t proto = pgnutls_protocol_get_version(s); gnutls_cipher_algorithm_t alg = pgnutls_cipher_get(s); @@ -743,10 +749,10 @@ static NTSTATUS schan_get_connection_info( void *args ) static NTSTATUS schan_get_unique_channel_binding( void *args ) { const struct get_unique_channel_binding_params *params = args; + gnutls_session_t s = session_from_handle(params->session); gnutls_datum_t datum; int rc; SECURITY_STATUS ret; - gnutls_session_t s = (gnutls_session_t)params->session; rc = pgnutls_session_channel_binding(s, GNUTLS_CB_TLS_UNIQUE, &datum); if (rc) @@ -769,10 +775,10 @@ static NTSTATUS schan_get_unique_channel_binding( void *args ) static NTSTATUS schan_get_key_signature_algorithm( void *args ) { const struct session_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); gnutls_kx_algorithm_t kx = pgnutls_kx_get(s); - TRACE("(%p)\n", params->session); + TRACE("(%p)\n", s); switch (kx) { @@ -791,7 +797,7 @@ static NTSTATUS schan_get_key_signature_algorithm( void *args ) static NTSTATUS schan_get_session_peer_certificate( void *args ) { const struct get_session_peer_certificate_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); const gnutls_datum_t *datum; unsigned int i, size; BYTE *ptr; @@ -825,7 +831,7 @@ static NTSTATUS schan_get_session_peer_certificate( void *args ) static NTSTATUS schan_send( void *args ) { const struct send_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SSIZE_T ret, total = 0; @@ -864,7 +870,7 @@ static NTSTATUS schan_send( void *args ) static NTSTATUS schan_recv( void *args ) { const struct recv_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); size_t data_size = *params->length; size_t received = 0; @@ -928,7 +934,7 @@ static unsigned int parse_alpn_protocol_list(unsigned char *buffer, unsigned int static NTSTATUS schan_set_application_protocols( void *args ) { const struct set_application_protocols_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); unsigned int extension_len, extension, count = 0, offset = 0; unsigned short list_len; gnutls_datum_t *protocols; @@ -968,7 +974,7 @@ static NTSTATUS schan_set_application_protocols( void *args ) static NTSTATUS schan_get_application_protocol( void *args ) { const struct get_application_protocol_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); SecPkgContext_ApplicationProtocol *protocol = params->protocol; gnutls_datum_t selected; @@ -989,7 +995,7 @@ static NTSTATUS schan_get_application_protocol( void *args ) static NTSTATUS schan_set_dtls_mtu( void *args ) { const struct set_dtls_mtu_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); pgnutls_dtls_set_mtu(s, params->mtu); TRACE("MTU set to %u\n", params->mtu); @@ -999,7 +1005,7 @@ static NTSTATUS schan_set_dtls_mtu( void *args ) static NTSTATUS schan_set_dtls_timeouts( void *args ) { const struct set_dtls_timeouts_params *params = args; - gnutls_session_t s = (gnutls_session_t)params->session; + gnutls_session_t s = session_from_handle(params->session); pgnutls_dtls_set_timeouts(s, params->retrans_timeout, params->total_timeout); return SEC_E_OK; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 5c35e4244c8..814d9faf82a 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -79,7 +79,7 @@ void load_auth_packages(void) DECLSPEC_HIDDEN; void SECUR32_deinitSchannelSP(void) DECLSPEC_HIDDEN; /* schannel internal interface */ -typedef struct schan_session_opaque *schan_session; +typedef UINT64 schan_session; typedef struct schan_credentials {

1 0

Nikolay Sivov : secur32: Simplify parameters structure of credentials allocation call.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 3ac7df1ac4f57514d778b86bf094bf564663acc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ac7df1ac4f57514d778b86b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 10:35:44 2022 +0300 secur32: Simplify parameters structure of credentials allocation call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 21 ++++++++++++++------- dlls/secur32/schannel_gnutls.c | 23 +++++++++++------------ dlls/secur32/secur32_priv.h | 7 +++++-- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 2e663872f71..5d6e8763095 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -545,8 +545,9 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, ULONG_PTR handle; SECURITY_STATUS status = SEC_E_OK; const CERT_CONTEXT *cert = NULL; - DATA_BLOB key_blob = {0}; - struct allocate_certificate_credentials_params params; + struct allocate_certificate_credentials_params params = { 0 }; + BYTE *key_blob = NULL; + ULONG key_size = 0; TRACE("schanCred %p, phCredential %p, ptsExpiry %p\n", schanCred, phCredential, ptsExpiry); @@ -581,12 +582,18 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, creds->credential_use = SECPKG_CRED_OUTBOUND; creds->enabled_protocols = enabled_protocols; - if (cert && !(key_blob.pbData = get_key_blob(cert, &key_blob.cbData))) goto fail; + if (cert && !(key_blob = get_key_blob(cert, &key_size))) goto fail; params.c = creds; - params.ctx = cert; - params.key_blob = &key_blob; + if (cert) + { + params.cert_encoding = cert->dwCertEncodingType; + params.cert_size = cert->cbCertEncoded; + params.cert_blob = cert->pbCertEncoded; + } + params.key_size = key_size; + params.key_blob = key_blob; if (GNUTLS_CALL( allocate_certificate_credentials, &params )) goto fail; - RtlFreeHeap(GetProcessHeap(), 0, key_blob.pbData); + RtlFreeHeap(GetProcessHeap(), 0, key_blob); handle = schan_alloc_handle(creds, SCHAN_HANDLE_CRED); if (handle == SCHAN_INVALID_HANDLE) goto fail; @@ -605,7 +612,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, fail: free(creds); - RtlFreeHeap(GetProcessHeap(), 0, key_blob.pbData); + RtlFreeHeap(GetProcessHeap(), 0, key_blob); return SEC_E_INTERNAL_ERROR; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index cfc7907bef4..131b40a45d3 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -1038,19 +1038,19 @@ static ULONG set_component(gnutls_datum_t *comp, BYTE *data, ULONG len, ULONG *b return comp->size; } -static gnutls_x509_privkey_t get_x509_key(const DATA_BLOB *key_blob) +static gnutls_x509_privkey_t get_x509_key(ULONG key_size, const BYTE *key_blob) { gnutls_privkey_t key = NULL; gnutls_x509_privkey_t x509key = NULL; gnutls_datum_t m, e, d, p, q, u, e1, e2; BYTE *ptr; RSAPUBKEY *rsakey; - DWORD size = key_blob->cbData; + DWORD size = key_size; int ret; if (size < sizeof(BLOBHEADER)) return NULL; - rsakey = (RSAPUBKEY *)(key_blob->pbData + sizeof(BLOBHEADER)); + rsakey = (RSAPUBKEY *)(key_blob + sizeof(BLOBHEADER)); TRACE("RSA key bitlen %u pubexp %u\n", (unsigned)rsakey->bitlen, (unsigned)rsakey->pubexp); size -= sizeof(BLOBHEADER) + FIELD_OFFSET(RSAPUBKEY, pubexp); @@ -1082,16 +1082,15 @@ static gnutls_x509_privkey_t get_x509_key(const DATA_BLOB *key_blob) return x509key; } -static gnutls_x509_crt_t get_x509_crt(const CERT_CONTEXT *ctx) +static gnutls_x509_crt_t get_x509_crt(const struct allocate_certificate_credentials_params *params) { gnutls_datum_t data; gnutls_x509_crt_t crt; int ret; - if (!ctx) return FALSE; - if (ctx->dwCertEncodingType != X509_ASN_ENCODING) + if (params->cert_encoding != X509_ASN_ENCODING) { - FIXME("encoding type %u not supported\n", (unsigned)ctx->dwCertEncodingType); + FIXME("encoding type %u not supported\n", (unsigned)params->cert_encoding); return NULL; } @@ -1101,8 +1100,8 @@ static gnutls_x509_crt_t get_x509_crt(const CERT_CONTEXT *ctx) return NULL; } - data.data = ctx->pbCertEncoded; - data.size = ctx->cbCertEncoded; + data.data = params->cert_blob; + data.size = params->cert_size; if ((ret = pgnutls_x509_crt_import(crt, &data, GNUTLS_X509_FMT_DER)) < 0) { pgnutls_perror(ret); @@ -1128,19 +1127,19 @@ static NTSTATUS schan_allocate_certificate_credentials( void *args ) return STATUS_INTERNAL_ERROR; } - if (!params->ctx) + if (!params->cert_blob) { params->c->credentials = creds; return STATUS_SUCCESS; } - if (!(crt = get_x509_crt(params->ctx))) + if (!(crt = get_x509_crt(params))) { pgnutls_certificate_free_credentials(creds); return STATUS_INTERNAL_ERROR; } - if (!(key = get_x509_key(params->key_blob))) + if (!(key = get_x509_key(params->key_size, params->key_blob))) { pgnutls_x509_crt_deinit(crt); pgnutls_certificate_free_credentials(creds); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 814d9faf82a..e4fa0381433 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -115,8 +115,11 @@ struct session_params struct allocate_certificate_credentials_params { schan_credentials *c; - const CERT_CONTEXT *ctx; - const DATA_BLOB *key_blob; + ULONG cert_encoding; + ULONG cert_size; + BYTE *cert_blob; + ULONG key_size; + BYTE *key_blob; }; struct create_session_params

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateDomainShader().
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 72046ad7c4103490ab205e5f40b19adaae64c19a URL: https://source.winehq.org/git/wine.git/?a=commit;h=72046ad7c4103490ab205e5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 15:07:31 2022 +0300 d3d11: Always initialize out shader pointer in CreateDomainShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 286874af993..b73df94b50c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3592,6 +3592,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device2 * TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 690f468e6cf..06cb2bc4273 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4824,6 +4824,7 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11Device *device, *tmp; ID3D11GeometryShader *gs; ID3D11VertexShader *vs; + ID3D11DomainShader *ds; ID3D11PixelShader *ps; ID3D11HullShader *hs; HRESULT hr; @@ -5007,6 +5008,12 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); ok(!hs, "Unexpected pointer %p.\n", hs); + /* Domain shader */ + ds = (void *)0xdeadbeef; + hr = ID3D11Device_CreateDomainShader(device, gs_4_0, sizeof(gs_4_0), NULL, &ds); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!ds, "Unexpected pointer %p.\n", ds); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Gabriel Ivăncescu : mshtml: Handle empty strings in heap_strndupWtoU.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 239b5726d412958a5df42314574807f7c723d910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=239b5726d412958a5df42314… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:26 2022 +0300 mshtml: Handle empty strings in heap_strndupWtoU. The HTTP response header status text can be empty, so process_response_status_text would erroneously return E_OUTOFMEMORY. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/wininet/tests/http.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ad1fca091fa..0a7c3a2556e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1392,11 +1392,11 @@ static inline char *heap_strndupWtoU(LPCWSTR str, unsigned len) char *ret = NULL; DWORD size; - if(str && len) { - size = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL); + if(str) { + size = len ? WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL) : 0; ret = heap_alloc(size + 1); if(ret) { - WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); + if(len) WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); ret[size] = '\0'; } } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ec576ae81e2..bc1b829fca2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4526,6 +4526,13 @@ static const http_status_test_t http_status_tests[] = { 200, "" }, + { + "HTTP/1.1 200 \r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "" + }, { "HTTP/1.1 410 \r\n" "Content-Length: 1\r\n"

1 0

Gabriel Ivăncescu : mshtml: Handle empty status text when processing the response.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 0fd3b8ad3760120bb19c53fcd2991850960b9a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd3b8ad3760120bb19c53fc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:27 2022 +0300 mshtml: Handle empty status text when processing the response. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e750ff28ee1..d5ec368e375 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1690,8 +1690,9 @@ static HRESULT process_response_status_text(const WCHAR *header, const WCHAR *he return E_FAIL; header = wcschr(header + 1, ' '); if(!header || header >= header_end) - return E_FAIL; - ++header; + header = header_end; + else + ++header; *status_text = heap_strndupWtoU(header, header_end - header);

1 0

Jacek Caban : winemac: Don't use snprintfW in macdrv_GetKeyNameText.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: cccec04f9aaed265854b06af6f888d94e5fcc465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cccec04f9aaed265854b06af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 23:48:35 2022 +0200 winemac: Don't use snprintfW in macdrv_GetKeyNameText. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/keyboard.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 08c76eb1389..94860f2e36c 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1266,9 +1266,11 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) if (!len) { - static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; - snprintfW(buffer, size, format, vkey); - len = strlenW(buffer); + char name[16]; + len = sprintf(name, "Key 0x%02x", vkey); + len = min(len + 1, size); + ascii_to_unicode(buffer, name, len); + if (len) buffer[--len] = 0; } if (!len)

1 0

Ziqing Hui : d2d1/tests: Test registering effect multiple times with different binding.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 3b4e112c17a461bdf9119b4ad6d68d0d60ba1f9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4e112c17a461bdf9119b4a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 26 16:40:53 2022 +0800 d2d1/tests: Test registering effect multiple times with different binding. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 29d3780a6e7..940205989bb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10437,7 +10437,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_create(IUnknown **effect_impl) object->ID2D1EffectImpl_iface.lpVtbl = &effect_impl_vtbl; object->refcount = 1; - object->integer = 0; + object->integer = 10; object->effect_context = NULL; *effect_impl = (IUnknown *)&object->ID2D1EffectImpl_iface; @@ -10489,11 +10489,12 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, static void test_effect_register(BOOL d3d11) { ID2D1DeviceContext *device_context; + ID2D1EffectContext *effect_context; struct d2d1_test_context ctx; + unsigned int i, integer; ID2D1Factory1 *factory; WCHAR display_name[64]; ID2D1Effect *effect; - unsigned int i; HRESULT hr; const D2D1_PROPERTY_BINDING binding[] = @@ -10613,6 +10614,52 @@ static void test_effect_register(BOOL d3d11) winetest_pop_context(); } + /* Register effect multiple times with different binding */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_c, binding, 1, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + integer = 0xdeadbeef; + effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, L"Integer", + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 10, "Got unexpected integer %u.\n", integer); + ok(effect_context == NULL, "Got unexpected effect context %p.\n", effect_context); + ID2D1Effect_Release(effect); + } + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_c, binding + 1, 1, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + integer = 0xdeadbeef; + effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, L"Integer", + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 10, "Got unexpected integer %u.\n", integer); + ok(effect_context == NULL, "Got unexpected effect context %p.\n", effect_context); + ID2D1Effect_Release(effect); + } + + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + /* Unregister builtin effect */ hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_D2D1Composite); todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr);

1 0

Ziqing Hui : d2d1/tests: Test effect property if register effect multiple times with different xml.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: a95433d685b9f228948e6d1fa28bdb4879c007be URL: https://source.winehq.org/git/wine.git/?a=commit;h=a95433d685b9f228948e6d1f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 26 16:40:52 2022 +0800 d2d1/tests: Test effect property if register effect multiple times with different xml. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..29d3780a6e7 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -37,7 +37,7 @@ DEFINE_GUID(GUID_TestPixelShader, 0x53015748,0xfc13,0x4168,0xbd,0x13,0x0f,0xcf, static const WCHAR *effect_xml_a = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectA'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -56,7 +56,7 @@ L"<?xml version='1.0'?> \ static const WCHAR *effect_xml_b = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectB'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -72,7 +72,7 @@ L"<?xml version='1.0'?> \ static const WCHAR *effect_xml_c = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectC'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -10488,8 +10488,11 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, static void test_effect_register(BOOL d3d11) { + ID2D1DeviceContext *device_context; struct d2d1_test_context ctx; ID2D1Factory1 *factory; + WCHAR display_name[64]; + ID2D1Effect *effect; unsigned int i; HRESULT hr; @@ -10529,6 +10532,7 @@ static void test_effect_register(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; + device_context = ctx.context; factory = ctx.factory1; if (!factory) { @@ -10564,9 +10568,31 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_a, NULL, 0, effect_impl_create); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)display_name, sizeof(display_name)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(display_name, L"TestEffectA"), "Got unexpected display name %s.\n", debugstr_w(display_name)); + ID2D1Effect_Release(effect); + } + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_b, NULL, 0, effect_impl_create); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)display_name, sizeof(display_name)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(display_name, L"TestEffectA"), "Got unexpected display name %s.\n", debugstr_w(display_name)); + ID2D1Effect_Release(effect); + } + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect);

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateGeometryShaderWithStreamOutput().
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 6c8181652514f6821b73cf6ad1b256d8c49b3c06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8181652514f6821b73cf6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 14:45:15 2022 +0300 d3d11: Always initialize out shader pointer in CreateGeometryShaderWithStreamOutput(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 396211561ff..c2cb941ecb0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3520,13 +3520,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutp iface, byte_code, byte_code_length, so_entries, entry_count, buffer_strides, strides_count, rasterizer_stream, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); if (FAILED(hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, so_entries, entry_count, buffer_strides, strides_count, rasterizer_stream, &object))) { - *shader = NULL; return hr; } @@ -6226,10 +6227,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp iface, byte_code, byte_code_length, output_stream_decls, output_stream_decl_count, output_stream_stride, shader); + *shader = NULL; + if (!output_stream_decl_count && output_stream_stride) { WARN("Stride must be 0 when declaration entry count is 0.\n"); - *shader = NULL; return E_INVALIDARG; } @@ -6237,7 +6239,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp && !(so_entries = heap_calloc(output_stream_decl_count, sizeof(*so_entries)))) { ERR("Failed to allocate D3D11 SO declaration array memory.\n"); - *shader = NULL; return E_OUTOFMEMORY; } @@ -6257,7 +6258,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp { WARN("Stride must be 0 when multiple output slots are used.\n"); heap_free(so_entries); - *shader = NULL; return E_INVALIDARG; } } @@ -6267,10 +6267,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp so_entries, output_stream_decl_count, &output_stream_stride, stride_count, 0, &object); heap_free(so_entries); if (FAILED(hr)) - { - *shader = NULL; return hr; - } *shader = &object->ID3D10GeometryShader_iface;

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateGeometryShader().
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: ec8f304bcfe80f07c726b8f194597bedaa397e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8f304bcfe80f07c726b8f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 14:32:48 2022 +0300 d3d11: Always initialize out shader pointer in CreateGeometryShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 6 ++++++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 3d8a5621a49..e292c27f7a1 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -15121,6 +15121,12 @@ float4 main(struct ps_data ps_input) : SV_Target device = test_context.device; + /* Failing case */ + gs = (void *)0xdeadbeef; + hr = ID3D10Device_CreateGeometryShader(device, vs_code, sizeof(vs_code), &gs); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!gs, "Unexpected pointer %p.\n", gs); + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c1207bf7bc9..396211561ff 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3492,6 +3492,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device2 TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); @@ -6198,6 +6200,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device1 TRACE("iface %p, byte_code %p, byte_code_length %Iu, shader %p.\n", iface, byte_code, byte_code_length, shader); + *shader = NULL; + if (FAILED(hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, NULL, 0, NULL, 0, 0, &object))) return hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7ba39cc3447..2096e6d25c5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25526,6 +25526,12 @@ float4 main(struct ps_data ps_input) : SV_Target device = test_context.device; context = test_context.immediate_context; + /* Failing case */ + gs = (void *)0xdeadbeef; + hr = ID3D11Device_CreateGeometryShader(device, vs_code, sizeof(vs_code), NULL, &gs); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!gs, "Unexpected pointer %p.\n", gs); + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0