wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Francois Gouget : testbot/UpdateFailures: Truncate the bug status and description if needed.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: tools Branch: master Commit: 3a830b95d95eba94a286c77bb186b3ce25ef2380 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3a830b95d95eba94a286c77… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 24 16:26:21 2022 +0200 testbot/UpdateFailures: Truncate the bug status and description if needed. They have to fit otherwise Failure::Validate() will prevent saving to the database. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateFailures.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateFailures.pl b/testbot/bin/UpdateFailures.pl index 7c89b7b9..f324cca2 100755 --- a/testbot/bin/UpdateFailures.pl +++ b/testbot/bin/UpdateFailures.pl @@ -157,6 +157,7 @@ foreach my $FailureId (@FailureIds) # Update the failures bug information my $Bugs = CollectBugInfo([keys %$BugIds]); +my ($MaxStatusLen, $MaxDescriptionLen); foreach my $FailureId (@FailureIds) { my $Failure = $Failures->GetItem($FailureId); @@ -167,9 +168,19 @@ foreach my $FailureId (@FailureIds) { my $Resolution = $Bug->{Resolution} || " ---"; $Resolution = $Resolution eq " ---" ? "" : " $Resolution"; - $Failure->BugStatus("$Bug->{Status}$Resolution"); + if (!defined $MaxStatusLen) + { + my $PropertyDescriptor = $Failure->GetPropertyDescriptorByName("BugStatus"); + $MaxStatusLen = $PropertyDescriptor->GetMaxLength(); + } + $Failure->BugStatus(substr("$Bug->{Status}$Resolution", 0, $MaxStatusLen)); + } + if (!defined $MaxDescriptionLen) + { + my $PropertyDescriptor = $Failure->GetPropertyDescriptorByName("BugDescription"); + $MaxDescriptionLen = $PropertyDescriptor->GetMaxLength(); } - $Failure->BugDescription($Bug->{Description}); + $Failure->BugDescription(substr($Bug->{Description}, 0, $MaxDescriptionLen)); } else {

1 0

Francois Gouget : testbot: Sort failures on their notes as a last resort.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: tools Branch: master Commit: ebea482465c96b13ed5d4a4be6fb64919bc469ff URL: https://source.winehq.org/git/tools.git/?a=commit;h=ebea482465c96b13ed5d4a4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 24 16:25:29 2022 +0200 testbot: Sort failures on their notes as a last resort. Sometimes a bug is spread across multiple failures and the Notes field normally describes what each one corresponds to. Sorting on the Notes field as a last resort typically ensures that all the parts are in an order that makes sense. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Failures.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index dc307bfa..6190ef25 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -50,11 +50,11 @@ sub Compare($$) # Sort deleted entries last my %StatusOrders = ("deleted" => 1); - my $Cmp = ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || + return ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || $self->GetColValue("ErrorGroup") cmp $B->GetColValue("ErrorGroup") || $self->GetColValue("TestUnit") cmp $B->GetColValue("TestUnit") || - $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription"); - return $Cmp + $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription") || + $self->GetColValue("Notes") cmp $B->GetColValue("Notes"); } sub BugId($;$)

1 0

Francois Gouget : testbot: Treat regular expression warnings as errors.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: tools Branch: master Commit: bf85455d64e25705afd326ef335e99f1a1d218cf URL: https://source.winehq.org/git/tools.git/?a=commit;h=bf85455d64e25705afd326e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 24 16:24:51 2022 +0200 testbot: Treat regular expression warnings as errors. In particular do so when validating failures so errors are caught when the failure is created / modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Failures.pm | 1 + testbot/lib/WineTestBot/LogUtils.pm | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 90620511..dc307bfa 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -104,6 +104,7 @@ sub Validate($) my ($Field, $Name) = @$Pair; my $RegExp = $self->$Field; my $ErrMessage = eval { + use warnings FATAL => qw(regexp); if ($RegExp and "" =~ /$RegExp/) { return "The $Name regular expression should not match empty strings"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9e73b5f6..41016314 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1390,7 +1390,10 @@ sub MatchLogFailures($$) { # Ignore failures that don't apply to this configuration my $ConfigRegExp = $Failure->ConfigRegExp; - my $Match = eval { !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/; + }; next if (!$Match); my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= []; @@ -1412,7 +1415,10 @@ sub MatchLogFailures($$) foreach my $UnitFailure (@$UnitFailures) { my $RegExp = $UnitFailure->FailureRegExp; - my $Match = eval { $RegExp and $Line =~ /$RegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + $RegExp and $Line =~ /$RegExp/; + }; next if (!$Match); my $LineFailures = $Group->{Failures}->{$ErrIndex} ||= [];

1 0

Jeremy White : Protect against patches that break the parsing.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: tools Branch: master Commit: af62ee218ed25a1502490a1017cf53d23cf65307 URL: https://source.winehq.org/git/tools.git/?a=commit;h=af62ee218ed25a1502490a1… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Jun 23 22:20:01 2022 -0500 Protect against patches that break the parsing. A patch that starts with '^From ' in the body breaks our parsing. See for example: https://gitlab.winehq.org/wine/wine/-/merge_requests/307/diffs?commit_id=5f… This change doesn't make it work perfectly, but keeps us from failing, and spamming the mailing list. --- gitlab/gitlab-to-mail/gitlabtomail.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index e113eaae..8333588e 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -628,6 +628,10 @@ def process_mr(mr, update_db): for nr, mail in enumerate(patches): # The hope is that a slight delay will allow receivers to order the patches correctly. time.sleep(0.1) + if mail['From'] == None: + log(f"Error: MR {iid} patch {nr} has no From") + continue + fixup_patch(mail, iid, version, nr+1) date = date + datetime.timedelta(seconds=1) fixup_date(mail, date)

1 0

Huw Davies : iphlpapi: Don't allocate the IO status block on the stack.
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: wine Branch: master Commit: aa48b656dce1c565b0787e5fa333a21963f25a92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa48b656dce1c565b0787e5f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 23 12:40:47 2022 +0100 iphlpapi: Don't allocate the IO status block on the stack. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index fc8ee3d2040..65d3793011b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4628,6 +4628,21 @@ DWORD WINAPI IcmpSendEcho2( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_rou opts, reply, reply_size, timeout ); } +struct icmp_apc_ctxt +{ + void *apc_ctxt; + PIO_APC_ROUTINE apc_routine; + IO_STATUS_BLOCK iosb; +}; + +void WINAPI icmp_apc_routine( void *context, IO_STATUS_BLOCK *iosb, ULONG reserved ) +{ + struct icmp_apc_ctxt *ctxt = context; + + ctxt->apc_routine( ctxt->apc_ctxt, iosb, reserved ); + heap_free( ctxt ); +} + /*********************************************************************** * IcmpSendEcho2Ex (IPHLPAPI.@) */ @@ -4636,24 +4651,30 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r void *reply, DWORD reply_size, DWORD timeout ) { struct icmp_handle_data *data = (struct icmp_handle_data *)handle; + struct icmp_apc_ctxt *ctxt = heap_alloc( sizeof(*ctxt) ); + IO_STATUS_BLOCK *iosb = &ctxt->iosb; DWORD opt_size, in_size, ret = 0; struct nsiproxy_icmp_echo *in; HANDLE request_event; - IO_STATUS_BLOCK iosb; NTSTATUS status; if (handle == INVALID_HANDLE_VALUE || !reply) { + heap_free( ctxt ); SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + ctxt->apc_routine = apc_routine; + ctxt->apc_ctxt = apc_ctxt; + opt_size = opts ? (opts->OptionsSize + 3) & ~3 : 0; in_size = FIELD_OFFSET(struct nsiproxy_icmp_echo, data[opt_size + request_size]); in = heap_alloc_zero( in_size ); if (!in) { + heap_free( ctxt ); SetLastError( IP_NO_RESOURCES ); return 0; } @@ -4678,20 +4699,21 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r request_event = event ? event : (apc_routine ? NULL : CreateEventW( NULL, 0, 0, NULL )); - status = NtDeviceIoControlFile( data->nsi_device, request_event, apc_routine, apc_ctxt, - &iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, - reply, reply_size ); + status = NtDeviceIoControlFile( data->nsi_device, request_event, apc_routine ? icmp_apc_routine : NULL, + apc_routine ? ctxt : apc_ctxt, iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, + in, in_size, reply, reply_size ); if (status == STATUS_PENDING) { if (!event && !apc_routine && !WaitForSingleObject( request_event, INFINITE )) - status = iosb.Status; + status = iosb->Status; } if (!status) ret = IcmpParseReplies( reply, reply_size ); if (!event && request_event) CloseHandle( request_event ); + if (!apc_routine || status != STATUS_PENDING) heap_free( ctxt ); heap_free( in ); if (status) SetLastError( RtlNtStatusToDosError( status ) );

1 0

Nikolay Sivov : d2d1/effect: Forward IsBufferPrecisionSupported() to corresponding device context.
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: wine Branch: master Commit: 918535d437b8c3fce64a492f9b85cd593b4aebd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=918535d437b8c3fce64a492f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 23 14:08:08 2022 +0300 d2d1/effect: Forward IsBufferPrecisionSupported() to corresponding device context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f5d5494c67a..f1b877821c8 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -367,9 +367,12 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1Eff static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface, D2D1_BUFFER_PRECISION precision) { - FIXME("iface %p, precision %#x stub!\n", iface, precision); + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); - return FALSE; + TRACE("iface %p, precision %u.\n", iface, precision); + + return ID2D1DeviceContext1_IsBufferPrecisionSupported(&effect_context->device_context->ID2D1DeviceContext1_iface, + precision); } static const ID2D1EffectContextVtbl d2d_effect_context_vtbl =

1 0

Nikolay Sivov : d2d1: Implement IsBufferPrecisionSupported().
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: wine Branch: master Commit: c7dbd459938c5d4d2734a01330301da1a5692746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7dbd459938c5d4d2734a013… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 23 14:06:14 2022 +0300 d2d1: Implement IsBufferPrecisionSupported(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index be7b8f9f8e2..04a31992ba2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2045,9 +2045,31 @@ static BOOL STDMETHODCALLTYPE d2d_device_context_IsDxgiFormatSupported(ID2D1Devi static BOOL STDMETHODCALLTYPE d2d_device_context_IsBufferPrecisionSupported(ID2D1DeviceContext1 *iface, D2D1_BUFFER_PRECISION buffer_precision) { - FIXME("iface %p, buffer_precision %#x stub!\n", iface, buffer_precision); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + DXGI_FORMAT format; + UINT support = 0; + HRESULT hr; - return FALSE; + TRACE("iface %p, buffer_precision %u.\n", iface, buffer_precision); + + switch (buffer_precision) + { + case D2D1_BUFFER_PRECISION_8BPC_UNORM: format = DXGI_FORMAT_R8G8B8A8_UNORM; break; + case D2D1_BUFFER_PRECISION_8BPC_UNORM_SRGB: format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; break; + case D2D1_BUFFER_PRECISION_16BPC_UNORM: format = DXGI_FORMAT_R16G16B16A16_UNORM; break; + case D2D1_BUFFER_PRECISION_16BPC_FLOAT: format = DXGI_FORMAT_R16G16B16A16_FLOAT; break; + case D2D1_BUFFER_PRECISION_32BPC_FLOAT: format = DXGI_FORMAT_R32G32B32A32_FLOAT; break; + default: + WARN("Unexpected precision %u.\n", buffer_precision); + return FALSE; + } + + if (FAILED(hr = ID3D11Device1_CheckFormatSupport(context->d3d_device, format, &support))) + { + WARN("Format support check failed, hr %#lx.\n", hr); + } + + return !!(support & D3D11_FORMAT_SUPPORT_BUFFER); } static void STDMETHODCALLTYPE d2d_device_context_GetImageLocalBounds(ID2D1DeviceContext1 *iface,

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.4.
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: wine Branch: master Commit: 072eb3a540fff3075baa5a63b3528031dedad4bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=072eb3a540fff3075baa5a63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 18:44:03 2022 +0200 vkd3d: Import upstream release 1.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/AUTHORS | 2 + libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 75 ++ libs/vkd3d/include/private/vkd3d_debug.h | 1 + libs/vkd3d/include/private/vkd3d_version.h | 2 +- libs/vkd3d/include/vkd3d.h | 18 + libs/vkd3d/include/vkd3d_shader.h | 16 + libs/vkd3d/include/vkd3d_types.h | 4 + libs/vkd3d/libs/vkd3d-common/debug.c | 28 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d/libs/vkd3d-shader/hlsl.c | 123 +- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 14 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 6 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 830 +++++++++---- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 404 ++++++- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 200 ++- libs/vkd3d/libs/vkd3d-shader/hlsl_sm1.c | 6 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm4.c | 648 ++++++---- libs/vkd3d/libs/vkd3d-shader/preproc.l | 5 +- libs/vkd3d/libs/vkd3d-shader/preproc.y | 34 +- libs/vkd3d/libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d/libs/vkd3d-shader/spirv.c | 18 +- libs/vkd3d/libs/vkd3d-shader/trace.c | 1 + libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 37 + .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 5 + libs/vkd3d/libs/vkd3d/command.c | 1277 +++++++++++++++----- libs/vkd3d/libs/vkd3d/device.c | 403 +++++- libs/vkd3d/libs/vkd3d/resource.c | 497 +++++++- libs/vkd3d/libs/vkd3d/state.c | 234 +++- libs/vkd3d/libs/vkd3d/vkd3d_main.c | 6 + libs/vkd3d/libs/vkd3d/vkd3d_private.h | 189 ++- libs/vkd3d/libs/vkd3d/vulkan_procs.h | 5 + 32 files changed, 4032 insertions(+), 1062 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=072eb3a540fff3075baa…

1 0

Alexandre Julliard : include: Add a number of 64-bit interlocked functions.
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: wine Branch: master Commit: a40973f20440c9f2181b45372483ab4af0602948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a40973f20440c9f2181b4537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 23 10:41:17 2022 +0200 include: Add a number of 64-bit interlocked functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/details.c | 16 ------- dlls/msvcp90/details.c | 16 ------- include/winnt.h | 119 ++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 103 insertions(+), 48 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 72bb744744c..8fd186eb71d 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -193,22 +193,6 @@ static void spin_wait(int *counter) } } -#ifdef _WIN64 -static size_t InterlockedIncrementSizeT(size_t volatile *dest) -{ - size_t v; - - do - { - v = *dest; - } while(InterlockedCompareExchange64((LONGLONG*)dest, v+1, v) != v); - - return v+1; -} -#else -#define InterlockedIncrementSizeT(dest) InterlockedIncrement((LONG*)dest) -#endif - static void CALLBACK queue_push_finally(BOOL normal, void *ctx) { threadsafe_queue *queue = ctx; diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index d63a47667f9..d2a741b4998 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -207,22 +207,6 @@ static void spin_wait(int *counter) } } -#ifdef _WIN64 -static size_t InterlockedIncrementSizeT(size_t volatile *dest) -{ - size_t v; - - do - { - v = *dest; - } while(InterlockedCompareExchange64((LONGLONG*)dest, v+1, v) != v); - - return v+1; -} -#else -#define InterlockedIncrementSizeT(dest) InterlockedIncrement((LONG*)dest) -#endif - static void CALLBACK queue_push_finally(BOOL normal, void *ctx) { threadsafe_queue *queue = ctx; diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..50f6452b145 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6361,19 +6361,24 @@ typedef enum _PROCESS_MITIGATION_POLICY #define BitScanReverse _BitScanReverse #define InterlockedAdd _InlineInterlockedAdd #define InterlockedAnd _InterlockedAnd +#define InterlockedAnd64 _InterlockedAnd64 #define InterlockedCompareExchange _InterlockedCompareExchange #define InterlockedCompareExchange64 _InterlockedCompareExchange64 #define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer #define InterlockedDecrement _InterlockedDecrement #define InterlockedDecrement16 _InterlockedDecrement16 +#define InterlockedDecrement64 _InterlockedDecrement64 #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd #define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 #define InterlockedExchangePointer _InterlockedExchangePointer #define InterlockedIncrement _InterlockedIncrement #define InterlockedIncrement16 _InterlockedIncrement16 +#define InterlockedIncrement64 _InterlockedIncrement64 #define InterlockedOr _InterlockedOr +#define InterlockedOr64 _InterlockedOr64 #define InterlockedXor _InterlockedXor +#define InterlockedXor64 _InterlockedXor64 #ifdef _MSC_VER @@ -6407,33 +6412,88 @@ long _InterlockedOr(long volatile *,long); long _InterlockedXor(long volatile *,long); DECLSPEC_NORETURN void __fastfail(unsigned int); -static FORCEINLINE long InterlockedAdd( long volatile *dest, long val ) -{ - return InterlockedExchangeAdd( dest, val ) + val; -} - -#if !defined(__i386__) || _MSC_VER >= 1600 +#ifndef __i386__ +#pragma intrinsic(_InterlockedAnd64) #pragma intrinsic(_InterlockedCompareExchangePointer) +#pragma intrinsic(_InterlockedDecrement64) +#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedExchangePointer) - -void *_InterlockedCompareExchangePointer(void *volatile*,void*,void*); -void *_InterlockedExchangePointer(void *volatile*,void*); +#pragma intrinsic(_InterlockedIncrement64) +#pragma intrinsic(_InterlockedOr64) +#pragma intrinsic(_InterlockedXord64) + +__int64 _InterlockedAnd64(__int64 volatile *, __int64); +void * _InterlockedCompareExchangePointer(void *volatile*,void*,void*); +__int64 _InterlockedDecrement64(__int64 volatile *); +__int64 _InterlockedExchangeAdd64(__int64 volatile *, __int64); +void * _InterlockedExchangePointer(void *volatile*,void*); +__int64 _InterlockedIncrement64(__int64 volatile *); +__int64 _InterlockedOr64(__int64 volatile *, __int64); +__int64 _InterlockedXor64(__int64 volatile *, __int64); #else +static FORCEINLINE __int64 InterlockedAnd64( __int64 volatile *dest, __int64 val ) +{ + __int64 prev; + do prev = *dest; while (InterlockedCompareExchange64( dest, prev & val, prev ) != prev); + return prev; +} + static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) { return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); } +static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __int64 val ) +{ + __int64 prev; + do prev = *dest; while (InterlockedCompareExchange64( dest, prev + val, prev ) != prev); + return prev; +} + static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) { return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); } +static FORCEINLINE __int64 InterlockedIncrement64( __int64 volatile *dest ) +{ + return InterlockedExchangeAdd64( dest, 1 ) + 1; +} + +static FORCEINLINE __int64 InterlockedDecrement64( __int64 volatile *dest ) +{ + return InterlockedExchangeAdd64( dest, -1 ) - 1; +} + +static FORCEINLINE __int64 InterlockedOr64( __int64 volatile *dest, __int64 val ) +{ + __int64 prev; + do prev = *dest; while (InterlockedCompareExchange64( dest, prev | val, prev ) != prev); + return prev; +} + +static FORCEINLINE __int64 InterlockedXor64( __int64 volatile *dest, __int64 val ) +{ + __int64 prev; + do prev = *dest; while (InterlockedCompareExchange64( dest, prev ^ val, prev ) != prev); + return prev; +} + #endif /* __i386__ */ +static FORCEINLINE long InterlockedAdd( long volatile *dest, long val ) +{ + return InterlockedExchangeAdd( dest, val ) + val; +} + +static FORCEINLINE __int64 InterlockedAdd64( __int64 volatile *dest, __int64 val ) +{ + return InterlockedExchangeAdd64( dest, val ) + val; +} + #ifdef __i386__ static FORCEINLINE void MemoryBarrier(void) @@ -6444,10 +6504,7 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__x86_64__) -#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(__faststorefence) - -long long _InterlockedExchangeAdd64(long long volatile *, long long); void __faststorefence(void); static FORCEINLINE void MemoryBarrier(void) @@ -6464,10 +6521,6 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__aarch64__) -#pragma intrinsic(_InterlockedExchangeAdd64) - -long long _InterlockedExchangeAdd64(long long volatile *, long long); - static FORCEINLINE void MemoryBarrier(void) { __dmb(_ARM64_BARRIER_SY); @@ -6494,11 +6547,21 @@ static FORCEINLINE LONG WINAPI InterlockedAdd( LONG volatile *dest, LONG val ) return __sync_add_and_fetch( dest, val ); } +static FORCEINLINE LONGLONG WINAPI InterlockedAdd64( LONGLONG volatile *dest, LONGLONG val ) +{ + return __sync_add_and_fetch( dest, val ); +} + static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) { return __sync_fetch_and_and( dest, val ); } +static FORCEINLINE LONGLONG WINAPI InterlockedAnd64( LONGLONG volatile *dest, LONGLONG val ) +{ + return __sync_fetch_and_and( dest, val ); +} + static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { return __sync_val_compare_and_swap( dest, compare, xchg ); @@ -6548,6 +6611,11 @@ static FORCEINLINE short WINAPI InterlockedIncrement16( short volatile *dest ) return __sync_add_and_fetch( dest, 1 ); } +static FORCEINLINE LONGLONG WINAPI InterlockedIncrement64( LONGLONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, 1 ); +} + static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { return __sync_add_and_fetch( dest, -1 ); @@ -6558,6 +6626,11 @@ static FORCEINLINE short WINAPI InterlockedDecrement16( short volatile *dest ) return __sync_add_and_fetch( dest, -1 ); } +static FORCEINLINE LONGLONG WINAPI InterlockedDecrement64( LONGLONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, -1 ); +} + static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) { void *ret; @@ -6578,11 +6651,21 @@ static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val ) return __sync_fetch_and_or( dest, val ); } +static FORCEINLINE LONGLONG WINAPI InterlockedOr64( LONGLONG volatile *dest, LONGLONG val ) +{ + return __sync_fetch_and_or( dest, val ); +} + static FORCEINLINE LONG WINAPI InterlockedXor( LONG volatile *dest, LONG val ) { return __sync_fetch_and_xor( dest, val ); } +static FORCEINLINE LONGLONG WINAPI InterlockedXor64( LONGLONG volatile *dest, LONGLONG val ) +{ + return __sync_fetch_and_xor( dest, val ); +} + static FORCEINLINE void MemoryBarrier(void) { __sync_synchronize(); @@ -6631,11 +6714,15 @@ static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 #endif +#define InterlockedDecrementSizeT(a) InterlockeDecrement64((LONGLONG *)(a)) #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)(a), (b)) +#define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONGLONG *)(a)) #else /* _WIN64 */ +#define InterlockedDecrementSizeT(a) InterlockeDecrement((LONG *)(a)) #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)(a), (b)) +#define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)(a)) #endif /* _WIN64 */

1 0

Zhiyi Zhang : uxtheme: Support parsing more window parts and states.
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: wine Branch: master Commit: 71bef6c985c3d37e4fbfdd7ac8983e3296814359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71bef6c985c3d37e4fbfdd7a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 17:35:39 2022 +0800 uxtheme: Support parsing more window parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 5 +++++ include/vsstyle.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index f69be5f5fd4..e1973305076 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -2,6 +2,7 @@ * msstyle data maps * * Copyright (C) 2004 Kevin Koltzau + * Copyright 2021-2022 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1397,6 +1398,10 @@ static const MSSTYLES_CLASS_MAP classWindow[] = { {WP_SMALLFRAMERIGHTSIZINGTEMPLATE, 0, L"SMALLFRAMERIGHTSIZINGTEMPLATE"}, {WP_FRAMEBOTTOMSIZINGTEMPLATE, 0, L"FRAMEBOTTOMSIZINGTEMPLATE"}, {WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE, 0, L"SMALLFRAMEBOTTOMSIZINGTEMPLATE"}, + {WP_FRAME, 0, L"FRAME"}, + {WP_FRAME, FS_ACTIVE, L"ACTIVE"}, + {WP_FRAME, FS_INACTIVE, L"INACTIVE"}, + {WP_BORDER, 0, L"BORDER"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index 09948cf8dd5..4bc3469ae87 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1589,6 +1589,7 @@ enum WINDOWPARTS { WP_FRAMEBOTTOMSIZINGTEMPLATE = 36, WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37, WP_FRAME = 38, + WP_BORDER = 39, }; #define WINDOWSTYLEPARTS WINDOWPARTS;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022