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

Piotr Caban : include: Update ddk/compstui.h header.
by Alexandre Julliard Aug. 17, 2022

Aug. 17, 2022

Module: wine Branch: master Commit: 74dded115464cf0ef82906fae4d982b46b031186 URL: https://gitlab.winehq.org/wine/wine/-/commit/74dded115464cf0ef82906fae4d982… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 16 15:43:52 2022 +0200 include: Update ddk/compstui.h header. --- include/ddk/compstui.h | 408 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 403 insertions(+), 5 deletions(-)

1 0

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

Aug. 17, 2022

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

Alexandre Julliard : xml2: Import upstream release 2.10.0.
by Alexandre Julliard Aug. 17, 2022

Aug. 17, 2022

1 0

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

Aug. 17, 2022

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 : xslt: Import upstream release 1.1.36.
by Alexandre Julliard Aug. 17, 2022

Aug. 17, 2022

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 : mountmgr: Don't crash if connecting to dbus fails.
by Alexandre Julliard Aug. 17, 2022

Aug. 17, 2022

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

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

Aug. 17, 2022

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 Aug. 17, 2022

Aug. 17, 2022

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

Robert Wilhelm : wshom: Support default style argument in IWshShell3::Run.
by Alexandre Julliard Aug. 17, 2022

Aug. 17, 2022

Module: wine Branch: master Commit: 98f546ed82604a940b2fe915f48056a9b336f675 URL: https://gitlab.winehq.org/wine/wine/-/commit/98f546ed82604a940b2fe915f48056… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed Aug 17 09:30:47 2022 +0200 wshom: Support default style argument in IWshShell3::Run. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53565 --- dlls/wshom.ocx/shell.c | 29 +++++++++++++++-------------- dlls/wshom.ocx/tests/wshom.c | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 034f6583d54..845f931be70 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1332,9 +1332,9 @@ static WCHAR *split_command( BSTR cmd, WCHAR **params ) static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, int *exit_code) { SHELLEXECUTEINFOW info; - int waitforprocess; + int waitforprocess, show; WCHAR *file, *params; - VARIANT s; + VARIANT v; HRESULT hr; BOOL ret; @@ -1343,25 +1343,26 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, if (!style || !wait || !exit_code) return E_POINTER; - VariantInit(&s); - hr = VariantChangeType(&s, style, 0, VT_I4); - if (FAILED(hr)) - { - ERR("failed to convert style argument, %#lx\n", hr); - return hr; + if (is_optional_argument(style)) + show = SW_SHOWNORMAL; + else { + VariantInit(&v); + hr = VariantChangeType(&v, style, 0, VT_I4); + if (FAILED(hr)) + return hr; + + show = V_I4(&v); } if (is_optional_argument(wait)) waitforprocess = 0; else { - VARIANT w; - - VariantInit(&w); - hr = VariantChangeType(&w, wait, 0, VT_I4); + VariantInit(&v); + hr = VariantChangeType(&v, wait, 0, VT_I4); if (FAILED(hr)) return hr; - waitforprocess = V_I4(&w); + waitforprocess = V_I4(&v); } if (!(file = split_command(cmd, &params))) return E_OUTOFMEMORY; @@ -1371,7 +1372,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; info.lpFile = file; info.lpParameters = params; - info.nShow = V_I4(&s); + info.nShow = show; ret = ShellExecuteExW(&info); free(file); diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index fc27373f296..34a02a8d1f9 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -251,7 +251,7 @@ static void test_wshshell(void) retval = 0xdeadbeef; str = SysAllocString(L"cmd.exe /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval); SysFreeString(str);

1 0

Nikolay Sivov : mfreadwrite/writer: Update some stats counters on WriteSample().
by Alexandre Julliard Aug. 17, 2022

Aug. 17, 2022

Module: wine Branch: master Commit: 080fe842e23edd2382a73ad72103bafc19c413c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/080fe842e23edd2382a73ad72103ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 17 00:17:19 2022 +0300 mfreadwrite/writer: Update some stats counters on WriteSample(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/writer.c | 88 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 5 deletions(-) diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index 039e8fc7477..ccd4a92f4c4 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -40,6 +40,7 @@ struct stream { IMFStreamSink *stream_sink; IMFTransform *encoder; + MF_SINK_WRITER_STATISTICS stats; }; struct sink_writer @@ -59,6 +60,7 @@ struct sink_writer IMFPresentationClock *clock; IMFMediaSink *sink; enum writer_state state; + MF_SINK_WRITER_STATISTICS stats; CRITICAL_SECTION cs; }; @@ -132,6 +134,7 @@ static ULONG WINAPI sink_writer_Release(IMFSinkWriter *iface) static HRESULT sink_writer_add_stream(struct sink_writer *writer, IMFStreamSink *stream_sink, DWORD *index) { + struct stream *stream; DWORD id = 0; HRESULT hr; @@ -144,9 +147,12 @@ static HRESULT sink_writer_add_stream(struct sink_writer *writer, IMFStreamSink if (FAILED(hr = IMFStreamSink_GetIdentifier(stream_sink, &id))) return hr; *index = writer->streams.count++; + stream = &writer->streams.items[*index]; - writer->streams.items[*index].stream_sink = stream_sink; + stream->stream_sink = stream_sink; IMFStreamSink_AddRef(stream_sink); + memset(&stream->stats, 0, sizeof(stream->stats)); + stream->stats.cb = sizeof(stream->stats); writer->streams.next_id = max(writer->streams.next_id, id); return hr; @@ -258,11 +264,61 @@ static struct stream * sink_writer_get_stream(const struct sink_writer *writer, return &writer->streams.items[index]; } +static HRESULT sink_writer_get_buffer_length(IMFSample *sample, LONGLONG *timestamp, DWORD *length) +{ + IMFMediaBuffer *buffer; + HRESULT hr; + + *timestamp = 0; + *length = 0; + + if (FAILED(hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer))) return hr; + hr = IMFMediaBuffer_GetCurrentLength(buffer, length); + IMFMediaBuffer_Release(buffer); + if (FAILED(hr)) return hr; + if (!*length) return E_INVALIDARG; + IMFSample_GetSampleTime(sample, timestamp); + + return hr; +} + static HRESULT WINAPI sink_writer_WriteSample(IMFSinkWriter *iface, DWORD index, IMFSample *sample) { - FIXME("%p, %lu, %p.\n", iface, index, sample); + struct sink_writer *writer = impl_from_IMFSinkWriter(iface); + struct stream *stream; + LONGLONG timestamp; + DWORD length; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %lu, %p.\n", iface, index, sample); + + if (!sample) + return E_INVALIDARG; + + EnterCriticalSection(&writer->cs); + + if (writer->state != SINK_WRITER_STATE_WRITING) + hr = MF_E_INVALIDREQUEST; + else if (!(stream = sink_writer_get_stream(writer, index))) + { + hr = MF_E_INVALIDSTREAMNUMBER; + } + else if (SUCCEEDED(hr = sink_writer_get_buffer_length(sample, &timestamp, &length))) + { + /* FIXME: queue sample */ + + stream->stats.llLastTimestampReceived = timestamp; + stream->stats.qwNumSamplesReceived++; + stream->stats.dwByteCountQueued += length; + + writer->stats.llLastTimestampReceived = timestamp; + writer->stats.qwNumSamplesReceived++; + writer->stats.dwByteCountQueued += length; + } + + EnterCriticalSection(&writer->cs); + + return hr; } static HRESULT WINAPI sink_writer_SendStreamTick(IMFSinkWriter *iface, DWORD index, LONGLONG timestamp) @@ -349,9 +405,30 @@ static HRESULT WINAPI sink_writer_GetServiceForStream(IMFSinkWriter *iface, DWOR static HRESULT WINAPI sink_writer_GetStatistics(IMFSinkWriter *iface, DWORD index, MF_SINK_WRITER_STATISTICS *stats) { - FIXME("%p, %lu, %p.\n", iface, index, stats); + struct sink_writer *writer = impl_from_IMFSinkWriter(iface); + struct stream *stream; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %lu, %p.\n", iface, index, stats); + + if (!stats) + return E_POINTER; + + if (stats->cb != sizeof(*stats)) + return E_INVALIDARG; + + EnterCriticalSection(&writer->cs); + + if (index == MF_SINK_WRITER_ALL_STREAMS) + *stats = writer->stats; + else if ((stream = sink_writer_get_stream(writer, index))) + *stats = stream->stats; + else + hr = MF_E_INVALIDSTREAMNUMBER; + + LeaveCriticalSection(&writer->cs); + + return hr; } static const IMFSinkWriterVtbl sink_writer_vtbl = @@ -479,6 +556,7 @@ HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attribut object->refcount = 1; object->sink = sink; IMFMediaSink_AddRef(sink); + object->stats.cb = sizeof(object->stats); InitializeCriticalSection(&object->cs); if (FAILED(hr = sink_writer_initialize_existing_streams(object, sink)))

1 0