December 2022 - Wine-Commits

Francois Gouget : testbot/web: Show the task id in a more compact form.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: tools Branch: master Commit: f1d196b96dcaa71f49acdb98ca80a3e1a462f3c5 URL: https://gitlab.winehq.org/winehq/tools/-/commit/f1d196b96dcaa71f49acdb98ca8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 17:33:06 2022 +0100 testbot/web: Show the task id in a more compact form. --- testbot/web/JobDetails.pl | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a4a250fa..c2b7cf5c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -50,7 +50,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures)$/ ? "" : + return $PropertyName =~ /^(?:Id|StepNo|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures)$/ ? "" : $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -65,7 +65,11 @@ sub GenerateHeaderView($$$) my ($self, $Row, $Col) = @_; my $PropertyName = $Col->{Descriptor}->GetName(); - if ($PropertyName eq "CmdLineArg") + if ($PropertyName eq "TaskNo") + { + print "<a class='title' title='Step.Task'>Task</a>"; + } + elsif ($PropertyName eq "CmdLineArg") { print "Arguments / <span class='MissionHeader'>Missions</span>"; } @@ -101,6 +105,11 @@ sub GenerateDataView($$$) my $StepTask = $Row->{Item}; my $PropertyName = $Col->{Descriptor}->GetName(); + if ($PropertyName eq "TaskNo") + { + print $StepTask->StepNo, ".", $StepTask->TaskNo; + return; + } if ($PropertyName eq "VMName") { print "<a href='#k", $StepTask->GetKey(), "'>",

1 0

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

Dec. 15, 2022

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

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

Dec. 15, 2022

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

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

Dec. 14, 2022

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

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

Dec. 14, 2022

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

Eric Pouech : rpcrt4: Fix GCC12.2 warnings.
by Alexandre Julliard Dec. 14, 2022

Dec. 14, 2022

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

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

Dec. 14, 2022

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

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

Dec. 14, 2022

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

Hans Leidekker : bcrypt: Add PSS compatibility defines.
by Alexandre Julliard Dec. 14, 2022

Dec. 14, 2022

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

Alex Henrie : joy: Correct spelling of "overridden".
by Alexandre Julliard Dec. 14, 2022

Dec. 14, 2022

1 0

Zebediah Figura : wined3d: Require pipeline statistics queries to create a feature level 10.0 device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: a25ae51c1462eb2219f28d184a0d5838109da572 URL: https://gitlab.winehq.org/wine/wine/-/commit/a25ae51c1462eb2219f28d184a0d58… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:11:26 2022 -0600 wined3d: Require pipeline statistics queries to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a7b2ff76e28..12bef2fba51 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2265,6 +2265,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.geometryShader && info->features2.features.depthClamp && info->features2.features.depthBiasClamp + && info->features2.features.pipelineStatisticsQuery && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Zebediah Figura : wined3d: Require vertex pipeline image stores and atomics to create a feature level 11.1 device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: ec62575e9d99fc35752760cc37ded207febdfd11 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec62575e9d99fc35752760cc37ded2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:19:40 2022 -0600 wined3d: Require vertex pipeline image stores and atomics to create a feature level 11.1 device. --- dlls/wined3d/adapter_vk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 12bef2fba51..713aaec9e39 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2283,6 +2283,11 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info && info->features2.features.tessellationShader; } +static bool feature_level_11_1_supported(const struct wined3d_physical_device_info *info) +{ + return info->features2.features.vertexPipelineStoresAndAtomics; +} + static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_physical_device_info *info, const struct shader_caps *shader_caps) { @@ -2314,6 +2319,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (!feature_level_11_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_10_1; + if (!feature_level_11_1_supported(info)) + return WINED3D_FEATURE_LEVEL_11; + return WINED3D_FEATURE_LEVEL_11_1; }

1 0

Zebediah Figura : wined3d: Require depth bias clamp to create a feature level 10.0 device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 80771f1c4bfe2d864e32b93a6c5e4d748879dc2d URL: https://gitlab.winehq.org/wine/wine/-/commit/80771f1c4bfe2d864e32b93a6c5e4d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:40:08 2022 -0600 wined3d: Require depth bias clamp to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d38882ff5ab..e5a9e80decb 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2258,6 +2258,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.multiViewport && info->features2.features.geometryShader && info->features2.features.depthClamp + && info->features2.features.depthBiasClamp && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Zebediah Figura : wined3d: Require precise occlusion queries to create a feature level 9.2 device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: c20b8da9e3ee086ad4ead4bb2c341565b49c0659 URL: https://gitlab.winehq.org/wine/wine/-/commit/c20b8da9e3ee086ad4ead4bb2c3415… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:09:11 2022 -0600 wined3d: Require precise occlusion queries to create a feature level 9.2 device. --- dlls/wined3d/adapter_vk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 03f7b4bfb5f..a7b2ff76e28 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2247,6 +2247,11 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, adapter_vk->a.d3d_info.feature_level, vram_bytes, sysmem_bytes); } +static bool feature_level_9_2_supported(const struct wined3d_physical_device_info *info) +{ + return info->features2.features.occlusionQueryPrecise; +} + static bool feature_level_9_3_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) { return shader_model >= 3 @@ -2293,6 +2298,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (shader_model <= 1) return WINED3D_FEATURE_LEVEL_8; + if (!feature_level_9_2_supported(info)) + return WINED3D_FEATURE_LEVEL_9_1; + if (!feature_level_9_3_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_9_2;

1 0

Zebediah Figura : wined3d: Disable wide line support.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: d6666cd02deea49badbd1c32aa0b61b2b270027b URL: https://gitlab.winehq.org/wine/wine/-/commit/d6666cd02deea49badbd1c32aa0b61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:45:37 2022 -0600 wined3d: Disable wide line support. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e5a9e80decb..03f7b4bfb5f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -299,6 +299,7 @@ static void wined3d_disable_vulkan_features(struct wined3d_physical_device_info VkPhysicalDeviceFeatures *features = &info->features2.features; features->depthBounds = VK_FALSE; + features->wideLines = VK_FALSE; features->alphaToOne = VK_FALSE; features->textureCompressionETC2 = VK_FALSE; features->textureCompressionASTC_LDR = VK_FALSE;

1 0

Alexandre Julliard : oleaut32: Fix A<->W conversion when storing names in typelibs.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 680d17b453ad651ecb12be5d12a7e6baf84a4de1 URL: https://gitlab.winehq.org/wine/wine/-/commit/680d17b453ad651ecb12be5d12a7e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 13:19:49 2022 +0100 oleaut32: Fix A<->W conversion when storing names in typelibs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52873 --- dlls/oleaut32/typelib.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 602b9a1ee17..d92d0234c6c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2252,12 +2252,12 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx ) if(size == -1){ V_BSTR(pVar) = NULL; }else{ + int len; ptr = heap_alloc_zero(size); MSFT_Read(ptr, size, pcx, DO_NOT_SEEK); - V_BSTR(pVar)=SysAllocStringLen(NULL,size); - /* FIXME: do we need a AtoW conversion here? */ - V_UNION(pVar, bstrVal[size])='\0'; - while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; + len = MultiByteToWideChar(CP_ACP, 0, ptr, size, NULL, 0 ); + V_BSTR(pVar)=SysAllocStringLen(NULL,len); + MultiByteToWideChar(CP_ACP, 0, ptr, size, V_BSTR(pVar), len ); heap_free(ptr); } } @@ -5734,23 +5734,12 @@ static HRESULT TLB_CopyElemDesc( const ELEMDESC *src, ELEMDESC *dest, char **buf return S_OK; } -static HRESULT TLB_SanitizeBSTR(BSTR str) -{ - UINT len = SysStringLen(str), i; - for (i = 0; i < len; ++i) - if (str[i] > 0x7f) - str[i] = '?'; - return S_OK; -} - static HRESULT TLB_SanitizeVariant(VARIANT *var) { if (V_VT(var) == VT_INT) return VariantChangeType(var, var, 0, VT_I4); else if (V_VT(var) == VT_UINT) return VariantChangeType(var, var, 0, VT_UI4); - else if (V_VT(var) == VT_BSTR) - return TLB_SanitizeBSTR(V_BSTR(var)); return S_OK; } @@ -9421,7 +9410,8 @@ static DWORD WMSFT_encode_variant(VARIANT *value, WMSFT_TLBFile *file) } case VT_BSTR: { - int i, len = (6+SysStringLen(V_BSTR(&v))+3) & ~0x3; + int mb_len = WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), NULL, 0, NULL, NULL ); + int i, len = (6 + mb_len + 3) & ~0x3; char *data; if(file->custdata_seg.data){ @@ -9434,15 +9424,9 @@ static DWORD WMSFT_encode_variant(VARIANT *value, WMSFT_TLBFile *file) } *((unsigned short *)data) = V_VT(value); - *((unsigned int *)(data+2)) = SysStringLen(V_BSTR(&v)); - for(i=0; i<SysStringLen(V_BSTR(&v)); i++) { - if(V_BSTR(&v)[i] <= 0x7f) - data[i+6] = V_BSTR(&v)[i]; - else - data[i+6] = '?'; - } - WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), &data[6], len-6, NULL, NULL); - for(i=6+SysStringLen(V_BSTR(&v)); i<len; i++) + *((unsigned int *)(data+2)) = mb_len; + WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), &data[6], mb_len, NULL, NULL); + for (i = 6 + mb_len; i < len; i++) data[i] = 0x57; /* TODO: Check if the encoded data is already present in custdata_seg */

1 0

Alexandre Julliard : kernel32/tests: Fix a string comparison test in utf-8 locales.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: b771d417d8f7f514ea57ff41e06cb96f912b48e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b771d417d8f7f514ea57ff41e06cb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 14:10:51 2022 +0100 kernel32/tests: Fix a string comparison test in utf-8 locales. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52964 --- dlls/kernel32/tests/locale.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 723c24873c6..40706c15755 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1816,8 +1816,13 @@ static void test_CompareStringA(void) static const char ABC_FF[] = {'A','B','C',0,0xFF}; int ret, i; char a[256]; + BOOL is_utf8; + CPINFOEXA cpinfo; LCID lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT); + GetCPInfoExA( CP_ACP, 0, &cpinfo ); + is_utf8 = cpinfo.CodePage == CP_UTF8; + for (i = 0; i < ARRAY_SIZE(comparestringa_data); i++) { const struct comparestringa_entry *entry = &comparestringa_data[i]; @@ -1945,13 +1950,13 @@ static void test_CompareStringA(void) ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 3); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 3); - ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_GREATER_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 5); - ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ok(ret == CSTR_LESS_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 5); - ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ok(ret == CSTR_LESS_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_FF, 5, ABC_EE, 5); - ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_GREATER_THAN, got %d\n", ret); } static void test_CompareStringW(void)

1 0

Zebediah Figura : server: Inherit the SO_RCVTIMEO value in accept_socket().
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 03391aab2457d8e4341339ba619acd8a2f071654 URL: https://gitlab.winehq.org/wine/wine/-/commit/03391aab2457d8e4341339ba619acd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:10:06 2022 -0600 server: Inherit the SO_RCVTIMEO value in accept_socket(). --- dlls/ws2_32/tests/sock.c | 3 +-- server/sock.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cb99ceb4b24..6f2bcb73a06 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,8 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i == 6) - ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); + ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } len = sizeof(linger); diff --git a/server/sock.c b/server/sock.c index a64ea8f7e56..a64cb22404e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2002,6 +2002,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->sndbuf = sock->sndbuf; acceptsock->rcvbuf = sock->rcvbuf; acceptsock->sndtimeo = sock->sndtimeo; + acceptsock->rcvtimeo = sock->rcvtimeo; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0

Zebediah Figura : server: Inherit address reuse flags in accept_socket().
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: ddc6c3fb23ae9a6ad584b596e8c5a7ff8ef1b4c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ddc6c3fb23ae9a6ad584b596e8c5a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:08:10 2022 -0600 server: Inherit address reuse flags in accept_socket(). --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 32c2172f0db..d8500144bd0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i == 0 || (i >= 3 && i <= 6)) + todo_wine_if (i >= 3 && i <= 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index c130821b7f4..8fe6086b8f6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1988,16 +1988,19 @@ static struct sock *accept_socket( struct sock *sock ) } /* newly created socket gets the same properties of the listening socket */ - acceptsock->state = SOCK_CONNECTED; - acceptsock->bound = 1; - acceptsock->nonblocking = sock->nonblocking; - acceptsock->mask = sock->mask; - acceptsock->proto = sock->proto; - acceptsock->type = sock->type; - acceptsock->family = sock->family; - acceptsock->window = sock->window; - acceptsock->message = sock->message; - acceptsock->connect_time = current_time; + acceptsock->state = SOCK_CONNECTED; + acceptsock->bound = 1; + acceptsock->nonblocking = sock->nonblocking; + acceptsock->mask = sock->mask; + acceptsock->proto = sock->proto; + acceptsock->type = sock->type; + acceptsock->family = sock->family; + acceptsock->window = sock->window; + acceptsock->message = sock->message; + acceptsock->reuseaddr = sock->reuseaddr; + acceptsock->exclusiveaddruse = sock->exclusiveaddruse; + acceptsock->connect_time = current_time; + if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); if (!(acceptsock->fd = create_anonymous_fd( &sock_fd_ops, acceptfd, &acceptsock->obj, get_fd_options( sock->fd ) )))

1 0

Zebediah Figura : server: Inherit the SO_SNDBUF value in accept_socket().
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: a58cd78ca9efa160ea13783839c461b8d3c65bec URL: https://gitlab.winehq.org/wine/wine/-/commit/a58cd78ca9efa160ea13783839c461… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:08:54 2022 -0600 server: Inherit the SO_SNDBUF value in accept_socket(). --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d8500144bd0..974cf087778 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i >= 3 && i <= 6) + todo_wine_if (i >= 4 && i <= 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index 8fe6086b8f6..e84b3c68017 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1999,6 +1999,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->message = sock->message; acceptsock->reuseaddr = sock->reuseaddr; acceptsock->exclusiveaddruse = sock->exclusiveaddruse; + acceptsock->sndbuf = sock->sndbuf; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0

Zebediah Figura : server: Inherit the SO_RCVBUF value in accept_socket().
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 1ef2cc0f643ba0614d189708b7a7af4bccee389f URL: https://gitlab.winehq.org/wine/wine/-/commit/1ef2cc0f643ba0614d189708b7a7af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:09:08 2022 -0600 server: Inherit the SO_RCVBUF value in accept_socket(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53911 --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 974cf087778..f32776de17f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i >= 4 && i <= 6) + todo_wine_if (i >= 5 && i <= 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index e84b3c68017..4a16180a960 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2000,6 +2000,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->reuseaddr = sock->reuseaddr; acceptsock->exclusiveaddruse = sock->exclusiveaddruse; acceptsock->sndbuf = sock->sndbuf; + acceptsock->rcvbuf = sock->rcvbuf; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0

Zebediah Figura : server: Inherit the SO_SNDTIMEO value in accept_socket().
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 418dff0c0122655aa6bf505333860b9e785c732a URL: https://gitlab.winehq.org/wine/wine/-/commit/418dff0c0122655aa6bf505333860b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:09:48 2022 -0600 server: Inherit the SO_SNDTIMEO value in accept_socket(). --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f32776de17f..cb99ceb4b24 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i >= 5 && i <= 6) + todo_wine_if (i == 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index 4a16180a960..a64ea8f7e56 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2001,6 +2001,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->exclusiveaddruse = sock->exclusiveaddruse; acceptsock->sndbuf = sock->sndbuf; acceptsock->rcvbuf = sock->rcvbuf; + acceptsock->sndtimeo = sock->sndtimeo; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0

Zebediah Figura : ntoskrnl/tests: Ignore CONFIGFLAG_FINISH_INSTALL on the child device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 5e3e0a519de9004f39ca8be8f3f833fe54bdeeb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e3e0a519de9004f39ca8be8f3f833… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:23:32 2022 -0600 ntoskrnl/tests: Ignore CONFIGFLAG_FINISH_INSTALL on the child device. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53976 --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 02af7ca230b..ff93cfc98ec 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -36,6 +36,7 @@ #include "setupapi.h" #include "cfgmgr32.h" #include "newdev.h" +#include "regstr.h" #include "dbt.h" #include "initguid.h" #include "devguid.h" @@ -1634,7 +1635,8 @@ static void test_pnp_devices(void) ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, &type, (BYTE *)&dword, sizeof(dword), NULL); ok(ret, "got error %#lx\n", GetLastError()); - ok(!dword, "got flags %#lx\n", dword); + /* windows 7 sets CONFIGFLAG_FINISH_INSTALL; it's not clear what this means */ + ok(!(dword & ~CONFIGFLAG_FINISH_INSTALL), "got flags %#lx\n", dword); ok(type == REG_DWORD, "got type %lu\n", type); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVTYPE,

1 0

Zebediah Figura : ws2_32/tests: Add tests for state inherited by accept().
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 96e5157f2a1d1a83698df6a727c2723a8a742351 URL: https://gitlab.winehq.org/wine/wine/-/commit/96e5157f2a1d1a83698df6a727c272… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:05:24 2022 -0600 ws2_32/tests: Add tests for state inherited by accept(). --- dlls/ws2_32/tests/sock.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bcccaef9bc6..32c2172f0db 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4761,6 +4761,89 @@ done: closesocket(server_socket); } +/* Test what socket state is inherited from the listening socket by accept(). */ +static void test_accept_inheritance(void) +{ + struct sockaddr_in addr, destaddr; + SOCKET listener, server, client; + struct linger linger; + int ret, len, value; + unsigned int i; + + static const struct + { + int optname; + int optval; + int value; + } + int_tests[] = + { + {SOL_SOCKET, SO_REUSEADDR, 1}, + {SOL_SOCKET, SO_KEEPALIVE, 1}, + {SOL_SOCKET, SO_OOBINLINE, 1}, + {SOL_SOCKET, SO_SNDBUF, 0x123}, + {SOL_SOCKET, SO_RCVBUF, 0x123}, + {SOL_SOCKET, SO_SNDTIMEO, 0x123}, + {SOL_SOCKET, SO_RCVTIMEO, 0x123}, + {IPPROTO_TCP, TCP_NODELAY, 1}, + }; + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + for (i = 0; i < ARRAY_SIZE(int_tests); ++i) + { + ret = setsockopt(listener, int_tests[i].optname, int_tests[i].optval, + (char *)&int_tests[i].value, sizeof(int_tests[i].value)); + ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); + } + + linger.l_onoff = 1; + linger.l_linger = 555; + ret = setsockopt(listener, SOL_SOCKET, SO_LINGER, (char *)&linger, sizeof(linger)); + ok(!ret, "got error %u\n", WSAGetLastError()); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = bind(listener, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + + ret = listen(listener, 1); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + for (i = 0; i < ARRAY_SIZE(int_tests); ++i) + { + value = 0; + len = sizeof(value); + ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); + ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); + todo_wine_if (i == 0 || (i >= 3 && i <= 6)) + ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); + } + + len = sizeof(linger); + memset(&linger, 0, sizeof(linger)); + ret = getsockopt(server, SOL_SOCKET, SO_LINGER, (char *)&linger, &len); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(linger.l_onoff == 1, "got on/off %u\n", linger.l_onoff); + ok(linger.l_linger == 555, "got linger %u\n", linger.l_onoff); + + close(server); + close(client); + close(listener); +} + static void test_extendedSocketOptions(void) { WSADATA wsa; @@ -13607,6 +13690,7 @@ START_TEST( sock ) test_listen(); test_select(); test_accept(); + test_accept_inheritance(); test_getpeername(); test_getsockname();

1 0

Zebediah Figura : include: Add CONFIGFLAG_* definitions.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 760788557c7322f5480ea67e94097f9112d86d54 URL: https://gitlab.winehq.org/wine/wine/-/commit/760788557c7322f5480ea67e94097f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:23:09 2022 -0600 include: Add CONFIGFLAG_* definitions. --- include/regstr.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/regstr.h b/include/regstr.h index 0be6c9ac5f1..850d16133a9 100644 --- a/include/regstr.h +++ b/include/regstr.h @@ -30,5 +30,25 @@ /* UninstallString <= 63 chars in Windows (otherwise problems) */ #define REGSTR_VAL_UNINSTALLER_COMMANDLINE TEXT("UninstallString") +#define CONFIGFLAG_DISABLED 0x00000001 +#define CONFIGFLAG_REMOVED 0x00000002 +#define CONFIGFLAG_MANUAL_INSTALL 0x00000004 +#define CONFIGFLAG_IGNORE_BOOT_LC 0x00000008 +#define CONFIGFLAG_NET_BOOT 0x00000010 +#define CONFIGFLAG_REINSTALL 0x00000020 +#define CONFIGFLAG_FAILEDINSTALL 0x00000040 +#define CONFIGFLAG_CANTSTOPACHILD 0x00000080 +#define CONFIGFLAG_OKREMOVEROM 0x00000100 +#define CONFIGFLAG_NOREMOVEEXIT 0x00000200 +#define CONFIGFLAG_FINISH_INSTALL 0x00000400 +#define CONFIGFLAG_NEEDS_FORCED_CONFIG 0x00000800 +#define CONFIGFLAG_NETBOOT_CARD 0x00001000 +#define CONFIGFLAG_PARTIAL_LOG_CONF 0x00002000 +#define CONFIGFLAG_SUPPRESS_SURPRISE 0x00004000 +#define CONFIGFLAG_VERIFY_HARDWARE 0x00008000 +#define CONFIGFLAG_FINISHINSTALL_UI 0x00010000 +#define CONFIGFLAG_FINISHINSTALL_ACTION 0x00020000 +#define CONFIGFLAG_BOOT_DEVICE 0x00040000 +#define CONFIGFLAG_NEEDS_CLASS_CONFIG 0x00080000 #endif /* _INC_REGSTR_H */

1 0