- wine-devel - winehq.org

[PATCH v5 1/7] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Giovanni Mascellani 27 Jun '22

27 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Remove the multiplier * The missing test cases will be reinsterted in a later commit --- dlls/mfplat/buffer.c | 22 ++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 40 ++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index eada3df18ad..39407ccc9e2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1351,8 +1351,25 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (is_yuv && bottom_up) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) - return hr; + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + plane_size = stride * height * 2; + break; + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * height * 3 / 2; + break; + default: + plane_size = stride * height; + } if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1377,7 +1394,6 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): max_length = pitch * height * 2; - plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 67cf8954c36..6ad667a7404 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5723,48 +5723,49 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int fourcc; unsigned int contiguous_length; int pitch; - unsigned int plane_multiplier; unsigned int max_length; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 0, 192 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 192 }, { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, - { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 0, 1536 }, + { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 1536 }, - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128 }, { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 0, 3072 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 3072 }, { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 1024 }, { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 1024 }, { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 1024 }, { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, @@ -5998,13 +5999,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); - hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); - ok(hr == S_OK, "Failed to get plane size, hr %#lx.\n", hr); - if (ptr->plane_multiplier) - length2 *= ptr->plane_multiplier; - ok(length2 == length, "%d: contiguous length %lu does not match plane size %lu, %u x %u, format %s.\n", i, length, - length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); -- 2.36.1

3 17

[tools] testbot/web: Use GetErrMessage() instead of direct field access.
by Francois Gouget 27 Jun '22

27 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 2 +- testbot/web/admin/Log.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 773fe3bb99..ec2eaba7e2 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -49,7 +49,7 @@ sub _initialize($$$) if (!$self->GetParam("Days") or !$self->Validate() or !int($self->GetParam("Days"))) # 00 case! { - $self->SetParam("Days", $DAYS_DEFAULT) if (!defined $self->{ErrMessage}); + $self->SetParam("Days", $DAYS_DEFAULT) if (!defined $self->GetErrMessage()); $self->{NoStats} = 1; } # The action is a no-op so unset it to not need to redefine OnAction() diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 9c18c375e2..74711df5f3 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -43,7 +43,7 @@ sub _initialize($$$) if (!$self->GetParam("Hours") or !$self->Validate() or !int($self->GetParam("Hours"))) # 00 case! { - $self->SetParam("Hours", $HOURS_DEFAULT) if (!defined $self->{ErrMessage}); + $self->SetParam("Hours", $HOURS_DEFAULT) if (!defined $self->GetErrMessage()); $self->SetParam("Action", undef); } } -- 2.30.2

1 0

[tools] testbot/web: Show the VM name for failure matches.
by Francois Gouget 27 Jun '22

27 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index ae4ccb4041..02803ed27a 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -45,7 +45,9 @@ sub GetPropertyDescriptors($) push @PropertyDescriptors, $PropertyDescriptor; if ($PropertyName eq "TaskLog") { - push @PropertyDescriptors, CreateBasicPropertyDescriptor("Date", "Date", !1, !1, "DT", 19); + push @PropertyDescriptors, + CreateBasicPropertyDescriptor("VM", "VM", !1, !1, "A", 20), + CreateBasicPropertyDescriptor("Date", "Date", !1, !1, "DT", 19); } } push @PropertyDescriptors, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128); @@ -89,6 +91,10 @@ sub GenerateDataView($$$) print "<a href='", $self->escapeHTML($URL), "'>", $self->escapeHTML($Row->{Item}->TaskLog), "</a>"; } + elsif ($PropertyName eq "VM") + { + print $self->escapeHTML($Row->{Item}->Task->VMName); + } elsif ($PropertyName eq "Date") { # The enclosing page already pulled in the datetime JavaScript code -- 2.30.2

1 0

[tools] testbot: Better track VM status changes.
by Francois Gouget 27 Jun '22

27 Jun '22

Only set OldStatus once to avoid issues in case the status is changed multiple times before the VM is saved. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This matches the recent job status tracking change. --- testbot/lib/WineTestBot/VMs.pm | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f0c16d19ec..2f736c636e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -157,15 +157,6 @@ use WineTestBot::TestAgent; use WineTestBot::Utils; -sub _initialize($$) -{ - my ($self, $VMs) = @_; - - $self->SUPER::_initialize($VMs); - - $self->{OldStatus} = undef; -} - sub InitializeNew($$) { my ($self, $Collection) = @_; @@ -270,8 +261,8 @@ sub Status($;$) if (!defined $CurrentStatus or $NewStatus ne $CurrentStatus) { + $self->{OldStatus} ||= $CurrentStatus; $self->SUPER::Status($NewStatus); - $self->{OldStatus} = $CurrentStatus; } return $NewStatus; @@ -424,15 +415,11 @@ sub OnSaved($) my ($self) = @_; $self->SUPER::OnSaved(); - - if (defined($self->{OldStatus})) + if (defined $self->{OldStatus} and $self->{OldStatus} ne $self->Status) { - my $NewStatus = $self->Status; - if ($NewStatus ne $self->{OldStatus}) - { - VMStatusChange($self->GetKey(), $self->{OldStatus}, $NewStatus); - } + VMStatusChange($self->GetKey(), $self->{OldStatus}, $self->Status); } + delete $self->{OldStatus}; } sub Run($$$$$$) -- 2.30.2

1 0

[tools] testbot/Janitor: Clean up obsolete failures.
by Francois Gouget 27 Jun '22

27 Jun '22

Delete failures that have been marked for deletion once they are no longer referenced. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 618c31d022..839e1a942c 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -43,6 +43,7 @@ $Name0 =~ s+^.*/++; use File::Path; use WineTestBot::Config; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; @@ -193,6 +194,22 @@ if ($JobPurgeDays != 0) } } +# And also failures marked for deletion +my $Failures = CreateFailures(); +$Failures->AddFilter("BugStatus", ["deleted"]); +foreach my $Failure (@{$Failures->GetItems()}) +{ + if ($Failure->TaskFailures->IsEmpty()) + { + $Failures->DeleteItem($Failure); + } + else + { + my $TaskFailure = @{$Failure->TaskFailures->GetItems()}[0]; + Trace "Keeping failure ", $Failure->Id, " for task log ", join("/", $TaskFailure->JobId, $TaskFailure->StepNo, $TaskFailure->TaskNo, $TaskFailure->TaskLog), "\n"; + } +} + # Purge the deleted VMs if they are not referenced anymore my $VMs = CreateVMs(); $VMs->AddFilter("Role", ["deleted"]); -- 2.30.2

1 0

[PATCH 0/1] MR315: windowscodecs: Fix non-zero alpha detection in ImagingFactory_CreateBitmapFromHICON.
by Jinoh Kang (＠iamahuman) 27 Jun '22

27 Jun '22

Increment pixel pointer for every *pixel*, not every *stride*. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/315

3 2

Re: [PATCH v6 0/5] MR310: mf: Fix several reference leaks.
by Rémi Bernon (＠rbernon) 27 Jun '22

27 Jun '22

v6: Restore temporary todo_wine in PATCH 2, lost in the split. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310#note_2800

1 0

[PATCH v5 0/5] MR310: mf: Fix several reference leaks.
by Rémi Bernon (＠rbernon) 27 Jun '22

27 Jun '22

So that the mf tests pass again on 32bit on the testbot, though they still fail locally with `LIBGL_ALWAYS_SOFTWARE=true GALLIUM_DRIVER=softpipe`. -- v5: mf: Uninitialize renderer before creating mixer and presenter. mf: Release video renderer services before re-initializing. mf: Avoid leaking nodes in IMFTopoLoader_Load. mf/tests: Add some missing IMFActivate_Shutdown calls. mf/tests: Add more consistent reference count checks. https://gitlab.winehq.org/wine/wine/-/merge_requests/310

3 9

[PATCH v4 0/5] MR310: mf: Fix several reference leaks.
by Rémi Bernon (＠rbernon) 27 Jun '22

27 Jun '22

So that the mf tests pass again on 32bit on the testbot, though they still fail locally with `LIBGL_ALWAYS_SOFTWARE=true GALLIUM_DRIVER=softpipe`. -- v4: mf: Uninitialize renderer before creating mixer and presenter. mf: Release video renderer services before re-initializing. mf: Avoid leaking nodes in IMFTopoLoader_Load. mf/tests: Add some missing IMFActivate_Shutdown calls. mf/tests: And more consistent reference count checks. https://gitlab.winehq.org/wine/wine/-/merge_requests/310

3 8

Re: [PATCH v8 0/9] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (＠iamahuman) 27 Jun '22

27 Jun '22

> When running under qemu-user CPU emulation, this can mean we not only remove the vdso from the process being launched (a performance degradation), but also clobber it out from under the qemu-user emulator hosting the wine-preloader process - which is in fact in the midst of a call to mmap that is *using* the vdso, so the emulator then segfaults before returning I'd call a QEMU bug. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6#note_2791

1 0

[PATCH v3 0/4] MR310: mf: Fix several reference leaks.
by Rémi Bernon (＠rbernon) 27 Jun '22

27 Jun '22

So that the mf tests pass again on 32bit on the testbot, though they still fail locally with `LIBGL_ALWAYS_SOFTWARE=true GALLIUM_DRIVER=softpipe`. -- v3: mf: Uninitialize renderer before creating mixer and presenter. mf: Release video renderer services before re-initializing. mf: Avoid leaking nodes in IMFTopoLoader_Load. mf/tests: Add some missing IMFActivate_Shutdown calls. https://gitlab.winehq.org/wine/wine/-/merge_requests/310

4 8

[PATCH 0/1] MR324: vbscript: Use return_null in more places.
by Robert Wilhelm (＠sloper42) 27 Jun '22

27 Jun '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/324

3 2

[PATCH v2 0/2] MR305: regedit: Add support for REG_QWORD type.
by Nikolay Sivov (＠nsivov) 27 Jun '22

27 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- v2: regedit: Remove unnecessary string conversion when modifying REG_DWORD value. regedit: Add support for REG_QWORD type. https://gitlab.winehq.org/wine/wine/-/merge_requests/305

4 4

Re: [PATCH v8 0/9] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Kevin Puetz (＠puetzk) 27 Jun '22

27 Jun '22

Another interesting case in this same area is qemu-user emulation. As you say, right now wine-preloader just uses MAP_FIXED and removes anything in its way (potentially including the vdso of ASLR put it in the way). When running under qemu-user CPU emulation, this can mean we not only remove the vdso from the process being launched (a performance degradation), but also clobber it out from under the qemu-user emulator hosting the wine-preloader process - which is in fact in the midst of a call to mmap that is *using* the vdso, so the emulator then segfaults before returning (intermittently, since ASLR doesn't always put the vdso in the way, but often enough I have seen it hit the in[0x7ffffe000000, +0x01ff0000 range](https://gitlab.winehq.org/wine/wine/-/blob/master/loader/preloader.c… I'm just remapping it won't fix that problem (having it move mid-call is going to be just as fatal as unmapping it), but it potentially makes it more tractable. qemu is already holding some separation/tagging of host vs guest, so maybe it could special case mremap to move it for us but retain it for its own purposes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6#note_2780

1 0

[PATCH v2 0/1] MR312: winex11.drv: Increment configure_serial in X11DRV_WindowPosChanged() even if...
by Paul Gofman (＠gofman) 27 Jun '22

27 Jun '22

Once we reached that place where sync_window_position() is called (or not called if window is about to be minimized or maximized) the old in-flight X_ConfigureNotify do not make sense anymore. sync_window_position() does that unconditionally but if we don't call it for minimize / maximize we should probably discard them regardless. An example of the failing scenario which this patch is fixing is the following: 1. App calls SetWindowPos() with some size, X_ConfigureNotify is in flight; 2. App calls ShowWindow(SW_MAXIMIZE), old X_ConfigureNotify is still in flight; sync_window_position() is not called and configure_serial is not updated; 3. Now X_ConfigureNotify from p.1 arrives and it gets processed like WM is changing window size back, that confuses the app and since the reaction on the new app's SetWindowPos / maximizing is also delayed and then X events triggered by p. 2. also arribe later. That may cause endless loop with non-functional window. -- v2: winex11.drv: Increment configure_serial in X11DRV_WindowPosChanged() even if not syncing window position. https://gitlab.winehq.org/wine/wine/-/merge_requests/312

2 3

[PATCH 0/5] MR322: winex11.drv: Preparation for nulldrv display modes.
by Rémi Bernon (＠rbernon) 27 Jun '22

27 Jun '22

The idea is to have a `add_mode` manager callback and enumerate adapter modes when updating display devices. Then the modes would be read from the registry and cached with the adapters and monitors, allowing us to move more things to win32u. This MR is a preparation towards that, moving the `winex11` settings handler to display.c, and making sure we do not enumerate display modes before they have been initialized or while the list is being built. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/322

3 11

[PATCH v2 0/1] MR320: riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo.
by Jinoh Kang (＠iamahuman) 27 Jun '22

27 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo. https://gitlab.winehq.org/wine/wine/-/merge_requests/320

2 1

[PATCH 0/2] MR323: winebus.sys: Move bus_event list entry to an internal structure.
by Rémi Bernon (＠rbernon) 27 Jun '22

27 Jun '22

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

2 2

[PATCH vkd3d v2 1/7] tests: Test dot() intrinsic.
by Giovanni Mascellani 27 Jun '22

27 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Fixed test case for SM1 --- Makefile.am | 1 + tests/hlsl-dot.shader_test | 96 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 tests/hlsl-dot.shader_test diff --git a/Makefile.am b/Makefile.am index ad6a0a41..400e79e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-cross.shader_test \ + tests/hlsl-dot.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function.shader_test \ diff --git a/tests/hlsl-dot.shader_test b/tests/hlsl-dot.shader_test new file mode 100644 index 00000000..cb117d15 --- /dev/null +++ b/tests/hlsl-dot.shader_test @@ -0,0 +1,96 @@ +[pixel shader] +uniform float4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 5.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (166.0, 166.0, 166.0, 166.0) + +[pixel shader] +uniform float2 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 0.0 0.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (53.0, 53.0, 53.0, 53.0) + +[pixel shader] +uniform float x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (92.0, 92.0, 92.0, 92.0) + +[pixel shader] +uniform float x; +uniform float y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +% Account for both the SM1 and SM4 uniform layout +uniform 0 float4 2.0 3.0 0.0 0.0 +uniform 4 float4 3.0 0.0 0.0 0.0 +todo draw quad +probe all rgba (6.0, 6.0, 6.0, 6.0) + +[pixel shader fail] +uniform float1x1 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float1x4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float4x1 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float4x4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} -- 2.36.1

3 20

[PATCH v2 0/5] MR321: win32u: menu conversion
by Jacek Caban (＠jacek) 27 Jun '22

27 Jun '22

-- v2: user32: Remove no longer needed helpers. win32u: Move menu object declarations to menu.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/321

4 8

Re: [PATCH v2 0/3] MR310: mf: Fix several reference leaks.
by Nikolay Sivov (＠nsivov) 27 Jun '22

27 Jun '22

On Mon Jun 27 07:57:50 2022 +0000, Rémi Bernon wrote: > I think the test failure may come from a missing the > `video_renderer_release_presenter_services` call, though I haven't > really investigated that aspect of the problem. If it's the case, > perhaps it should be added to `video_renderer_initialize` too. > The issue with the testbot and 32bit apps is that the way `Initialize` > is currently written it create a second video renderer before releasing > the previously created one. This requires another d3d device > initialization, which often fails from address space exhaustion, so > releasing the previous renderer first was resolving the issue (and the > reference leak also probably made it worse). Ok, that's probably fine then. This release should happen only in "!`EVR_SHUT_DOWN`" branch, it's fine to move releasing part of `video_renderer_initialize` right there, because it's not going to be used outside of `Initialize()`. Having another helper _uninitialize() is also an option to keep method body easier to read. Note that with current patch you have returns while holding a lock. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310#note_2756

1 0

[PATCH 0/5] MR321: win32u: menu conversion
by Jacek Caban (＠jacek) 27 Jun '22

27 Jun '22

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

2 5

Re: [PATCH v3 0/1] MR306: reg: Add REG_QWORD support to 'add'. - approved
by Hugh McMaster (＠hmc) 27 Jun '22

27 Jun '22

This merge request was approved by Hugh McMaster. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/306

1 0

[PATCH 0/1] MR320: riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo.
by Jinoh Kang (＠iamahuman) 27 Jun '22

27 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/320

2 1

Re: [PATCH v2 0/3] MR310: mf: Fix several reference leaks.
by Rémi Bernon (＠rbernon) 27 Jun '22

27 Jun '22

On Mon Jun 27 07:52:49 2022 +0000, Nikolay Sivov wrote: > This is already done in video_renderer_initialize(). Maybe it's not > triggered on shutdown? I think the test failure may come from a missing the `video_renderer_release_presenter_services` call, though I haven't really investigated that aspect of the problem. If it's the case, perhaps it should be added to `video_renderer_initialize` too. The issue with the testbot and 32bit apps is that the way `Initialize` is currently written it create a second video renderer before releasing the previously created one. This requires another d3d device initialization, which often fails from address space exhaustion, so releasing the previous renderer first was resolving the issue (and the reference leak also probably made it worse). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310#note_2750

1 0

Re: [PATCH v2 0/3] MR310: mf: Fix several reference leaks.
by Nikolay Sivov (＠nsivov) 27 Jun '22

27 Jun '22

Nikolay Sivov (@nsivov) commented about dlls/mf/evr.c: > + renderer->mixer = NULL; > + } > + > + if (renderer->presenter) > + { > + video_renderer_release_presenter_services(renderer); > + IMFVideoPresenter_Release(renderer->presenter); > + renderer->presenter = NULL; > + } > + > + if (renderer->device_manager) > + { > + IUnknown_Release(renderer->device_manager); > + renderer->device_manager = NULL; > + } > + This is already done in video_renderer_initialize(). Maybe it's not triggered on shutdown? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310#note_2749

1 0

[PATCH 0/17] MR319: d2d1: Initial implementation of effect properties handling
by Nikolay Sivov (＠nsivov) 27 Jun '22

27 Jun '22

-- This merge request has too many patches to be relayed via email. Please visit the URL below to see the contents of the merge request. https://gitlab.winehq.org/wine/wine/-/merge_requests/319

1 0

[PATCH 0/1] MR316: wbemprox: Use return length from NtQuerySystemInformationEx().
by Brendan Shanks (＠bshanks) 27 Jun '22

27 Jun '22

The return length is unlikely to change between the two NtQuerySystemInformationEx calls, but it's possible, and it's more correct to parse the entries with the length from the call where the data was returned. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/316

3 2

[PATCH 0/5] MR318: light.msstyles: Add Vista+ button parts.
by Zhiyi Zhang (＠zhiyi) 27 Jun '22

27 Jun '22

These theme parts are queried by Qt5 applications. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/318

2 5

[PATCH 0/6] MR317: uxtheme/tests: Test that DrawThemeBackgroundEx() is at ordinal 47.
by Zhiyi Zhang (＠zhiyi) 27 Jun '22

27 Jun '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/317

2 6

[PATCH 0/6] MR265: kernelbase: Implement PrefetchVirtualMemory.
by Jinoh Kang (＠iamahuman) 26 Jun '22

26 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/265

3 9

[PATCH v5 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 26 Jun '22

26 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- v5: nsiproxy.sys: Add static ARP entries which are always present on Windows. https://gitlab.winehq.org/wine/wine/-/merge_requests/296

3 3

[PATCH v4 0/9] MR272: d3dx10: Add D3DX10CreateThreadPump implementation.
by Piotr Caban (＠piotr) 26 Jun '22

26 Jun '22

The GetWorkItemCount implementation may look strange. It's done this way because of how WaitForAllItems is implemented. Alternative solution is to introduce separate counter for GetWorkItemCount. -- v4: d3dx10/tests: Add D3DX10CreateThreadPump tests. d3dx10: Add ID3DX10ThreadPump:PurgeAllItems implementation. d3dx10: Add ID3DX10ThreadPump:GetQueueStatus implementation. d3dx10: Add ID3DX10ThreadPump:WaitForAllItems implementation. d3dx10: Add ID3DX10ThreadPump:ProcessDeviceWorkItems implementation. d3dx10: Add ID3DX10ThreadPump:GetWorkItemCount implementation. d3dx10: Add ID3DX10ThreadPump:AddWorkItem implementation. d3dx10: Add D3DX10CreateThreadPump stub. d3dx10/tests: Fix texture leak in check_resource_data. https://gitlab.winehq.org/wine/wine/-/merge_requests/272

2 9

[PATCH 0/2] MR314: ntdll/tests: Preserve EFLAGS across syscall on x64.
by Jinoh Kang (＠iamahuman) 26 Jun '22

26 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/314

2 2

[PATCH v3 0/9] MR272: d3dx10: Add D3DX10CreateThreadPump implementation.
by Piotr Caban (＠piotr) 26 Jun '22

26 Jun '22

The GetWorkItemCount implementation may look strange. It's done this way because of how WaitForAllItems is implemented. Alternative solution is to introduce separate counter for GetWorkItemCount. -- v3: d3dx10/tests: Add D3DX10CreateThreadPump tests. d3dx10: Add ID3DX10ThreadPump:PurgeAllItems implementation. d3dx10: Add ID3DX10ThreadPump:GetQueueStatus implementation. d3dx10: Add ID3DX10ThreadPump:WaitForAllItems implementation. d3dx10: Add ID3DX10ThreadPump:ProcessDeviceWorkItems implementation. d3dx10: Add ID3DX10ThreadPump:GetWorkItemCount implementation. d3dx10: Add ID3DX10ThreadPump:AddWorkItem implementation. d3dx10: Add D3DX10CreateThreadPump stub. d3dx10/tests: Fix texture leak in check_resource_data. https://gitlab.winehq.org/wine/wine/-/merge_requests/272

6 34

[PATCH v2 0/1] MR282: ntdll: Set r11 on exit from syscall dispatcher on x64.
by Jinoh Kang (＠iamahuman) 26 Jun '22

26 Jun '22

-- v2: ntdll: Set r11 on exit from syscall dispatcher on x64. https://gitlab.winehq.org/wine/wine/-/merge_requests/282

2 2

[PATCH v2 0/5] MR307: dnsapi: Fix wow64 translation.
by Zebediah Figura (＠zfigura) 26 Jun '22

26 Jun '22

-- v2: ntdll: Add some documentation for ntdll_umbstowcs() and ntdll_wcstoumbs(). dnsapi: Return a double-null-terminated string from DnsQueryConfig(DnsConfigSearchList). dnsapi: ntdll_umbstowcs() deals in characters, not bytes. dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList). https://gitlab.winehq.org/wine/wine/-/merge_requests/307

4 6

[PATCH v4 0/2] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 25 Jun '22

25 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- v4: Apply 1 suggestion(s) to 1 file(s) https://gitlab.winehq.org/wine/wine/-/merge_requests/296

4 3

[PATCH 0/5] MR242: winegstreamer: Don't try using src_getrange_cb input buffer.
by Rémi Bernon (＠rbernon) 25 Jun '22

25 Jun '22

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

3 13

[PATCH v3 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 25 Jun '22

25 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- v3: nsiproxy.sys: Add static ARP entries which are always present on Windows. https://gitlab.winehq.org/wine/wine/-/merge_requests/296

3 3

[PATCH 0/1] MR312: winex11.drv: Increment configure_serial in X11DRV_WindowPosChanged() even if...
by Paul Gofman (＠gofman) 25 Jun '22

25 Jun '22

Once we reached that place where sync_window_position() is called (or not called if window is about to be minimized or maximized) the old in-flight X_ConfigureNotify do not make sense anymore. sync_window_position() does that unconditionally but if we don't call it for minimize / maximize we should probably discard them regardless. An example of the failing scenario which this patch is fixing is the following: 1. App calls SetWindowPos() with some size, X_ConfigureNotify is in flight; 2. App calls ShowWindow(SW_MAXIMIZE), old X_ConfigureNotify is still in flight; sync_window_position() is not called and configure_serial is not updated; 3. Now X_ConfigureNotify from p.1 arrives and it gets processed like WM is changing window size back, that confuses the app and since the reaction on the new app's SetWindowPos / maximizing is also delayed and then X events triggered by p. 2. also arribe later. That may cause endless loop with non-functional window. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/312

2 1

[PATCH] po: Update Dutch translation.
by Floris Renaud 24 Jun '22

24 Jun '22

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/nl.po b/po/nl.po index bf4ff469379..8e3074e26e5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-04-15 18:10+0200\n" +"PO-Revision-Date: 2022-06-25 00:15+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -16455,10 +16455,8 @@ msgstr "&DWORD-waarde" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "&DWORD-waarde" +msgstr "&QWORD-waarde" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -17017,16 +17015,12 @@ msgid "Collapse" msgstr "Invouwen" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "Een nieuwe 32-bit waarde toevoegen" +msgstr "Een nieuwe 64-bit waarde toevoegen" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "DWORD waarde bewerken" +msgstr "QWORD waarde bewerken" #: programs/regsvr32/regsvr32.rc:33 msgid "" -- 2.36.1

1 0

[PATCH] Suppress below message, with fix mojibake for japanese filename in LANG=ja_JP.SJIS environment. "err:environ:init_unix_codepage unrecognized charset 'SJIS'"
by Yoshiji Emoto 24 Jun '22

24 Jun '22

In past I sent patch for "dlls/winex11.drv/window.c" is not needed. Cancel it please. Signed-off-by: Yoshiji Emoto <alumina.from.ceramix(a)gmail.com> --- dlls/ntdll/unix/env.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a71df03966f..90035f683e7 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -270,6 +270,7 @@ static const struct { const char *name; UINT cp; } charset_names[] = { "ISO88599", 28599 }, { "KOI8R", 20866 }, { "KOI8U", 21866 }, + { "SJIS", 932 }, { "TIS620", 28601 }, { "UTF8", CP_UTF8 } }; -- 2.35.2

1 0

[PATCH] po: Update Lithuanian translation.
by Aurimas Fišeras 24 Jun '22

24 Jun '22

1 0

[PATCH 0/2] MR308: Add "wine/str.h", use "wine/heap.h" and it in winemenubuilder
by Davide Beatrici (＠davidebeatrici) 24 Jun '22

24 Jun '22

I originally wanted to add these utils into `unicode.h`, but it cannot be used with msvcrt headers. This prompted the creation of a new header called `str.h`. The name is generic and broad, but the file may grow to contain more general stuff in the future. The rationale behind writing the UTF helpers is mainly to solve, at least in part, the complexity. `WideCharToMultiByte()` and `MultiByteToWideChar()` in particular are quite dangerous as they treat the buffer size as bytes for `char` (8 bits) and as number of characters for `WCHAR` (16 bits). There are already several wrappers around the codebase, mine should be able to replace them. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/308

3 12

Re: [PATCH v4 0/1] MR303: win32u: Don't report cloned monitors in EnumDisplayMonitors(). - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

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

1 0

Re: [PATCH v2 0/1] MR309: wow64: Report the correct size for SystemLogicalProcessorInformationEx. - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

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

1 0

Re: [PATCH v2 0/1] MR293: winedbg: Clarify options specific to GDB proxy mode. - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

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

1 0

Re: [PATCH v2 0/3] MR311: win32u: menu conversion - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

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

1 0

Re: [PATCH v2 0/1] MR304: mshtml: Enable CSS grid layout. - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

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

1 0

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