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

Jacek Caban : win32u: Use send_message_timeout for WM_CREATE and WM_NCCREATE.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: e41c255be6ba66d1eec7affe674b8cc7699226b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e41c255be6ba66d1eec7affe674b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 14 23:41:53 2022 +0200 win32u: Use send_message_timeout for WM_CREATE and WM_NCCREATE. --- dlls/user32/win.c | 4 +--- dlls/win32u/window.c | 38 +++++++++++--------------------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 77bd2bfa3fe..d0a34841ce0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -303,7 +303,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, UNICODE_STRING class, window_name; HWND hwnd, top_child = 0; MDICREATESTRUCTW mdi_cs; - CBT_CREATEWNDW cbtc; WNDCLASSEXW info; HMENU menu; @@ -408,10 +407,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (!menu && info.lpszMenuName && (cs->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) menu = LoadMenuW( cs->hInstance, info.lpszMenuName ); - cbtc.lpcs = cs; hwnd = NtUserCreateWindowEx( cs->dwExStyle, &class, NULL, &window_name, cs->style, cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, menu, module, - cs->lpCreateParams, 0, &cbtc, 0, !unicode ); + cs->lpCreateParams, 0, NULL, 0, !unicode ); if (!hwnd && menu && menu != cs->hMenu) NtUserDestroyMenu( menu ); if (!unicode) RtlFreeUnicodeString( &window_name ); return hwnd; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 6e41bc8d27f..0eac0a6320b 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5050,41 +5050,27 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, UNICODE_STRING *version, UNICODE_STRING *window_name, DWORD style, INT x, INT y, INT cx, INT cy, HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ) + DWORD flags, CBT_CREATEWNDW *client_cbtc, DWORD unk, BOOL ansi ) { - CREATESTRUCTW cs, *client_cs, cs_buf; UINT win_dpi, thread_dpi = get_thread_dpi(); DPI_AWARENESS_CONTEXT context; - CBT_CREATEWNDW cbtc_buf; + CBT_CREATEWNDW cbtc; HWND hwnd, owner = 0; + CREATESTRUCTW cs; INT sw = SW_SHOW; RECT rect; WND *win; static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; - /* FIXME: We should pass a packed struct to client instead of using client_cs */ - if (cbtc) - { - client_cs = cbtc->lpcs; - cs.lpszName = client_cs->lpszName; - cs.lpszClass = client_cs->lpszClass; - cs.hInstance = client_cs->hInstance; /* may be different than instance for win16 */ - } - else - { - cbtc = &cbtc_buf; - client_cs = cbtc->lpcs = &cs_buf; - cs.lpszName = window_name ? window_name->Buffer : NULL; - cs.lpszClass = class_name->Buffer; - cs.hInstance = instance; - } - cs.lpCreateParams = params; + cs.hInstance = instance; cs.hMenu = menu; cs.hwndParent = parent; cs.style = style; cs.dwExStyle = ex_style; + cs.lpszName = window_name ? window_name->Buffer : NULL; + cs.lpszClass = class_name ? class_name->Buffer : NULL; cs.x = x; cs.y = y; cs.cx = cx; @@ -5166,9 +5152,9 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, /* call the WH_CBT hook */ release_win_ptr( win ); - *client_cs = cs; - cbtc->hwndInsertAfter = HWND_TOP; - if (call_hooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)cbtc, !ansi )) + cbtc.hwndInsertAfter = HWND_TOP; + cbtc.lpcs = &cs; + if (call_hooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, TRUE )) { free_window_handle( hwnd ); return 0; @@ -5250,8 +5236,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, /* send WM_NCCREATE */ TRACE( "hwnd %p cs %d,%d %dx%d %s\n", hwnd, cs.x, cs.y, cs.cx, cs.cy, wine_dbgstr_rect(&rect) ); - *client_cs = cs; - if (!NtUserMessageCall( hwnd, WM_NCCREATE, 0, (LPARAM)client_cs, NULL, NtUserSendMessage, ansi )) + if (!send_message_timeout( hwnd, WM_NCCREATE, 0, (LPARAM)&cs, SMTO_NORMAL, 0, ansi )) { WARN( "%p: aborted by WM_NCCREATE\n", hwnd ); goto failed; @@ -5283,9 +5268,8 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, else goto failed; /* send WM_CREATE */ - if (NtUserMessageCall( hwnd, WM_CREATE, 0, (LPARAM)client_cs, 0, NtUserSendMessage, ansi ) == -1) + if (send_message_timeout( hwnd, WM_CREATE, 0, (LPARAM)&cs, SMTO_NORMAL, 0, ansi ) == -1) goto failed; - cs = *client_cs; /* call the driver */

1 0

Jacek Caban : win32u: Move more logic from dispatch_win_proc_params.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 439cdf49014e97b684e0d75c52aaa2885e44cfc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/439cdf49014e97b684e0d75c52aaa2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 14 16:06:14 2022 +0200 win32u: Move more logic from dispatch_win_proc_params. --- dlls/user32/winproc.c | 62 +++----------------------------------------- dlls/win32u/class.c | 19 +++++++++++++- dlls/win32u/message.c | 8 +++--- dlls/win32u/ntuser_private.h | 2 +- include/ntuser.h | 1 - 5 files changed, 27 insertions(+), 65 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 2c0aaf03da5..ab28eecb67c 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -719,78 +719,24 @@ void dispatch_win_proc_params( struct win_proc_params *params ) if (params->procW == WINPROC_PROC16) WINPROC_CallProcWtoA( wow_handlers.call_window_proc, params->hwnd, params->msg, params->wparam, params->lparam, params->result, params->func ); - else if (params->is_dialog) - { - if (!params->ansi_dst) - { - if (params->procW) - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procW ); - else - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->func ); - } - else - { - if (params->procA) - WINPROC_CallProcWtoA( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procA ); - else - WINPROC_CallProcWtoA( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->func ); - } - } - else if (params->procW) - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procW ); - else if (params->procA) - WINPROC_CallProcWtoA( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procA ); else if (!params->ansi_dst) call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->func ); + params->result, params->procW ); else WINPROC_CallProcWtoA( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->func ); + params->lparam, params->result, params->procA ); } else { if (params->procA == WINPROC_PROC16) wow_handlers.call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, params->result, params->func ); - else if (params->is_dialog) - { - if (!params->ansi_dst) - { - if (params->procW) - WINPROC_CallProcAtoW( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procW, params->mapping ); - else - WINPROC_CallProcAtoW( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->func, params->mapping ); - } - else - { - if (params->procA) - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procA ); - else - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->func ); - } - } - else if (params->procA) - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procA ); - else if (params->procW) - WINPROC_CallProcAtoW( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procW, params->mapping ); else if (!params->ansi_dst) WINPROC_CallProcAtoW( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->func, params->mapping ); + params->lparam, params->result, params->procW, params->mapping ); else call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->func ); + params->result, params->procA ); } SetThreadDpiAwarenessContext( context ); diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index f8a7e67ddd1..6058617b80e 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -201,7 +201,7 @@ BOOL is_winproc_unicode( WNDPROC proc, BOOL def_val ) return ptr->procW != NULL; } -void get_winproc_params( struct win_proc_params *params ) +void get_winproc_params( struct win_proc_params *params, BOOL fixup_ansi_dst ) { WINDOWPROC *proc = get_winproc_ptr( params->func ); @@ -217,7 +217,24 @@ void get_winproc_params( struct win_proc_params *params ) { params->procA = proc->procA; params->procW = proc->procW; + + if (fixup_ansi_dst) + { + if (params->ansi) + { + if (params->procA) params->ansi_dst = TRUE; + else if (params->procW) params->ansi_dst = FALSE; + } + else + { + if (params->procW) params->ansi_dst = FALSE; + else if (params->procA) params->ansi_dst = TRUE; + } + } } + + if (!params->procA) params->procA = params->func; + if (!params->procW) params->procW = params->func; } DLGPROC get_dialog_proc( HWND hwnd, enum dialog_proc_type type ) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 6506a201559..b0c444f5407 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -202,11 +202,10 @@ static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UIN params->wparam = wparam; params->lparam = lparam; params->ansi = params->ansi_dst = ansi; - params->is_dialog = FALSE; params->needs_unpack = FALSE; params->mapping = WMCHAR_MAP_CALLWINDOWPROC; params->dpi_awareness = get_window_dpi_awareness_context( params->hwnd ); - get_winproc_params( params ); + get_winproc_params( params, TRUE ); return TRUE; } @@ -214,6 +213,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, LPARAM lParam, LRESULT *result, BOOL ansi, enum wm_char_mapping mapping ) { + BOOL is_dialog; WND *win; user_check_not_lock(); @@ -227,11 +227,10 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, } params->func = win->winproc; params->ansi_dst = !(win->flags & WIN_ISUNICODE); - params->is_dialog = win->dlgInfo != NULL; + is_dialog = win->dlgInfo != NULL; release_win_ptr( win ); params->hwnd = get_full_window_handle( hwnd ); - get_winproc_params( params ); params->msg = msg; params->wparam = wParam; params->lparam = lParam; @@ -240,6 +239,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, params->needs_unpack = FALSE; params->mapping = mapping; params->dpi_awareness = get_window_dpi_awareness_context( params->hwnd ); + get_winproc_params( params, !is_dialog ); return TRUE; } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 1be8eed3020..c8ba7522278 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -235,7 +235,7 @@ WORD get_class_word( HWND hwnd, INT offset ) DECLSPEC_HIDDEN; DLGPROC get_dialog_proc( HWND hwnd, enum dialog_proc_type type ) DECLSPEC_HIDDEN; ATOM get_int_atom_value( UNICODE_STRING *name ) DECLSPEC_HIDDEN; WNDPROC get_winproc( WNDPROC proc, BOOL ansi ) DECLSPEC_HIDDEN; -void get_winproc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; +void get_winproc_params( struct win_proc_params *params, BOOL fixup_ansi_dst ) DECLSPEC_HIDDEN; struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; BOOL needs_ime_window( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 053f60b8d1e..17301562013 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -146,7 +146,6 @@ struct win_proc_params LRESULT *result; BOOL ansi; BOOL ansi_dst; - BOOL is_dialog; BOOL needs_unpack; enum wm_char_mapping mapping; DPI_AWARENESS_CONTEXT dpi_awareness;

1 0

Nikolay Sivov : mfsrcsnk: Add WAVE sink class factory.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 9b38ff960dc3c31eb154b54746c84b2aa2f854e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b38ff960dc3c31eb154b54746c84b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 13:10:15 2022 +0300 mfsrcsnk: Add WAVE sink class factory. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfsrcsnk/Makefile.in | 3 + dlls/mfsrcsnk/factory.c | 115 +++++++++++++++++++++++++++++++++++++++ dlls/mfsrcsnk/mfsrcsnk.idl | 26 +++++++++ dlls/mfsrcsnk/mfsrcsnk.spec | 2 + dlls/mfsrcsnk/mfsrcsnk_private.h | 21 +++++++ dlls/mfsrcsnk/wave.c | 49 +++++++++++++++++ 6 files changed, 216 insertions(+) diff --git a/dlls/mfsrcsnk/Makefile.in b/dlls/mfsrcsnk/Makefile.in index a63ebaf60eb..5f586dcc83f 100644 --- a/dlls/mfsrcsnk/Makefile.in +++ b/dlls/mfsrcsnk/Makefile.in @@ -5,4 +5,7 @@ IMPORTS = ole32 mfplat mfuuid uuid EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ + factory.c \ wave.c + +IDL_SRCS = mfsrcsnk.idl diff --git a/dlls/mfsrcsnk/factory.c b/dlls/mfsrcsnk/factory.c new file mode 100644 index 00000000000..2e03451a523 --- /dev/null +++ b/dlls/mfsrcsnk/factory.c @@ -0,0 +1,115 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include "mfidl.h" +#include "wine/mfinternal.h" + +#include "mfsrcsnk_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +struct class_factory +{ + IClassFactory IClassFactory_iface; + HRESULT (*create_instance)(REFIID riid, void **out); +}; + +static inline struct class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **out) +{ + if (IsEqualGUID(riid, &IID_IClassFactory) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + WARN("Interface %s is not supported.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **out) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), out); + + *out = NULL; + + if (outer) + return CLASS_E_NOAGGREGATION; + + return factory->create_instance(riid, out); +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("%p, %d.\n", iface, dolock); + + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +static struct class_factory wave_sink_factory = { { &class_factory_vtbl }, wave_sink_factory_create }; + +/*********************************************************************** + * DllGetClassObject (mfsrcsnk.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + *out = NULL; + + if (IsEqualGUID(clsid, &CLSID_MFWAVESinkClassFactory)) + { + return IClassFactory_QueryInterface(&wave_sink_factory.IClassFactory_iface, riid, out); + } + else + { + FIXME("Unknown clsid %s.\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } +} diff --git a/dlls/mfsrcsnk/mfsrcsnk.idl b/dlls/mfsrcsnk/mfsrcsnk.idl new file mode 100644 index 00000000000..13bdac2977e --- /dev/null +++ b/dlls/mfsrcsnk/mfsrcsnk.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +[ + helpstring("MF WAVE Sink Factory"), + threading(both), + uuid(36f99745-23c9-4c9c-8dd5-cc31ce964390) +] +coclass MFWAVESinkClassFactory { } diff --git a/dlls/mfsrcsnk/mfsrcsnk.spec b/dlls/mfsrcsnk/mfsrcsnk.spec index 9acfef27ae2..ab9f2e4c207 100644 --- a/dlls/mfsrcsnk/mfsrcsnk.spec +++ b/dlls/mfsrcsnk/mfsrcsnk.spec @@ -1 +1,3 @@ +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stdcall MFCreateWAVEMediaSink(ptr ptr ptr) diff --git a/dlls/mfsrcsnk/mfsrcsnk_private.h b/dlls/mfsrcsnk/mfsrcsnk_private.h new file mode 100644 index 00000000000..29249d640f8 --- /dev/null +++ b/dlls/mfsrcsnk/mfsrcsnk_private.h @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#include "wine/mfinternal.h" + +extern HRESULT wave_sink_factory_create(REFIID riid, void **out) DECLSPEC_HIDDEN; diff --git a/dlls/mfsrcsnk/wave.c b/dlls/mfsrcsnk/wave.c index ce57865d093..cf74368d8f7 100644 --- a/dlls/mfsrcsnk/wave.c +++ b/dlls/mfsrcsnk/wave.c @@ -22,6 +22,8 @@ #include "mfidl.h" #include "mferror.h" +#include "mfsrcsnk_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -889,3 +891,50 @@ failed: return hr; } + +static HRESULT WINAPI sink_class_factory_QueryInterface(IMFSinkClassFactory *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IMFSinkClassFactory) + || IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + IMFSinkClassFactory_AddRef(iface); + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI sink_class_factory_AddRef(IMFSinkClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI sink_class_factory_Release(IMFSinkClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI sink_class_factory_CreateMediaSink(IMFSinkClassFactory *iface, IMFByteStream *stream, + IMFMediaType *video_type, IMFMediaType *audio_type, IMFMediaSink **sink) +{ + TRACE("%p, %p, %p, %p.\n", stream, video_type, audio_type, sink); + + return MFCreateWAVEMediaSink(stream, audio_type, sink); +} + +static const IMFSinkClassFactoryVtbl wave_sink_factory_vtbl = +{ + sink_class_factory_QueryInterface, + sink_class_factory_AddRef, + sink_class_factory_Release, + sink_class_factory_CreateMediaSink, +}; + +static IMFSinkClassFactory wave_sink_factory = { &wave_sink_factory_vtbl }; + +HRESULT wave_sink_factory_create(REFIID riid, void **out) +{ + return IMFSinkClassFactory_QueryInterface(&wave_sink_factory, riid, out); +}

1 0

Nikolay Sivov : mfsrcsnk/wave: Implement sample processing.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: cf9b383032ad7c477726ca559e21c2c85edfa30b URL: https://gitlab.winehq.org/wine/wine/-/commit/cf9b383032ad7c477726ca559e21c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 14 10:11:17 2022 +0300 mfsrcsnk/wave: Implement sample processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfsrcsnk/wave.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 168 insertions(+), 6 deletions(-) diff --git a/dlls/mfsrcsnk/wave.c b/dlls/mfsrcsnk/wave.c index 583eefb98b0..ce57865d093 100644 --- a/dlls/mfsrcsnk/wave.c +++ b/dlls/mfsrcsnk/wave.c @@ -50,6 +50,9 @@ static inline const char *debugstr_time(LONGLONG time) enum wave_sink_flags { SINK_SHUT_DOWN = 0x1, + SINK_HEADER_WRITTEN = 0x2, + SINK_DATA_CHUNK_STARTED = 0x4, + SINK_DATA_FINALIZED = 0x8, }; struct wave_sink @@ -66,6 +69,10 @@ struct wave_sink WAVEFORMATEX *fmt; IMFByteStream *bytestream; + QWORD data_size_offset; + QWORD riff_size_offset; + DWORD data_length; + DWORD full_length; unsigned int flags; CRITICAL_SECTION cs; @@ -338,18 +345,133 @@ static HRESULT WINAPI wave_sink_Shutdown(IMFFinalizableMediaSink *iface) return hr; } +static void wave_sink_write_raw(struct wave_sink *sink, const void *data, DWORD length, HRESULT *hr) +{ + DWORD written_length; + + if (FAILED(*hr)) return; + if (SUCCEEDED(*hr = IMFByteStream_Write(sink->bytestream, data, length, &written_length))) + sink->full_length += length; +} + +static void wave_sink_write_pad(struct wave_sink *sink, DWORD size, HRESULT *hr) +{ + DWORD i, len = size / 4, zero = 0; + + for (i = 0; i < len; ++i) + wave_sink_write_raw(sink, &zero, 4, hr); + if ((len = size % 4)) + wave_sink_write_raw(sink, &zero, len, hr); +} + +static void wave_sink_write_junk(struct wave_sink *sink, DWORD size, HRESULT *hr) +{ + wave_sink_write_raw(sink, "JUNK", 4, hr); + wave_sink_write_raw(sink, &size, 4, hr); + wave_sink_write_pad(sink, size, hr); +} + +static HRESULT wave_sink_write_header(struct wave_sink *sink) +{ + HRESULT hr = S_OK; + DWORD size = 0; + + wave_sink_write_raw(sink, "RIFF", 4, &hr); + if (SUCCEEDED(hr)) + hr = IMFByteStream_GetCurrentPosition(sink->bytestream, &sink->riff_size_offset); + wave_sink_write_raw(sink, &size, sizeof(size), &hr); + wave_sink_write_raw(sink, "WAVE", 4, &hr); + wave_sink_write_junk(sink, 28, &hr); + + /* Format chunk */ + wave_sink_write_raw(sink, "fmt ", 4, &hr); + size = sizeof(*sink->fmt); + wave_sink_write_raw(sink, &size, sizeof(size), &hr); + wave_sink_write_raw(sink, sink->fmt, size, &hr); + + sink->flags |= SINK_HEADER_WRITTEN; + + return hr; +} + +static HRESULT wave_sink_start_data_chunk(struct wave_sink *sink) +{ + HRESULT hr = S_OK; + + wave_sink_write_raw(sink, "data", 4, &hr); + if (SUCCEEDED(hr)) + hr = IMFByteStream_GetCurrentPosition(sink->bytestream, &sink->data_size_offset); + wave_sink_write_pad(sink, 4, &hr); + sink->flags |= SINK_DATA_CHUNK_STARTED; + + return hr; +} + +static HRESULT wave_sink_write_data(struct wave_sink *sink, const BYTE *data, DWORD length) +{ + HRESULT hr = S_OK; + + wave_sink_write_raw(sink, data, length, &hr); + if (SUCCEEDED(hr)) + sink->data_length += length; + + return hr; +} + +static void wave_sink_write_at(struct wave_sink *sink, const void *data, DWORD length, QWORD offset, HRESULT *hr) +{ + QWORD position; + + if (FAILED(*hr)) return; + + if (FAILED(*hr = IMFByteStream_GetCurrentPosition(sink->bytestream, &position))) return; + if (FAILED(*hr = IMFByteStream_SetCurrentPosition(sink->bytestream, offset))) return; + wave_sink_write_raw(sink, data, length, hr); + IMFByteStream_SetCurrentPosition(sink->bytestream, position); +} + static HRESULT WINAPI wave_sink_BeginFinalize(IMFFinalizableMediaSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("%p, %p, %p.\n", iface, callback, state); + struct wave_sink *sink = impl_from_IMFFinalizableMediaSink(iface); + HRESULT hr = S_OK, status; + IMFAsyncResult *result; + DWORD size; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, callback, state); + + EnterCriticalSection(&sink->cs); + + if (!(sink->flags & SINK_DATA_FINALIZED)) + { + size = sink->full_length - 8 /* RIFF chunk header size */; + wave_sink_write_at(sink, &size, 4, sink->riff_size_offset, &hr); + wave_sink_write_at(sink, &sink->data_length, 4, sink->data_size_offset, &hr); + sink->flags |= SINK_DATA_FINALIZED; + status = hr; + } + else + status = E_INVALIDARG; + + if (callback) + { + if (SUCCEEDED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + { + IMFAsyncResult_SetStatus(result, status); + hr = MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_STANDARD, result); + IMFAsyncResult_Release(result); + } + } + + LeaveCriticalSection(&sink->cs); + + return hr; } static HRESULT WINAPI wave_sink_EndFinalize(IMFFinalizableMediaSink *iface, IMFAsyncResult *result) { - FIXME("%p, %p.\n", iface, result); + TRACE("%p, %p.\n", iface, result); - return E_NOTIMPL; + return result ? IMFAsyncResult_GetStatus(result) : E_INVALIDARG; } static const IMFFinalizableMediaSinkVtbl wave_sink_vtbl = @@ -563,9 +685,45 @@ static HRESULT WINAPI wave_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface, static HRESULT WINAPI wave_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { - FIXME("%p, %p.\n", iface, sample); + struct wave_sink *sink = impl_from_IMFStreamSink(iface); + DWORD max_length, length; + IMFMediaBuffer *buffer; + HRESULT hr = S_OK; + BYTE *data; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, sample); + + EnterCriticalSection(&sink->cs); + + if (sink->flags & SINK_SHUT_DOWN) + hr = MF_E_STREAMSINK_REMOVED; + else + { + if (!(sink->flags & SINK_HEADER_WRITTEN)) + hr = wave_sink_write_header(sink); + + if (SUCCEEDED(hr) && !(sink->flags & SINK_DATA_CHUNK_STARTED)) + hr = wave_sink_start_data_chunk(sink); + + if (SUCCEEDED(hr)) + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer); + + if (SUCCEEDED(hr)) + { + if (SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &length))) + { + hr = wave_sink_write_data(sink, data, length); + IMFMediaBuffer_Unlock(buffer); + } + } + + if (buffer) + IMFMediaBuffer_Release(buffer); + } + + LeaveCriticalSection(&sink->cs); + + return hr; } static HRESULT WINAPI wave_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type, @@ -703,6 +861,10 @@ HRESULT WINAPI MFCreateWAVEMediaSink(IMFByteStream *bytestream, IMFMediaType *me goto failed; } + /* Update derived fields. */ + object->fmt->nAvgBytesPerSec = object->fmt->nSamplesPerSec * object->fmt->nChannels * object->fmt->wBitsPerSample / 8; + object->fmt->nBlockAlign = object->fmt->nChannels * object->fmt->wBitsPerSample / 8; + object->IMFFinalizableMediaSink_iface.lpVtbl = &wave_sink_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &wave_sink_events_vtbl; object->IMFStreamSink_iface.lpVtbl = &wave_stream_sink_vtbl;

1 0

Nikolay Sivov : mfsrcsnk: Add a stub dll.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 73d6ca6e1e7399ffe8282d81ae299976d6b38410 URL: https://gitlab.winehq.org/wine/wine/-/commit/73d6ca6e1e7399ffe8282d81ae2999… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 13:24:11 2022 +0300 mfsrcsnk: Add a stub dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/mfsrcsnk/Makefile.in | 7 +++++++ dlls/mfsrcsnk/mfsrcsnk.spec | 1 + dlls/mfsrcsnk/wave.c | 33 +++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 6 files changed, 45 insertions(+) diff --git a/configure b/configure index 9a426b619bb..d28c299743b 100755 --- a/configure +++ b/configure @@ -1170,6 +1170,7 @@ enable_mfmediaengine enable_mfplat enable_mfplay enable_mfreadwrite +enable_mfsrcsnk enable_mgmtapi enable_midimap enable_mlang @@ -21600,6 +21601,7 @@ wine_fn_config_makefile dlls/mfplay enable_mfplay wine_fn_config_makefile dlls/mfplay/tests enable_tests wine_fn_config_makefile dlls/mfreadwrite enable_mfreadwrite wine_fn_config_makefile dlls/mfreadwrite/tests enable_tests +wine_fn_config_makefile dlls/mfsrcsnk enable_mfsrcsnk wine_fn_config_makefile dlls/mgmtapi enable_mgmtapi wine_fn_config_makefile dlls/midimap enable_midimap wine_fn_config_makefile dlls/mlang enable_mlang diff --git a/configure.ac b/configure.ac index 560d66c46de..9525621c93f 100644 --- a/configure.ac +++ b/configure.ac @@ -2740,6 +2740,7 @@ WINE_CONFIG_MAKEFILE(dlls/mfplay) WINE_CONFIG_MAKEFILE(dlls/mfplay/tests) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite/tests) +WINE_CONFIG_MAKEFILE(dlls/mfsrcsnk) WINE_CONFIG_MAKEFILE(dlls/mgmtapi) WINE_CONFIG_MAKEFILE(dlls/midimap) WINE_CONFIG_MAKEFILE(dlls/mlang) diff --git a/dlls/mfsrcsnk/Makefile.in b/dlls/mfsrcsnk/Makefile.in new file mode 100644 index 00000000000..a110a5058f1 --- /dev/null +++ b/dlls/mfsrcsnk/Makefile.in @@ -0,0 +1,7 @@ +MODULE = mfsrcsnk.dll +IMPORTLIB = mfsrcsnk + +EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + wave.c diff --git a/dlls/mfsrcsnk/mfsrcsnk.spec b/dlls/mfsrcsnk/mfsrcsnk.spec new file mode 100644 index 00000000000..9acfef27ae2 --- /dev/null +++ b/dlls/mfsrcsnk/mfsrcsnk.spec @@ -0,0 +1 @@ +@ stdcall MFCreateWAVEMediaSink(ptr ptr ptr) diff --git a/dlls/mfsrcsnk/wave.c b/dlls/mfsrcsnk/wave.c new file mode 100644 index 00000000000..d9d51ac62e2 --- /dev/null +++ b/dlls/mfsrcsnk/wave.c @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#include "mfidl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +/*********************************************************************** + * MFCreateWAVEMediaSink (mfplat.@) + */ +HRESULT WINAPI MFCreateWAVEMediaSink(IMFByteStream *bytestream, IMFMediaType *media_type, + IMFMediaSink **sink) +{ + FIXME("%p, %p, %p.\n", bytestream, media_type, sink); + + return E_NOTIMPL; +} diff --git a/include/mfidl.idl b/include/mfidl.idl index 72e96d1c598..c42fba77fbe 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -719,6 +719,7 @@ cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode **node);") cpp_quote("HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader);") cpp_quote("HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate);") +cpp_quote("HRESULT WINAPI MFCreateWAVEMediaSink(IMFByteStream *stream, IMFMediaType *media_type, IMFMediaSink **sink);") cpp_quote("HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetSupportedSchemes(PROPVARIANT *array);")

1 0

Nikolay Sivov : mfplat: Implement Write() for file streams.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 6b418e82130dc53dd4769b2b9d735ef838b165b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b418e82130dc53dd4769b2b9d735e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 11:21:06 2022 +0300 mfplat: Implement Write() for file streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1afec10405b..ebab4ed6f1f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4089,11 +4089,30 @@ static HRESULT WINAPI bytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *r return bytestream_complete_io_request(stream, ASYNC_STREAM_OP_READ, result, byte_read); } -static HRESULT WINAPI bytestream_file_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +static HRESULT WINAPI bytestream_file_Write(IMFByteStream *iface, const BYTE *data, ULONG size, ULONG *written) { - FIXME("%p, %p, %lu, %p\n", iface, data, count, written); + struct bytestream *stream = impl_from_IMFByteStream(iface); + LARGE_INTEGER position; + HRESULT hr = S_OK; + BOOL ret; - return E_NOTIMPL; + TRACE("%p, %p, %lu, %p\n", iface, data, size, written); + + EnterCriticalSection(&stream->cs); + + position.QuadPart = stream->position; + if ((ret = SetFilePointerEx(stream->hfile, position, NULL, FILE_BEGIN))) + { + if ((ret = WriteFile(stream->hfile, data, size, written, NULL))) + stream->position += *written; + } + + if (!ret) + hr = HRESULT_FROM_WIN32(GetLastError()); + + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG size,

1 0

Piotr Caban : msvcp90: Use 'MultiByteToWideChar' in _Fiopen implementation.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 8c46e2a85b588273fc6c6123b3b542e5b25d8d2e URL: https://gitlab.winehq.org/wine/wine/-/commit/8c46e2a85b588273fc6c6123b3b542… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 9 19:30:00 2022 +0200 msvcp90: Use 'MultiByteToWideChar' in _Fiopen implementation. Based on a patch by Yeshun Ye. --- dlls/msvcp90/ios.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index ef2c122f17f..a8014a3dfcf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3262,8 +3262,13 @@ FILE* __cdecl _Fiopen(const char *name, int mode, int prot) TRACE("(%s %d %d)\n", name, mode, prot); +#if _MSVCP_VER >= 71 && _MSVCP_VER <= 90 if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) return NULL; +#else + if(!MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, FILENAME_MAX-1)) + return NULL; +#endif return _Fiopen_wchar(nameW, mode, prot); }

1 0

Robert Wilhelm : wshom: Use signed type for property ExitCode in IWshExec.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: e7dada5f9050fb265d314c841f8ce4b45415141a URL: https://gitlab.winehq.org/wine/wine/-/commit/e7dada5f9050fb265d314c841f8ce4… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sun Aug 14 11:26:12 2022 +0200 wshom: Use signed type for property ExitCode in IWshExec. Automation interfaces should use signed types, because VBScript does not support unsigned types like VT_UI4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53542 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 5ac04e60e88..034f6583d54 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -277,7 +277,7 @@ static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, int *pid) return S_OK; } -static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) +static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, int *code) { WshExecImpl *This = impl_from_IWshExec(iface); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index ee9578f5ae3..cdd674460f6 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -439,7 +439,7 @@ library IWshRuntimeLibrary HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] DWORD *code); + HRESULT ExitCode([out, retval] int *code); [id(0x0008)] HRESULT Terminate(); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index c2984afc227..54de529a7a3 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -439,7 +439,7 @@ library IWshRuntimeLibrary HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] DWORD *code); + HRESULT ExitCode([out, retval] int *code); [id(0x0008)] HRESULT Terminate();

1 0

Robert Wilhelm : wshom: Use signed type for property ProcessID in IWshExec.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: cfdbebd80cba33c3b201071bc195940a831368e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfdbebd80cba33c3b201071bc19594… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sun Aug 14 11:18:04 2022 +0200 wshom: Use signed type for property ProcessID in IWshExec. Automation interfaces should use signed types, because VBScript does not support unsigned types like VT_UI4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53542 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 41913dcadd5..5ac04e60e88 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -264,7 +264,7 @@ static HRESULT WINAPI WshExec_get_StdErr(IWshExec *iface, ITextStream **stream) return S_OK; } -static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid) +static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, int *pid) { WshExecImpl *This = impl_from_IWshExec(iface); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index a0175bb1604..ee9578f5ae3 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -436,7 +436,7 @@ library IWshRuntimeLibrary HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] DWORD *pid); + HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] HRESULT ExitCode([out, retval] DWORD *code); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index c69362d6fac..c2984afc227 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -436,7 +436,7 @@ library IWshRuntimeLibrary HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] DWORD *pid); + HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] HRESULT ExitCode([out, retval] DWORD *code);

1 0

Nikolay Sivov : mfsrcsnk/wave: Add clock state callbacks.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: bfdf5c775d27dce58af3069dc80d5e31a7e965be URL: https://gitlab.winehq.org/wine/wine/-/commit/bfdf5c775d27dce58af3069dc80d5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 13 15:23:44 2022 +0300 mfsrcsnk/wave: Add clock state callbacks. Don't bother with state handling for now, it's possible it's ignored entirely. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfsrcsnk/tests/Makefile.in | 2 +- dlls/mfsrcsnk/tests/mfsrcsnk.c | 14 ++++ dlls/mfsrcsnk/wave.c | 162 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 173 insertions(+), 5 deletions(-) diff --git a/dlls/mfsrcsnk/tests/Makefile.in b/dlls/mfsrcsnk/tests/Makefile.in index 59ee4830573..32e5637db4f 100644 --- a/dlls/mfsrcsnk/tests/Makefile.in +++ b/dlls/mfsrcsnk/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfsrcsnk.dll -IMPORTS = ole32 mfsrcsnk mfplat uuid mfuuid +IMPORTS = ole32 mfsrcsnk mfplat mf uuid mfuuid C_SRCS = \ mfsrcsnk.c diff --git a/dlls/mfsrcsnk/tests/mfsrcsnk.c b/dlls/mfsrcsnk/tests/mfsrcsnk.c index df3fcfbee38..e3d5b100b09 100644 --- a/dlls/mfsrcsnk/tests/mfsrcsnk.c +++ b/dlls/mfsrcsnk/tests/mfsrcsnk.c @@ -46,6 +46,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_wave_sink(void) { + IMFPresentationClock *clock; IMFStreamSink *stream_sink; IMFMediaSink *sink, *sink2; IMFByteStream *bytestream; @@ -101,6 +102,19 @@ static void test_wave_sink(void) check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); check_interface(sink, &IID_IMFFinalizableMediaSink, TRUE); + check_interface(sink, &IID_IMFClockStateSink, TRUE); + + /* Clock */ + hr = MFCreatePresentationClock(&clock); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSink_SetPresentationClock(sink, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSink_SetPresentationClock(sink, clock); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IMFPresentationClock_Release(clock); /* Stream tests */ hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); diff --git a/dlls/mfsrcsnk/wave.c b/dlls/mfsrcsnk/wave.c index 9f271375e1e..b9951b3e2b6 100644 --- a/dlls/mfsrcsnk/wave.c +++ b/dlls/mfsrcsnk/wave.c @@ -26,6 +26,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static inline const char *debugstr_time(LONGLONG time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + enum wave_sink_flags { SINK_SHUT_DOWN = 0x1, @@ -35,11 +56,13 @@ struct wave_sink { IMFFinalizableMediaSink IMFFinalizableMediaSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; + IMFClockStateSink IMFClockStateSink_iface; IMFStreamSink IMFStreamSink_iface; LONG refcount; IMFMediaEventQueue *event_queue; IMFMediaEventQueue *stream_event_queue; + IMFPresentationClock *clock; IMFByteStream *bytestream; @@ -62,6 +85,11 @@ static struct wave_sink *impl_from_IMFStreamSink(IMFStreamSink *iface) return CONTAINING_RECORD(iface, struct wave_sink, IMFStreamSink_iface); } +static struct wave_sink *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct wave_sink, IMFClockStateSink_iface); +} + static HRESULT WINAPI wave_sink_QueryInterface(IMFFinalizableMediaSink *iface, REFIID riid, void **obj) { struct wave_sink *sink = impl_from_IMFFinalizableMediaSink(iface); @@ -78,6 +106,10 @@ static HRESULT WINAPI wave_sink_QueryInterface(IMFFinalizableMediaSink *iface, R { *obj = &sink->IMFMediaEventGenerator_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &sink->IMFClockStateSink_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -219,18 +251,65 @@ static HRESULT WINAPI wave_sink_GetStreamSinkById(IMFFinalizableMediaSink *iface return hr; } +static void wave_sink_set_presentation_clock(struct wave_sink *sink, IMFPresentationClock *clock) +{ + if (sink->clock) + { + IMFPresentationClock_RemoveClockStateSink(sink->clock, &sink->IMFClockStateSink_iface); + IMFPresentationClock_Release(sink->clock); + } + sink->clock = clock; + if (sink->clock) + { + IMFPresentationClock_AddRef(sink->clock); + IMFPresentationClock_AddClockStateSink(sink->clock, &sink->IMFClockStateSink_iface); + } +} + static HRESULT WINAPI wave_sink_SetPresentationClock(IMFFinalizableMediaSink *iface, IMFPresentationClock *clock) { - FIXME("%p, %p.\n", iface, clock); + struct wave_sink *sink = impl_from_IMFFinalizableMediaSink(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, clock); + + EnterCriticalSection(&sink->cs); + + if (sink->flags & SINK_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + wave_sink_set_presentation_clock(sink, clock); + + LeaveCriticalSection(&sink->cs); + + return hr; } static HRESULT WINAPI wave_sink_GetPresentationClock(IMFFinalizableMediaSink *iface, IMFPresentationClock **clock) { - FIXME("%p, %p.\n", iface, clock); + struct wave_sink *sink = impl_from_IMFFinalizableMediaSink(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, clock); + + if (!clock) + return E_POINTER; + + EnterCriticalSection(&sink->cs); + + if (sink->flags & SINK_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (sink->clock) + { + *clock = sink->clock; + IMFPresentationClock_AddRef(*clock); + } + else + hr = MF_E_NO_CLOCK; + + LeaveCriticalSection(&sink->cs); + + return hr; } static HRESULT WINAPI wave_sink_Shutdown(IMFFinalizableMediaSink *iface) @@ -249,6 +328,7 @@ static HRESULT WINAPI wave_sink_Shutdown(IMFFinalizableMediaSink *iface) sink->flags |= SINK_SHUT_DOWN; IMFMediaEventQueue_Shutdown(sink->event_queue); IMFMediaEventQueue_Shutdown(sink->stream_event_queue); + wave_sink_set_presentation_clock(sink, NULL); } LeaveCriticalSection(&sink->cs); @@ -518,6 +598,79 @@ static const IMFStreamSinkVtbl wave_stream_sink_vtbl = wave_stream_sink_Flush, }; +static HRESULT WINAPI wave_sink_clock_sink_QueryInterface(IMFClockStateSink *iface, REFIID riid, void **obj) +{ + struct wave_sink *sink = impl_from_IMFClockStateSink(iface); + return IMFFinalizableMediaSink_QueryInterface(&sink->IMFFinalizableMediaSink_iface, riid, obj); +} + +static ULONG WINAPI wave_sink_clock_sink_AddRef(IMFClockStateSink *iface) +{ + struct wave_sink *sink = impl_from_IMFClockStateSink(iface); + return IMFFinalizableMediaSink_AddRef(&sink->IMFFinalizableMediaSink_iface); +} + +static ULONG WINAPI wave_sink_clock_sink_Release(IMFClockStateSink *iface) +{ + struct wave_sink *sink = impl_from_IMFClockStateSink(iface); + return IMFFinalizableMediaSink_Release(&sink->IMFFinalizableMediaSink_iface); +} + +static HRESULT WINAPI wave_sink_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) +{ + struct wave_sink *sink = impl_from_IMFClockStateSink(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + + return IMFMediaEventQueue_QueueEventParamVar(sink->stream_event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); +} + +static HRESULT WINAPI wave_sink_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) +{ + struct wave_sink *sink = impl_from_IMFClockStateSink(iface); + + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + return IMFMediaEventQueue_QueueEventParamVar(sink->stream_event_queue, MEStreamSinkStopped, &GUID_NULL, S_OK, NULL); +} + +static HRESULT WINAPI wave_sink_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) +{ + struct wave_sink *sink = impl_from_IMFClockStateSink(iface); + + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + return IMFMediaEventQueue_QueueEventParamVar(sink->stream_event_queue, MEStreamSinkPaused, &GUID_NULL, S_OK, NULL); +} + +static HRESULT WINAPI wave_sink_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) +{ + struct wave_sink *sink = impl_from_IMFClockStateSink(iface); + + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + return IMFMediaEventQueue_QueueEventParamVar(sink->stream_event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); +} + +static HRESULT WINAPI wave_sink_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) +{ + FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl wave_sink_clock_sink_vtbl = +{ + wave_sink_clock_sink_QueryInterface, + wave_sink_clock_sink_AddRef, + wave_sink_clock_sink_Release, + wave_sink_clock_sink_OnClockStart, + wave_sink_clock_sink_OnClockStop, + wave_sink_clock_sink_OnClockPause, + wave_sink_clock_sink_OnClockRestart, + wave_sink_clock_sink_OnClockSetRate, +}; + /*********************************************************************** * MFCreateWAVEMediaSink (mfsrcsnk.@) */ @@ -544,6 +697,7 @@ HRESULT WINAPI MFCreateWAVEMediaSink(IMFByteStream *bytestream, IMFMediaType *me object->IMFFinalizableMediaSink_iface.lpVtbl = &wave_sink_vtbl; 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->refcount = 1; IMFByteStream_AddRef((object->bytestream = bytestream)); InitializeCriticalSection(&object->cs);

1 0