July 2020 - Wine-devel - list.winehq.org

wine-5.0.2-rc1 Available
by Michael Stefaniuc 26 Jul '20

26 Jul '20

Hello guys, I have pushed wine-5.0.2-rc1 (782cbd5ecf0bf917d9726cb3a761a01c7fbb41b8) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ Pretty boring release. So without further ado What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 5.0.2 (total 47): 8439 Multiple Microsoft product installers fail due missing shell app path expansion (Visual Studio .NET 2002, 2003, Visual Foxpro 9.0) 19239 Multiple applications crash with division by zero on edit control with zero line height (eBay Turbo Lister, Clarin TX control wrapper) 29806 Hype The Time Quest: DirectX Media (DXM) v6.0 runtime installer fails (advpack.ExecuteCab should extract the INF from CAB before running the install part) 30814 Age of Empires II scrolling gets stuck after Alt-Tab away and back 31890 Multiple applications need IAudioEndpointVolume::GetMasterVolumeLevelScalar method implementation (Cisco IP Communicator, Cairo Shell v0.3.x) 39534 Bad Mojo Redux crashes on start (ddraw1_vtbl and ddraw_surface1_vtbl need to be writable) 41559 (winecfg) Add ability to change windows version via command line 43638 Multiple 4k demoscene OpenGL demos crash on startup with 'No active WGL context found' (Yermom, 'End of time' by Alcatraz and Altair) 45839 Qt 5.8 SDK installer needs 'IFileSystem.MoveFile' method implementation for maintenance tool creation step 46949 DDraw games using older windowed mode wrappers such as DirectX Windower Embedded v2.3/D3D Windower v1.x crash (ddraw_palette_vtbl and ddraw_surface{1,2,3,4,7}_vtbl need to be writable) 47621 Command link buttons in task dialog are displayed in wrong style 47794 Rockstar Games Launcher installer button images do not display 47999 Gif pictures stored in PE files are not loaded into HTML web pages via Res protocol 48186 every wine process shows a definite leak in dlls/ntdll/env.c 48471 Mismatching behavior of GetEnvironmentVariableW for empty / long values 48490 Restored minimized windows have wrong height 48495 XCP-ng Center v8.x (.NET 4.6 app) can't connect to server with self-signed certificate 48593 Multiple games play only one frame of video (Fable: The Lost Chapters, Audiosurf, Dark Souls 2, Oddworld: Munch's Oddysee) 48611 Cairo Shell v0.3.x (.NET 4.7 app) crashes due to missing 'HKCU\\Software\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon\\Shell' registry sub-key 48683 iTunes v12.10.4.2 crashes on unimplemented function wmvcore.dll.WMIsContentProtected when adding folders to directory scan 48731 Just Cause crashes while loading level with builtin d3dx9_26 48732 How to Survive crashes on start (fullscreen mode) 48738 cmd.exe crashes when running certain batch files 48739 ConEmu (Windows console emulator) v19.10.12 fails to set Wininet's INTERNET_OPTION_IGNORE_OFFLINE and shows error dialog at startup 48740 ConEmu is constantly loosing focus 48747 ConEmu flickers and scrolls randomly 48750 Few missing DirectSound3D Algorithms GUID Defs 48762 IExplore immediately crashes on www.msnbc.com with a failed assertion 48801 Multiple games crash on unimplemented function d3dx11_43.dll.D3DX11GetImageInfoFromFile (Assetto Corsa 1.14.x, Project Cars) 48803 FITietokanta crashes every time after ADD-button is pressed 48806 Panzer Corps 2 needs msvcp140.dll.?_XLgamma(a)std@@YANN(a)Z 48814 Microsoft Word 6.0 for Windows installer crashes after wine-4.8-247-g0d7d0427d0 48816 The explorer doesn't support '/cd' option 48832 Magic The Gathering Online: client does not start due to long file names since 2020-03-25 update 48844 Magical Scramble Demo 1.20P shows white boxes instead of pictures. 48932 Wine does not display any windows unless `xrandr --auto` has been run 48960 NtQueryDirectoryFile incorrectly returns STATUS_NO_MORE_FILES when it encounters an ignored entry 48974 Multiple MSI-based installers show 'newBinaryXX' text instead of bitmap on button controls (missing support for 'msidbControlAttributesBitmap') 49005 Listview header occasionally fails to redraw when list is scrolled vertically 49034 Enlarge list width in font selection dialog 49115 Hitman (2016) and Hitman 2 (2018) fail to launch in DX11 mode 49142 Horizontal mouse scroll events (X11 buttons 6 and 7) should not be translated to back/forward events 49146 Hearts of Iron IV needs api-ms-win-crt-private-l1-1-0.dll._o_sin 49173 widl generates invalid code for Gecko's ISimpleDOM.idl 49175 Duplicated checking canonicalized inside kernelbase/path.c 49198 Denuvo Anti-Cheat 'denuvo-anti-cheat.sys' crashes in entry point (incorrect page protection restored during relocation processing) 49203 Possible incorrect usage >= instead <= in shlview.c ---------------------------------------------------------------- Changes since 5.0.1: Akihiro Sagawa (2): ddraw/tests: Add more managed texture tests. ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps. Alex Henrie (2): mmdevapi: Report 100% volume in GetMasterVolumeLevelScalar stub. wine.inf: Add Winlogon keys. Alexandre Julliard (5): user.exe: Clear out the thunk array to catch invalid winprocs. ntdll: Don't abort directory search in single entry mode when a file is ignored. urlmon/tests: Update winehq.org's IP address. secur32/tests: Update for new WineHQ certificate. wininet/tests: Update for new WineHQ certificate. Alistair Leslie-Hughes (4): winmm: Use CreateFileA instead of OpenFile. d3dx9: Add support for D3DFMT_P8 in DDS files. ddraw: Make palette and remaining surface vtbls writable. shell32: Correct if condition. Andrew Eikum (1): winebus.sys: Don't return too early if SDL initialization succeeds. Andrey Gusev (1): d3dx11: Add D3DX11GetImageInfoFromFileA/W stub. Bernhard Übelacker (1): cmd: Fix crash in if condition parsing. Brendan Shanks (3): dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL. dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL. vulkan-1: Set FILEVERSION to fix official Vulkan loader installer. Damjan Jovanovic (5): shell32/tests: Test shlexec argv[0], and same-named executables in a different directory. shell32: Simplify SHELL_execute(). shell32: Pass the executable's full path from SHELL_execute() to CreateProcess(). mshtml: Fix handling res protocol resource type ids without leading '#'. mshtml: Support implicit RT_FILE resource type in res protocol. Dmitry Timoshkov (4): server: All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value. ntdll: Don't try to map the PE file past the size of the backing file. kernel32: On process entry store PEB address in %ebx. kernel32/tests: Add a PE test image that resembles format of some of 8k demos. Emilio Cobos Álvarez (1): widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too. Gabriel Ivăncescu (3): quartz: Clear the WS_CHILD style instead of unparenting the window. winex11.drv: Use a helper to retrieve the decoration rect for managed windows. winex11.drv: Fix X11DRV_X_to_window_rect to handle windows smaller than the decoration. Gijs Vermeulen (2): advpack: Extract inf file before installing in ExecuteCab(). ucrtbase: Add more _o forwards. Hans Leidekker (1): msi: Add support for bitmap buttons. Ilia Mirkin (1): crypt32: Also check CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG. Jacek Caban (2): scrrun: Add MoveFile implementation. widl: Use DECLSPEC_ALIGN in MSVC compatible way. Jeff Smith (3): mshtml/tests: Add tests showing how toString has changed in IE9+. jscript: Set return object's class to 'object' in Object.create. msvcrt: Stop forwarding iswctype functions to ntdll. Markus Engel (1): user32: Force undefined bits in GetKeyState() and GetKeyboardState() to zero. Martin Storsjo (2): ntdll: Properly return errors when failing to unwind. ntdll: Pass a nonnull handler_data when continuing after a collided unwind on arm64. Mas Ahmad Muhammad (1): comdlg32: Enlarge list area in CHOOSE_FONT window. Michael Müller (2): opengl32: Treat invalid pixel types as PFD_TYPE_RGBA in wglChoosePixelFormat. ddraw: Make ddraw1_vtbl and ddraw_surface1_vtbl writable. Murray Colpman (1): winex11.drv: Interpret mouse 6/7 as horiz scroll. Nikolay Sivov (3): comctl32/button: Use duplicated image for drawing. comctl32/listview: Only apply horizontal offset when setting header position. dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag. Owen Rudge (2): winecfg: Add support for '/v' parameter allowing Windows version to be changed. winecfg: Return 0 on success when setting Windows version. Paul Gofman (1): d3d11: Use stricmp() instead of _strnicmp(..., -1). Piotr Caban (1): msvcp90: Add std:_XLgamma implementation. Roman Pišl (5): wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE. user32/edit: Avoid division by zero during initialization. wineconsole: Don't activate window when computing positions. wineconsole: Don't allow recurrent resizing while grabbing changes. comctl32/edit: Avoid division by zero during initialization. Rémi Bernon (1): winex11.drv: Remove frame when non-client area is empty. Sven Baars (6): ntdll: Fix a string leak in init_user_process_params (Valgrind). setupapi: Fix a memory leak (Valgrind). kernelbase: Fix a string leak in CreateProcessInternal (Valgrind). ntdll: Fix a memory leak in fork_and_exec. setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind). setupapi: Make sure the class name is always set on success in SetupDiGetINFClassW (Valgrind). Vijay Kiran Kamuju (2): wmvcore: Add semi-stub implementation for WMIsContentProtected. include: Add missing GUIDs in dsound.h. Vladimir Panteleev (4): kernel32/tests: Fix GetLastError() checks in environment tests. kernelbase: Preserve last error when GetEnvironmentVariableA succeeds. kernelbase: Don't return ERROR_INSUFFICIENT_BUFFER from GetEnvironmentVariableW. kernelbase: Fix GetEnvironmentVariableW return for empty variables. Zebediah Figura (5): winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time. winegstreamer: Clamp both timestamp and timestamp + diff to 0. ntoskrnl.exe: Protect relocated pages one at a time. ntoskrnl.exe: Protect the two relocated pages independently. ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment(). Zhipeng Zhao (1): explorer: Support '/cd,' command line option. Zhiyi Zhang (5): winex11.drv: Ignore disconnected outputs when finding mirroring slaves. comctl32/tests: Test button styles. comctl32/button: Do not set BS_PUSHBUTTON and BS_DEFPUSHBUTTON style directly to Split Buttons and Command Links. kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW(). setupapi: Fix a registry key handle leak. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH v3 3/3] amstream: Implement IMediaStreamFilter::GetStopPosition.
by Myah Caron 26 Jul '20

26 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/filter.c | 24 +++++- dlls/amstream/tests/amstream.c | 150 ++++++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index ef23edfae3..6d1b107df5 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -800,9 +800,29 @@ static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - FIXME("iface %p, stop %p, stub!\n", iface, stop); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, stop %p\n", iface, stop); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetStopPosition(seeking, stop); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b0f1d42242..06b70d50e2 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -812,6 +812,7 @@ struct testfilter LONGLONG current_position; LONGLONG stop_position; HRESULT get_duration_hr; + HRESULT get_stop_position_hr; HRESULT set_positions_hr; HRESULT init_stream_hr; HRESULT cleanup_stream_hr; @@ -995,8 +996,12 @@ static HRESULT WINAPI testsource_seeking_GetDuration(IMediaSeeking *iface, LONGL static HRESULT WINAPI testsource_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IMediaSeeking(iface); + + if (SUCCEEDED(filter->get_stop_position_hr)) + *stop = 0x8000000000000000ULL; + + return filter->get_stop_position_hr; } static HRESULT WINAPI testsource_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) @@ -5225,6 +5230,146 @@ static void test_mediastreamfilter_get_duration(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_stop_position(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + IMediaStreamFilter *filter; + struct testfilter source1; + struct testfilter source2; + struct testfilter source3; + IAMMediaStream *stream1; + IAMMediaStream *stream2; + IAMMediaStream *stream3; + LONGLONG stop_position; + IMediaSeeking *seeking; + IGraphBuilder *graph; + IPin *pin1; + IPin *pin2; + IPin *pin3; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stop_position == 0x8000000000000000ULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.get_stop_position_hr = E_FAIL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.get_stop_position_hr = E_NOTIMPL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5467,6 +5612,7 @@ START_TEST(amstream) test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); test_mediastreamfilter_get_duration(); + test_mediastreamfilter_get_stop_position(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); -- 2.27.0

1 0

[PATCH v3 1/3] amstream: Implement IMediaStreamFilter::GetDuration.
by Myah Caron 26 Jul '20

26 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/filter.c | 24 +++++- dlls/amstream/tests/amstream.c | 141 +++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0a06e78180..ef23edfae3 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -773,9 +773,29 @@ static HRESULT WINAPI filter_seeking_SetTimeFormat(IMediaSeeking *iface, const G static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - FIXME("iface %p, duration %p, stub!\n", iface, duration); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, duration %p\n", iface, duration); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetDuration(seeking, duration); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8adf9db934..48953684f9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5007,6 +5007,146 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_duration(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + IMediaStreamFilter *filter; + struct testfilter source1; + struct testfilter source2; + struct testfilter source3; + IAMMediaStream *stream1; + IAMMediaStream *stream2; + IAMMediaStream *stream3; + LONGLONG duration; + IMediaSeeking *seeking; + IGraphBuilder *graph; + IPin *pin1; + IPin *pin2; + IPin *pin3; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_FAIL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_NOTIMPL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5247,6 +5387,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); -- 2.27.0

1 0

[PATCH v2 3/3] amstream: Implement IMediaStreamFilter::GetStopPosition.
by Myah Caron 25 Jul '20

25 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/filter.c | 24 +++++- dlls/amstream/tests/amstream.c | 150 ++++++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index ef23edfae3..6d1b107df5 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -800,9 +800,29 @@ static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - FIXME("iface %p, stop %p, stub!\n", iface, stop); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, stop %p\n", iface, stop); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetStopPosition(seeking, stop); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 70fc4f02d0..cc24d31e83 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -793,6 +793,7 @@ struct testfilter LONGLONG current_position; LONGLONG stop_position; HRESULT get_duration_hr; + HRESULT get_stop_position_hr; HRESULT set_positions_hr; HRESULT init_stream_hr; HRESULT cleanup_stream_hr; @@ -976,8 +977,12 @@ static HRESULT WINAPI testsource_seeking_GetDuration(IMediaSeeking *iface, LONGL static HRESULT WINAPI testsource_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IMediaSeeking(iface); + + if (SUCCEEDED(filter->get_stop_position_hr)) + *stop = 0x8000000000000000ULL; + + return filter->get_stop_position_hr; } static HRESULT WINAPI testsource_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) @@ -5206,6 +5211,146 @@ static void test_mediastreamfilter_get_duration(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_stop_position(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + IMediaStreamFilter *filter; + struct testfilter source1; + struct testfilter source2; + struct testfilter source3; + IAMMediaStream *stream1; + IAMMediaStream *stream2; + IAMMediaStream *stream3; + LONGLONG stop_position; + IMediaSeeking *seeking; + IGraphBuilder *graph; + IPin *pin1; + IPin *pin2; + IPin *pin3; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stop_position == 0x8000000000000000ULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.get_stop_position_hr = E_FAIL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.get_stop_position_hr = E_NOTIMPL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5448,6 +5593,7 @@ START_TEST(amstream) test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); test_mediastreamfilter_get_duration(); + test_mediastreamfilter_get_stop_position(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); -- 2.27.0

2 1

[PATCH v2 2/3] amstream: Implement IAMMultiMediaStream::GetDuration.
by Myah Caron 25 Jul '20

25 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: Add test case, return E_NOINTERFACE if This->media_seeking is missing (as uncovered by test case). --- dlls/amstream/multimedia.c | 7 ++-- dlls/amstream/tests/amstream.c | 60 ++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 200bd5c4a5..8f978b72ff 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -177,9 +177,12 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); + TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); - return E_NOTIMPL; + if (!This->media_seeking) + return E_NOINTERFACE; + + return IMediaSeeking_GetDuration(This->media_seeking, pDuration); } static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 48953684f9..70fc4f02d0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -335,6 +335,65 @@ static void test_openfile(const WCHAR *test_avi_path) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mmstream_get_duration(const WCHAR *test_avi_path) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + LONGLONG duration; + HRESULT hr; + ULONG ref; + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); + ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 0xf4240ULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(duration == 0, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(duration == 0, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_renderfile(const WCHAR *test_avi_path) { IAMMultiMediaStream *pams; @@ -5351,6 +5410,7 @@ START_TEST(amstream) test_avi_path = load_resource(L"test.avi"); test_openfile(test_avi_path); + test_mmstream_get_duration(test_avi_path); test_renderfile(test_avi_path); unload_resource(test_avi_path); -- 2.27.0

2 1

[PATCH v2 1/3] amstream: Implement IMediaStreamFilter::GetDuration.
by Myah Caron 25 Jul '20

25 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: Created a separate test function following Zebediah's feedback. The function is copied from test_mediastreamfilter_set_positions, with simple replacements for GetDuration. dlls/amstream/filter.c | 24 +++++- dlls/amstream/tests/amstream.c | 141 +++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0a06e78180..ef23edfae3 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -773,9 +773,29 @@ static HRESULT WINAPI filter_seeking_SetTimeFormat(IMediaSeeking *iface, const G static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - FIXME("iface %p, duration %p, stub!\n", iface, duration); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, duration %p\n", iface, duration); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetDuration(seeking, duration); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8adf9db934..48953684f9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5007,6 +5007,146 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_duration(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + IMediaStreamFilter *filter; + struct testfilter source1; + struct testfilter source2; + struct testfilter source3; + IAMMediaStream *stream1; + IAMMediaStream *stream2; + IAMMediaStream *stream3; + LONGLONG duration; + IMediaSeeking *seeking; + IGraphBuilder *graph; + IPin *pin1; + IPin *pin2; + IPin *pin3; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_FAIL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_NOTIMPL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5247,6 +5387,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); -- 2.27.0

1 0

[PATCH] kernel32/tests: Relax a timing test.
by Zebediah Figura 25 Jul '20

25 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/mailslot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index da595e97143..9da960fba81 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -324,7 +324,7 @@ todo_wine ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); dwTimeout = GetTickCount() - dwTimeout; - ok( dwTimeout >= 990, "timeout too short %u\n", dwTimeout ); + ok( dwTimeout >= 900, "timeout too short %u\n", dwTimeout ); ok( CloseHandle( hSlot ), "closing the mailslot\n"); return 0; -- 2.27.0

1 0

[PATCH 1/5] dsdmo: Add a stub waves reverb effect.
by Zebediah Figura 24 Jul '20

24 Jul '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsdmo/Makefile.in | 4 + dlls/dsdmo/dsdmo.idl | 27 +++ dlls/dsdmo/main.c | 429 +++++++++++++++++++++++++++++++++++++-- dlls/dsdmo/tests/dsdmo.c | 42 ++-- 4 files changed, 462 insertions(+), 40 deletions(-) create mode 100644 dlls/dsdmo/dsdmo.idl diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index 99816ae0c08..3787415abd6 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,6 +1,10 @@ MODULE = dsdmo.dll +IMPORTS = dmoguids uuid EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +IDL_SRCS = \ + dsdmo.idl diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl new file mode 100644 index 00000000000..a967186af3f --- /dev/null +++ b/dlls/dsdmo/dsdmo.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2020 Zebediah Figura + * + * 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 + +[ + threading(both), + progid("Microsoft.DirectSoundWavesReverbDMO.1"), + vi_progid("Microsoft.DirectSoundWavesReverbDMO"), + uuid(87fc0268-9a55-4360-95aa-004a1d9de26c) +] +coclass DirectSoundWavesReverbDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 788381b7a45..44915ca8566 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -15,9 +15,13 @@ * 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 "ole2.h" +#define COBJMACROS +#include "dmo.h" +#include "mmreg.h" +#include "mmsystem.h" +#include "initguid.h" +#include "dsound.h" #include "rpcproxy.h" #include "wine/debug.h" @@ -26,19 +30,318 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); static HINSTANCE dsdmo_instance; -/****************************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +struct effect +{ + IMediaObject IMediaObject_iface; + IUnknown IUnknown_inner; + IUnknown *outer_unk; + LONG refcount; + + const struct effect_ops *ops; +}; + +struct effect_ops +{ + void *(*query_interface)(struct effect *effect, REFIID iid); + void (*destroy)(struct effect *effect); +}; + +static struct effect *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IUnknown_inner); +} + +static HRESULT WINAPI effect_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IUnknown(iface); + + TRACE("effect %p, iid %s, out %p.\n", effect, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown)) + *out = iface; + else if (IsEqualGUID(iid, &IID_IMediaObject)) + *out = &effect->IMediaObject_iface; + else if (!(*out = effect->ops->query_interface(effect, iid))) + { + WARN("%s not implemented; returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI effect_inner_AddRef(IUnknown *iface) +{ + struct effect *effect = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&effect->refcount); + + TRACE("%p increasing refcount to %u.\n", effect, refcount); + return refcount; +} + +static ULONG WINAPI effect_inner_Release(IUnknown *iface) { - TRACE("(%p %d %p)\n", inst, reason, reserved); + struct effect *effect = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&effect->refcount); + + TRACE("%p decreasing refcount to %u.\n", effect, refcount); + + if (!refcount) + { + effect->ops->destroy(effect); + } + return refcount; +} + +static const IUnknownVtbl effect_inner_vtbl = +{ + effect_inner_QueryInterface, + effect_inner_AddRef, + effect_inner_Release, +}; + +static struct effect *impl_from_IMediaObject(IMediaObject *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IMediaObject_iface); +} + +static HRESULT WINAPI effect_QueryInterface(IMediaObject *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IMediaObject(iface); + return IUnknown_QueryInterface(effect->outer_unk, iid, out); +} + +static ULONG WINAPI effect_AddRef(IMediaObject *iface) +{ + struct effect *effect = impl_from_IMediaObject(iface); + return IUnknown_AddRef(effect->outer_unk); +} + +static ULONG WINAPI effect_Release(IMediaObject *iface) +{ + struct effect *effect = impl_from_IMediaObject(iface); + return IUnknown_Release(effect->outer_unk); +} + +static HRESULT WINAPI effect_GetStreamCount(IMediaObject *iface, DWORD *input, DWORD *output) +{ + FIXME("iface %p, input %p, output %p, stub!\n", iface, input, output); + return E_NOTIMPL; +} +static HRESULT WINAPI effect_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) +{ + FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) +{ + FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) +{ + FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) +{ + FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputSizeInfo(IMediaObject *iface, DWORD index, + DWORD *size, DWORD *lookahead, DWORD *alignment) +{ + FIXME("iface %p, index %u, size %p, lookahead %p, alignment %p, stub!\n", iface, index, size, lookahead, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) +{ + FIXME("iface %p, index %u, size %p, alignment %p, stub!\n", iface, index, size, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) +{ + FIXME("iface %p, index %u, latency %p, stub!\n", iface, index, latency); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) +{ + FIXME("iface %p, index %u, latency %s, stub!\n", iface, index, wine_dbgstr_longlong(latency)); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_Flush(IMediaObject *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_Discontinuity(IMediaObject *iface, DWORD index) +{ + FIXME("iface %p, index %u, stub!\n", iface, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_AllocateStreamingResources(IMediaObject *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_FreeStreamingResources(IMediaObject *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) +{ + FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_ProcessInput(IMediaObject *iface, DWORD index, + IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) +{ + FIXME("iface %p, index %u, buffer %p, flags %#x, timestamp %s, timelength %s, stub!\n", + iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_ProcessOutput(IMediaObject *iface, DWORD flags, + DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) +{ + FIXME("iface %p, flags %#x, count %u, buffers %p, status %p, stub!\n", iface, flags, count, buffers, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_Lock(IMediaObject *iface, LONG lock) +{ + FIXME("iface %p, lock %d, stub!\n", iface, lock); + return E_NOTIMPL; +} + +static const IMediaObjectVtbl effect_vtbl = +{ + effect_QueryInterface, + effect_AddRef, + effect_Release, + effect_GetStreamCount, + effect_GetInputStreamInfo, + effect_GetOutputStreamInfo, + effect_GetInputType, + effect_GetOutputType, + effect_SetInputType, + effect_SetOutputType, + effect_GetInputCurrentType, + effect_GetOutputCurrentType, + effect_GetInputSizeInfo, + effect_GetOutputSizeInfo, + effect_GetInputMaxLatency, + effect_SetInputMaxLatency, + effect_Flush, + effect_Discontinuity, + effect_AllocateStreamingResources, + effect_FreeStreamingResources, + effect_GetInputStatus, + effect_ProcessInput, + effect_ProcessOutput, + effect_Lock, +}; + +static void effect_init(struct effect *effect, IUnknown *outer, const struct effect_ops *ops) +{ + effect->outer_unk = outer ? outer : &effect->IUnknown_inner; + effect->refcount = 1; + effect->IUnknown_inner.lpVtbl = &effect_inner_vtbl; + effect->IMediaObject_iface.lpVtbl = &effect_vtbl; + + effect->ops = ops; +} + +struct waves_reverb +{ + struct effect effect; +}; + +static struct waves_reverb *impl_waves_reverb_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct waves_reverb, effect); +} + +static void *waves_reverb_query_interface(struct effect *iface, REFIID iid) +{ + return NULL; +} + +static void waves_reverb_destroy(struct effect *iface) +{ + struct waves_reverb *effect = impl_waves_reverb_from_effect(iface); + + free(effect); +} + +static const struct effect_ops waves_reverb_ops = +{ + .destroy = waves_reverb_destroy, + .query_interface = waves_reverb_query_interface, +}; + +static HRESULT waves_reverb_create(IUnknown *outer, IUnknown **out) +{ + struct waves_reverb *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &waves_reverb_ops); + + TRACE("Created waves reverb effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ switch(reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - dsdmo_instance = inst; + dsdmo_instance = instance; DisableThreadLibraryCalls(dsdmo_instance); break; } @@ -46,35 +349,117 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return TRUE; } -/*********************************************************************** - * DllGetClassObject - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +struct class_factory { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + IClassFactory IClassFactory_iface; + HRESULT (*create_instance)(IUnknown *outer, IUnknown **out); +}; + +static 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 iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(iid)); + 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 iid, void **out) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + IUnknown *unk; + HRESULT hr; + + TRACE("iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid(iid), out); + + *out = NULL; + + if (outer && !IsEqualGUID(iid, &IID_IUnknown)) + return E_NOINTERFACE; + + if (SUCCEEDED(hr = factory->create_instance(outer, &unk))) + { + hr = IUnknown_QueryInterface(unk, iid, out); + IUnknown_Release(unk); + } + return hr; +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("lock %d, stub!\n", lock); + 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 +{ + const GUID *clsid; + struct class_factory factory; +} +class_factories[] = +{ + {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) +{ + unsigned int i; + + TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + for (i = 0; i < ARRAY_SIZE(class_factories); ++i) + { + if (IsEqualGUID(clsid, class_factories[i].clsid)) + return IClassFactory_QueryInterface(&class_factories[i].factory.IClassFactory_iface, iid, out); + } + + FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow - */ HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; } -/*********************************************************************** - * DllRegisterServer - */ HRESULT WINAPI DllRegisterServer(void) { TRACE("()\n"); return __wine_register_resources(dsdmo_instance); } -/*********************************************************************** - * DllUnregisterServer - */ HRESULT WINAPI DllUnregisterServer(void) { TRACE("()\n"); diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index b8f0932790b..f236c95d43c 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -80,9 +80,7 @@ static void test_aggregation(const GUID *clsid) dmo = (IMediaObject *)0xdeadbeef; hr = CoCreateInstance(clsid, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - if (hr != E_NOINTERFACE) - return; + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!dmo, "Got interface %p.\n", dmo); hr = CoCreateInstance(clsid, &test_outer, CLSCTX_INPROC_SERVER, @@ -138,9 +136,7 @@ static void test_interfaces(const GUID *clsid, const GUID *iid) ULONG ref; hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, iid, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - return; + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IMediaObject, (void **)&unk2); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -204,9 +200,7 @@ static void test_media_types(const GUID *clsid) }; hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - return; + ok(hr == S_OK, "Got hr %#x.\n", hr); build_pcm_format(&wfx, WAVE_FORMAT_PCM, 16, 44100, 2); @@ -508,18 +502,19 @@ START_TEST(dsdmo) { const GUID *clsid; const GUID *iid; + BOOL todo; } tests[] = { - {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus}, - {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor}, - {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion}, - {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, - {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger}, - {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle}, - {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb}, - {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq}, - {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb}, + {&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_FLANGER, &IID_IDirectSoundFXFlanger, TRUE}, + {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, + {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb, TRUE}, + {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq, TRUE}, + {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb, TRUE}, }; unsigned int i; @@ -527,6 +522,17 @@ START_TEST(dsdmo) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(tests[i].clsid, NULL, CLSCTX_INPROC_SERVER, tests[i].iid, (void **)&unk); + todo_wine_if(tests[i].todo) ok(hr == S_OK, "Failed to create %s, hr %#x.\n", + debugstr_guid(tests[i].clsid), hr); + if (hr == S_OK) + IUnknown_Release(unk); + else + continue; + test_aggregation(tests[i].clsid); test_interfaces(tests[i].clsid, tests[i].iid); test_media_types(tests[i].clsid); -- 2.27.0

2 7

[PATCH 1/4] wine.inf: Move the Drivers32 section to the registry.
by Zebediah Figura 24 Jul '20

24 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- The changes to msacm32 and msvfw32 need to be done in lockstep, to avoid reporting duplicate entries or omitting entries. dlls/msacm32/internal.c | 15 +-------------- dlls/msvfw32/msvideo_main.c | 19 ------------------- loader/wine.inf.in | 22 +++++++++------------- 3 files changed, 10 insertions(+), 46 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 9c4d1a75f3b..0ff3fea2af3 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -352,15 +352,13 @@ void MSACM_RegisterAllDrivers(void) { static const WCHAR msacm32[] = {'m','s','a','c','m','3','2','.','d','l','l','\0'}; static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; - static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'D','r','i','v','e','r','s','3','2','\0'}; DWORD i, cnt, bufLen, lRet, type; - WCHAR buf[2048], valname[64], *name, *s; + WCHAR buf[2048], valname[64], *name; FILETIME lastWrite; HKEY hKey; @@ -392,17 +390,6 @@ void MSACM_RegisterAllDrivers(void) RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) - { - for(s = buf; *s; s += lstrlenW(s) + 1) - { - if (wcsnicmp(s, msacmW, ARRAY_SIZE(msacmW))) continue; - if (!(name = wcschr(s, '='))) continue; - *name = 0; - MSACM_RegisterDriver(s, name + 1, 0); - *name = '='; - } - } MSACM_ReorderDriversByPriority(); MSACM_RegisterDriver(msacm32, msacm32, 0); } diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index e3a3300e5a1..905be6e5afb 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -308,25 +308,6 @@ BOOL VFWAPI ICInfo(DWORD type, DWORD handler, ICINFO *info) RegCloseKey(key); } - if (GetPrivateProfileSectionA("drivers32", buf, sizeof(buf), "system.ini")) - { - char *s; - for (s = buf; *s; s += strlen(s) + 1) - { - if (s[4] != '.' || s[9] != '=') continue; - ret_type = mmioStringToFOURCCA(s, 0); - ret_handler = mmioStringToFOURCCA(s + 5, 0); - if (type && compare_fourcc(type, ret_type)) continue; - if (compare_fourcc(handler, ret_handler) && handler != count++) continue; - - info->fccType = ret_type; - info->fccHandler = ret_handler; - MultiByteToWideChar(CP_ACP, 0, s + 10, -1, info->szDriver, ARRAY_SIZE(info->szDriver)); - TRACE("Returning codec %s, driver %s.\n", debugstr_an(s, 9), debugstr_a(s + 10)); - return TRUE; - } - } - LIST_FOR_EACH_ENTRY(driver, &reg_driver_list, struct reg_driver, entry) { if (type && compare_fourcc(type, driver->fccType)) continue; diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 35992a01dfd..6f66f285569 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -556,7 +556,14 @@ HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" HKLM,%CurrentVersionNT%\Console,,16 -HKLM,%CurrentVersionNT%\Drivers32,,16 +HKLM,%CurrentVersionNT%\Drivers32,"msacm.imaadpcm",,"imaadp32.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.l3acm",,"l3codeca.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.msadpcm",,"msadp32.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.msg711",,"msg711.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.msgsm610",,"msgsm32.acm" +HKLM,%CurrentVersionNT%\Drivers32,"vidc.cvid",,"iccvid.dll" +HKLM,%CurrentVersionNT%\Drivers32,"vidc.mrle",,"msrle32.dll" +HKLM,%CurrentVersionNT%\Drivers32,"vidc.msvc",,"msvidc32.dll" HKLM,%CurrentVersionNT%\FontDpi,,16 HKLM,%CurrentVersionNT%\FontLink,,16 HKLM,%CurrentVersionNT%\FontMapper,,16 @@ -565,6 +572,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\IniFileMapping\system.ini,"drivers32",,"SYS:Microsoft\Windows NT\CurrentVersion\Drivers32" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" @@ -2734,18 +2742,6 @@ system.ini, mci,,"vcr=mcivisca.drv" system.ini, mci,,"; videodisc=mcipionr.drv" system.ini, mci,,"waveaudio=mciwave.dll" -system.ini, drivers32,,"msacm.imaadpcm=imaadp32.acm" -system.ini, drivers32,,"msacm.msadpcm=msadp32.acm" -system.ini, drivers32,,"msacm.msg711=msg711.acm" -system.ini, drivers32,,"msacm.l3acm=l3codeca.acm" -system.ini, drivers32,,"msacm.msgsm610=msgsm32.acm" -system.ini, drivers32,,"vidc.mrle=msrle32.dll" -system.ini, drivers32,,"vidc.msvc=msvidc32.dll" -system.ini, drivers32,,"vidc.cvid=iccvid.dll" -system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" -system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" -system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" - [Timezones] ; The timezone information (TZI field) comes from the Olson timezone database ; http://www.twinsun.com/tz/tz-link.htm -- 2.27.0

2 7

[PATCH 03/10] xactengine3_7: Implement IXACT3SoundBank Interface.
by Vijay Kiran Kamuju 24 Jul '20

24 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1