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

Vitaly Lipatov : include: Update COMPRESSION_ defines and move it to ddk/ntifs.h.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

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 Aug. 8, 2023

Aug. 8, 2023

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: Use a mftime_to_seconds() helper to convert time.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

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

Zhiyi Zhang : mfmediaengine/tests: Test IMFMediaEngine::GetDuration().
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

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

Mohamad Al-Jaf : hvsimanagementapi: Implement IIsolatedWindowsEnvironmentHostStatics::get_IsReady().
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 6b8ecfd2898f7bab3b931d8873267a29b75b07cf URL: https://gitlab.winehq.org/wine/wine/-/commit/6b8ecfd2898f7bab3b931d8873267a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 2 01:07:57 2023 -0400 hvsimanagementapi: Implement IIsolatedWindowsEnvironmentHostStatics::get_IsReady(). Needed for MS Office 365. --- dlls/hvsimanagementapi/host.c | 6 ++++-- dlls/hvsimanagementapi/tests/isolation.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/hvsimanagementapi/host.c b/dlls/hvsimanagementapi/host.c index 37120d9ee94..c4d8b5b34db 100644 --- a/dlls/hvsimanagementapi/host.c +++ b/dlls/hvsimanagementapi/host.c @@ -119,8 +119,10 @@ DEFINE_IINSPECTABLE( isolated_host_statics, IIsolatedWindowsEnvironmentHostStati static HRESULT WINAPI isolated_host_statics_get_IsReady( IIsolatedWindowsEnvironmentHostStatics *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + return S_OK; } static HRESULT WINAPI isolated_host_statics_get_HostErrors( IIsolatedWindowsEnvironmentHostStatics *iface, diff --git a/dlls/hvsimanagementapi/tests/isolation.c b/dlls/hvsimanagementapi/tests/isolation.c index 7554ea74873..4df8ce33004 100644 --- a/dlls/hvsimanagementapi/tests/isolation.c +++ b/dlls/hvsimanagementapi/tests/isolation.c @@ -76,8 +76,8 @@ static void test_IsolatedWindowsEnvironmentHostStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IIsolatedWindowsEnvironmentHostStatics_get_IsReady( isolated_host_statics, &value ); - todo_wine ok( hr == S_OK || broken( hr == E_NOTIMPL /* Win10 2004 */ ), "got hr %#lx.\n", hr ); - todo_wine ok( !value, "got %d.\n", value ); + ok( hr == S_OK || broken( hr == E_NOTIMPL /* Win10 2004 */ ), "got hr %#lx.\n", hr ); + ok( !value, "got %d.\n", value ); ref = IIsolatedWindowsEnvironmentHostStatics_Release( isolated_host_statics ); ok( ref == 2, "got ref %ld.\n", ref );

1 0

Mohamad Al-Jaf : hvsimanagementapi/tests: Add IIsolatedWindowsEnvironmentHostStatics::get_IsReady() tests.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 3d12331476588eb572ec62eb7c9d864739b7169e URL: https://gitlab.winehq.org/wine/wine/-/commit/3d12331476588eb572ec62eb7c9d86… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 2 01:04:45 2023 -0400 hvsimanagementapi/tests: Add IIsolatedWindowsEnvironmentHostStatics::get_IsReady() tests. --- dlls/hvsimanagementapi/tests/isolation.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/hvsimanagementapi/tests/isolation.c b/dlls/hvsimanagementapi/tests/isolation.c index 8e0dc75c005..7554ea74873 100644 --- a/dlls/hvsimanagementapi/tests/isolation.c +++ b/dlls/hvsimanagementapi/tests/isolation.c @@ -51,6 +51,7 @@ static void test_IsolatedWindowsEnvironmentHostStatics(void) static const WCHAR *isolated_host_statics_name = L"Windows.Security.Isolation.IsolatedWindowsEnvironmentHost"; IIsolatedWindowsEnvironmentHostStatics *isolated_host_statics; IActivationFactory *factory; + BOOLEAN value = 0; HSTRING str; HRESULT hr; LONG ref; @@ -74,6 +75,10 @@ static void test_IsolatedWindowsEnvironmentHostStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IIsolatedWindowsEnvironmentHostStatics, (void **)&isolated_host_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IIsolatedWindowsEnvironmentHostStatics_get_IsReady( isolated_host_statics, &value ); + todo_wine ok( hr == S_OK || broken( hr == E_NOTIMPL /* Win10 2004 */ ), "got hr %#lx.\n", hr ); + todo_wine ok( !value, "got %d.\n", value ); + ref = IIsolatedWindowsEnvironmentHostStatics_Release( isolated_host_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Mohamad Al-Jaf : hvsimanagementapi: Add IIsolatedWindowsEnvironmentHostStatics stub interface.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: f3aa576aad75a4a6870e85ea24709fa00bdd5265 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3aa576aad75a4a6870e85ea24709f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 2 00:50:38 2023 -0400 hvsimanagementapi: Add IIsolatedWindowsEnvironmentHostStatics stub interface. --- dlls/hvsimanagementapi/host.c | 38 ++++++++++++++++++++++++++++++++ dlls/hvsimanagementapi/private.h | 38 ++++++++++++++++++++++++++++++++ dlls/hvsimanagementapi/tests/isolation.c | 6 +++++ 3 files changed, 82 insertions(+) diff --git a/dlls/hvsimanagementapi/host.c b/dlls/hvsimanagementapi/host.c index e41e2ef7e99..37120d9ee94 100644 --- a/dlls/hvsimanagementapi/host.c +++ b/dlls/hvsimanagementapi/host.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hvsi); struct isolated_host_statics { IActivationFactory IActivationFactory_iface; + IIsolatedWindowsEnvironmentHostStatics IIsolatedWindowsEnvironmentHostStatics_iface; LONG ref; }; @@ -49,6 +50,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IIsolatedWindowsEnvironmentHostStatics )) + { + *out = &impl->IIsolatedWindowsEnvironmentHostStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -107,9 +115,39 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( isolated_host_statics, IIsolatedWindowsEnvironmentHostStatics, struct isolated_host_statics, IActivationFactory_iface ) + +static HRESULT WINAPI isolated_host_statics_get_IsReady( IIsolatedWindowsEnvironmentHostStatics *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI isolated_host_statics_get_HostErrors( IIsolatedWindowsEnvironmentHostStatics *iface, + IVectorView_IsolatedWindowsEnvironmentHostError **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IIsolatedWindowsEnvironmentHostStaticsVtbl isolated_host_statics_vtbl = +{ + isolated_host_statics_QueryInterface, + isolated_host_statics_AddRef, + isolated_host_statics_Release, + /* IInspectable methods */ + isolated_host_statics_GetIids, + isolated_host_statics_GetRuntimeClassName, + isolated_host_statics_GetTrustLevel, + /* IIsolatedWindowsEnvironmentHostStatics methods */ + isolated_host_statics_get_IsReady, + isolated_host_statics_get_HostErrors, +}; + static struct isolated_host_statics isolated_host_statics = { {&factory_vtbl}, + {&isolated_host_statics_vtbl}, 1, }; diff --git a/dlls/hvsimanagementapi/private.h b/dlls/hvsimanagementapi/private.h index af18f54c077..4799a654176 100644 --- a/dlls/hvsimanagementapi/private.h +++ b/dlls/hvsimanagementapi/private.h @@ -37,4 +37,42 @@ extern IActivationFactory *isolated_host_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/hvsimanagementapi/tests/isolation.c b/dlls/hvsimanagementapi/tests/isolation.c index d08f6ecb645..8e0dc75c005 100644 --- a/dlls/hvsimanagementapi/tests/isolation.c +++ b/dlls/hvsimanagementapi/tests/isolation.c @@ -49,6 +49,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_IsolatedWindowsEnvironmentHostStatics(void) { static const WCHAR *isolated_host_statics_name = L"Windows.Security.Isolation.IsolatedWindowsEnvironmentHost"; + IIsolatedWindowsEnvironmentHostStatics *isolated_host_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -70,6 +71,11 @@ static void test_IsolatedWindowsEnvironmentHostStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_IIsolatedWindowsEnvironmentHostStatics, (void **)&isolated_host_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IIsolatedWindowsEnvironmentHostStatics_Release( isolated_host_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Mohamad Al-Jaf : hvsimanagementapi: Add stub DLL.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

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

Mohamad Al-Jaf : include: Add windows.security.isolation.idl file.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

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

Bernhard Kölbl : mfmediaengine: Implement RemoveAllEffects().
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

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