December 2022 - Wine-commits

Francois Gouget : winetest/build-patterns: Fix the summary pattern for the success case.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: tools Branch: master Commit: e2c6973cac94d42664f786b94387ce21a3116d3a URL: https://gitlab.winehq.org/winehq/tools/-/commit/e2c6973cac94d42664f786b9438… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Dec 11 04:07:17 2022 +0100 winetest/build-patterns: Fix the summary pattern for the success case. The data for the summary pattern is stored under the "0" pseudo-test name. But that pseudo-test was never marked as present so that if no other test failed it would be marked as 'missing in this build' instead of as 'successful run'. --- winetest/build-patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index 14b1917c..d541d5a2 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -366,6 +366,7 @@ foreach my $build (@sortedbuilds) $reports{$reportdir} = $report; } $build->{hasreport}->{$reportdir} = 1; + $build->{hastest}->{0} = 1; # summary results are present in all builds } while (my $line = <$fh>)

1 0

Francois Gouget : testbot/LogUtils: Fix counting of known new messages.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: tools Branch: master Commit: 5683ae9206971084b0b6827f84d6c36ee196496d URL: https://gitlab.winehq.org/winehq/tools/-/commit/5683ae9206971084b0b6827f84d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 8 18:44:16 2022 +0100 testbot/LogUtils: Fix counting of known new messages. A given line can be matched by more than one known failure when it is too generic. This resulted in the eKnownNew counter being too high which then resulted in an invalid NewTestFailures value for the task. This patch ensures the *KnownNew counters count each line only once. --- testbot/lib/WineTestBot/LogUtils.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 07b4dcf5..4a6aa72f 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1538,6 +1538,8 @@ sub MatchLogFailures($$) my $NonFlakyLine = $Line; $NonFlakyLine =~ s/Test succeeded inside flaky todo block:/Test succeeded inside todo block:/g; $NonFlakyLine =~ s/Test marked flaky:/Test failed:/g; + + my $AddToKnownNew = $Group->{IsNew}->[$MsgIndex]; foreach my $UnitFailure (@$UnitFailures) { my $RegExp = $UnitFailure->FailureRegExp; @@ -1549,11 +1551,12 @@ sub MatchLogFailures($$) my $LineFailures = $Group->{Failures}->{$MsgIndex} ||= []; push @$LineFailures, $UnitFailure->Id; - if ($Group->{IsNew}->[$MsgIndex]) + if ($AddToKnownNew) { my $Type = $Group->{Types}->[$MsgIndex]; $Group->{"${Type}KnownNew"}++; $LogInfo->{"${Type}KnownNew"}++; + $AddToKnownNew = undef; } my $LogFailure = $LogFailures->{Failures}->{$UnitFailure->Id};

1 0

Francois Gouget : testbot/LogUtils: Make the MarkAllMessagesAsNew() documentation a bit more explicit.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: tools Branch: master Commit: 686c002eb3c3229f7f5802ebeb44b89251283e33 URL: https://gitlab.winehq.org/winehq/tools/-/commit/686c002eb3c3229f7f5802ebeb4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 8 18:42:44 2022 +0100 testbot/LogUtils: Make the MarkAllMessagesAsNew() documentation a bit more explicit. --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4a6aa72f..e8f32f34 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1258,13 +1258,13 @@ The $LogInfo structure is augmented with the following fields: =over =item New -The total number of new messages. +The total number of new messages of all types. =item MsgGroups =over =item New -The number of new messages in this group. +The number of new messages of all types in this group. =back

1 0

Alex Henrie : dswave: Don't force a calling convention on internal functions.
by Alexandre Julliard 14 Dec '22

14 Dec '22

Module: wine Branch: master Commit: 523a7f82f3d9e4cf496a5d013afee8e149007d0f URL: https://gitlab.winehq.org/wine/wine/-/commit/523a7f82f3d9e4cf496a5d013afee8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 12 21:15:05 2022 -0700 dswave: Don't force a calling convention on internal functions. --- dlls/dswave/dswave.c | 2 +- dlls/dswave/dswave_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index 1b83d5ab053..e6d85d738fe 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -175,7 +175,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ppobj) +HRESULT create_dswave(REFIID lpcGUID, void **ppobj) { IDirectMusicWaveImpl *obj; HRESULT hr; diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 5b5eb7a937d..dfd8ed6f51c 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -42,7 +42,7 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dswave(REFIID lpcGUID, void **ret_iface) DECLSPEC_HIDDEN; /********************************************************************** * Dll lifetime tracking declaration for dswave.dll

1 0

Paul Gofman : bcrypt: Do not error out for GNUTLS_ECC_CURVE_SECP384R1 in key_export_ecc().
by Alexandre Julliard 14 Dec '22

14 Dec '22

Module: wine Branch: master Commit: ccdef80543ff5c1f08a8aaff39c3f623522152df URL: https://gitlab.winehq.org/wine/wine/-/commit/ccdef80543ff5c1f08a8aaff39c3f6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 14 11:21:18 2022 -0600 bcrypt: Do not error out for GNUTLS_ECC_CURVE_SECP384R1 in key_export_ecc(). --- dlls/bcrypt/gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 70f55a6e8d6..bb79e885652 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1075,7 +1075,7 @@ static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *r return STATUS_INTERNAL_ERROR; } - if (curve != GNUTLS_ECC_CURVE_SECP256R1) + if (curve != GNUTLS_ECC_CURVE_SECP256R1 && curve != GNUTLS_ECC_CURVE_SECP384R1) { FIXME( "curve %u not supported\n", curve ); free( x.data ); free( y.data ); free( d.data );

1 0

Hans Leidekker : bcrypt: Add PSS compatibility defines.
by Alexandre Julliard 14 Dec '22

14 Dec '22

Module: wine Branch: master Commit: 45b823114ce89ee56a36705a77f4f6bb9761dde4 URL: https://gitlab.winehq.org/wine/wine/-/commit/45b823114ce89ee56a36705a77f4f6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 09:30:20 2022 +0100 bcrypt: Add PSS compatibility defines. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54121 --- dlls/bcrypt/gnutls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 9425cccd066..70f55a6e8d6 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -73,6 +73,10 @@ typedef enum #define GNUTLS_CIPHER_AES_128_CFB8 29 #define GNUTLS_CIPHER_AES_192_CFB8 30 #define GNUTLS_CIPHER_AES_256_CFB8 31 + +#define GNUTLS_PK_RSA_PSS 6 +#define GNUTLS_PRIVKEY_SIGN_FLAG_RSA_PSS (1 << 7) +typedef struct gnutls_x509_spki_st *gnutls_x509_spki_t; #endif union key_data

1 0

Zebediah Figura : wined3d: Always bind to GL_ELEMENT_ARRAY_BUFFER if the bind flags include WINED3D_BIND_INDEX_BUFFER.
by Alexandre Julliard 14 Dec '22

14 Dec '22

Module: wine Branch: master Commit: 33d6900b35f510d17d6d5b1dc0936e7cc7136d73 URL: https://gitlab.winehq.org/wine/wine/-/commit/33d6900b35f510d17d6d5b1dc0936e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 13 20:42:33 2022 -0600 wined3d: Always bind to GL_ELEMENT_ARRAY_BUFFER if the bind flags include WINED3D_BIND_INDEX_BUFFER. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53623 --- dlls/wined3d/buffer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2f6c52ef36f..fa24f006872 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -141,7 +141,11 @@ GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *g if (!bind_flags) return GL_PIXEL_UNPACK_BUFFER; - if (bind_flags == WINED3D_BIND_INDEX_BUFFER) + /* We must always return GL_ELEMENT_ARRAY_BUFFER here; + * wined3d_device_gl_create_bo() checks the GL binding to see whether we + * can suballocate, and we cannot suballocate if this BO might be used for + * an index buffer. */ + if (bind_flags & WINED3D_BIND_INDEX_BUFFER) return GL_ELEMENT_ARRAY_BUFFER; if (bind_flags & (WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS)

1 0

Eric Pouech : rpcrt4: Pass a common header to RPCRT4_BuildCommonHeader.
by Alexandre Julliard 14 Dec '22

14 Dec '22

Module: wine Branch: master Commit: 5d2547cef492e337830dffb1a96827ea0e95612c URL: https://gitlab.winehq.org/wine/wine/-/commit/5d2547cef492e337830dffb1a96827… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 10 17:46:50 2022 +0100 rpcrt4: Pass a common header to RPCRT4_BuildCommonHeader. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rpcrt4/rpc_message.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index a799064e8e9..77aebf44ea1 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -106,21 +106,21 @@ static BOOL packet_does_auth_negotiation(const RpcPktHdr *Header) } } -static VOID RPCRT4_BuildCommonHeader(RpcPktHdr *Header, unsigned char PacketType, +static VOID RPCRT4_BuildCommonHeader(RpcPktCommonHdr *Header, unsigned char PacketType, ULONG DataRepresentation) { - Header->common.rpc_ver = RPC_VER_MAJOR; - Header->common.rpc_ver_minor = RPC_VER_MINOR; - Header->common.ptype = PacketType; - Header->common.drep[0] = LOBYTE(LOWORD(DataRepresentation)); - Header->common.drep[1] = HIBYTE(LOWORD(DataRepresentation)); - Header->common.drep[2] = LOBYTE(HIWORD(DataRepresentation)); - Header->common.drep[3] = HIBYTE(HIWORD(DataRepresentation)); - Header->common.auth_len = 0; - Header->common.call_id = 1; - Header->common.flags = 0; + Header->rpc_ver = RPC_VER_MAJOR; + Header->rpc_ver_minor = RPC_VER_MINOR; + Header->ptype = PacketType; + Header->drep[0] = LOBYTE(LOWORD(DataRepresentation)); + Header->drep[1] = HIBYTE(LOWORD(DataRepresentation)); + Header->drep[2] = LOBYTE(HIWORD(DataRepresentation)); + Header->drep[3] = HIBYTE(HIWORD(DataRepresentation)); + Header->auth_len = 0; + Header->call_id = 1; + Header->flags = 0; /* Flags and fragment length are computed in RPCRT4_Send. */ -} +} static RpcPktHdr *RPCRT4_BuildRequestHeader(ULONG DataRepresentation, ULONG BufferLength, @@ -137,7 +137,7 @@ static RpcPktHdr *RPCRT4_BuildRequestHeader(ULONG DataRepresentation, return NULL; } - RPCRT4_BuildCommonHeader(header, PKT_REQUEST, DataRepresentation); + RPCRT4_BuildCommonHeader(&header->common, PKT_REQUEST, DataRepresentation); header->common.frag_len = sizeof(header->request); header->request.alloc_hint = BufferLength; header->request.context_id = 0; @@ -160,7 +160,7 @@ RpcPktHdr *RPCRT4_BuildResponseHeader(ULONG DataRepresentation, ULONG BufferLeng return NULL; } - RPCRT4_BuildCommonHeader(header, PKT_RESPONSE, DataRepresentation); + RPCRT4_BuildCommonHeader(&header->common, PKT_RESPONSE, DataRepresentation); header->common.frag_len = sizeof(header->response); header->response.alloc_hint = BufferLength; @@ -176,7 +176,7 @@ RpcPktHdr *RPCRT4_BuildFaultHeader(ULONG DataRepresentation, RPC_STATUS Status) return NULL; } - RPCRT4_BuildCommonHeader(header, PKT_FAULT, DataRepresentation); + RPCRT4_BuildCommonHeader(&header->common, PKT_FAULT, DataRepresentation); header->common.frag_len = sizeof(header->fault); header->fault.status = Status; @@ -199,7 +199,7 @@ RpcPktHdr *RPCRT4_BuildBindHeader(ULONG DataRepresentation, } ctxt_elem = (RpcContextElement *)(&header->bind + 1); - RPCRT4_BuildCommonHeader(header, PKT_BIND, DataRepresentation); + RPCRT4_BuildCommonHeader(&header->common, PKT_BIND, DataRepresentation); header->common.frag_len = sizeof(header->bind) + FIELD_OFFSET(RpcContextElement, transfer_syntaxes[1]); header->bind.max_tsize = MaxTransmissionSize; header->bind.max_rsize = MaxReceiveSize; @@ -220,7 +220,7 @@ static RpcPktHdr *RPCRT4_BuildAuthHeader(ULONG DataRepresentation) if (header == NULL) return NULL; - RPCRT4_BuildCommonHeader(header, PKT_AUTH3, DataRepresentation); + RPCRT4_BuildCommonHeader(&header->common, PKT_AUTH3, DataRepresentation); header->common.frag_len = sizeof(header->auth3); return header; @@ -238,7 +238,7 @@ RpcPktHdr *RPCRT4_BuildBindNackHeader(ULONG DataRepresentation, return NULL; } - RPCRT4_BuildCommonHeader(header, PKT_BIND_NACK, DataRepresentation); + RPCRT4_BuildCommonHeader(&header->common, PKT_BIND_NACK, DataRepresentation); header->common.frag_len = FIELD_OFFSET(RpcPktHdr, bind_nack.protocols[1]); header->bind_nack.reject_reason = RejectReason; header->bind_nack.protocols_count = 1; @@ -270,7 +270,7 @@ RpcPktHdr *RPCRT4_BuildBindAckHeader(ULONG DataRepresentation, return NULL; } - RPCRT4_BuildCommonHeader(header, PKT_BIND_ACK, DataRepresentation); + RPCRT4_BuildCommonHeader(&header->common, PKT_BIND_ACK, DataRepresentation); header->common.frag_len = header_size; header->bind_ack.max_tsize = MaxTransmissionSize; header->bind_ack.max_rsize = MaxReceiveSize; @@ -299,7 +299,7 @@ RpcPktHdr *RPCRT4_BuildHttpHeader(ULONG DataRepresentation, return NULL; } - RPCRT4_BuildCommonHeader(header, PKT_HTTP, DataRepresentation); + RPCRT4_BuildCommonHeader(&header->common, PKT_HTTP, DataRepresentation); /* since the packet isn't current sent using RPCRT4_Send, set the flags * manually here */ header->common.flags = RPC_FLG_FIRST|RPC_FLG_LAST;

1 0

Eric Pouech : rpcrt4: Fix GCC12.2 warnings.
by Alexandre Julliard 14 Dec '22

14 Dec '22

Module: wine Branch: master Commit: 7ffcd6609f5e8524caff214147ec683a59ed473b URL: https://gitlab.winehq.org/wine/wine/-/commit/7ffcd6609f5e8524caff214147ec68… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 10 17:46:51 2022 +0100 rpcrt4: Fix GCC12.2 warnings. GCC12.2 warns about dereferencing a pointer to RpcPktHdr while it has been allocated to the size of one of the packet (hence smaller in some cases). /home/eric/work/wine/dlls/rpcrt4/rpc_message.c:111:26: warning: array subscript 'RpcPktHdr[0]' is partly outside array bounds of 'unsigned char[24]' [-Warray-bounds] 111 | Header->common.rpc_ver = RPC_VER_MAJOR; This patch fixes the warnings by accessing the created object through a pointer to their type (and not through the union). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rpcrt4/rpc_message.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 77aebf44ea1..46736c21fc1 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -153,34 +153,34 @@ static RpcPktHdr *RPCRT4_BuildRequestHeader(ULONG DataRepresentation, RpcPktHdr *RPCRT4_BuildResponseHeader(ULONG DataRepresentation, ULONG BufferLength) { - RpcPktHdr *header; + RpcPktResponseHdr *header; - header = calloc(1, sizeof(header->response)); + header = calloc(1, sizeof(*header)); if (header == NULL) { return NULL; } RPCRT4_BuildCommonHeader(&header->common, PKT_RESPONSE, DataRepresentation); - header->common.frag_len = sizeof(header->response); - header->response.alloc_hint = BufferLength; + header->common.frag_len = sizeof(*header); + header->alloc_hint = BufferLength; - return header; + return (RpcPktHdr *)header; } RpcPktHdr *RPCRT4_BuildFaultHeader(ULONG DataRepresentation, RPC_STATUS Status) { - RpcPktHdr *header; + RpcPktFaultHdr *header; - header = calloc(1, sizeof(header->fault)); + header = calloc(1, sizeof(*header)); if (header == NULL) { return NULL; } RPCRT4_BuildCommonHeader(&header->common, PKT_FAULT, DataRepresentation); - header->common.frag_len = sizeof(header->fault); - header->fault.status = Status; + header->common.frag_len = sizeof(*header); + header->status = Status; - return header; + return (RpcPktHdr *)header; } RpcPktHdr *RPCRT4_BuildBindHeader(ULONG DataRepresentation, @@ -214,16 +214,16 @@ RpcPktHdr *RPCRT4_BuildBindHeader(ULONG DataRepresentation, static RpcPktHdr *RPCRT4_BuildAuthHeader(ULONG DataRepresentation) { - RpcPktHdr *header; + RpcPktAuth3Hdr *header; - header = calloc(1, sizeof(header->auth3)); + header = calloc(1, sizeof(*header)); if (header == NULL) return NULL; RPCRT4_BuildCommonHeader(&header->common, PKT_AUTH3, DataRepresentation); - header->common.frag_len = sizeof(header->auth3); + header->common.frag_len = sizeof(*header); - return header; + return (RpcPktHdr*)header; } RpcPktHdr *RPCRT4_BuildBindNackHeader(ULONG DataRepresentation, @@ -231,21 +231,22 @@ RpcPktHdr *RPCRT4_BuildBindNackHeader(ULONG DataRepresentation, unsigned char RpcVersionMinor, unsigned short RejectReason) { - RpcPktHdr *header; + RpcPktBindNAckHdr *header; + C_ASSERT(sizeof(*header) >= FIELD_OFFSET(RpcPktBindNAckHdr, protocols[1])); - header = calloc(1, FIELD_OFFSET(RpcPktHdr, bind_nack.protocols[1])); + header = calloc(1, sizeof(*header)); if (header == NULL) { return NULL; } RPCRT4_BuildCommonHeader(&header->common, PKT_BIND_NACK, DataRepresentation); - header->common.frag_len = FIELD_OFFSET(RpcPktHdr, bind_nack.protocols[1]); - header->bind_nack.reject_reason = RejectReason; - header->bind_nack.protocols_count = 1; - header->bind_nack.protocols[0].rpc_ver = RpcVersion; - header->bind_nack.protocols[0].rpc_ver_minor = RpcVersionMinor; + header->common.frag_len = FIELD_OFFSET(RpcPktBindNAckHdr, protocols[1]); + header->reject_reason = RejectReason; + header->protocols_count = 1; + header->protocols[0].rpc_ver = RpcVersion; + header->protocols[0].rpc_ver_minor = RpcVersionMinor; - return header; + return (RpcPktHdr *)header; } RpcPktHdr *RPCRT4_BuildBindAckHeader(ULONG DataRepresentation,

1 0

Alex Henrie : joy: Correct spelling of "overridden".
by Alexandre Julliard 14 Dec '22

14 Dec '22

1 0