wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

[PATCH 1/3] wined3d: Pause transform feedback in wined3d_context_gl_draw_shaded_quad().
by Zebediah Figura 02 Jun '22

02 Jun '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 5ae237db54b..f2e1fc0ea75 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5946,6 +5946,8 @@ void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, apply_texture_blit_state(gl_info, &texture_gl->texture_rgb, info.bind_target, level, filter); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); + wined3d_context_gl_pause_transform_feedback(context_gl, FALSE); + wined3d_context_gl_get_rt_size(context_gl, &dst_size); w = dst_size.cx; h = dst_size.cy; -- 2.36.1

1 2

[PATCH vkd3d 1/7] tests: Test how matrix types interact with semantics.
by Giovanni Mascellani 02 Jun '22

02 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v2: * Use the new single component syntax --- Makefile.am | 1 + tests/matrix-semantics.shader_test | 71 ++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 tests/matrix-semantics.shader_test diff --git a/Makefile.am b/Makefile.am index dd3ce1ff..74c23b2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/math.shader_test \ + tests/matrix-semantics.shader_test \ tests/nointerpolation.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ diff --git a/tests/matrix-semantics.shader_test b/tests/matrix-semantics.shader_test new file mode 100644 index 00000000..6a089683 --- /dev/null +++ b/tests/matrix-semantics.shader_test @@ -0,0 +1,71 @@ +[pixel shader] +float4x1 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader] +row_major float1x4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[require] +shader model >= 4.0 + +[pixel shader] +row_major float4x1 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all r (1.0) + +[pixel shader] +float1x4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all r (1.0) + +[pixel shader] +void main(out row_major float1x4 x : sv_target0, out float1x4 y : sv_target1) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float4(5.0, 6.0, 7.0, 8.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader fail todo] +void main(out float1x4 x : sv_target0, out float1x4 y : sv_target1) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float4(5.0, 6.0, 7.0, 8.0); +} + +[pixel shader] +void main(out float1x4 x : sv_target0, out float1x4 y : sv_target4) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float4(5.0, 6.0, 7.0, 8.0); +} + +[test] +todo draw quad +probe all r (1.0) -- 2.36.1

2 9

[PATCH v3 0/4] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

-- v3: qasf: Implement ASF Reader filter pin DecideBufferSize. qasf: Implement ASF Reader filter pin_query_accept. winegstreamer: Implement IWMOutputMediaProps_SetMediaType. qasf: Implement ASF Reader filter pin_get_media_type. https://gitlab.winehq.org/wine/wine/-/merge_requests/140

3 6

Re: [PATCH v2 0/4] MR168: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 01 Jun '22

01 Jun '22

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

1 0

Re: [PATCH v2 0/1] MR166: include: Add touch and pointer input related winuser.h declarations. - approved
by Alexandre Julliard (＠julliard) 01 Jun '22

01 Jun '22

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

1 0

Re: [PATCH v2 0/1] MR164: winex11.drv: Avoid adding duplicate GPUs. - approved
by Alexandre Julliard (＠julliard) 01 Jun '22

01 Jun '22

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

1 0

[PATCH v2 0/5] MR169: user32/tests: Cleanup some tests.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

-- v2: user32/tests: Process messages while waiting in WindowFromPoint tests. user32/tests: Check for window class registration failure normally. user32/tests: Remove SetForegroundWindow success checks. user32/tests: Remove unnecessary test skipping checks. user32/tests: Fix indentation to silence a warning. https://gitlab.winehq.org/wine/wine/-/merge_requests/169

5 17

[PATCH 0/2] MR89: Use +threadname channel for thread names.
by Brendan Shanks (＠bshanks) 01 Jun '22

01 Jun '22

Currently, the two methods of setting thread names in Windows (SetThreadDescription() and the 0x406D1388 exception) log to different channels. I think it would be useful for these to both log to the same +threadname channel. My thinking is that this would be similar to +debugstr, in that all messages are human-readable descriptions which would be useful for debugging crashes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/89

3 3

[PATCH 0/6] MR165: ntdll: Improve block size rounding compatibility.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

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

4 11

[PATCH] xaudio2/tests: Remove failing legacy CLSID tests
by Andrew Eikum 01 Jun '22

01 Jun '22

Modern Windows fails these tests, and no application is known to need this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52998 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 9d50944b8d3..f4f808c2656 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1067,10 +1067,6 @@ static void test_xapo_creation_modern(const char *module) /* CLSIDs are the same across all versions */ static const GUID *const_clsids[] = { - &CLSID_FXEQ27, - &CLSID_FXMasteringLimiter27, - &CLSID_FXReverb27, - &CLSID_FXEcho27, &CLSID_FXEQ, &CLSID_FXMasteringLimiter, &CLSID_FXReverb, @@ -1111,19 +1107,6 @@ static void test_xapo_creation_modern(const char *module) IUnknown_Release(fx_unk); } - /* test legacy CLSID */ - hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08lx\n", module, hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08lx\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - rc = IUnknown_Release(fx_unk); - ok(rc == 0, "XAPO via legacy CreateFX should have been released, got refcount: %lu\n", rc); - } - pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter"); ok(pCAVM != NULL, "%s did not have CreateAudioVolumeMeter?\n", module); -- 2.36.1

1 0

[PATCH 0/5] MR169: user32/tests: Cleanup some msg.c tests.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

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

4 11

[PATCH v2 4/6] d3dx10_43: Add D3DX10CreateAsyncTextureInfoProcessor stub.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 6 ++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10.h | 2 +- include/d3dx10async.h | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-)

3 4

[PATCH 0/4] MR168: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 01 Jun '22

01 Jun '22

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

3 5

Re: [PATCH v2 0/5] MR162: explorer: Move clipboard manager thread from display driver.
by Martin Storsjö (＠mstorsjo) 01 Jun '22

01 Jun '22

This (in particular, the “explorer: …” commit) caused a regression for me. In an entirely headless configuration (configured with `--without-x`) on arm32 (probably happens on other architectures too, but that’s where it happened for me), when bootstrapping a new wineprefix (setting `WINEPREFIX` to a new, nonexistent directory, running `wine wineboot`), it can hang, printing errors like these: ``` 0048:err:sync:RtlpWaitForCriticalSection section 7BC8A3F0 "../src/dlls/ntdll /loader.c: loader_section" wait timed out in thread 0048, blocked by 0054, r etrying (60 sec) 0048:err:sync:RtlpWaitForCriticalSection section 7BC8A3F0 "../src/dlls/ntdll /loader.c: loader_section" wait timed out in thread 0048, blocked by 0054, r etrying (60 sec) ``` Does this trigger some race condition when bootstrapping the environment? (I can report it in bugzilla later, I presume that’s still preferred, I just happened to have better access to gitlab.) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/162#note_1460

1 0

[PATCH v2 6/6] d3dx10_43/tests: Add D3DX10CreateAsyncTextureInfoProcessor tests.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)

2 1

[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