August 2023 - Wine-commits - list.winehq.org

Vitaly Lipatov : include: Update COMPRESSION_ defines and move it to ddk/ntifs.h.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 115403dc5b346bc634d99a0a2d68960b717b6d93 URL: https://gitlab.winehq.org/wine/wine/-/commit/115403dc5b346bc634d99a0a2d6896… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:10:31 2023 +0300 include: Update COMPRESSION_ defines and move it to ddk/ntifs.h. --- dlls/ntdll/tests/rtl.c | 1 + include/ddk/ntifs.h | 15 +++++++++++++++ include/winnt.h | 6 ------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 76cecebae34..117d9eed067 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -27,6 +27,7 @@ #include "in6addr.h" #include "inaddr.h" #include "ip2string.h" +#include "ddk/ntifs.h" #include "wine/asm.h" #ifndef __WINE_WINTERNL_H diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index cedd54a66fe..980235abdc9 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -188,6 +188,21 @@ typedef struct _REPARSE_GUID_DATA_BUFFER #define REPARSE_GUID_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_GUID_DATA_BUFFER, GenericReparseBuffer) +#define COMPRESSION_FORMAT_NONE 0 +#define COMPRESSION_FORMAT_DEFAULT 1 +#define COMPRESSION_FORMAT_LZNT1 2 +#define COMPRESSION_FORMAT_XPRESS 3 +#define COMPRESSION_FORMAT_XPRESS_HUFF 4 +#define COMPRESSION_FORMAT_MAX 4 + +#define COMPRESSION_ENGINE_STANDARD 0x0000 +#define COMPRESSION_ENGINE_MAXIMUM 0x0100 +#define COMPRESSION_ENGINE_HIBER 0x0200 +#define COMPRESSION_ENGINE_MAX 0x0200 + +#define COMPRESSION_FORMAT_MASK 0x00ff +#define COMPRESSION_ENGINE_MASK 0xff00 + BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); DEVICE_OBJECT * WINAPI IoGetAttachedDevice(DEVICE_OBJECT*); PEPROCESS WINAPI IoGetRequestorProcess(IRP*); diff --git a/include/winnt.h b/include/winnt.h index ab14bcc80d5..c04f25b29bd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5468,12 +5468,6 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_256_BYTE_ALIGNMENT 0x000000ff #define FILE_512_BYTE_ALIGNMENT 0x000001ff -#define COMPRESSION_FORMAT_NONE 0 -#define COMPRESSION_FORMAT_DEFAULT 1 -#define COMPRESSION_FORMAT_LZNT1 2 -#define COMPRESSION_ENGINE_STANDARD 0 -#define COMPRESSION_ENGINE_MAXIMUM 256 - #define MAILSLOT_NO_MESSAGE ((DWORD)-1) #define MAILSLOT_WAIT_FOREVER ((DWORD)-1)

1 0

Vitaly Lipatov : ntdll: Use COMPRESSION_FORMAT_MASK instead of ~COMPRESSION_ENGINE_MAXINUM.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: ee1d3a19a4b8571ba32bdf9af845a74bca22c97b URL: https://gitlab.winehq.org/wine/wine/-/commit/ee1d3a19a4b8571ba32bdf9af845a7… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:11:27 2023 +0300 ntdll: Use COMPRESSION_FORMAT_MASK instead of ~COMPRESSION_ENGINE_MAXINUM. --- dlls/ntdll/rtl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 1eec1962b1e..4cc722836e1 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1754,7 +1754,7 @@ NTSTATUS WINAPI RtlGetCompressionWorkSpaceSize(USHORT format, PULONG compress_wo { FIXME("0x%04x, %p, %p: semi-stub\n", format, compress_workspace, decompress_workspace); - switch (format & ~COMPRESSION_ENGINE_MAXIMUM) + switch (format & COMPRESSION_FORMAT_MASK) { case COMPRESSION_FORMAT_LZNT1: if (compress_workspace) @@ -1818,7 +1818,7 @@ NTSTATUS WINAPI RtlCompressBuffer(USHORT format, PUCHAR uncompressed, ULONG unco FIXME("0x%04x, %p, %lu, %p, %lu, %lu, %p, %p: semi-stub\n", format, uncompressed, uncompressed_size, compressed, compressed_size, chunk_size, final_size, workspace); - switch (format & ~COMPRESSION_ENGINE_MAXIMUM) + switch (format & COMPRESSION_FORMAT_MASK) { case COMPRESSION_FORMAT_LZNT1: return lznt1_compress(uncompressed, uncompressed_size, compressed, @@ -2021,7 +2021,7 @@ NTSTATUS WINAPI RtlDecompressFragment(USHORT format, PUCHAR uncompressed, ULONG TRACE("0x%04x, %p, %lu, %p, %lu, %lu, %p, %p\n", format, uncompressed, uncompressed_size, compressed, compressed_size, offset, final_size, workspace); - switch (format & ~COMPRESSION_ENGINE_MAXIMUM) + switch (format & COMPRESSION_FORMAT_MASK) { case COMPRESSION_FORMAT_LZNT1: return lznt1_decompress(uncompressed, uncompressed_size, compressed,

1 0

Zhiyi Zhang : mfmediaengine/tests: Test IMFMediaEngine::GetDuration().
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 613d7b099986828212299a8e98179f22c86b80ab URL: https://gitlab.winehq.org/wine/wine/-/commit/613d7b099986828212299a8e98179f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 4 17:35:04 2023 +0800 mfmediaengine/tests: Test IMFMediaEngine::GetDuration(). --- dlls/mfmediaengine/tests/mfmediaengine.c | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index a3d9a2bbf75..5e32c38d063 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <math.h> #define COBJMACROS @@ -66,6 +67,11 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +static BOOL compare_double(double a, double b, double allowed_error) +{ + return fabs(a - b) <= allowed_error; +} + static DWORD compare_rgb32(const BYTE *data, DWORD *length, const RECT *rect, const BYTE *expect) { DWORD x, y, size, diff = 0, width = (rect->right + 0xf) & ~0xf, height = (rect->bottom + 0xf) & ~0xf; @@ -1931,6 +1937,40 @@ done: IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } +static void test_GetDuration(void) +{ + static const double allowed_error = 0.000001; + struct test_transfer_notify *notify; + IMFMediaEngineEx *media_engine; + IMFByteStream *stream; + double duration; + HRESULT hr; + DWORD res; + BSTR url; + + notify = create_transfer_notify(); + media_engine = create_media_engine_ex(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_B8G8R8X8_UNORM); + notify->media_engine = media_engine; + ok(!!media_engine, "create_media_engine_ex failed.\n"); + + stream = load_resource(L"i420-64x64.avi", L"video/avi"); + url = SysAllocString(L"i420-64x64.avi"); + hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, stream, url); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + res = WaitForSingleObject(notify->ready_event, 5000); + ok(!res, "Unexpected res %#lx.\n", res); + + duration = IMFMediaEngineEx_GetDuration(media_engine); + todo_wine + ok(compare_double(duration, 0.133467, allowed_error), "Got unexpected duration %lf.\n", duration); + + SysFreeString(url); + IMFByteStream_Release(stream); + IMFMediaEngineEx_Shutdown(media_engine); + IMFMediaEngineEx_Release(media_engine); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -1963,6 +2003,7 @@ START_TEST(mfmediaengine) test_audio_configuration(); test_TransferVideoFrame(); test_effect(); + test_GetDuration(); IMFMediaEngineClassFactory_Release(factory);

1 0

Zhiyi Zhang : mfmediaengine: Use a mftime_to_seconds() helper to convert time.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: a2eec346781c2660f057399b943f8923dc1057f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2eec346781c2660f057399b943f89… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 4 17:39:37 2023 +0800 mfmediaengine: Use a mftime_to_seconds() helper to convert time. --- dlls/mfmediaengine/main.c | 13 ++++++++----- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 2f8addaf873..2ef1cb8413a 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -63,6 +63,12 @@ static BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, si return TRUE; } +/* Convert 100ns to seconds */ +static double mftime_to_seconds(MFTIME time) +{ + return (double)time / 10000000.0; +} + enum media_engine_mode { MEDIA_ENGINE_INVALID, @@ -1248,10 +1254,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi /* Assume live source if duration was not provided. */ if (SUCCEEDED(IMFPresentationDescriptor_GetUINT64(pd, &MF_PD_DURATION, &duration))) - { - /* Convert 100ns to seconds. */ - engine->duration = duration / 10000000; - } + engine->duration = mftime_to_seconds(duration); else engine->duration = INFINITY; @@ -1749,7 +1752,7 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngineEx *iface) } else if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) { - ret = (double)clocktime / 10000000.0; + ret = mftime_to_seconds(clocktime); } LeaveCriticalSection(&engine->cs); diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 5e32c38d063..7ddc1fa0679 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1961,7 +1961,6 @@ static void test_GetDuration(void) ok(!res, "Unexpected res %#lx.\n", res); duration = IMFMediaEngineEx_GetDuration(media_engine); - todo_wine ok(compare_double(duration, 0.133467, allowed_error), "Got unexpected duration %lf.\n", duration); SysFreeString(url);

1 0

Ilia Docin : sane.ds: Do the reverse conversion of frame edges before setting.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 5590294cf3b9c3832abc71d60fe05afa8bd8c4b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5590294cf3b9c3832abc71d60fe05a… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Sun Aug 6 12:30:31 2023 +0300 sane.ds: Do the reverse conversion of frame edges before setting. Sane backends must attach a unit of either pixels or millimeters to scan area options. --- dlls/sane.ds/ds_image.c | 8 ++++---- dlls/sane.ds/options.c | 5 +++++ dlls/sane.ds/sane_i.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index b2fad94c848..93193abc69f 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -164,10 +164,10 @@ TW_UINT16 SANE_ImageLayoutSet (pTW_IDENTITY pOrigin, img->Frame.Right.Whole, img->Frame.Right.Frac, img->Frame.Bottom.Whole, img->Frame.Bottom.Frac); - tlx = img->Frame.Left.Whole * 65536 + img->Frame.Left.Frac; - tly = img->Frame.Top.Whole * 65536 + img->Frame.Top.Frac; - brx = img->Frame.Right.Whole * 65536 + img->Frame.Right.Frac; - bry = img->Frame.Bottom.Whole * 65536 + img->Frame.Bottom.Frac; + tlx = convert_twain_res_to_sane( img->Frame.Left ); + tly = convert_twain_res_to_sane( img->Frame.Top ); + brx = convert_twain_res_to_sane( img->Frame.Right ); + bry = convert_twain_res_to_sane( img->Frame.Bottom ); twrc = sane_option_set_scan_area( tlx, tly, brx, bry, &changed ); if (twrc != TWRC_SUCCESS) diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 30ca441fd28..fabbb554744 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -200,6 +200,11 @@ TW_FIX32 convert_sane_res_to_twain(int res) return value; } +int convert_twain_res_to_sane( TW_FIX32 res ) +{ + return MulDiv( res.Whole * 65536 + res.Frac, 254, 10 ); /* inch -> mm */ +} + TW_UINT16 get_sane_params( struct frame_parameters *params ) { return SANE_CALL( get_params, params ); diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 571917944e1..685ccbe0814 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -208,6 +208,7 @@ TW_UINT16 sane_option_get_scan_area( int *tlx, int *tly, int *brx, int *bry ) DE TW_UINT16 sane_option_get_max_scan_area( int *tlx, int *tly, int *brx, int *bry ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_set_scan_area( int tlx, int tly, int brx, int bry, BOOL *reload ) DECLSPEC_HIDDEN; TW_FIX32 convert_sane_res_to_twain( int res ) DECLSPEC_HIDDEN; +int convert_twain_res_to_sane( TW_FIX32 res ) DECLSPEC_HIDDEN; TW_UINT16 get_sane_params( struct frame_parameters *params ) DECLSPEC_HIDDEN; #endif

1 0

Bernhard Kölbl : mfmediaengine/tests: Make effect tests more consistent.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: d19af88f59dbd6a7372adf64c2a0410fd8f85a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/d19af88f59dbd6a7372adf64c2a041… Author: Bernhard Kölbl <bkoelbl(a)codeweavers.com> Date: Tue Jul 25 23:31:32 2023 +0200 mfmediaengine/tests: Make effect tests more consistent. Do this by waiting for the first available frame with a separate ready event and removing flaky ref checks. Signed-off-by: Bernhard Kölbl <bkoelbl(a)codeweavers.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 42 +++++++++++--------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index aa9de414fcb..4eb04c8e7ef 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1139,7 +1139,7 @@ struct test_transfer_notify LONG refcount; IMFMediaEngineEx *media_engine; - HANDLE ready_event; + HANDLE ready_event, frame_ready_event; HRESULT error; }; @@ -1175,6 +1175,7 @@ static ULONG WINAPI test_transfer_notify_Release(IMFMediaEngineNotify *iface) if (!refcount) { + CloseHandle(notify->frame_ready_event); CloseHandle(notify->ready_event); free(notify); } @@ -1211,6 +1212,8 @@ static HRESULT WINAPI test_transfer_notify_EventNotify(IMFMediaEngineNotify *ifa notify->error = param2; /* fallthrough */ case MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY: + SetEvent(notify->frame_ready_event); + break; case MF_MEDIA_ENGINE_EVENT_TIMEUPDATE: SetEvent(notify->ready_event); break; @@ -1237,6 +1240,9 @@ static struct test_transfer_notify *create_transfer_notify(void) object->ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(!!object->ready_event, "Failed to create an event, error %lu.\n", GetLastError()); + object->frame_ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(!!object->frame_ready_event, "Failed to create an event, error %lu.\n", GetLastError()); + return object; } @@ -1295,7 +1301,7 @@ static void test_TransferVideoFrame(void) SysFreeString(url); IMFByteStream_Release(stream); - res = WaitForSingleObject(notify->ready_event, 5000); + res = WaitForSingleObject(notify->frame_ready_event, 5000); ok(!res, "Unexpected res %#lx.\n", res); if (FAILED(notify->error)) @@ -1787,7 +1793,6 @@ static void test_effect(void) UINT token; HRESULT hr; DWORD res; - ULONG ref; BSTR url; stream = load_resource(L"i420-64x64.avi", L"video/avi"); @@ -1858,14 +1863,9 @@ static void test_effect(void) IMFByteStream_Release(stream); /* Wait for MediaEngine to be ready. */ - res = WaitForSingleObject(notify->ready_event, 5000); + res = WaitForSingleObject(notify->frame_ready_event, 5000); ok(!res, "Unexpected res %#lx.\n", res); - /* Wait for another update. This makes MediaEngine shutdown more consistent on Windows. */ - res = WaitForSingleObject(notify->ready_event, 500); - /* Timeupdates are missing in Wine. */ - todo_wine ok(!res, "Unexpected res %#lx.\n", res); - SetRect(&dst_rect, 0, 0, desc.Width, desc.Height); hr = IMFMediaEngineEx_TransferVideoFrame(notify->media_engine, (IUnknown *)texture, NULL, &dst_rect, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1890,9 +1890,7 @@ done: if (media_engine_ex) { IMFMediaEngineEx_Shutdown(media_engine_ex); - - ref = IMFMediaEngineEx_Release(media_engine_ex); - todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); + IMFMediaEngineEx_Release(media_engine_ex); } if (texture) @@ -1901,26 +1899,14 @@ done: ID3D11Device_Release(device); if (audio_effect2) - { - ref = IMFTransform_Release(&audio_effect2->IMFTransform_iface); - todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); - } + IMFTransform_Release(&audio_effect2->IMFTransform_iface); if (audio_effect) - { - ref = IMFTransform_Release(&audio_effect->IMFTransform_iface); - todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); - } + IMFTransform_Release(&audio_effect->IMFTransform_iface); if (video_effect2) - { - ref = IMFTransform_Release(&video_effect2->IMFTransform_iface); - todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); - } + IMFTransform_Release(&video_effect2->IMFTransform_iface); if (video_effect) - { - ref = IMFTransform_Release(&video_effect->IMFTransform_iface); - todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); - } + IMFTransform_Release(&video_effect->IMFTransform_iface); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); }

1 0

Bernhard Kölbl : mfmediaengine/tests: Add tests for RemoveAllEffects().
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: ffba650a3311f004976f9e33568f0331759cf509 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffba650a3311f004976f9e33568f03… Author: Bernhard Kölbl <bkoelbl(a)codeweavers.com> Date: Tue Jul 18 13:49:18 2023 +0200 mfmediaengine/tests: Add tests for RemoveAllEffects(). Signed-off-by: Bernhard Kölbl <bkoelbl(a)codeweavers.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 4eb04c8e7ef..3fbcd8c4d1d 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1828,6 +1828,9 @@ static void test_effect(void) hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = passthrough_mft_create(0, &video_effect); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1842,6 +1845,22 @@ static void test_effect(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(&video_effect2->IMFTransform_iface, 2); + hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 1); + todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 1); + + if (FAILED(hr)) /* Temporary skip */ + goto done; + + hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect->IMFTransform_iface, FALSE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 2); + + hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect2->IMFTransform_iface, FALSE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 2); + hr = passthrough_mft_create(0, &audio_effect); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1890,6 +1909,10 @@ done: if (media_engine_ex) { IMFMediaEngineEx_Shutdown(media_engine_ex); + + hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex); + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); }

1 0

Bernhard Kölbl : mfmediaengine: Implement RemoveAllEffects().
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 13106b2b38ca01178060be15c96ee5382cb625dd URL: https://gitlab.winehq.org/wine/wine/-/commit/13106b2b38ca01178060be15c96ee5… Author: Bernhard Kölbl <bkoelbl(a)codeweavers.com> Date: Tue Jul 18 13:55:08 2023 +0200 mfmediaengine: Implement RemoveAllEffects(). Signed-off-by: Bernhard Kölbl <bkoelbl(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 17 +++++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 17 +++++++---------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index e664db81d1d..2f8addaf873 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2719,9 +2719,22 @@ static HRESULT WINAPI media_engine_InsertAudioEffect(IMFMediaEngineEx *iface, IU static HRESULT WINAPI media_engine_RemoveAllEffects(IMFMediaEngineEx *iface) { - FIXME("%p stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + media_engine_clear_effects(&engine->audio_effects); + media_engine_clear_effects(&engine->video_effects); + } + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_SetTimelineMarkerTimer(IMFMediaEngineEx *iface, double timeout) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 3fbcd8c4d1d..a3d9a2bbf75 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1829,7 +1829,7 @@ static void test_effect(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = passthrough_mft_create(0, &video_effect); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1846,20 +1846,17 @@ static void test_effect(void) EXPECT_REF(&video_effect2->IMFTransform_iface, 2); hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 1); - todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 1); - - if (FAILED(hr)) /* Temporary skip */ - goto done; + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + EXPECT_REF(&video_effect->IMFTransform_iface, 1); + EXPECT_REF(&video_effect2->IMFTransform_iface, 1); hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect->IMFTransform_iface, FALSE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 2); + EXPECT_REF(&video_effect->IMFTransform_iface, 2); hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect2->IMFTransform_iface, FALSE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 2); + EXPECT_REF(&video_effect2->IMFTransform_iface, 2); hr = passthrough_mft_create(0, &audio_effect); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1911,7 +1908,7 @@ done: IMFMediaEngineEx_Shutdown(media_engine_ex); hr = IMFMediaEngineEx_RemoveAllEffects(media_engine_ex); - todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); IMFMediaEngineEx_Release(media_engine_ex); }

1 0

Mohamad Al-Jaf : include: Add windows.security.isolation.idl file.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: b14d9ae881fac8db8f7b6c0027dbd85ed1fa60ca URL: https://gitlab.winehq.org/wine/wine/-/commit/b14d9ae881fac8db8f7b6c0027dbd8… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 10 02:03:34 2023 -0400 include: Add windows.security.isolation.idl file. --- include/Makefile.in | 1 + include/windows.security.isolation.idl | 79 ++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b810f7e8442..96f79518c2e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -844,6 +844,7 @@ SOURCES = \ windows.perception.spatial.surfaces.idl \ windows.security.credentials.idl \ windows.security.cryptography.idl \ + windows.security.isolation.idl \ windows.storage.idl \ windows.storage.streams.idl \ windows.system.idl \ diff --git a/include/windows.security.isolation.idl b/include/windows.security.isolation.idl new file mode 100644 index 00000000000..4147aefd646 --- /dev/null +++ b/include/windows.security.isolation.idl @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.Security.Isolation { + typedef enum IsolatedWindowsEnvironmentHostError IsolatedWindowsEnvironmentHostError; + + interface IIsolatedWindowsEnvironmentHostStatics; + + runtimeclass IsolatedWindowsEnvironmentHost; + + declare { + interface Windows.Foundation.Collections.IVectorView<Windows.Security.Isolation.IsolatedWindowsEnvironmentHostError>; + } + + [ + contractversion(3.0) + ] + apicontract IsolatedWindowsEnvironmentContract + { + } + + [ + contract(Windows.Security.Isolation.IsolatedWindowsEnvironmentContract, 1.0) + ] + enum IsolatedWindowsEnvironmentHostError + { + AdminPolicyIsDisabledOrNotPresent = 0, + FeatureNotInstalled = 1, + HardwareRequirementsNotMet = 2, + RebootRequired = 3, + UnknownError = 4, + }; + + [ + contract(Windows.Security.Isolation.IsolatedWindowsEnvironmentContract, 1.0), + exclusiveto(Windows.Security.Isolation.IsolatedWindowsEnvironmentHost), + uuid(2c0e22c7-05a0-517a-b81c-6ee8790c381f) + ] + interface IIsolatedWindowsEnvironmentHostStatics : IInspectable + { + [propget] HRESULT IsReady([out, retval] boolean *value); + [propget] HRESULT HostErrors([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Security.Isolation.IsolatedWindowsEnvironmentHostError> **value); + } + + [ + contract(Windows.Security.Isolation.IsolatedWindowsEnvironmentContract, 1.0), + marshaling_behavior(agile), + static(Windows.Security.Isolation.IIsolatedWindowsEnvironmentHostStatics, Windows.Security.Isolation.IsolatedWindowsEnvironmentContract, 1.0), + threading(both) + ] + runtimeclass IsolatedWindowsEnvironmentHost + { + } +}

1 0

Mohamad Al-Jaf : hvsimanagementapi: Add stub DLL.
by Alexandre Julliard 08 Aug '23

08 Aug '23

Module: wine Branch: master Commit: 8840087d9ef2cd58837f52019ee44c680ce2b86f URL: https://gitlab.winehq.org/wine/wine/-/commit/8840087d9ef2cd58837f52019ee44c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 10 02:21:03 2023 -0400 hvsimanagementapi: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/hvsimanagementapi/Makefile.in | 9 ++ dlls/hvsimanagementapi/classes.idl | 23 +++++ dlls/hvsimanagementapi/host.c | 116 ++++++++++++++++++++++++++ dlls/hvsimanagementapi/hvsimanagementapi.spec | 3 + dlls/hvsimanagementapi/main.c | 46 ++++++++++ dlls/hvsimanagementapi/private.h | 40 +++++++++ dlls/hvsimanagementapi/tests/Makefile.in | 5 ++ dlls/hvsimanagementapi/tests/isolation.c | 87 +++++++++++++++++++ 10 files changed, 334 insertions(+)

1 0