June 2022 - Wine-commits - list.winehq.org

Rémi Bernon : winegstreamer: Register stub ResamplerMediaObject transform.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: b6a7a02159eccc7fb40aa119a828e48ae256313a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6a7a02159eccc7fb40aa119… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 23:52:45 2022 +0200 winegstreamer: Register stub ResamplerMediaObject transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 42 +- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 13 + dlls/winegstreamer/mfplat.c | 20 +- dlls/winegstreamer/resampler.c | 606 +++++++++++++++++++++++++++ dlls/winegstreamer/winegstreamer_classes.idl | 6 + 7 files changed, 681 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6a7a02159eccc7fb40a…

1 0

Rémi Bernon : winegstreamer: Implement ResamplerMediaObject transform.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: d33cb57e7d891ee9f01dcde3b6366095b4bcf8a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33cb57e7d891ee9f01dcde3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 16:07:42 2022 +0200 winegstreamer: Implement ResamplerMediaObject transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 39 ---- dlls/winegstreamer/resampler.c | 402 +++++++++++++++++++++++++++++++++++--- dlls/winegstreamer/wg_transform.c | 1 + 3 files changed, 376 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d33cb57e7d891ee9f01d…

1 0

Rémi Bernon : winegstreamer: Remove unnecessary WineAudioConverter transform.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: 09b56e2f3631bebdd5581586465fcfe1556ff39f URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b56e2f3631bebdd5581586… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 11:21:30 2022 +0100 winegstreamer: Remove unnecessary WineAudioConverter transform. Superseded by the standard ResamplerMediaObject transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/audioconvert.c | 584 --------------------------- dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/mfplat.c | 13 - dlls/winegstreamer/winegstreamer_classes.idl | 6 - 5 files changed, 605 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09b56e2f3631bebdd558…

1 0

Rémi Bernon : winegstreamer: Register stub ColorConvertDMO transform.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: 5b178b2fa94b2fe3d0140d0c841695903cb39bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b178b2fa94b2fe3d0140d0c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 23:54:58 2022 +0200 winegstreamer: Register stub ColorConvertDMO transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 42 +- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/color_convert.c | 606 +++++++++++++++++++++++++++ dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 50 +++ dlls/winegstreamer/mfplat.c | 60 +++ dlls/winegstreamer/winegstreamer_classes.idl | 6 + 7 files changed, 765 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b178b2fa94b2fe3d014…

1 0

Rémi Bernon : winegstreamer: Implement ColorConvertDMO transform.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: 41184e9de97599dacad00d80021c35f2010f9d0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=41184e9de97599dacad00d80… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 16:16:18 2022 +0200 winegstreamer: Implement ColorConvertDMO transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 41 +--- dlls/winegstreamer/color_convert.c | 422 ++++++++++++++++++++++++++++++++++--- dlls/winegstreamer/wg_transform.c | 2 +- 3 files changed, 398 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41184e9de97599dacad0…

1 0

Jacek Caban : win32u: Move menu tracking implementation from user32.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: b9d8a842f0ba1e4c3c59b9e9ede667bea1761e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9d8a842f0ba1e4c3c59b9e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 12 16:52:40 2022 +0200 win32u: Move menu tracking implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 3 - dlls/user32/defwnd.c | 3 +- dlls/user32/input.c | 10 - dlls/user32/menu.c | 3216 +++--------------------------------------- dlls/user32/nonclient.c | 59 - dlls/user32/user32.spec | 8 +- dlls/user32/user_main.c | 16 +- dlls/user32/user_private.h | 1 - dlls/win32u/defwnd.c | 30 +- dlls/win32u/gdiobj.c | 3 + dlls/win32u/menu.c | 1816 +++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 4 +- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u.spec | 8 +- dlls/win32u/win32u_private.h | 11 + dlls/win32u/window.c | 6 +- dlls/win32u/wrappers.c | 19 + dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 5 + include/ntuser.h | 5 +- 21 files changed, 2081 insertions(+), 3146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9d8a842f0ba1e4c3c59…

1 0

Jacek Caban : win32u: Move WM_CONTEXTMENU and WM_POPUPSYSTEMMENU implementation from user32.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: fc940d5834751c80d4e7ded25f46c4eacfa1c041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc940d5834751c80d4e7ded2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 00:09:52 2022 +0200 win32u: Move WM_CONTEXTMENU and WM_POPUPSYSTEMMENU implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/defwnd.c | 26 ------- dlls/user32/nonclient.c | 182 ------------------------------------------------ dlls/win32u/defwnd.c | 26 +++++++ 4 files changed, 26 insertions(+), 209 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc940d5834751c80d4e7…

1 0

Giovanni Mascellani : mfplat/tests: Test interaction between Lock() and LockRect().
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: 0d63116b27df2eb7c098625878b7182aaf83089b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d63116b27df2eb7c0986258… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 14 17:15:46 2022 +0200 mfplat/tests: Test interaction between Lock() and LockRect(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 28b89de4b1f..2cd27ed1269 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6398,6 +6398,7 @@ static void test_MFCreateDXSurfaceBuffer(void) { IDirect3DSurface9 *backbuffer = NULL, *surface; IDirect3DSwapChain9 *swapchain; + D3DLOCKED_RECT locked_rect; DWORD length, max_length; IDirect3DDevice9 *device; IMF2DBuffer2 *_2dbuffer2; @@ -6470,9 +6471,32 @@ static void test_MFCreateDXSurfaceBuffer(void) ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); ok(length == 2 * max_length, "Unexpected length %lu.\n", length); + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == S_OK, "Failed to lock back buffer, hr %#lx.\n", hr); + + /* Cannot lock while the surface is locked. */ + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(backbuffer); + ok(hr == S_OK, "Failed to unlock back buffer, hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(length == max_length, "Unexpected length %lu instead of %lu.\n", length, max_length); + + /* You can lock the surface while the media buffer is locked. */ + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == S_OK, "Failed to lock back buffer, hr %#lx.\n", hr); + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(length == max_length, "Unexpected length.\n"); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(backbuffer); + ok(hr == S_OK, "Failed to unlock back buffer, hr %#lx.\n", hr); /* Unlock twice. */ hr = IMFMediaBuffer_Unlock(buffer);

1 0

Giovanni Mascellani : mfplat/tests: Test interaction between Lock2D() and LockRect().
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: 433845277ba7a019737dad2050d51c7d38df9316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=433845277ba7a019737dad20… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 14 17:15:47 2022 +0200 mfplat/tests: Test interaction between Lock2D() and LockRect(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2cd27ed1269..67cf8954c36 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6526,9 +6526,23 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr); + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == S_OK, "Failed to lock back buffer, hr %#lx.\n", hr); + + /* Cannot lock the buffer while the surface is locked. */ + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(backbuffer); + ok(hr == S_OK, "Failed to unlock back buffer, hr %#lx.\n", hr); + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + /* Cannot lock the surface once the buffer is locked. */ + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Julian Klemann : httpapi/tests: Move sleep statement.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: 39502adc6c2578c4279e3e6f125673ed6c658a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39502adc6c2578c4279e3e6f… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Thu Jun 16 12:55:07 2022 -0500 httpapi/tests: Move sleep statement. The mentioned bug randomly occurred after some subsequent patches, so the sleep should happen before GetOverlappedResult is called. Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index be1d31c12ad..9d344f26d02 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -228,10 +228,6 @@ static void test_v1_server(void) ret = send(s, req_text, strlen(req_text), 0); ok(ret == strlen(req_text), "send() returned %d.\n", ret); - ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); - ok(ret, "Got error %lu.\n", GetLastError()); - ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); - /* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 * version 1507, but probably affecting others) suffer from a bug where the * kernel will report success before completely filling the buffer or @@ -239,6 +235,10 @@ static void test_v1_server(void) * around this. */ Sleep(100); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(!req->Flags, "Got flags %#lx.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n"); ok(req->RequestId, "Expected nonzero connection ID.\n");

1 0