wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

[tools] testbot/cgi: Tweak the CollectionBlock master columns iterations.
by Francois Gouget 06 Jun '22

06 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 336c7cd05..e8156a1bf 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -243,7 +243,7 @@ sub GetDetailsLink($$) my ($MasterColNames, $MasterColValues) = $Row->{Item}->GetMasterCols(); if (defined $MasterColNames) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { $Row->{DetailsLink} .= "&". $MasterColNames->[$ColIndex] ."=". uri_escape($MasterColValues->[$ColIndex]); @@ -385,7 +385,7 @@ sub GenerateFormStart($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0..scalar @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), @@ -684,7 +684,7 @@ sub OnAction($$) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . "=" . uri_escape($MasterColValues->[$ColIndex]); -- 2.30.2

1 0

[tools] testbot: Simplify building a slash-separated Item identifiers.
by Francois Gouget 06 Jun '22

06 Jun '22

This also fixes the task id in the GetReportNames() error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 +- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ testbot/lib/WineTestBot/Steps.pm | 3 +-- testbot/lib/WineTestBot/Tasks.pm | 13 +++++-------- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index ab72ac1b6..af1123aed 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -205,7 +205,7 @@ if (%DeletedVMs) { if (exists $DeletedVMs{$Task->VM->Name}) { - Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; + Trace "Keeping the ", $Task->VM->Name, " VM for task ", $Task->GetSlashKey(), "\n"; delete $DeletedVMs{$Task->VM->Name}; last if (!%DeletedVMs); } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 0b1da92a2..39c80cc89 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -350,6 +350,25 @@ sub GetMasterKey($) return (\@MasterColNames, \@MasterColValues); } +=pod +=over 12 + +=item C<GetSlashKey()> + +Returns a string containing all the slash-separated key components. + +This can be used to display the key in the GUI or to build file paths (assuming +the key components can be trusted). + +=back +=cut + +sub GetSlashKey($) +{ + my ($self) = @_; + return join("/", @{$self->GetMasterKey()}); # drops the column names +} + sub ResetModified($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 860dc4920..cd585e9db 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -128,8 +128,7 @@ sub Validate($) sub GetDir($) { my ($self) = @_; - my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/$StepNo"; + return "$DataDir/jobs/". $self->GetSlashKey(); } sub CreateDir($) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 50ce9604a..8c9f89ce8 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -91,8 +91,7 @@ sub InitializeNew($$) sub GetDir($) { my ($self) = @_; - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; + return "$DataDir/jobs/". $self->GetSlashKey(); } sub CreateDir($) @@ -118,13 +117,11 @@ sub GetReportNames($) return ($ErrMessage, undef, undef) if (defined $ErrMessage); if (!@$Missions) { - my @TaskKey = $self->GetMasterKey(); - return ("Task @TaskKey has no mission", undef, undef); + return ("Task ". $self->GetSlashKey() ." has no mission", undef, undef); } if (@$Missions > 1) { - my @TaskKey = $self->GetMasterKey(); - return ("Task @TaskKey should not have missions for multiple tasks\n", undef); + return ("Task ". $self->GetSlashKey() ." should not have missions for multiple tasks\n", undef); } my $TaskMissions = $Missions->[0]; @@ -277,7 +274,6 @@ sub UpdateStatus($$) if ($Status eq "running" and ($VM->Status ne "running" or !$VM->HasRunningChild())) { - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002); my $TaskDir = $self->CreateDir(); if (open TASKLOG, ">>", "$TaskDir/testbot.log") @@ -288,7 +284,8 @@ sub UpdateStatus($$) umask($OldUMask); require WineTestBot::Log; - WineTestBot::Log::LogMsg("Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"); + WineTestBot::Log::LogMsg("Child process for task ", $self->GetSlashKey(), + " died unexpectedly\n"); # A crash probably indicates a bug in the task script but getting stuck # could happen due to network issues. So requeue the task like its script -- 2.30.2

1 0

[tools] testbot/orm: Simplify CombineKey() and SplitKey() a bit.
by Francois Gouget 06 Jun '22

06 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 63d470bbc..1a48eec35 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -462,18 +462,14 @@ sub IsEmpty($) sub CombineKey($@) { - my $self = shift; - - my $CombinedKey = join("#@#", @_); - return $CombinedKey; + my $_self = shift; + return join("#@#", @_); } sub SplitKey($$) { - my ($self, $CombinedKey) = @_; - - my @KeyComponents = split /#@#/, $CombinedKey; - return @KeyComponents; + my ($_self, $CombinedKey) = @_; + return split /#@#/, $CombinedKey; } =pod -- 2.30.2

1 0

[tools] testbot: Access the master columns directly instead of going through GetMasterKey().
by Francois Gouget 06 Jun '22

06 Jun '22

We now have read-only access to them. This makes the code more readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Steps.pm | 5 ++--- testbot/lib/WineTestBot/StepsTasks.pm | 6 ++---- testbot/lib/WineTestBot/Tasks.pm | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index cd585e9db..48d020949 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -153,9 +153,8 @@ sub GetFullFileName($;$) $FileName = $self->FileName if (!defined $FileName); return undef if (!defined $FileName); - my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - my $Path = "$DataDir/jobs/$JobId/"; - foreach my $StepNo ($StepNo, $self->PreviousNo) + my $Path = "$DataDir/jobs/". $self->JobId ."/"; + foreach my $StepNo ($self->No, $self->PreviousNo) { next if (!$StepNo); my $Full = "$Path$StepNo/$FileName"; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 0b1655a37..5970c872e 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -37,8 +37,7 @@ use WineTestBot::Missions; sub GetStepDir($) { my ($self) = @_; - my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/". $self->StepNo; + return "$DataDir/jobs/". $self->JobId ."/". $self->StepNo; } # Keep in sync with WineTestBot::Step::GetFullFileName() @@ -49,8 +48,7 @@ sub GetFullFileName($;$) $FileName = $self->FileName if (!defined $FileName); return undef if (!defined $FileName); - my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - my $Path = "$DataDir/jobs/$JobId/"; + my $Path = "$DataDir/jobs/". $self->JobId ."/"; foreach my $StepNo ($self->StepNo, $self->PreviousNo) { next if (!$StepNo); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 8c9f89ce8..a7d9e820e 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -139,8 +139,7 @@ sub GetReportNames($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - my ($JobId, $_StepNo, $_TaskNo) = @{$self->GetMasterKey()}; - return sprintf("%s-job%06d-%s", $self->VM->Name, $JobId, $ReportName); + return sprintf("%s-job%06d-%s", $self->VM->Name, $self->JobId, $ReportName); } sub GetRefReportPaths($$;$$) @@ -237,13 +236,12 @@ sub Run($$) { my ($self, $Step) = @_; - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $Script = $Step->Type eq "reconfig" ? "Reconfig" : $self->VM->Type eq "wine" ? "WineTest" : $Step->Type eq "build" ? "Build" : "Task"; my $Args = ["$BinDir/${ProjectName}Run$Script.pl", "--log-only", - $JobId, $StepNo, $TaskNo]; + $self->JobId, $self->StepNo, $self->No]; my $ErrMessage = $self->VM->Run("running", $Args, $self->Timeout + $TimeoutMargin, -- 2.30.2

1 0

[tools] testbot: Slightly simplify $Job->Restart().
by Francois Gouget 06 Jun '22

06 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 778a0f4df..1eb7bb7eb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -417,11 +417,9 @@ sub Restart($) return "This job is already " . $self->Status; } - my $Steps = $self->Steps; - foreach my $Step (@{$Steps->GetSortedItems()}) + foreach my $Step (@{$self->Steps->GetSortedItems()}) { - my $Tasks = $Step->Tasks; - foreach my $Task (@{$Tasks->GetItems()}) + foreach my $Task (@{$Step->Tasks->GetItems()}) { $Task->Status("queued"); $Task->Started(undef); -- 2.30.2

1 0

[PATCH 0/1] MR190: shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail).
by Jinoh Kang (＠iamahuman) 05 Jun '22

05 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52673 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/190

3 2

[PATCH 0/1] MR189: windows.gaming.input: Fix a leak on error path (Coverity).
by Nikolay Sivov (＠nsivov) 05 Jun '22

05 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/189

3 2

[PATCH 0/1] MR188: wow64: Fix NtQueryDirectoryObject wrapper.
by Piotr Caban (＠piotr) 04 Jun '22

04 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/188

2 1

[PATCH 0/3] MR187: ntdll/tests: Test if RtlFormatMessage modifies va_list on error.
by Daniel Lehman (＠dlehman25) 04 Jun '22

04 Jun '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/187

2 3

[PATCH v3 0/2] MR155: ntdll: Fix reading stale Information from IOSB.
by Jinoh Kang (＠iamahuman) 04 Jun '22

04 Jun '22

Enforce proper atomic update so that other threads do not read stale data from IO_STATUS_BLOCK. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v3: ntdll: Fix reading stale Information from IOSB. include: Define atomic read/write helpers for 32-bit integers. https://gitlab.winehq.org/wine/wine/-/merge_requests/155

3 3

[PATCH] include: Define atomic read/write helpers for 32-bit integers.
by Jinoh Kang 04 Jun '22

04 Jun '22

Based on the corresponding functions from Windows SDK header files. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 121 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..a98201dc3b0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6475,6 +6475,70 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __i386__ */ +#if defined(__i386__) || defined(__x86_64__) + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value = *src; + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value = *src; + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + *dest = value; +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + *dest = value; +} + +#else + +/* __iso_volatile_* intrinsics do not need explicit declarations. */ +#pragma intrinsic(__iso_volatile_load32) +#pragma intrinsic(__iso_volatile_store32) + +#if defined(__arm__) +#define WINE_MEMORY_BARRIER_ACQUIRE() __dmb(_ARM_BARRIER_ISH) +#define WINE_MEMORY_BARRIER_RELEASE() __dmb(_ARM_BARRIER_ISH) +#elif defined(__aarch64__) +#define WINE_MEMORY_BARRIER_ACQUIRE() __dmb(_ARM64_BARRIER_ISH) +#define WINE_MEMORY_BARRIER_RELEASE() __dmb(_ARM64_BARRIER_ISH) +#endif /* defined(__arm__) */ + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value = __iso_volatile_load32( (int const volatile *)src ); + WINE_MEMORY_BARRIER_ACQUIRE(); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value = __iso_volatile_load32( (int const volatile *)src ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + WINE_MEMORY_BARRIER_RELEASE(); + __iso_volatile_store32( (int volatile *)dest, value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __iso_volatile_store32( (int volatile *)dest, value ); +} + +#endif /* defined(__i386__) || defined(__x86_64__) */ + #elif defined(__GNUC__) static FORCEINLINE BOOLEAN WINAPI BitScanForward(DWORD *index, DWORD mask) @@ -6588,6 +6652,43 @@ static FORCEINLINE void MemoryBarrier(void) __sync_synchronize(); } +#if defined(__x86_64__) || defined(__i386__) +/* On x86, Support old GCC with either no or buggy (GCC BZ#81316) __atomic_* support */ +#define WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) do { *(ret) = *(ptr); __asm__ __volatile__( "" ::: "memory" ); } while (0) +#define WINE_ATOMIC_LOAD_RELAXED(ptr, ret) do { *(ret) = *(ptr); } while (0) +#define WINE_ATOMIC_STORE_RELEASE(ptr, val) do { __asm__ __volatile__( "" ::: "memory" ); *(ptr) = *(val); } while (0) +#define WINE_ATOMIC_STORE_RELAXED(ptr, val) do { *(ptr) = *(val); } while (0) +#else +#define WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_ACQUIRE) +#define WINE_ATOMIC_LOAD_RELAXED(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_RELAXED) +#define WINE_ATOMIC_STORE_RELEASE(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELEASE) +#define WINE_ATOMIC_STORE_RELAXED(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELAXED) +#endif /* defined(__x86_64__) || defined(__i386__) */ + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value; + WINE_ATOMIC_LOAD_ACQUIRE( src, &value ); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value; + WINE_ATOMIC_LOAD_RELAXED( src, &value ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + WINE_ATOMIC_STORE_RELEASE( dest, &value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + WINE_ATOMIC_STORE_RELAXED( dest, &value ); +} + static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) { #if defined(__x86_64__) || defined(__i386__) @@ -6603,6 +6704,26 @@ static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) #endif /* __GNUC__ */ +static FORCEINLINE ULONG ReadULongAcquire( ULONG const volatile *src ) +{ + return (ULONG)ReadAcquire( (LONG const volatile *)src ); +} + +static FORCEINLINE ULONG ReadULongNoFence( ULONG const volatile *src ) +{ + return (ULONG)ReadNoFence( (LONG const volatile *)src ); +} + +static FORCEINLINE void WriteULongRelease( ULONG volatile *dest, ULONG value ) +{ + WriteRelease( (LONG volatile *)dest, value ); +} + +static FORCEINLINE void WriteULongNoFence( ULONG volatile *dest, ULONG value ) +{ + WriteNoFence( (LONG volatile *)dest, value ); +} + #ifdef _WIN64 #define InterlockedCompareExchange128 _InterlockedCompareExchange128 -- 2.34.3

1 0

[PATCH v3 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 04 Jun '22

04 Jun '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v3: ntdll: Cancel asyncs when thread is terminated. ws2_32/tests: Add tests for terminated thread asyncs completion. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

4 7

[PATCH 0/1] MR185: d2d1: Use d3d11 constants for constant buffer description.
by Nikolay Sivov (＠nsivov) 04 Jun '22

04 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/185

2 1

Wine staging 7.10 release
by Alistair Leslie-Hughes 04 Jun '22

04 Jun '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.10 (545 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * kernelbase: Implement sortkey generation on official tables * kernelbase: Implement sortkey punctuation * kernelbase: Implement sortkey for Japanese characters * kernelbase: Implement sortkey expansion * kernelbase: Implement sortkey language support * kernelbase: Implement CompareString functions Added: * [#53038] - dwmapi: Supply some defaults values for DwmGetCompositionTimingInfo. * [#53035] - dwmapi: DwmFlush return S_OK. Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

Re: [PATCH v3 0/1] MR163: avicap32: Add fallback Unixlib function and thunk to use when V4L is unavailable. - approved
by Alexandre Julliard (＠julliard) 03 Jun '22

03 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/163

1 0

Re: [PATCH v2 0/1] MR184: mscoree: Update Wine Mono to 7.3.0. - approved
by Alexandre Julliard (＠julliard) 03 Jun '22

03 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/184

1 0

Re: [PATCH v2 0/11] MR177: winemac: PE conversion - approved
by Alexandre Julliard (＠julliard) 03 Jun '22

03 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/177

1 0

[PATCH] vbscript: Implement IsDate().
by Robert Wilhelm 03 Jun '22

03 Jun '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 31 +++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 13 +++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 90cfd557038..222e0534665 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -425,6 +425,25 @@ HRESULT to_int(VARIANT *v, int *ret) return S_OK; } +static HRESULT to_date(VARIANT *v, DATE *ret) +{ + VARIANT r; + HRESULT hres; + + V_VT(&r) = VT_EMPTY; + hres = VariantChangeType(&r, v, 0, VT_DATE); + if(FAILED(hres)) { + hres = VariantChangeType(&r, v, 0, VT_R8); + if(FAILED(hres)) + return hres; + hres = VariantChangeType(&r, &r, 0, VT_DATE); + if(FAILED(hres)) + return hres; + } + *ret = V_DATE(&r); + return S_OK; +} + static HRESULT to_double(VARIANT *v, double *ret) { VARIANT dst; @@ -935,8 +954,16 @@ static HRESULT Global_VarType(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt static HRESULT Global_IsDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + DATE d; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = to_date(arg, &d); + + return return_bool(res, SUCCEEDED(hres)); } static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index be1d4a806c0..d70f95ce69b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -181,6 +181,19 @@ Call ok(not isObject(4), "isObject(4) is true?") Call ok(not isObject("x"), "isObject(""x"") is true?") Call ok(not isObject(Null), "isObject(Null) is true?") +Call ok(not isDate(new EmptyClass), "isDate(new EmptyClass) is true?") +Set x = new EmptyClass +Call ok(not isDate(x), "isDate(x) is true?") +x = CDate(1) +Call ok(isDate(x), "isDate(x) is not true?") +Call ok(isDate(empty), "isDate(empty) is not true?") +Call ok(not isDate(Nothing), "isDate(Nothing) is true?") +Call ok(isDate(true), "isDate(true) is not true?") +Call ok(isDate(4), "isDate(4) is not true?") +Call ok(isDate("4"), "isDate(""4"") is not true?") +Call ok(not isDate("x"), "isDate(""x"") is true?") +Call ok(not isDate(Null), "isDate(Null) is true?") + Call ok(not isEmpty(new EmptyClass), "isEmpty(new EmptyClass) is true?") Set x = new EmptyClass Call ok(not isEmpty(x), "isEmpty(x) is true?") -- 2.36.1

2 1

[PATCH 0/1] MR184: mscoree: Update Wine Mono to 7.3.0.
by Esme (＠madewokherd) 03 Jun '22

03 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/184

3 2

[PATCH 0/9] MR180: misc: Fixes and workarounds for UAF warnings. (GCC12)
by Rémi Bernon (＠rbernon) 03 Jun '22

03 Jun '22

The mscoree one is a genuine UAF bug, other are more arguably false positive but GCC doesn't like freed pointer value to be used in any way. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/180

8 18

[tools] testbot/orm: Fix multi-column key support in Item::Compare().
by Francois Gouget 03 Jun '22

03 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I think that so far this issue has been masked by the MasterColumns. --- testbot/lib/ObjectModel/Item.pm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 7d36ffa38..0b1da92a2 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -422,22 +422,27 @@ sub Compare($$) { my $ColName = $ColNames->[0]; my $ColType = $PropertyDescriptor->GetType(); - return ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? - $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : - $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + my $Cmp = ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? + $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : + $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); } - if ($PropertyDescriptor->GetClass() eq "Enum") + elsif ($PropertyDescriptor->GetClass() eq "Enum") { my $ColName = $ColNames->[0]; - return $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; - } - - # A Detailref cannot be a key so this is an Itemref - foreach my $ColName (@$ColNames) - { my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; return $Cmp if ($Cmp); } + else + { + # A Detailref cannot be a key so this is an Itemref. Note that its + # underlying column types are unknown so treat them as strings. + foreach my $ColName (@$ColNames) + { + my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); + } + } } return 0; } -- 2.30.2

1 0

[tools] testbot/orm: Protect DBIBackend::LoadItem() from invalid keys.
by Francois Gouget 03 Jun '22

03 Jun '22

Check that the requested key has the right number of parts to avoid a crash during the SQL execution. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 29 +++++++++++++-------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 07b838d74..62332c1f6 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -169,22 +169,19 @@ sub BuildKeyWhere($$$) { my ($self, $PropertyDescriptors, $Where) = @_; + # Faster than join+map+grep + my $PartCount; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { - if ($PropertyDescriptor->GetIsKey()) + next if (!$PropertyDescriptor->GetIsKey()); + foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) - { - if ($Where ne "") - { - $Where .= " AND "; - } - $Where .= "$ColName = ?"; - } + $Where .= " AND " if ($Where ne ""); + $Where .= "$ColName = ?"; + $PartCount++; } } - - return $Where; + return ($PartCount, $Where); } =pod @@ -422,8 +419,10 @@ sub LoadItem($$$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); - push @Data, $Collection->SplitKey($RequestedKey); + (my $PartCount, $Where) = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); + my @KeyParts = $Collection->SplitKey($RequestedKey); + return undef if ($PartCount != @KeyParts); + push @Data, @KeyParts; my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); if ($Where ne "") @@ -572,7 +571,7 @@ sub BuildUpdateStatement($$$$) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; } - $Where = $self->BuildKeyWhere($PropertyDescriptors, $Where); + (my $_PartCount, $Where) = $self->BuildKeyWhere($PropertyDescriptors, $Where); return "UPDATE $TableName SET $Fields WHERE $Where"; } @@ -713,7 +712,7 @@ sub DeleteItem($$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); + (my $_PartCount, $Where) = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " . -- 2.30.2

1 0

[tools] testbot/web: Only link to the VM details page for administrators.
by Francois Gouget 03 Jun '22

03 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b07b39d22..21ee5fea4 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -176,6 +176,15 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +sub GetDetailsPage($) +{ + my ($self) = @_; + my $Session = $self->{EnclosingPage}->GetCurrentSession(); + my $CurrentUser = $Session->User if (defined $Session); + return (!$CurrentUser or !$CurrentUser->HasRole("admin")) ? undef : + "/admin/VMDetails.pl"; +} + sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; -- 2.30.2

1 0

[PATCH v3 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource
by Alistair Leslie-Hughes (＠alesliehughes) 03 Jun '22

03 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v3: d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource https://gitlab.winehq.org/wine/wine/-/merge_requests/167

3 2

[PATCH v2 1/3] jscript: Don't allow starting script using state from uninitialized.
by Gabriel Ivăncescu 03 Jun '22

03 Jun '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/jscript.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8cf141d..d6028e6 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -824,7 +824,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: case SCRIPTSTATE_CONNECTED: /* FIXME */ - if(This->ctx->state == SCRIPTSTATE_CLOSED) + if(This->ctx->state == SCRIPTSTATE_UNINITIALIZED || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; exec_queued_code(This); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8c985e5..8723541 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -863,6 +863,12 @@ static void test_jscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) returned: %08lx\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CONNECTED) returned: %08lx\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); -- 2.34.1

2 5

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-devel