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

Alistair Leslie-Hughes : dsdmo: Add Echo FX Support.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 6d8279f0ee34a1cbb9463c4f952144d31d082633 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d8279f0ee34a1cbb9463c4f952144… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 13 11:57:20 2022 +1000 dsdmo: Add Echo FX Support. --- dlls/dsdmo/dsdmo.idl | 8 ++++ dlls/dsdmo/main.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 8 ++-- 3 files changed, 110 insertions(+), 3 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index 7f172084828..c8130f8a1ce 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -41,3 +41,11 @@ coclass DirectSoundParamEqDMO {} uuid(87fc0268-9a55-4360-95aa-004a1d9de26c) ] coclass DirectSoundWavesReverbDMO {} + +[ + uuid(ef3e932c-d40b-4f51-8ccf-3f98f1b29d5d), + threading(both), + progid("Microsoft.DirectSoundEchoDMO.1"), + vi_progid("Microsoft.DirectSoundEchoDMO") +] +coclass DirectSoundEchoDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 3b106a8f633..200293f5214 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -947,6 +947,102 @@ static HRESULT waves_reverb_create(IUnknown *outer, IUnknown **out) return S_OK; } +struct dmo_echofx +{ + struct effect effect; + IDirectSoundFXEcho IDirectSoundFXEcho_iface; +}; + +static inline struct dmo_echofx *impl_from_IDirectSoundFXEcho(IDirectSoundFXEcho *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_echofx, IDirectSoundFXEcho_iface); +} + +static HRESULT WINAPI echofx_QueryInterface(IDirectSoundFXEcho *iface, REFIID iid, void **out) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI echofx_AddRef(IDirectSoundFXEcho *iface) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI echofx_Release(IDirectSoundFXEcho *iface) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI echofx_SetAllParameters(IDirectSoundFXEcho *iface, const DSFXEcho *echo) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + FIXME("(%p) %p\n", effect, echo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI echofx_GetAllParameters(IDirectSoundFXEcho *iface, DSFXEcho *echo) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + FIXME("(%p) %p\n", effect, echo); + + return E_NOTIMPL; +} + +static const struct IDirectSoundFXEchoVtbl echofx_vtbl = +{ + echofx_QueryInterface, + echofx_AddRef, + echofx_Release, + echofx_SetAllParameters, + echofx_GetAllParameters +}; + +static struct dmo_echofx *impl_echo_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_echofx, effect); +} + +static void *echo_query_interface(struct effect *iface, REFIID iid) +{ + struct dmo_echofx *effect = impl_echo_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXEcho)) + return &effect->IDirectSoundFXEcho_iface; + return NULL; +} + +static void echo_destroy(struct effect *iface) +{ + struct dmo_echofx *effect = impl_echo_from_effect(iface); + + free(effect); +} + +static const struct effect_ops echo_ops = +{ + .destroy = echo_destroy, + .query_interface = echo_query_interface, +}; + +static HRESULT echo_create(IUnknown *outer, IUnknown **out) +{ + struct dmo_echofx *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &echo_ops); + object->IDirectSoundFXEcho_iface.lpVtbl = &echofx_vtbl; + + TRACE("Created echo effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; @@ -1031,6 +1127,7 @@ class_factories[] = {&GUID_DSFX_STANDARD_I3DL2REVERB, {{&class_factory_vtbl}, reverb_create}}, {&GUID_DSFX_STANDARD_PARAMEQ, {{&class_factory_vtbl}, eq_create}}, {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, + {&GUID_DSFX_STANDARD_ECHO, {{&class_factory_vtbl}, echo_create}}, }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 31f4dc6a473..2b3c3ef6772 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -385,12 +385,14 @@ static void test_echo_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_ECHO, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXEcho, (void **)&echo); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr != S_OK) return; hr = IDirectSoundFXEcho_GetAllParameters(echo, &params); - ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr != S_OK) + return; ok(params.fWetDryMix == 50.0f, "Got %.8e%% wetness.\n", params.fWetDryMix); ok(params.fFeedback == 50.0f, "Got %.8e%% feedback.\n", params.fFeedback); ok(params.fLeftDelay == 500.0f, "Got left delay %.8e ms.\n", params.fLeftDelay); @@ -545,7 +547,7 @@ START_TEST(dsdmo) {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus, TRUE}, {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor, TRUE}, {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, - {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho, TRUE}, + {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE}, {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb},

1 0

Alistair Leslie-Hughes : dsdmo: Add Compressor FX Support.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 39889f19c3db917703a8b42167ee4084dfa091d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/39889f19c3db917703a8b42167ee40… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 13 15:03:46 2022 +1000 dsdmo: Add Compressor FX Support. --- dlls/dsdmo/dsdmo.idl | 8 ++++ dlls/dsdmo/main.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 8 ++-- 3 files changed, 109 insertions(+), 4 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index c8130f8a1ce..3922b4d6778 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -49,3 +49,11 @@ coclass DirectSoundWavesReverbDMO {} vi_progid("Microsoft.DirectSoundEchoDMO") ] coclass DirectSoundEchoDMO {} + +[ + uuid(ef011f79-4000-406d-87af-bffb3fc39d57), + threading(both), + progid("Microsoft.DirectSoundCompressorDMO.1"), + vi_progid("Microsoft.DirectSoundCompressorDMO") +] +coclass DirectSoundCompressorDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 200293f5214..bb19b7b7e2e 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -1043,6 +1043,102 @@ static HRESULT echo_create(IUnknown *outer, IUnknown **out) return S_OK; } +struct dmo_compressorfx +{ + struct effect effect; + IDirectSoundFXCompressor IDirectSoundFXCompressor_iface; +}; + +static inline struct dmo_compressorfx *impl_from_IDirectSoundFXCompressor(IDirectSoundFXCompressor *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_compressorfx, IDirectSoundFXCompressor_iface); +} + +static HRESULT WINAPI compressorfx_QueryInterface(IDirectSoundFXCompressor *iface, REFIID iid, void **out) +{ + struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI compressorfx_AddRef(IDirectSoundFXCompressor *iface) +{ + struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI compressorfx_Release(IDirectSoundFXCompressor *iface) +{ + struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI compressorfx_SetAllParameters(IDirectSoundFXCompressor *iface, const DSFXCompressor *compressor) +{ + struct dmo_compressorfx *This = impl_from_IDirectSoundFXCompressor(iface); + FIXME("(%p) %p\n", This, compressor); + + return E_NOTIMPL; +} + +static HRESULT WINAPI compressorfx_GetAllParameters(IDirectSoundFXCompressor *iface, DSFXCompressor *compressor) +{ + struct dmo_compressorfx *This = impl_from_IDirectSoundFXCompressor(iface); + FIXME("(%p) %p\n", This, compressor); + + return E_NOTIMPL; +} + +static const struct IDirectSoundFXCompressorVtbl compressor_vtbl = +{ + compressorfx_QueryInterface, + compressorfx_AddRef, + compressorfx_Release, + compressorfx_SetAllParameters, + compressorfx_GetAllParameters +}; + +static struct dmo_compressorfx *impl_compressor_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_compressorfx, effect); +} + +static void *compressor_query_interface(struct effect *iface, REFIID iid) +{ + struct dmo_compressorfx *effect = impl_compressor_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXCompressor)) + return &effect->IDirectSoundFXCompressor_iface; + return NULL; +} + +static void compressor_destroy(struct effect *iface) +{ + struct dmo_compressorfx *effect = impl_compressor_from_effect(iface); + + free(effect); +} + +static const struct effect_ops compressor_ops = +{ + .destroy = compressor_destroy, + .query_interface = compressor_query_interface, +}; + +static HRESULT compressor_create(IUnknown *outer, IUnknown **out) +{ + struct dmo_compressorfx *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &compressor_ops); + object->IDirectSoundFXCompressor_iface.lpVtbl = &compressor_vtbl; + + TRACE("Created compressor effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; @@ -1128,6 +1224,7 @@ class_factories[] = {&GUID_DSFX_STANDARD_PARAMEQ, {{&class_factory_vtbl}, eq_create}}, {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, {&GUID_DSFX_STANDARD_ECHO, {{&class_factory_vtbl}, echo_create}}, + {&GUID_DSFX_STANDARD_COMPRESSOR, {{&class_factory_vtbl}, compressor_create}}, }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 2b3c3ef6772..9296ad29168 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -335,12 +335,12 @@ static void test_compressor_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_COMPRESSOR, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXCompressor, (void **)&compressor); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirectSoundFXCompressor_GetAllParameters(compressor, &params); todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr != S_OK) return; - - hr = IDirectSoundFXCompressor_GetAllParameters(compressor, &params); - ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(params.fGain == 0.0f, "Got gain %.8e dB.\n", params.fGain); ok(params.fAttack == 10.0f, "Got attack time %.8e ms.\n", params.fAttack); ok(params.fThreshold == -20.0f, "Got threshold %.8e dB.\n", params.fThreshold); @@ -545,7 +545,7 @@ START_TEST(dsdmo) tests[] = { {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus, TRUE}, - {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor, TRUE}, + {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor}, {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE},

1 0

Paul Gofman : winex11.drv: Set correct cursor when setting cursor from another thread.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 68208425790cc37a3109f2817718ebd553f85794 URL: https://gitlab.winehq.org/wine/wine/-/commit/68208425790cc37a3109f2817718eb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 15 15:58:33 2022 -0500 winex11.drv: Set correct cursor when setting cursor from another thread. --- dlls/winex11.drv/mouse.c | 3 ++- dlls/winex11.drv/window.c | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 9e005881170..d0cc185d96c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1503,7 +1503,8 @@ void X11DRV_SetCursor( HCURSOR handle ) NtGetTickCount() - last_cursor_change > 100) { last_cursor_change = NtGetTickCount(); - if (cursor_window) send_notify_message( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + if (cursor_window) send_notify_message( cursor_window, WM_X11DRV_SET_CURSOR, + GetCurrentThreadId(), (LPARAM)handle ); } } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3ebbee0856e..118604b0ae0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2996,15 +2996,26 @@ LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) X11DRV_resize_desktop( (BOOL)lp ); return 0; case WM_X11DRV_SET_CURSOR: + { + Window win = 0; + if ((data = get_win_data( hwnd ))) { - Window win = data->whole_window; + win = data->whole_window; release_win_data( data ); - if (win) set_window_cursor( win, (HCURSOR)lp ); } else if (hwnd == x11drv_thread_data()->clip_hwnd) - set_window_cursor( x11drv_thread_data()->clip_window, (HCURSOR)lp ); + win = x11drv_thread_data()->clip_window; + + if (win) + { + if (wp == GetCurrentThreadId()) + set_window_cursor( win, (HCURSOR)lp ); + else + sync_window_cursor( win ); + } return 0; + } case WM_X11DRV_CLIP_CURSOR_NOTIFY: return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); case WM_X11DRV_CLIP_CURSOR_REQUEST:

1 0

Alexandre Julliard : mountmgr: Don't crash if connecting to dbus fails.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 3110b72e12a2dba79a3993fe6511351a97ce1917 URL: https://gitlab.winehq.org/wine/wine/-/commit/3110b72e12a2dba79a3993fe651135… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 16:45:57 2022 +0200 mountmgr: Don't crash if connecting to dbus fails. --- dlls/mountmgr.sys/dbus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 051f735b219..cc115751a19 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -600,6 +600,9 @@ static DBusMessage *device_by_iface_request( const char *iface ) DBusMessage *request, *reply; DBusMessageIter iter; DBusError error; + DBusConnection *connection = get_dhcp_connection(); + + if (!connection) return NULL; request = p_dbus_message_new_method_call( "org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager", "GetDeviceByIpIface" ); @@ -609,7 +612,7 @@ static DBusMessage *device_by_iface_request( const char *iface ) p_dbus_message_iter_append_basic( &iter, DBUS_TYPE_STRING, &iface ); p_dbus_error_init( &error ); - reply = p_dbus_connection_send_with_reply_and_block( get_dhcp_connection(), request, -1, &error ); + reply = p_dbus_connection_send_with_reply_and_block( connection, request, -1, &error ); p_dbus_message_unref( request ); if (!reply) {

1 0

Alexandre Julliard : xslt: Import upstream release 1.1.36.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: a63922d803b8710e3324c87e12782c0db4af6b54 URL: https://gitlab.winehq.org/wine/wine/-/commit/a63922d803b8710e3324c87e12782c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 19:02:26 2022 +0200 xslt: Import upstream release 1.1.36. --- libs/xslt/libxslt/attributes.c | 19 ------ libs/xslt/libxslt/extra.c | 2 - libs/xslt/libxslt/functions.c | 43 +++--------- libs/xslt/libxslt/imports.c | 19 ------ libs/xslt/libxslt/namespaces.c | 18 ----- libs/xslt/libxslt/security.c | 22 +------ libs/xslt/libxslt/transform.c | 1 - libs/xslt/libxslt/variables.c | 13 ++-- libs/xslt/libxslt/win32config.h | 78 ---------------------- libs/xslt/libxslt/xsltconfig.h | 9 ++- libs/xslt/libxslt/xsltexports.h | 142 +++++++++------------------------------- libs/xslt/libxslt/xsltlocale.h | 2 +- libs/xslt/libxslt/xsltutils.c | 9 ++- libs/xslt/libxslt/xsltutils.h | 3 - 14 files changed, 61 insertions(+), 319 deletions(-)

1 0

Alexandre Julliard : xml2: Import upstream release 2.10.0.
by Alexandre Julliard 17 Aug '22

17 Aug '22

1 0

Gabriel Ivăncescu : jscript: Implement fdexNameCaseInsensitive flag handling.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 7be0cffa067ba7c6386972b5bc941de2ad3a3f8e URL: https://gitlab.winehq.org/wine/wine/-/commit/7be0cffa067ba7c6386972b5bc941d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 16 21:02:06 2022 +0300 jscript: Implement fdexNameCaseInsensitive flag handling. Despite common sense, native doesn't seem to look for exact match first; it simply case-insensitively compares the props and returns as soon as it finds one. This is also reliant on implementation details in case the object has multiple props with same case-insensitive names, e.g. an object having `Foo` prop, with `foo` prop on its prototype, can still find `Foo` even if you look up `foo` instead (which matches exactly on the prototype). Which is not always reliable, sometimes it finds the prototype first. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 94 ++++++++++++++++++---------------- dlls/jscript/tests/jscript.c | 119 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 12 +++++ dlls/mshtml/tests/script.c | 103 +++++++++++++++++++++++++++++++++++++ 4 files changed, 285 insertions(+), 43 deletions(-)

1 0

Nikolay Sivov : mfreadwrite/writer: Make sure output pointer is initialized.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: b5040bce825ce7e365344c7834471681f7092233 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5040bce825ce7e365344c78344716… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 16 17:27:29 2022 +0300 mfreadwrite/writer: Make sure output pointer is initialized. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 10 ++++++++++ dlls/mfreadwrite/writer.c | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 95f615767d5..14e92cceab2 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1299,8 +1299,18 @@ static void test_sink_writer(void) hr = MFCreateSinkWriterFromURL(NULL, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + writer = (void *)0xdeadbeef; hr = MFCreateSinkWriterFromURL(NULL, NULL, NULL, &writer); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!writer, "Unexpected pointer %p.\n", writer); + + hr = MFCreateSinkWriterFromMediaSink(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + writer = (void *)0xdeadbeef; + hr = MFCreateSinkWriterFromMediaSink(NULL, NULL, &writer); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!writer, "Unexpected pointer %p.\n", writer); } START_TEST(mfplat) diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index f4bd08b8cda..9e92e6f8f9e 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -186,6 +186,11 @@ HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attribut struct sink_writer *object; HRESULT hr; + *out = NULL; + + if (!sink) + return E_INVALIDARG; + object = malloc(sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -205,6 +210,9 @@ HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes { TRACE("%p, %p, %p.\n", sink, attributes, writer); + if (!writer) + return E_INVALIDARG; + return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); } @@ -289,6 +297,8 @@ HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *bytestream, CLSID clsid; HRESULT hr; + *out = NULL; + if (!url && !bytestream) return E_INVALIDARG; @@ -332,5 +342,8 @@ HRESULT WINAPI MFCreateSinkWriterFromURL(const WCHAR *url, IMFByteStream *bytest { TRACE("%s, %p, %p, %p.\n", debugstr_w(url), bytestream, attributes, writer); + if (!writer) + return E_INVALIDARG; + return create_sink_writer_from_url(url, bytestream, attributes, &IID_IMFSinkWriter, (void **)writer); }

1 0

Nikolay Sivov : mfsrcsnk/wave: Add a type handler stub.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: debf5d85dc5d41f0855f3b70b39c739cda72f2ad URL: https://gitlab.winehq.org/wine/wine/-/commit/debf5d85dc5d41f0855f3b70b39c73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 22:13:17 2022 +0300 mfsrcsnk/wave: Add a type handler stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfsrcsnk/tests/mfsrcsnk.c | 43 +++++++++++++++- dlls/mfsrcsnk/wave.c | 112 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 3 deletions(-) diff --git a/dlls/mfsrcsnk/tests/mfsrcsnk.c b/dlls/mfsrcsnk/tests/mfsrcsnk.c index e3d5b100b09..1aba4094c62 100644 --- a/dlls/mfsrcsnk/tests/mfsrcsnk.c +++ b/dlls/mfsrcsnk/tests/mfsrcsnk.c @@ -46,13 +46,15 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_wave_sink(void) { + IMFMediaType *media_type, *media_type2; + IMFMediaTypeHandler *type_handler; IMFPresentationClock *clock; IMFStreamSink *stream_sink; IMFMediaSink *sink, *sink2; IMFByteStream *bytestream; - IMFMediaType *media_type; DWORD id, count, flags; HRESULT hr; + GUID guid; hr = MFCreateWAVEMediaSink(NULL, NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); @@ -133,6 +135,39 @@ static void test_wave_sink(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaSink_Release(sink2); + check_interface(stream_sink, &IID_IMFMediaEventGenerator, TRUE); + check_interface(stream_sink, &IID_IMFMediaTypeHandler, TRUE); + + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &guid); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); + + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count == 1, "Unexpected count %lu.\n", count); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, &media_type2); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_NUM_CHANNELS, 1); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IMFMediaType_Release(media_type2); + } + /* Shutdown state */ hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -146,6 +181,11 @@ static void test_wave_sink(void) hr = IMFStreamSink_GetIdentifier(stream_sink, &id); ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaTypeHandler_GetMajorType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &guid); + ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#lx.\n", hr); + IMFStreamSink_Release(stream_sink); hr = IMFMediaSink_AddStreamSink(sink, 123, media_type, &stream_sink); @@ -159,6 +199,7 @@ static void test_wave_sink(void) IMFMediaSink_Release(sink); + IMFMediaTypeHandler_Release(type_handler); IMFMediaType_Release(media_type); IMFByteStream_Release(bytestream); } diff --git a/dlls/mfsrcsnk/wave.c b/dlls/mfsrcsnk/wave.c index cf74368d8f7..a1108de4bdc 100644 --- a/dlls/mfsrcsnk/wave.c +++ b/dlls/mfsrcsnk/wave.c @@ -62,6 +62,7 @@ struct wave_sink IMFFinalizableMediaSink IMFFinalizableMediaSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; IMFClockStateSink IMFClockStateSink_iface; + IMFMediaTypeHandler IMFMediaTypeHandler_iface; IMFStreamSink IMFStreamSink_iface; LONG refcount; @@ -100,6 +101,11 @@ static struct wave_sink *impl_from_IMFClockStateSink(IMFClockStateSink *iface) return CONTAINING_RECORD(iface, struct wave_sink, IMFClockStateSink_iface); } +static struct wave_sink *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct wave_sink, IMFMediaTypeHandler_iface); +} + static HRESULT WINAPI wave_sink_QueryInterface(IMFFinalizableMediaSink *iface, REFIID riid, void **obj) { struct wave_sink *sink = impl_from_IMFFinalizableMediaSink(iface); @@ -574,6 +580,10 @@ static HRESULT WINAPI wave_stream_sink_QueryInterface(IMFStreamSink *iface, REFI { *obj = &sink->IMFStreamSink_iface; } + else if (IsEqualIID(riid, &IID_IMFMediaTypeHandler)) + { + *obj = &sink->IMFMediaTypeHandler_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -680,9 +690,17 @@ static HRESULT WINAPI wave_stream_sink_GetIdentifier(IMFStreamSink *iface, DWORD static HRESULT WINAPI wave_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface, IMFMediaTypeHandler **handler) { - FIXME("%p, %p.\n", iface, handler); + struct wave_sink *sink = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, handler); + + if (sink->flags & SINK_SHUT_DOWN) + return MF_E_STREAMSINK_REMOVED; + + *handler = &sink->IMFMediaTypeHandler_iface; + IMFMediaTypeHandler_AddRef(*handler); + + return S_OK; } static HRESULT WINAPI wave_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) @@ -833,6 +851,95 @@ static const IMFClockStateSinkVtbl wave_sink_clock_sink_vtbl = wave_sink_clock_sink_OnClockSetRate, }; +static HRESULT WINAPI wave_sink_type_handler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, + void **obj) +{ + struct wave_sink *sink = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_QueryInterface(&sink->IMFStreamSink_iface, riid, obj); +} + +static ULONG WINAPI wave_sink_type_handler_AddRef(IMFMediaTypeHandler *iface) +{ + struct wave_sink *sink = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_AddRef(&sink->IMFStreamSink_iface); +} + +static ULONG WINAPI wave_sink_type_handler_Release(IMFMediaTypeHandler *iface) +{ + struct wave_sink *sink = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_Release(&sink->IMFStreamSink_iface); +} + +static HRESULT WINAPI wave_sink_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, + IMFMediaType *in_type, IMFMediaType **out_type) +{ + FIXME("%p, %p, %p.\n", iface, in_type, out_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wave_sink_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + TRACE("%p, %p.\n", iface, count); + + *count = 1; + + return S_OK; +} + +static HRESULT WINAPI wave_sink_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **media_type) +{ + FIXME("%p, %lu, %p.\n", iface, index, media_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wave_sink_type_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, + IMFMediaType *media_type) +{ + FIXME("%p, %p.\n", iface, media_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wave_sink_type_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, + IMFMediaType **media_type) +{ + FIXME("%p, %p.\n", iface, media_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI wave_sink_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + struct wave_sink *sink = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %p.\n", iface, type); + + if (!type) + return E_POINTER; + + if (sink->flags & SINK_SHUT_DOWN) + return MF_E_STREAMSINK_REMOVED; + + memcpy(type, &MFMediaType_Audio, sizeof(*type)); + return S_OK; +} + +static const IMFMediaTypeHandlerVtbl wave_sink_type_handler_vtbl = +{ + wave_sink_type_handler_QueryInterface, + wave_sink_type_handler_AddRef, + wave_sink_type_handler_Release, + wave_sink_type_handler_IsMediaTypeSupported, + wave_sink_type_handler_GetMediaTypeCount, + wave_sink_type_handler_GetMediaTypeByIndex, + wave_sink_type_handler_SetCurrentMediaType, + wave_sink_type_handler_GetCurrentMediaType, + wave_sink_type_handler_GetMajorType, +}; + /*********************************************************************** * MFCreateWAVEMediaSink (mfsrcsnk.@) */ @@ -871,6 +978,7 @@ HRESULT WINAPI MFCreateWAVEMediaSink(IMFByteStream *bytestream, IMFMediaType *me object->IMFMediaEventGenerator_iface.lpVtbl = &wave_sink_events_vtbl; object->IMFStreamSink_iface.lpVtbl = &wave_stream_sink_vtbl; object->IMFClockStateSink_iface.lpVtbl = &wave_sink_clock_sink_vtbl; + object->IMFMediaTypeHandler_iface.lpVtbl = &wave_sink_type_handler_vtbl; object->refcount = 1; IMFByteStream_AddRef((object->bytestream = bytestream)); InitializeCriticalSection(&object->cs);

1 0

Jeremy Newman : wine-cvs moved to wine-commits, update to mailman3
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: website Branch: master Commit: 65717d93916ea1653b410e3a011fec5c0cd2cc11 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/65717d93916ea1653b410e3a01… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Aug 17 13:42:10 2022 -0500 wine-cvs moved to wine-commits, update to mailman3 --- templates/en/forums.template | 9 ++++----- templates/fr/forums.template | 6 +++--- templates/ko/forums.template | 6 +++--- templates/nl/forums.template | 6 +++--- templates/pl/forums.template | 6 +++--- templates/pt/forums.template | 6 +++--- templates/tr/forums.template | 6 +++--- templates/zh-cn/forums.template | 6 +++--- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 5f96768b..c9e4c6f6 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -68,11 +68,10 @@ You can set your subscription to not send you email, or send as a digest. </li> <li> - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive</a>] - A medium traffic (25/day) read only list which tracks commits to the Git - tree. + <a href="mailto:wine-commits(a)winehq.org">wine-commits(a)winehq.org</a> + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-commits.winehq.org/">(Un-)Subscribe</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-commits(a)winehq.org/">Archive</a>] + A medium traffic (25/day) read only list which tracks commits to the Git tree. </li> <li> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index 774a2f35..afe8ca84 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -41,9 +41,9 @@ Voici les plus utiles pour les utilisateurs : </li> <li> - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Dés-)inscription</a>] - [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive</a>] + <a href="mailto:wine-commits(a)winehq.org">wine-commits(a)winehq.org</a> + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-commits.winehq.org/">(Dés-)inscription</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-commits(a)winehq.org/">Archive</a>] Une liste moyen trafic (25 messages par jour) en lecture seule pour le suivi des commits dans Git. </li> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index a3dcc8e9..7618a4d7 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -57,9 +57,9 @@ href="https://www.winehq.org/mailman3/postorius/lists/?all-lists">웹 페이지< </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">구독/해지</a>] - [<a href="//www.winehq.org/pipermail/wine-cvs/">메시지 기록</a>] - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-commits.winehq.org/">구독/해지</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-commits(a)winehq.org/">메시지 기록</a>] + <a href="mailto:wine-commits(a)winehq.org">wine-commits(a)winehq.org</a> Git 트리의 커밋 정보를 게시하는 읽기 전용 리스트입니다. 메시지 전송 빈도: 1일에 25여통(중간) </li> diff --git a/templates/nl/forums.template b/templates/nl/forums.template index 54e55901..b0165d74 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -55,9 +55,9 @@ Anders behandeld de software van de mailinglijsten uw bericht als spam. </li> <li> - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">In- uitschrijven</a>] - [<a href="//www.winehq.org/pipermail/wine-cvs/">Archief</a>] + <a href="mailto:wine-commits(a)winehq.org">wine-commits(a)winehq.org</a> + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-commits.winehq.org/">In- uitschrijven</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-commits(a)winehq.org/">Archief</a>] Een alleen-lezen lijst met ongeveer 25 berichten per dag met de Git-commits. </li> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index 2087e4bd..81c7dc7b 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -52,9 +52,9 @@ oprogramowanie listy mailingowej. </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Wy-/Za-)pisz</a>] - [<a href="//www.winehq.org/pipermail/wine-cvs/">Archiwum</a>] - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-commits.winehq.org/">(Wy-/Za-)pisz</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-commits(a)winehq.org/">Archiwum</a>] + <a href="mailto:wine-commits(a)winehq.org">wine-commits(a)winehq.org</a> Średni ruch (25/dziennie) lista tylko-do-odczytu, która śledzi zatwierdzenia do drzewa Git. </li> diff --git a/templates/pt/forums.template b/templates/pt/forums.template index 4151864f..3b0c4151 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -52,9 +52,9 @@ do contrário o seu email será tratado como um possível spam pelo software da </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Des-)Inscrever</a>] - [<a href="//www.winehq.org/pipermail/wine-cvs/">Arquivo</a>] - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-commits.winehq.org/">(Des-)Inscrever</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-commits(a)winehq.org/">Arquivo</a>] + <a href="mailto:wine-commits(a)winehq.org">wine-commits(a)winehq.org</a> Uma lista aberta de tráfego médio (25/dia) de somente leitura que lista os commits feitas na árvore Git. </li> diff --git a/templates/tr/forums.template b/templates/tr/forums.template index 55b8607e..fa32782b 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -47,9 +47,9 @@ </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">Abone ol/iptal et</a>] - [<a href="//www.winehq.org/pipermail/wine-cvs/">Arşiv</a>] - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-commits.winehq.org/">Abone ol/iptal et</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-commits(a)winehq.org/">Arşiv</a>] + <a href="mailto:wine-commits(a)winehq.org">wine-commits(a)winehq.org</a> A medium traffic (25/day) read only list which tracks commits to the Git tree. </li> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 3c62b4c8..4e4baab8 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -47,9 +47,9 @@ </li> <li> - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-cvs/">存档</a>] + <a href="mailto:wine-commits(a)winehq.org">wine-commits(a)winehq.org</a> + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-commits.winehq.org/">（取消）订阅</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-commits(a)winehq.org/">存档</a>] 一个中等流量（25封/天）的只读列表，用于追踪 Git tree 上的 commits。 </li>

1 0