December 2021 - Wine-commits

Alexandre Julliard : secur32: Move the buffers initialization and callbacks to the Unix side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: a4d69c874b2e62055fe8ef4c5ff222d0555bba87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4d69c874b2e62055fe8ef4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 14:09:13 2021 +0100 secur32: Move the buffers initialization and callbacks to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 116 +--------------------------------- dlls/secur32/schannel_gnutls.c | 137 +++++++++++++++++++++++++++++++++++++++-- dlls/secur32/secur32_priv.h | 6 +- 3 files changed, 137 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4d69c874b2e62055fe8…

1 0

Alexandre Julliard : secur32: Move the memory allocation for get_session_peer_certificate() to the PE side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: bcc30639ad6c61a15ac52979805af218502648ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcc30639ad6c61a15ac52979… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 14:31:38 2021 +0100 secur32: Move the memory allocation for get_session_peer_certificate() to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 23 ++++++++++++++++------- dlls/secur32/schannel_gnutls.c | 28 ++++++++++++++++++---------- dlls/secur32/secur32_priv.h | 8 +------- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f9deb5d8a23..483e3285f09 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -909,28 +909,37 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) HCERTSTORE store; PCCERT_CONTEXT cert = NULL; SECURITY_STATUS status; - struct schan_cert_list list; + CERT_BLOB *certs; + ULONG count, size = 0; if (ctx->cert) return SEC_E_OK; if (!(store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL))) return GetLastError(); - if ((status = schan_funcs->get_session_peer_certificate(ctx->transport.session, &list)) == SEC_E_OK) + status = schan_funcs->get_session_peer_certificate(ctx->transport.session, NULL, &size, &count); + if (status != SEC_E_BUFFER_TOO_SMALL) goto done; + if (!(certs = malloc( size ))) + { + status = SEC_E_INSUFFICIENT_MEMORY; + goto done; + } + status = schan_funcs->get_session_peer_certificate(ctx->transport.session, certs, &size, &count); + if (status == SEC_E_OK) { unsigned int i; - for (i = 0; i < list.count; i++) + for (i = 0; i < count; i++) { - if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, list.certs[i].pbData, - list.certs[i].cbData, CERT_STORE_ADD_REPLACE_EXISTING, + if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, certs[i].pbData, + certs[i].cbData, CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert)) { if (i) CertFreeCertificateContext(cert); return GetLastError(); } } - RtlFreeHeap(GetProcessHeap(), 0, list.certs); } - + free(certs); +done: ctx->cert = cert; CertCloseStore(store, 0); return status; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 8a540035bdc..392d10e538b 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -810,28 +810,36 @@ static ALG_ID CDECL schan_get_key_signature_algorithm(schan_session session) } } -static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session session, struct schan_cert_list *list) +static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session session, CERT_BLOB *certs, + ULONG *bufsize, ULONG *retcount) { gnutls_session_t s = (gnutls_session_t)session; const gnutls_datum_t *datum; unsigned int i, size; BYTE *ptr; + unsigned int count; - if (!(datum = pgnutls_certificate_get_peers(s, &list->count))) return SEC_E_INTERNAL_ERROR; + if (!(datum = pgnutls_certificate_get_peers(s, &count))) return SEC_E_INTERNAL_ERROR; - size = list->count * sizeof(list->certs[0]); - for (i = 0; i < list->count; i++) size += datum[i].size; - if (!(list->certs = RtlAllocateHeap(GetProcessHeap(), 0, size))) return SEC_E_INSUFFICIENT_MEMORY; + size = count * sizeof(certs[0]); + for (i = 0; i < count; i++) size += datum[i].size; - ptr = (BYTE *)&list->certs[list->count]; - for (i = 0; i < list->count; i++) + if (!certs || *bufsize < size) { - list->certs[i].cbData = datum[i].size; - list->certs[i].pbData = ptr; - memcpy(list->certs[i].pbData, datum[i].data, datum[i].size); + *bufsize = size; + return SEC_E_BUFFER_TOO_SMALL; + } + ptr = (BYTE *)&certs[count]; + for (i = 0; i < count; i++) + { + certs[i].cbData = datum[i].size; + certs[i].pbData = ptr; + memcpy(certs[i].pbData, datum[i].data, datum[i].size); ptr += datum[i].size; } + *bufsize = size; + *retcount = count; return SEC_E_OK; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 3552a6aaf38..7cad59a51f7 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -108,12 +108,6 @@ struct schan_transport struct schan_buffers out; }; -struct schan_cert_list -{ - unsigned int count; - CERT_BLOB *certs; -}; - struct schan_funcs { BOOL (CDECL *allocate_certificate_credentials)(schan_credentials *, const CERT_CONTEXT *, const DATA_BLOB *); @@ -126,7 +120,7 @@ struct schan_funcs ALG_ID (CDECL *get_key_signature_algorithm)(schan_session); unsigned int (CDECL *get_max_message_size)(schan_session); unsigned int (CDECL *get_session_cipher_block_size)(schan_session); - SECURITY_STATUS (CDECL *get_session_peer_certificate)(schan_session, struct schan_cert_list *); + SECURITY_STATUS (CDECL *get_session_peer_certificate)(schan_session, CERT_BLOB *, ULONG *, ULONG *); SECURITY_STATUS (CDECL *get_unique_channel_binding)(schan_session, SecPkgContext_Bindings *); SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, ULONG ); SECURITY_STATUS (CDECL *recv)(schan_session, SecBufferDesc *, SIZE_T, void *, SIZE_T *);

1 0

Alexandre Julliard : secur32: Move the memory allocation for get_unique_channel_binding() to the PE side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: abdae539381c03b874adda6bb8f85b3ec79eef22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abdae539381c03b874adda6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 15:48:28 2021 +0100 secur32: Move the memory allocation for get_unique_channel_binding() to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 21 ++++++++++++++++++++- dlls/secur32/schannel_gnutls.c | 21 ++++++--------------- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 483e3285f09..432c35cdfde 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1057,8 +1057,27 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( } case SECPKG_ATTR_UNIQUE_BINDINGS: { + static const char prefix[] = "tls-unique:"; SecPkgContext_Bindings *bindings = buffer; - return schan_funcs->get_unique_channel_binding(ctx->transport.session, bindings); + ULONG size; + char *p; + + if (schan_funcs->get_unique_channel_binding(ctx->transport.session, NULL, &size) != SEC_E_BUFFER_TOO_SMALL) + return SEC_E_INTERNAL_ERROR; + + bindings->BindingsLength = sizeof(*bindings->Bindings) + sizeof(prefix)-1 + size; + /* freed with FreeContextBuffer */ + bindings->Bindings = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, bindings->BindingsLength); + if(!bindings->Bindings) + return SEC_E_INSUFFICIENT_MEMORY; + + bindings->Bindings->cbApplicationDataLength = sizeof(prefix)-1 + size; + bindings->Bindings->dwApplicationDataOffset = sizeof(*bindings->Bindings); + + p = (char*)(bindings->Bindings+1); + memcpy(p, prefix, sizeof(prefix)-1); + p += sizeof(prefix)-1; + return schan_funcs->get_unique_channel_binding(ctx->transport.session, p, &size); } case SECPKG_ATTR_APPLICATION_PROTOCOL: { diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 392d10e538b..e4da13c9b3e 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -755,13 +755,11 @@ static SECURITY_STATUS CDECL schan_get_connection_info(schan_session session, Se return SEC_E_OK; } -static SECURITY_STATUS CDECL schan_get_unique_channel_binding(schan_session session, SecPkgContext_Bindings *bindings) +static SECURITY_STATUS CDECL schan_get_unique_channel_binding(schan_session session, void *buffer, ULONG *bufsize) { - static const char prefix[] = "tls-unique:"; gnutls_datum_t datum; int rc; SECURITY_STATUS ret; - char *p; gnutls_session_t s = (gnutls_session_t)session; rc = pgnutls_session_channel_binding(s, GNUTLS_CB_TLS_UNIQUE, &datum); @@ -770,21 +768,14 @@ static SECURITY_STATUS CDECL schan_get_unique_channel_binding(schan_session sess pgnutls_perror(rc); return SEC_E_INTERNAL_ERROR; } - - bindings->BindingsLength = sizeof(SEC_CHANNEL_BINDINGS) + sizeof(prefix)-1 + datum.size; - bindings->Bindings = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, bindings->BindingsLength); - if (!bindings->Bindings) - ret = SEC_E_INSUFFICIENT_MEMORY; - else + if (buffer && *bufsize >= datum.size) { - bindings->Bindings->cbApplicationDataLength = sizeof(prefix)-1 + datum.size; - bindings->Bindings->dwApplicationDataOffset = sizeof(SEC_CHANNEL_BINDINGS); - p = (char*)(bindings->Bindings+1); - memcpy(p, prefix, sizeof(prefix)-1); - p += sizeof(prefix)-1; - memcpy(p, datum.data, datum.size); + memcpy( buffer, datum.data, datum.size ); ret = SEC_E_OK; } + else ret = SEC_E_BUFFER_TOO_SMALL; + + *bufsize = datum.size; free(datum.data); return ret; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 7cad59a51f7..9970c0847e3 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -121,7 +121,7 @@ struct schan_funcs unsigned int (CDECL *get_max_message_size)(schan_session); unsigned int (CDECL *get_session_cipher_block_size)(schan_session); SECURITY_STATUS (CDECL *get_session_peer_certificate)(schan_session, CERT_BLOB *, ULONG *, ULONG *); - SECURITY_STATUS (CDECL *get_unique_channel_binding)(schan_session, SecPkgContext_Bindings *); + SECURITY_STATUS (CDECL *get_unique_channel_binding)(schan_session, void *, ULONG *); SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, ULONG ); SECURITY_STATUS (CDECL *recv)(schan_session, SecBufferDesc *, SIZE_T, void *, SIZE_T *); SECURITY_STATUS (CDECL *send)(schan_session, SecBufferDesc *, const void *, SIZE_T *);

1 0

Alexandre Julliard : secur32: Pre-allocate the token buffer for handshake() on the PE side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 1cf48b46845c1364e5d032924a700f372f7b0628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf48b46845c1364e5d03292… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 18:24:24 2021 +0100 secur32: Pre-allocate the token buffer for handshake() on the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 17 ++++++++++++++++- dlls/secur32/schannel_gnutls.c | 41 +++++++---------------------------------- dlls/secur32/secur32_priv.h | 4 ++-- 3 files changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 432c35cdfde..14645080f38 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -689,12 +689,14 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { + const ULONG extra_size = 0x10000; struct schan_context *ctx; struct schan_buffers *out_buffers; struct schan_credentials *cred; SIZE_T expected_size = ~0UL; SECURITY_STATUS ret; SecBuffer *buffer; + SecBuffer alloc_buffer = { 0 }; int idx; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, @@ -814,19 +816,32 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx->req_ctx_attr = fContextReq; /* Perform the TLS handshake */ - ret = schan_funcs->handshake(ctx->transport.session, pInput, expected_size, pOutput, fContextReq); + if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) + { + alloc_buffer.cbBuffer = extra_size; + alloc_buffer.BufferType = SECBUFFER_TOKEN; + alloc_buffer.pvBuffer = RtlAllocateHeap( GetProcessHeap(), 0, extra_size ); + } + ret = schan_funcs->handshake(ctx->transport.session, pInput, expected_size, pOutput, &alloc_buffer); out_buffers = &ctx->transport.out; if (out_buffers->current_buffer_idx != -1) { SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; buffer->cbBuffer = out_buffers->offset; + if (buffer->pvBuffer == alloc_buffer.pvBuffer) + { + RtlReAllocateHeap( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, + buffer->pvBuffer, buffer->cbBuffer ); + alloc_buffer.pvBuffer = NULL; + } } else if (out_buffers->desc && out_buffers->desc->cBuffers > 0) { SecBuffer *buffer = &out_buffers->desc->pBuffers[0]; buffer->cbBuffer = 0; } + RtlFreeHeap( GetProcessHeap(), 0, alloc_buffer.pvBuffer ); if(ctx->transport.in.offset && ctx->transport.in.offset != pInput->pBuffers[0].cbBuffer) { if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index e4da13c9b3e..d832c353fcd 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -204,7 +204,7 @@ static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc des s->limit = ~0UL; s->desc = desc; s->current_buffer_idx = -1; - s->allow_buffer_resize = FALSE; + s->alloc_buffer = NULL; s->get_next_buffer = get_next_buffer; } @@ -240,10 +240,9 @@ static int handshake_get_next_buffer_alloc(const struct schan_transport *t, stru idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_EMPTY); if (idx != -1) s->desc->pBuffers[idx].BufferType = SECBUFFER_TOKEN; } - if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer) + if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer && s->alloc_buffer) { - s->desc->pBuffers[idx].cbBuffer = 0; - s->allow_buffer_resize = TRUE; + s->desc->pBuffers[idx] = *s->alloc_buffer; } return idx; } @@ -302,31 +301,6 @@ static int recv_message_get_next_buffer(const struct schan_transport *t, struct return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); } -static void resize_current_buffer(const struct schan_buffers *s, SIZE_T min_size) -{ - SecBuffer *b = &s->desc->pBuffers[s->current_buffer_idx]; - SIZE_T new_size = b->cbBuffer ? b->cbBuffer * 2 : 128; - void *new_data; - - if (b->cbBuffer >= min_size || !s->allow_buffer_resize || min_size > UINT_MAX / 2) return; - - while (new_size < min_size) new_size *= 2; - - if (b->pvBuffer) /* freed with FreeContextBuffer */ - new_data = RtlReAllocateHeap(GetProcessHeap(), 0, b->pvBuffer, new_size); - else - new_data = RtlAllocateHeap(GetProcessHeap(), 0, new_size); - - if (!new_data) - { - TRACE("Failed to resize %p from %d to %ld\n", b->pvBuffer, b->cbBuffer, new_size); - return; - } - - b->cbBuffer = new_size; - b->pvBuffer = new_data; -} - static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) { SIZE_T max_count; @@ -353,7 +327,6 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s buffer = &s->desc->pBuffers[s->current_buffer_idx]; TRACE("Using buffer %d: cbBuffer %d, BufferType %#x, pvBuffer %p\n", s->current_buffer_idx, buffer->cbBuffer, buffer->BufferType, buffer->pvBuffer); - resize_current_buffer(s, s->offset + *count); max_count = buffer->cbBuffer - s->offset; if (s->limit != ~0UL && s->limit < max_count) max_count = s->limit; @@ -362,7 +335,6 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s { int buffer_idx; - s->allow_buffer_resize = FALSE; buffer_idx = s->get_next_buffer(t, s); if (buffer_idx == -1) { @@ -580,7 +552,8 @@ static void CDECL schan_set_session_target(schan_session session, const char *ta } static SECURITY_STATUS CDECL schan_handshake(schan_session session, SecBufferDesc *input, - SIZE_T input_size, SecBufferDesc *output, ULONG flags ) + SIZE_T input_size, SecBufferDesc *output, + SecBuffer *alloc_buffer ) { gnutls_session_t s = (gnutls_session_t)session; struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); @@ -588,8 +561,8 @@ static SECURITY_STATUS CDECL schan_handshake(schan_session session, SecBufferDes init_schan_buffers(&t->in, input, handshake_get_next_buffer); t->in.limit = input_size; - init_schan_buffers(&t->out, output, (flags & ISC_REQ_ALLOCATE_MEMORY) ? - handshake_get_next_buffer_alloc : handshake_get_next_buffer ); + init_schan_buffers(&t->out, output, handshake_get_next_buffer_alloc ); + t->out.alloc_buffer = alloc_buffer; while(1) { err = pgnutls_handshake(s); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9970c0847e3..6bfa1ff7a26 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -95,8 +95,8 @@ struct schan_buffers SIZE_T offset; SIZE_T limit; const SecBufferDesc *desc; + SecBuffer *alloc_buffer; int current_buffer_idx; - BOOL allow_buffer_resize; int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *); }; @@ -122,7 +122,7 @@ struct schan_funcs unsigned int (CDECL *get_session_cipher_block_size)(schan_session); SECURITY_STATUS (CDECL *get_session_peer_certificate)(schan_session, CERT_BLOB *, ULONG *, ULONG *); SECURITY_STATUS (CDECL *get_unique_channel_binding)(schan_session, void *, ULONG *); - SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, ULONG ); + SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, SecBuffer * ); SECURITY_STATUS (CDECL *recv)(schan_session, SecBufferDesc *, SIZE_T, void *, SIZE_T *); SECURITY_STATUS (CDECL *send)(schan_session, SecBufferDesc *, const void *, SIZE_T *); void (CDECL *set_application_protocols)(schan_session, unsigned char *, unsigned int);

1 0

Alexandre Julliard : secur32: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 392bdb85e73b0287c21626b489957bf076137674 URL: https://source.winehq.org/git/wine.git/?a=commit;h=392bdb85e73b0287c21626b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 4 13:18:34 2021 +0100 secur32: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 1 + dlls/secur32/schannel.c | 124 +++++++++++++++------ dlls/secur32/schannel_gnutls.c | 245 +++++++++++++++++++++-------------------- dlls/secur32/secur32_priv.h | 142 ++++++++++++++++++++---- 4 files changed, 331 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=392bdb85e73b0287c216…

1 0

Torge Matthies : windowscodecs/tests: Add test for big PNG chunks.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 2abf0173e5cecdb59d7aeb3c673d34088135d88a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2abf0173e5cecdb59d7aeb3c… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Dec 3 21:26:15 2021 +0100 windowscodecs/tests: Add test for big PNG chunks. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 8c33d3b9645..b44fd017fcf 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -922,6 +922,34 @@ todo_wine_if(td[i].todo) #undef PNG_COLOR_TYPE_GRAY_ALPHA #undef PNG_COLOR_TYPE_RGB_ALPHA +/* 1 bpp 1x1 pixel PNG image with 8 MiB comment */ +static const char png_8M_tEXt_start[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x37,0x6e,0xf9,0x24, + 0x00,0x80,0x00,0x08,'t','E','X','t','C','o','m','m','e','n','t',0x00 /* ,[0x800030]=0x00,0x1e,0x13,0xe2,0xc7 */ +}; +static const char png_8M_tEXt_end[] = { + /* 0x00,0x80,0x00,0x08,'t','E','X','t','C','o','m','m','e','n','t',0x00,[0x800030]=0x00, */ 0x1e,0x13,0xe2,0xc7, + 0x00,0x00,0x00,0x0c,'I','D','A','T',0x78,0x9c,0x63,0x68,0x00,0x00,0x00,0x82,0x00,0x81,0x77,0xcd,0x72,0xb6, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_chunk_size(void) +{ + static char png_8M_tEXt[sizeof(png_8M_tEXt_start) + 0x800000 + sizeof(png_8M_tEXt_end)] = {0}; + HRESULT hr; + IWICBitmapDecoder *decoder; + + memcpy(png_8M_tEXt, png_8M_tEXt_start, sizeof(png_8M_tEXt_start)); + memcpy(png_8M_tEXt + sizeof(png_8M_tEXt) - sizeof(png_8M_tEXt_end), png_8M_tEXt_end, sizeof(png_8M_tEXt_end)); + + hr = create_decoder(png_8M_tEXt, sizeof(png_8M_tEXt), &decoder); + todo_wine ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; + + IWICBitmapDecoder_Release(decoder); +} + START_TEST(pngformat) { HRESULT hr; @@ -935,6 +963,7 @@ START_TEST(pngformat) test_color_contexts(); test_png_palette(); test_color_formats(); + test_chunk_size(); IWICImagingFactory_Release(factory); CoUninitialize();

1 0

Torge Matthies : windowscodecs: Disable libpng chunk size limit.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: e1130d240e8a3ff05c814dd8a2d6e55b3f054e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1130d240e8a3ff05c814dd8… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Dec 3 21:26:16 2021 +0100 windowscodecs: Disable libpng chunk size limit. Reading a PNG file with libpng with a chunk bigger than the 8 MiB default chunk size limit set by libpng results in a libpng error, e.g. "iTXt: chunk data is too large" for a too big iTXt chunk. Fix this by disabling the chunk size limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52147 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 1 + dlls/windowscodecs/tests/pngformat.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 27a735550f3..8e876b23efe 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -107,6 +107,7 @@ static HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stre goto end; } png_set_crc_action(png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); + png_set_chunk_malloc_max(png_ptr, 0); /* seek to the start of the stream */ hr = stream_seek(stream, 0, STREAM_SEEK_SET, NULL); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index b44fd017fcf..32afc989c2b 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -944,7 +944,7 @@ static void test_chunk_size(void) memcpy(png_8M_tEXt + sizeof(png_8M_tEXt) - sizeof(png_8M_tEXt_end), png_8M_tEXt_end, sizeof(png_8M_tEXt_end)); hr = create_decoder(png_8M_tEXt, sizeof(png_8M_tEXt), &decoder); - todo_wine ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); if (hr != S_OK) return; IWICBitmapDecoder_Release(decoder);

1 0

Alexandre Julliard : Wine release 6.23
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: website Branch: master Commit: cdda2bb01155610fe89f8549210f57f65445ae7f URL: https://source.winehq.org/git/website.git/?a=commit;h=cdda2bb01155610fe89f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 22:19:18 2021 +0100 Wine release 6.23 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021120302.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021120302.xml b/news/en/2021120302.xml new file mode 100644 index 00000000..157ebe2d --- /dev/null +++ b/news/en/2021120302.xml @@ -0,0 +1,17 @@ +<news> +<date>December 3, 2021</date> +<title>Wine 6.23 Released</title> +<body> + The Wine development release 6.23 is now available. + <a href="{$root}/announce/6.23">What's new</a> in this release: +<ul> + <li>Mount manager and CoreAudio driver converted to PE.</li> + <li>Support for exception handling in Wow64 mode.</li> + <li>Optional support for using the distribution's PE libraries.</li> + <li>A number of UI improvements in WineDbg.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.23.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Hans Leidekker : wbemprox: Add a stub MSSMBios_RawSMBiosTables implementation.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 5effe62af4ec27b37f65d8911bac09d85d21f211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5effe62af4ec27b37f65d891… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 14:20:25 2021 +0100 wbemprox: Add a stub MSSMBios_RawSMBiosTables implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51946 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 22 +++++++++++++++++++++- dlls/wbemprox/tests/query.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3fccd3fb600..6b63c744b69 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -358,6 +358,10 @@ static const struct column col_quickfixengineering[] = { L"Caption", CIM_STRING }, { L"HotFixID", CIM_STRING|COL_FLAG_KEY }, }; +static const struct column col_rawsmbiostables[] = +{ + { L"SMBiosData", CIM_UINT8|CIM_FLAG_ARRAY }, +}; static const struct column col_service[] = { { L"AcceptPause", CIM_BOOLEAN }, @@ -776,6 +780,10 @@ struct record_quickfixengineering const WCHAR *caption; const WCHAR *hotfixid; }; +struct record_rawsmbiostables +{ + const struct array *smbiosdata; +}; struct record_service { int accept_pause; @@ -953,11 +961,18 @@ static const struct record_physicalmedia data_physicalmedia[] = { { L"WINEHDISK", L"\\\\.\\PHYSICALDRIVE0" } }; + +static const struct record_rawsmbiostables data_rawsmbiostables[] = +{ + { 0 }, +}; + static const struct record_qualifier data_qualifier[] = { { L"__WIN32_PROCESS_GETOWNER_OUT", L"User", CIM_SINT32, FLAVOR_ID, L"ID", 0 }, { L"__WIN32_PROCESS_GETOWNER_OUT", L"Domain", CIM_SINT32, FLAVOR_ID, L"ID", 1 } }; + static const struct record_quickfixengineering data_quickfixengineering[] = { { L"http://winehq.org", L"KB1234567" }, @@ -4128,6 +4143,11 @@ static struct table cimv2_builtin_classes[] = { L"Win32_VideoController", C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, { L"Win32_WinSAT", C(col_winsat), D(data_winsat) }, }; + +static struct table wmi_builtin_classes[] = +{ + { L"MSSMBios_RawSMBiosTables", C(col_rawsmbiostables), D(data_rawsmbiostables) }, +}; #undef C #undef D @@ -4141,7 +4161,7 @@ builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, {L"Microsoft\\Windows\\Storage", NULL, 0}, - {L"wmi", NULL, 0}, + {L"wmi", wmi_builtin_classes, ARRAY_SIZE(wmi_builtin_classes)}, }; void init_table_list( void ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 577a352c26f..912671f4ad2 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2102,6 +2102,41 @@ static void test_empty_namespace( IWbemLocator *locator ) IWbemServices_Release( services ); } +static void test_MSSMBios_RawSMBiosTables( IWbemLocator *locator ) +{ + BSTR path = SysAllocString( L"ROOT\\WMI" ); + BSTR bios = SysAllocString( L"MSSMBios_RawSMBiosTables" ); + IWbemServices *services; + IEnumWbemClassObject *iter; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + ULONG count; + HRESULT hr; + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = IWbemServices_CreateInstanceEnum( services, bios, 0, NULL, &iter ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &obj, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"SMBiosData", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( V_VT( &val ) == (VT_UI1 | VT_ARRAY), "got %08x\n", V_VT(&val) ); + ok( type == (CIM_UINT8 | CIM_FLAG_ARRAY), "got %08x\n", type ); + + IWbemClassObject_Release( obj ); + IEnumWbemClassObject_Release( iter ); + IWbemServices_Release( services ); + SysFreeString( path ); + SysFreeString( bios ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -2180,6 +2215,7 @@ START_TEST(query) test_Win32_WinSAT( services ); test_SystemRestore( services ); test_empty_namespace( locator ); + test_MSSMBios_RawSMBiosTables( locator ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Nikolay Sivov : mfplat: Trace types passed to MFTEnum*.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 1162fe57004bb281ca89835cb7ce39e4e5868eeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1162fe57004bb281ca89835c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 3 17:04:17 2021 +0300 mfplat: Trace types passed to MFTEnum*. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a70d7d401a1..978340a7ece 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -90,6 +90,12 @@ struct mft_registration BOOL local; }; +static const char *debugstr_reg_typeinfo(const MFT_REGISTER_TYPE_INFO *info) +{ + return info ? wine_dbg_sprintf("%p{%s,%s}", info, debugstr_mf_guid(&info->guidMajorType), + debugstr_mf_guid(&info->guidSubtype)) : wine_dbg_sprintf("%p", info); +} + static CRITICAL_SECTION local_mfts_section = { NULL, -1, 0, 0, 0, 0 }; static struct list local_mfts = LIST_INIT(local_mfts); @@ -1331,8 +1337,8 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu struct list mfts; HRESULT hr; - TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, - clsids, count); + TRACE("%s, %#x, %s, %s, %p, %p, %p.\n", debugstr_mf_guid(&category), flags, debugstr_reg_typeinfo(input_type), + debugstr_reg_typeinfo(output_type), attributes, clsids, count); if (!clsids || !count) return E_INVALIDARG; @@ -1377,7 +1383,8 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count) { - TRACE("%s, %#x, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, activate, count); + TRACE("%s, %#x, %s, %s, %p, %p.\n", debugstr_mf_guid(&category), flags, debugstr_reg_typeinfo(input_type), + debugstr_reg_typeinfo(output_type), activate, count); return mft_enum(category, flags, input_type, output_type, NULL, activate, count); } @@ -1388,8 +1395,8 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, IMFActivate ***activate, UINT32 *count) { - TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, - activate, count); + TRACE("%s, %#x, %s, %s, %p, %p, %p.\n", debugstr_mf_guid(&category), flags, debugstr_reg_typeinfo(input_type), + debugstr_reg_typeinfo(output_type), attributes, activate, count); if (attributes) FIXME("Ignoring attributes.\n"); @@ -1903,7 +1910,9 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_RGB565), X(MFVideoFormat_RGB555), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID), + X(MFT_CATEGORY_MULTIPLEXER), X(MFVideoFormat_A2R10G10B10), + X(MFT_CATEGORY_VIDEO_EFFECT), X(MFMediaType_Script), X(MFMediaType_Image), X(MFMediaType_HTML), @@ -1923,8 +1932,10 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_H265), X(MFVideoFormat_HEVC), X(MFVideoFormat_HEVC_ES), + X(MFT_CATEGORY_AUDIO_EFFECT), X(MFVideoFormat_I420), X(MFVideoFormat_IYUV), + X(MFT_CATEGORY_VIDEO_DECODER), X(MFVideoFormat_M4S2), X(MFVideoFormat_MJPG), X(MFVideoFormat_MP43), @@ -1937,8 +1948,8 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_NV12), X(MFVideoFormat_ORAW), X(MFAudioFormat_Opus), - X(MFVideoFormat_D16), X(MFAudioFormat_MPEG), + X(MFVideoFormat_D16), X(MFVideoFormat_P010), X(MFVideoFormat_P016), X(MFVideoFormat_P210), @@ -1953,6 +1964,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_WMV2), X(MFVideoFormat_WMV3), X(MFVideoFormat_WVC1), + X(MFT_CATEGORY_OTHER), X(MFVideoFormat_Y210), X(MFVideoFormat_Y216), X(MFVideoFormat_Y410), @@ -1986,7 +1998,9 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_v410), X(MFMediaType_Video), X(MFAudioFormat_AAC_HDCP), + X(MFT_CATEGORY_DEMULTIPLEXER), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID), + X(MFT_CATEGORY_VIDEO_ENCODER), X(MFAudioFormat_Dolby_AC3_HDCP), X(MFMediaType_Subtitle), X(MFMediaType_Stream), @@ -1997,7 +2011,9 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFAudioFormat_FLAC), X(MFAudioFormat_Dolby_DDPlus), X(MFMediaType_MultiplexedFrames), + X(MFT_CATEGORY_AUDIO_DECODER), X(MFAudioFormat_Base_HDCP), + X(MFT_CATEGORY_AUDIO_ENCODER), X(MFVideoFormat_Base_HDCP), X(MFVideoFormat_H264_HDCP), X(MFVideoFormat_HEVC_HDCP), @@ -2005,6 +2021,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFMediaType_Protected), X(MFVideoFormat_H264_ES), X(MFMediaType_Perception), + X(MFT_CATEGORY_VIDEO_PROCESSOR), #undef X }; struct guid_def *ret = NULL;

1 0