March 2024 - Wine-commits - list.winehq.org

Nikolay Sivov : d2d1: Fix a double free on error path (Valgrind).
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: df97793045b5f818b260eff6544eb24a5dca384d URL: https://gitlab.winehq.org/wine/wine/-/commit/df97793045b5f818b260eff6544eb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 24 01:12:55 2024 +0100 d2d1: Fix a double free on error path (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 94a8b80a745..3cc23c0325b 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -3974,7 +3974,6 @@ HRESULT d2d_d3d_create_render_target(struct d2d_device *device, IDXGISurface *su { WARN("Failed to create target bitmap, hr %#lx.\n", hr); IUnknown_Release(&object->IUnknown_iface); - free(object); return hr; }

1 0

Santino Mazza : crypt32: Fix CryptBinaryToString not adding a separator.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: 624e87a7252abd1f03598c68edc56e6815af1ef2 URL: https://gitlab.winehq.org/wine/wine/-/commit/624e87a7252abd1f03598c68edc56e… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Fri Mar 22 17:08:32 2024 -0300 crypt32: Fix CryptBinaryToString not adding a separator. --- dlls/crypt32/base64.c | 16 +++++++++------- dlls/crypt32/tests/base64.c | 8 ++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index b61ed7ff8cc..298756ca541 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -111,8 +111,6 @@ static DWORD encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, i = 0; while (div > 0 && ptr < end) { - if (i && i % 64 == 0) - ptr += stradd(ptr, end, sep, strlen(sep)); /* first char is the first 6 bits of the first byte*/ chunk[0] = b64[ ( d[0] >> 2) & 0x3f ]; /* second char is the last 2 bits of the first byte and the first 4 @@ -127,6 +125,9 @@ static DWORD encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, i += 4; d += 3; div--; + + if (i && i % 64 == 0) + ptr += stradd(ptr, end, sep, strlen(sep)); } switch(pad_bytes) @@ -393,11 +394,6 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, i = 0; while (div > 0) { - if (i && i % 64 == 0) - { - lstrcpyW(ptr, sep); - ptr += lstrlenW(sep); - } /* first char is the first 6 bits of the first byte*/ *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; /* second char is the last 2 bits of the first byte and the first 4 @@ -411,6 +407,12 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, i += 4; d += 3; div--; + + if (i && i % 64 == 0) + { + lstrcpyW(ptr, sep); + ptr += lstrlenW(sep); + } } switch(pad_bytes) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index e81a57c576d..2263b236fa8 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -57,6 +57,8 @@ static const BYTE toEncode4[] = static const BYTE toEncode5[] = "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHI"; +static const BYTE toEncode6[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; + static const struct BinTests tests[] = { { toEncode1, sizeof(toEncode1), "AA==\r\n", }, { toEncode2, sizeof(toEncode2), "AQI=\r\n", }, @@ -69,6 +71,9 @@ static const struct BinTests tests[] = { "SElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NTY3ODkwAA==\r\n" }, { toEncode5, sizeof(toEncode5), "YWJjZGVmZ2hpamxrbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5MEFCQ0RFRkdISQA=\r\n" }, + { toEncode6, sizeof(toEncode6), + "YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh\r\n" + "YQA=\r\n" }, }; static const struct BinTests testsNoCR[] = { @@ -83,6 +88,9 @@ static const struct BinTests testsNoCR[] = { "SElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NTY3ODkwAA==\n" }, { toEncode5, sizeof(toEncode5), "YWJjZGVmZ2hpamxrbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5MEFCQ0RFRkdISQA=\n" }, + { toEncode6, sizeof(toEncode6), + "YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh\n" + "YQA=\n" }, }; static WCHAR *strdupAtoW(const char *str)

1 0

Rémi Bernon : mf/tests: Check that pan scan and geometric apertures are set.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: da2c20a2e688f395e42a5f3086a11833d26698ad URL: https://gitlab.winehq.org/wine/wine/-/commit/da2c20a2e688f395e42a5f3086a118… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 25 12:43:05 2024 +0100 mf/tests: Check that pan scan and geometric apertures are set. --- dlls/mf/tests/transform.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 28ac7291e0b..e43b1627789 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4090,6 +4090,8 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + ATTR_BLOB(MF_MT_GEOMETRIC_APERTURE, &actual_aperture, 16, .todo = TRUE), + ATTR_BLOB(MF_MT_PAN_SCAN_APERTURE, &actual_aperture, 16, .todo = TRUE), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), @@ -4104,6 +4106,8 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + ATTR_BLOB(MF_MT_GEOMETRIC_APERTURE, &actual_aperture, 16, .todo = TRUE), + ATTR_BLOB(MF_MT_PAN_SCAN_APERTURE, &actual_aperture, 16, .todo = TRUE), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), @@ -4118,6 +4122,8 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + ATTR_BLOB(MF_MT_GEOMETRIC_APERTURE, &actual_aperture, 16, .todo = TRUE), + ATTR_BLOB(MF_MT_PAN_SCAN_APERTURE, &actual_aperture, 16, .todo = TRUE), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), @@ -4132,6 +4138,8 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + ATTR_BLOB(MF_MT_GEOMETRIC_APERTURE, &actual_aperture, 16, .todo = TRUE), + ATTR_BLOB(MF_MT_PAN_SCAN_APERTURE, &actual_aperture, 16, .todo = TRUE), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), @@ -4146,6 +4154,8 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + ATTR_BLOB(MF_MT_GEOMETRIC_APERTURE, &actual_aperture, 16, .todo = TRUE), + ATTR_BLOB(MF_MT_PAN_SCAN_APERTURE, &actual_aperture, 16, .todo = TRUE), }, }; const MFT_OUTPUT_STREAM_INFO initial_output_info =

1 0

Rémi Bernon : evr/tests: Split create_d3d_sample to a separate helper.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: 1f589f63041cad0f000575baf57f25447df1e132 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f589f63041cad0f000575baf57f25… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 25 11:39:27 2024 +0100 evr/tests: Split create_d3d_sample to a separate helper. --- dlls/evr/tests/evr.c | 109 +++++++++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 47 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 25fb1978443..a0aba91aa74 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -3318,6 +3318,66 @@ done: DestroyWindow(window); } +static void create_d3d_sample(IDirect3DDeviceManager9 *manager, const GUID *subtype, IMFSample **sample) +{ + static const BITMAPINFOHEADER expect_header = + { + .biSize = sizeof(BITMAPINFOHEADER), + .biWidth = 96, .biHeight = 96, + .biPlanes = 1, .biBitCount = 32, + .biCompression = BI_RGB, + .biSizeImage = 96 * 96 * 4, + }; + DWORD data_size, frame_data_len; + D3DLOCKED_RECT d3d_rect = {0}; + IDirect3DSurface9 *surface; + const BYTE *frame_data; + LONG stride; + HRESULT hr; + + if (IsEqualGUID(subtype, &MFVideoFormat_NV12)) + { + load_resource(L"nv12frame.bmp", &frame_data, &frame_data_len); + /* skip BMP header and RGB data from the dump */ + data_size = *(DWORD *)(frame_data + 2); + frame_data_len = frame_data_len - data_size; + frame_data = frame_data + data_size; + ok(frame_data_len == 13824, "got length %lu\n", frame_data_len); + } + else + { + load_resource(L"rgb32frame.bmp", &frame_data, &frame_data_len); + /* skip BMP header from the dump */ + data_size = *(DWORD *)(frame_data + 2 + 2 * sizeof(DWORD)); + frame_data_len -= data_size; + frame_data += data_size; + ok(frame_data_len == 36864, "got length %lu\n", frame_data_len); + } + + surface = create_surface(manager, subtype->Data1, expect_header.biWidth, expect_header.biHeight); + ok(!!surface, "Failed to create input surface.\n"); + hr = IDirect3DSurface9_LockRect(surface, &d3d_rect, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (IsEqualGUID(subtype, &MFVideoFormat_RGB32)) + memcpy(d3d_rect.pBits, frame_data, frame_data_len); + else if (IsEqualGUID(subtype, &MFVideoFormat_NV12)) + { + hr = MFGetStrideForBitmapInfoHeader(subtype->Data1, expect_header.biWidth, &stride); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCopyImage(d3d_rect.pBits, d3d_rect.Pitch, frame_data, stride, expect_header.biWidth, expect_header.biHeight); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + frame_data += stride * expect_header.biHeight; + d3d_rect.pBits = (BYTE *)d3d_rect.pBits + d3d_rect.Pitch * expect_header.biHeight; + hr = MFCopyImage(d3d_rect.pBits, d3d_rect.Pitch, frame_data, stride, expect_header.biWidth, expect_header.biHeight / 2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + } + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, sample); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IDirect3DSurface9_Release(surface); +} + static void test_presenter_orientation(const GUID *subtype) { IMFTopologyServiceLookupClient *lookup_client; @@ -3331,18 +3391,14 @@ static void test_presenter_orientation(const GUID *subtype) }; BITMAPINFOHEADER header = {.biSize = sizeof(BITMAPINFOHEADER)}; IMFVideoDisplayControl *display_control; - DWORD diff, data_size, frame_data_len; IDirect3DDeviceManager9 *manager; - D3DLOCKED_RECT d3d_rect = {0}; IMFVideoPresenter *presenter; - IDirect3DSurface9 *surface; IMFMediaType *video_type; - const BYTE *frame_data; + DWORD diff, data_size; struct test_host host; IMFTransform *mixer; LONGLONG timestamp; IMFSample *sample; - LONG stride; HWND window; BYTE *data; HRESULT hr; @@ -3393,48 +3449,7 @@ static void test_presenter_orientation(const GUID *subtype) hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (IsEqualGUID(subtype, &MFVideoFormat_NV12)) - { - load_resource(L"nv12frame.bmp", &frame_data, &frame_data_len); - /* skip BMP header and RGB data from the dump */ - data_size = *(DWORD *)(frame_data + 2); - frame_data_len = frame_data_len - data_size; - frame_data = frame_data + data_size; - ok(frame_data_len == 13824, "got length %lu\n", frame_data_len); - } - else - { - load_resource(L"rgb32frame.bmp", &frame_data, &frame_data_len); - /* skip BMP header from the dump */ - data_size = *(DWORD *)(frame_data + 2 + 2 * sizeof(DWORD)); - frame_data_len -= data_size; - frame_data += data_size; - ok(frame_data_len == 36864, "got length %lu\n", frame_data_len); - } - - surface = create_surface(manager, subtype->Data1, expect_header.biWidth, expect_header.biHeight); - ok(!!surface, "Failed to create input surface.\n"); - hr = IDirect3DSurface9_LockRect(surface, &d3d_rect, NULL, 0); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (IsEqualGUID(subtype, &MFVideoFormat_RGB32)) - memcpy(d3d_rect.pBits, frame_data, frame_data_len); - else if (IsEqualGUID(subtype, &MFVideoFormat_NV12)) - { - hr = MFGetStrideForBitmapInfoHeader(subtype->Data1, expect_header.biWidth, &stride); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = MFCopyImage(d3d_rect.pBits, d3d_rect.Pitch, frame_data, stride, expect_header.biWidth, expect_header.biHeight); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - frame_data += stride * expect_header.biHeight; - d3d_rect.pBits = (BYTE *)d3d_rect.pBits + d3d_rect.Pitch * expect_header.biHeight; - hr = MFCopyImage(d3d_rect.pBits, d3d_rect.Pitch, frame_data, stride, expect_header.biWidth, expect_header.biHeight / 2); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - } - hr = IDirect3DSurface9_UnlockRect(surface); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - IDirect3DSurface9_Release(surface); - + create_d3d_sample(manager, subtype, &sample); hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0);

1 0

Rémi Bernon : evr/tests: Split check_presenter_output to a separate helper.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: c5f00392237c93d75066a5ab407c2fa97e34fd52 URL: https://gitlab.winehq.org/wine/wine/-/commit/c5f00392237c93d75066a5ab407c2f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 25 11:44:17 2024 +0100 evr/tests: Split check_presenter_output to a separate helper. --- dlls/evr/tests/evr.c | 74 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index a0aba91aa74..abd507760c5 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -3378,6 +3378,46 @@ static void create_d3d_sample(IDirect3DDeviceManager9 *manager, const GUID *subt IDirect3DSurface9_Release(surface); } +#define check_presenter_output(a, b, c, d) check_presenter_output_(__LINE__, a, b, c, d) +static DWORD check_presenter_output_(int line, IMFVideoPresenter *presenter, const BITMAPINFOHEADER *expect_header, + const WCHAR *resource, const RECT *rect) +{ + BITMAPINFOHEADER header = {.biSize = sizeof(BITMAPINFOHEADER)}; + IMFVideoDisplayControl *display_control; + DWORD diff, data_size; + LONGLONG timestamp; + BYTE *data; + HRESULT hr; + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFVideoDisplayControl_GetCurrentImage(display_control, &header, &data, &data_size, &timestamp); + if (hr == MF_E_INVALIDREQUEST) + { + Sleep(500); + hr = IMFVideoDisplayControl_GetCurrentImage(display_control, &header, &data, &data_size, &timestamp); + } + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFVideoDisplayControl_Release(display_control); + + ok_(__FILE__, line)(header.biSize == expect_header->biSize, "Unexpected biSize %#lx\n", header.biSize); + ok_(__FILE__, line)(header.biWidth == expect_header->biWidth, "Unexpected biWidth %#lx\n", header.biWidth); + ok_(__FILE__, line)(header.biHeight == expect_header->biHeight, "Unexpected biHeight %#lx\n", header.biHeight); + ok_(__FILE__, line)(header.biPlanes == expect_header->biPlanes, "Unexpected biPlanes %#x\n", header.biPlanes); + ok_(__FILE__, line)(header.biBitCount == expect_header->biBitCount, "Unexpected biBitCount %#x\n", header.biBitCount); + ok_(__FILE__, line)(header.biCompression == expect_header->biCompression, "Unexpected biCompression %#lx\n", header.biCompression); + ok_(__FILE__, line)(header.biSizeImage == expect_header->biSizeImage, "Unexpected biSizeImage %#lx\n", header.biSizeImage); + ok_(__FILE__, line)(header.biXPelsPerMeter == expect_header->biXPelsPerMeter, "Unexpected biXPelsPerMeter %#lx\n", header.biXPelsPerMeter); + ok_(__FILE__, line)(header.biYPelsPerMeter == expect_header->biYPelsPerMeter, "Unexpected biYPelsPerMeter %#lx\n", header.biYPelsPerMeter); + ok_(__FILE__, line)(header.biClrUsed == expect_header->biClrUsed, "Unexpected biClrUsed %#lx\n", header.biClrUsed); + ok_(__FILE__, line)(header.biClrImportant == expect_header->biClrImportant, "Unexpected biClrImportant %#lx\n", header.biClrImportant); + + diff = check_rgb32_data(resource, data, header.biSizeImage, rect); + CoTaskMemFree(data); + + return diff; +} + static void test_presenter_orientation(const GUID *subtype) { IMFTopologyServiceLookupClient *lookup_client; @@ -3389,19 +3429,15 @@ static void test_presenter_orientation(const GUID *subtype) .biCompression = BI_RGB, .biSizeImage = 96 * 96 * 4, }; - BITMAPINFOHEADER header = {.biSize = sizeof(BITMAPINFOHEADER)}; - IMFVideoDisplayControl *display_control; IDirect3DDeviceManager9 *manager; IMFVideoPresenter *presenter; IMFMediaType *video_type; - DWORD diff, data_size; struct test_host host; IMFTransform *mixer; - LONGLONG timestamp; IMFSample *sample; HWND window; - BYTE *data; HRESULT hr; + DWORD diff; RECT rect; window = create_window(); @@ -3456,33 +3492,9 @@ static void test_presenter_orientation(const GUID *subtype) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFSample_Release(sample); - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFVideoDisplayControl_GetCurrentImage(display_control, &header, &data, &data_size, &timestamp); - if (hr == MF_E_INVALIDREQUEST) - { - Sleep(500); - hr = IMFVideoDisplayControl_GetCurrentImage(display_control, &header, &data, &data_size, &timestamp); - } - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - IMFVideoDisplayControl_Release(display_control); - - ok(header.biSize == expect_header.biSize, "Unexpected biSize %#lx\n", header.biSize); - ok(header.biWidth == expect_header.biWidth, "Unexpected biWidth %#lx\n", header.biWidth); - ok(header.biHeight == expect_header.biHeight, "Unexpected biHeight %#lx\n", header.biHeight); - ok(header.biPlanes == expect_header.biPlanes, "Unexpected biPlanes %#x\n", header.biPlanes); - ok(header.biBitCount == expect_header.biBitCount, "Unexpected biBitCount %#x\n", header.biBitCount); - ok(header.biCompression == expect_header.biCompression, "Unexpected biCompression %#lx\n", header.biCompression); - ok(header.biSizeImage == expect_header.biSizeImage, "Unexpected biSizeImage %#lx\n", header.biSizeImage); - ok(header.biXPelsPerMeter == expect_header.biXPelsPerMeter, "Unexpected biXPelsPerMeter %#lx\n", header.biXPelsPerMeter); - ok(header.biYPelsPerMeter == expect_header.biYPelsPerMeter, "Unexpected biYPelsPerMeter %#lx\n", header.biYPelsPerMeter); - ok(header.biClrUsed == expect_header.biClrUsed, "Unexpected biClrUsed %#lx\n", header.biClrUsed); - ok(header.biClrImportant == expect_header.biClrImportant, "Unexpected biClrImportant %#lx\n", header.biClrImportant); - - SetRect(&rect, 0, 0, header.biWidth, header.biHeight); - diff = check_rgb32_data(L"rgb32frame-flip.bmp", data, header.biSizeImage, &rect); + SetRect(&rect, 0, 0, expect_header.biWidth, expect_header.biHeight); + diff = check_presenter_output(presenter, &expect_header, L"rgb32frame-flip.bmp", &rect); ok(diff <= 5, "Unexpected %lu%% diff\n", diff); - CoTaskMemFree(data); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_ENDSTREAMING, 0); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : evr/tests: Add more video mixer input media type aperture tests.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: d304e587894d69c2716c8e242a96ee56e141284b URL: https://gitlab.winehq.org/wine/wine/-/commit/d304e587894d69c2716c8e242a96ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 25 12:00:21 2024 +0100 evr/tests: Add more video mixer input media type aperture tests. --- dlls/evr/tests/evr.c | 208 ++++++++++++++++++++++++++++++++++++- dlls/evr/tests/resource.rc | 10 +- dlls/evr/tests/rgb32frame-crop.bmp | Bin 0 -> 7670 bytes 3 files changed, 211 insertions(+), 7 deletions(-)

1 0

Rémi Bernon : evr/mixer: Respect input media type MF_MT_GEOMETRIC_APERTURE.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: b1cca5b52ad5dbcfb9547557040f7a380908da2f URL: https://gitlab.winehq.org/wine/wine/-/commit/b1cca5b52ad5dbcfb9547557040f7a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 13 11:19:58 2024 +0100 evr/mixer: Respect input media type MF_MT_GEOMETRIC_APERTURE. --- dlls/evr/mixer.c | 52 ++++++++++++++++++++++++++++++---------------------- dlls/evr/presenter.c | 24 ++++++++++++++---------- dlls/evr/tests/evr.c | 4 ++-- 3 files changed, 46 insertions(+), 34 deletions(-)

1 0

Zhiyi Zhang : mfmediaengine: Implement IMFMediaEngineEx::SetCurrentTime().
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: 2bcc87b30301bef3c77601d31d87fa93e60d79d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bcc87b30301bef3c77601d31d87fa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 28 18:04:30 2023 +0800 mfmediaengine: Implement IMFMediaEngineEx::SetCurrentTime(). --- dlls/mfmediaengine/main.c | 59 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 0e16305ddda..96eeb4bdbcc 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -94,6 +94,7 @@ enum media_engine_flags FLAGS_ENGINE_NEW_FRAME = 0x8000, FLAGS_ENGINE_SOURCE_PENDING = 0x10000, FLAGS_ENGINE_PLAY_PENDING = 0x20000, + FLAGS_ENGINE_SEEKING = 0x40000, }; struct vec3 @@ -164,6 +165,7 @@ struct media_engine { IMFMediaSource *source; IMFPresentationDescriptor *pd; + PROPVARIANT start_position; } presentation; struct effects video_effects; struct effects audio_effects; @@ -978,7 +980,14 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface break; } case MESessionStarted: - + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SEEKING) + { + media_engine_set_flag(engine, FLAGS_ENGINE_SEEKING | FLAGS_ENGINE_IS_ENDED, FALSE); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKED, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); + } + LeaveCriticalSection(&engine->cs); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAYING, 0, 0); break; case MESessionEnded: @@ -1339,10 +1348,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi static void media_engine_start_playback(struct media_engine *engine) { - PROPVARIANT var; - - var.vt = VT_EMPTY; - IMFMediaSession_Start(engine->session, &GUID_NULL, &var); + IMFMediaSession_Start(engine->session, &GUID_NULL, &engine->presentation.start_position); + /* Reset the playback position to the current position */ + engine->presentation.start_position.vt = VT_EMPTY; } static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) @@ -1770,6 +1778,10 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngineEx *iface) { ret = engine->duration; } + else if (engine->flags & FLAGS_ENGINE_PAUSED && engine->presentation.start_position.vt == VT_I8) + { + ret = (double)engine->presentation.start_position.hVal.QuadPart / 10000000; + } else if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) { ret = mftime_to_seconds(clocktime); @@ -1779,17 +1791,50 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngineEx *iface) return ret; } +static HRESULT media_engine_set_current_time(struct media_engine *engine, double seektime) +{ + PROPVARIANT position; + DWORD caps; + HRESULT hr; + + hr = IMFMediaSession_GetSessionCapabilities(engine->session, &caps); + if (FAILED(hr) || !(caps & MFSESSIONCAP_SEEK)) + return hr; + + position.vt = VT_I8; + position.hVal.QuadPart = min(max(0, seektime), engine->duration) * 10000000; + + if (IMFMediaEngineEx_IsPaused(&engine->IMFMediaEngineEx_iface)) + { + engine->presentation.start_position = position; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKING, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKED, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); + return S_OK; + } + + if (SUCCEEDED(hr = IMFMediaSession_Start(engine->session, &GUID_NULL, &position))) + { + media_engine_set_flag(engine, FLAGS_ENGINE_SEEKING, TRUE); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKING, 0, 0); + } + + return hr; +} + static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngineEx *iface, double time) { struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); - HRESULT hr = E_NOTIMPL; + HRESULT hr; - FIXME("(%p, %f): stub.\n", iface, time); + TRACE("%p, %f.\n", iface, time); EnterCriticalSection(&engine->cs); if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) hr = MF_E_SHUTDOWN; + else + hr = media_engine_set_current_time(engine, time); LeaveCriticalSection(&engine->cs);

1 0

Rémi Bernon : configure: Quote ac_cv_lib_soname_MoltenVK when setting SONAME_LIBVULKAN.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: 5ce5dc1f1e774ac379bc64ab2ad35acd14d162ef URL: https://gitlab.winehq.org/wine/wine/-/commit/5ce5dc1f1e774ac379bc64ab2ad35a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 25 09:48:40 2024 +0100 configure: Quote ac_cv_lib_soname_MoltenVK when setting SONAME_LIBVULKAN. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 960441b93c9..17a6d982075 100755 --- a/configure +++ b/configure @@ -19167,7 +19167,7 @@ printf "%s\n" "$ac_cv_lib_soname_MoltenVK" >&6; } printf "%s\n" "#define SONAME_LIBMOLTENVK \"$ac_cv_lib_soname_MoltenVK\"" >>confdefs.h - printf "%s\n" "#define SONAME_LIBVULKAN $ac_cv_lib_soname_MoltenVK" >>confdefs.h + printf "%s\n" "#define SONAME_LIBVULKAN \"$ac_cv_lib_soname_MoltenVK\"" >>confdefs.h fi fi diff --git a/configure.ac b/configure.ac index 5398e4b1785..b03bb12f303 100644 --- a/configure.ac +++ b/configure.ac @@ -1827,7 +1827,7 @@ then WINE_CHECK_SONAME(vulkan, vkGetInstanceProcAddr) if test "x$ac_cv_lib_soname_vulkan" = "x" then - WINE_CHECK_SONAME(MoltenVK, vkGetInstanceProcAddr, [AC_DEFINE_UNQUOTED(SONAME_LIBVULKAN,[$ac_cv_lib_soname_MoltenVK])]) + WINE_CHECK_SONAME(MoltenVK, vkGetInstanceProcAddr, [AC_DEFINE_UNQUOTED(SONAME_LIBVULKAN,["$ac_cv_lib_soname_MoltenVK"])]) fi fi WINE_NOTICE_WITH(vulkan,[test "x$ac_cv_lib_soname_vulkan" = "x" -a "x$ac_cv_lib_soname_MoltenVK" = "x"],

1 0

Rémi Bernon : win32u: Move vulkan loading and init guard out of the drivers.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: 28873ce8c426f696ceb16e3f5d98d5f5c5ed3b79 URL: https://gitlab.winehq.org/wine/wine/-/commit/28873ce8c426f696ceb16e3f5d98d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 12 22:12:11 2024 +0100 win32u: Move vulkan loading and init guard out of the drivers. --- dlls/win32u/driver.c | 12 +++--- dlls/win32u/vulkan.c | 58 +++++++++++++++++++++++++- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/vulkan.c | 71 ++++++++++--------------------- dlls/winewayland.drv/vulkan.c | 71 +++++++++++-------------------- dlls/winewayland.drv/waylanddrv.h | 2 +- dlls/winewayland.drv/waylanddrv_main.c | 2 +- dlls/winex11.drv/init.c | 10 +---- dlls/winex11.drv/vulkan.c | 76 ++++++++++++---------------------- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 6 +-- dlls/winex11.drv/xrandr.c | 2 +- include/wine/gdi_driver.h | 4 +- 14 files changed, 150 insertions(+), 170 deletions(-)

1 0