wine-devel June 2022

wine-devel@winehq.org

68 participants
754 discussions

[PATCH v2 3/6] d3dx10_43: Share code for resource data loading.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 93 ++++++++++++++++++++++++++++---------- dlls/d3dx10_43/compiler.c | 34 ++------------ dlls/d3dx10_43/dxhelpers.h | 4 ++ dlls/d3dx10_43/texture.c | 70 ++++------------------------ 4 files changed, 89 insertions(+), 112 deletions(-)

2 1

[PATCH v2 2/6] d3dx10_43: Share code for file data loading.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 39 +++++++++++++++--------- dlls/d3dx10_43/dxhelpers.h | 19 ++++++++++++ dlls/d3dx10_43/texture.c | 62 +++++--------------------------------- 3 files changed, 51 insertions(+), 69 deletions(-) create mode 100644 dlls/d3dx10_43/dxhelpers.h

2 1

[PATCH v2 1/6] d3dx10_43: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - include patch with tests (no changes to patches 1..5) dlls/d3dx10_43/async.c | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[tools] testbot/build: Fix passing the BuildWine() target list in Reconfig.
by Francois Gouget 01 Jun '22

01 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Broken yesterday :-( --- testbot/bin/build/Reconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 9e1043aa1..4f07eeefc 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -57,9 +57,9 @@ sub UpdateWineBuilds($$) my $Configure = "--without-x --without-freetype --disable-winetest"; return BuildWine($TaskMissions, $Flags, "exe32", - $Configure, "buildtests") && + $Configure, ["buildtests"]) && BuildWine($TaskMissions, $Flags, "exe64", - "$Configure --enable-win64", "buildtests"); + "$Configure --enable-win64", ["buildtests"]); } -- 2.30.2

1 0

[tools] testbot/TestWTBS: Provide finer grained support for 32-/64-bit reports.
by Francois Gouget 01 Jun '22

01 Jun '22

This allows specifying different expected errors for 32-bit and 64-bit report files. This is in particular needed when trying to match Wine exception messages since they contain the bitness. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 49 ++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e5cd44832..139f011ef 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -337,7 +337,7 @@ sub LoadTestInfo($) foreach my $RawGroupName (@{$RawInfo->{ErrGroupNames}}) { my $GroupName = lcfirst($RawGroupName); - if ($GroupName =~ s/^(tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.(report|log|testbot)\.//) + if ($GroupName =~ s/^(tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.(win32|wow32|wow64|report|log|testbot)\.//) { my $ErrInfo = ($TestInfo->{$1}->{"$2.errors"} ||= {}); push @{$ErrInfo->{ErrGroupNames}}, $GroupName; @@ -381,8 +381,8 @@ sub LoadTestInfo($) if (ref($SrcVal) eq "HASH" and $Field !~ /\.errors$/) { # Simply propagating hashtable references would result in changes to - # win32 to impact the parent win / test parent which is not what we - # want. So subsets of properties are not supported. + # win32 to impact the win / test parent which is not what we want. + # So subsets of properties are not supported. # .errors properties are the exception because their values are a # LoadLogErrors() structure. As a result they are read-only, and are # not merged. @@ -445,7 +445,7 @@ sub LoadTestInfo($) foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", "wine", "wine:build", "wine:test", "wine:module") { - foreach my $LogType ("report", "log", "testbot") + foreach my $LogType ("win32", "wow32", "wow64", "report", "log", "testbot") { my $Array = $TestInfo->{$TaskType}->{"$LogType.$GrepType"}; next if (!defined $Array); @@ -483,6 +483,30 @@ sub LoadTestInfo($) SetDefault($TestInfo, "webpatch", "Status", $Status); } + # Propagate the 'report.*' settings to win32, wow32 and wow64 + foreach my $TaskType ("wine", "wine:build", "wine:test", "wine:module") + { + my $TaskInfo = $TestInfo->{$TaskType}; + foreach my $ReportField (keys %$TaskInfo) + { + next if (!$ReportField =~ /^report\./); + if (ref($TaskInfo->{$ReportField}) eq "HASH" and + $ReportField !~ /\.errors$/) + { + # See the previous task-type propagation comment. + fail("internal error: $TaskType.$ReportField should not be a hash in $FileName"); + next; + } + foreach my $LogType ("win32", "wow32", "wow64") + { + my $LogField = $ReportField; + $LogField =~ s/^report/$LogType/; + next if (defined $TaskInfo->{$LogField}); + $TaskInfo->{$LogField} = $TaskInfo->{$ReportField}; + } + } + } + return $TestInfo; } @@ -643,13 +667,14 @@ sub IsTimeoutError($$) } =pod -=item <tasks.(report|log|testbot).groupname> +=item <tasks.(win32|wow32|wow64|report|log|testbot).groupname> Verifies the presence of new errors in the specified error log or report of the tasks in the specified category. For this, list the group and errors that are expected to appear; where the group name is prefixed by the task -category and either 'report' for the test reports, 'log' for 'task.log', or -'testbot' for 'testbot.log'. +category and either 'win32' for 'win32.report', 'wow32' for 'wow32.report', +'wow64' for 'wow64.report', 'report' for any of the test reports, +'log' for 'task.log', or 'testbot' for 'testbot.log'. For instance: g 0 tests.report.kernel32 @@ -678,7 +703,7 @@ Finally, note that while the error directives are inherited by subcategories, they are not merged. So if both win and win32 have error-matching directives, win32 will not inherit anything from the win category. -=item <tasks.(report|log|testbot).Errors> +=item <tasks.(win32|wow32|wow64|report|log|testbot).Errors> Inheritance of the reference error lists cannot be prevented but can be ignored by setting this property to 'ignore'. @@ -856,8 +881,8 @@ depend on whether the test was the last one run by the task (in the Wine case). By default this check is skipped and timeout errors are reported like any other unexpected error. -=item <tasks.(report|log|testbot).Grep> -=item <tasks.(report|log|testbot).GrepV> +=item <tasks.(win32|wow32|wow64|report|log|testbot).Grep> +=item <tasks.(win32|wow32|wow64|report|log|testbot).GrepV> Verifies the presence or absence of specific regular expressions in the specified error log or reports of the tasks in the specified category. @@ -940,7 +965,9 @@ sub CheckTask($$$$) my $LogType = "log"; if ($LogName =~ /\.report$/) { - $LogType = "report"; + $LogType = $LogName =~ /^wow32/ ? "wow32" : + $LogName =~ /^wow64/ ? "wow64" : + "win32"; $ReportCount++; ok($ReportTypes{$LogName}, "Check that $LogName is expected"); -- 2.30.2

1 0

[tools] testbot/orm: Take the filters into account in DBIBackend::DeleteAll().
by Francois Gouget 01 Jun '22

01 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 940d37f65..07b838d74 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -738,6 +738,22 @@ sub DeleteAll($$) push @Data, @{$MasterColValues}; } + my $Filter = $Collection->GetFilter(); + if ($Filter) + { + my ($Composite, $FilterWhere, $FilterData) = GetFilterWhere($self, $Collection, $Filter); + if ($Where ne "") + { + $Where .= ($Composite ? " AND ($FilterWhere)" : " AND $FilterWhere"); + push @Data, @$FilterData; + } + else + { + $Where = $FilterWhere; + @Data = @$FilterData; + } + } + my $Query = "DELETE FROM " . $Collection->GetTableName(); if ($Where ne "") { -- 2.30.2

1 0

[PATCH 0/2] MR157: win32u/clipboard: Set bitmap and palette as system object.
by Jactry Zeng (＠jactry) 01 Jun '22

01 Jun '22

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

3 5

[PATCH v3 0/2] MR138: d3drm: IDirect3DRMTexture3 Get/SetDecalTransparency
by Alistair Leslie-Hughes (＠alesliehughes) 01 Jun '22

01 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v3: d3drm: IDirect3DRMTexture3 Get/SetDecalSize d3drm: IDirect3DRMTexture3 Get/SetDecalTransparency https://gitlab.winehq.org/wine/wine/-/merge_requests/138

2 3

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

01 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/167

2 1

[PATCH 0/1] MR166: include: Add touch and pointer input related winuser.h declarations.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

This is a bit exhaustive but as it really hurts compilation it's probably better to declare as much as we can. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/166

2 1

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 June 2022