November 2020 - Wine-Commits

Austin English : ksuser: Add version resource.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: c205840f5b6725b772f4563b559fbbfe70bf5db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c205840f5b6725b772f4563b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:46 2020 -0500 ksuser: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ksuser/Makefile.in | 2 ++ dlls/ksuser/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ksuser/Makefile.in b/dlls/ksuser/Makefile.in index 6674a680f24..c5e8251fb23 100644 --- a/dlls/ksuser/Makefile.in +++ b/dlls/ksuser/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +RC_SRCS = version.rc diff --git a/dlls/ksuser/version.rc b/dlls/ksuser/version.rc new file mode 100644 index 00000000000..7cb006bdbfd --- /dev/null +++ b/dlls/ksuser/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine ksuser" +#define WINE_FILENAME_STR "ksuser.dll" +#define WINE_FILEVERSION 5,3,0,900 +#define WINE_FILEVERSION_STR "5.3.0.900" +#define WINE_PRODUCTVERSION 5,3,0,900 +#define WINE_PRODUCTVERSION_STR "5.3.0.900" + +#include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : mfplat: Implement MFMapDXGIFormatToDX9Format().
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: af37f3b085c572dbb5209c5aa18f631e4ca65828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af37f3b085c572dbb5209c5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 3 15:56:02 2020 +0300 mfplat: Implement MFMapDXGIFormatToDX9Format(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 73 ++++++++++++++++++++++++++++++++++ include/mfapi.h | 2 + 4 files changed, 174 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index fcaef110038..f3895ca4d49 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3211,3 +3211,101 @@ HRESULT WINAPI MFFrameRateToAverageTimePerFrame(UINT32 numerator, UINT32 denomin return S_OK; } + +/*********************************************************************** + * MFMapDXGIFormatToDX9Format (mfplat.@) + */ +DWORD WINAPI MFMapDXGIFormatToDX9Format(DXGI_FORMAT dxgi_format) +{ + switch (dxgi_format) + { + case DXGI_FORMAT_R32G32B32A32_FLOAT: + return D3DFMT_A32B32G32R32F; + case DXGI_FORMAT_R16G16B16A16_FLOAT: + return D3DFMT_A16B16G16R16F; + case DXGI_FORMAT_R16G16B16A16_UNORM: + return D3DFMT_A16B16G16R16; + case DXGI_FORMAT_R16G16B16A16_SNORM: + return D3DFMT_Q16W16V16U16; + case DXGI_FORMAT_R32G32_FLOAT: + return D3DFMT_G32R32F; + case DXGI_FORMAT_R10G10B10A2_UNORM: + return D3DFMT_A2B10G10R10; + case DXGI_FORMAT_R8G8B8A8_SNORM: + return D3DFMT_Q8W8V8U8; + case DXGI_FORMAT_R16G16_FLOAT: + return D3DFMT_G16R16F; + case DXGI_FORMAT_R16G16_UNORM: + return D3DFMT_G16R16; + case DXGI_FORMAT_R16G16_SNORM: + return D3DFMT_V16U16; + case DXGI_FORMAT_D32_FLOAT: + return D3DFMT_D32F_LOCKABLE; + case DXGI_FORMAT_R32_FLOAT: + return D3DFMT_R32F; + case DXGI_FORMAT_D24_UNORM_S8_UINT: + return D3DFMT_D24S8; + case DXGI_FORMAT_R8G8_SNORM: + return D3DFMT_V8U8; + case DXGI_FORMAT_R16_FLOAT: + return D3DFMT_R16F; + case DXGI_FORMAT_D16_UNORM: + return D3DFMT_D16_LOCKABLE; + case DXGI_FORMAT_R16_UNORM: + return D3DFMT_L16; + case DXGI_FORMAT_R8_UNORM: + return D3DFMT_L8; + case DXGI_FORMAT_A8_UNORM: + return D3DFMT_A8; + case DXGI_FORMAT_BC1_UNORM: + case DXGI_FORMAT_BC1_UNORM_SRGB: + return D3DFMT_DXT1; + case DXGI_FORMAT_BC2_UNORM: + case DXGI_FORMAT_BC2_UNORM_SRGB: + return D3DFMT_DXT2; + case DXGI_FORMAT_BC3_UNORM: + case DXGI_FORMAT_BC3_UNORM_SRGB: + return D3DFMT_DXT4; + case DXGI_FORMAT_R8G8B8A8_UNORM: + return D3DFMT_A8B8G8R8; + case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: + case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: + return D3DFMT_A8R8G8B8; + case DXGI_FORMAT_B8G8R8X8_UNORM: + case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: + return D3DFMT_X8R8G8B8; + case DXGI_FORMAT_AYUV: + return MAKEFOURCC('A','Y','U','V'); + case DXGI_FORMAT_Y410: + return MAKEFOURCC('Y','4','1','0'); + case DXGI_FORMAT_Y416: + return MAKEFOURCC('Y','4','1','6'); + case DXGI_FORMAT_NV12: + return MAKEFOURCC('N','V','1','2'); + case DXGI_FORMAT_P010: + return MAKEFOURCC('P','0','1','0'); + case DXGI_FORMAT_P016: + return MAKEFOURCC('P','0','1','6'); + case DXGI_FORMAT_420_OPAQUE: + return MAKEFOURCC('4','2','0','O'); + case DXGI_FORMAT_YUY2: + return D3DFMT_YUY2; + case DXGI_FORMAT_Y210: + return MAKEFOURCC('Y','2','1','0'); + case DXGI_FORMAT_Y216: + return MAKEFOURCC('Y','2','1','6'); + case DXGI_FORMAT_NV11: + return MAKEFOURCC('N','V','1','1'); + case DXGI_FORMAT_AI44: + return MAKEFOURCC('A','I','4','4'); + case DXGI_FORMAT_IA44: + return MAKEFOURCC('I','A','4','4'); + case DXGI_FORMAT_P8: + return D3DFMT_P8; + case DXGI_FORMAT_A8P8: + return D3DFMT_A8P8; + default: + return 0; + } +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 36e009c2db9..8ef40dd20c8 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -131,6 +131,7 @@ @ stdcall MFJoinWorkQueue(long long ptr) rtworkq.RtwqJoinWorkQueue @ stdcall MFLockPlatform() rtworkq.RtwqLockPlatform @ stdcall MFLockWorkQueue(long) rtworkq.RtwqLockWorkQueue +@ stdcall MFMapDXGIFormatToDX9Format(long) @ stdcall MFPutWaitingWorkItem(long long ptr ptr) rtworkq.RtwqPutWaitingWorkItem @ stdcall MFPutWorkItem(long ptr ptr) @ stdcall MFPutWorkItem2(long long ptr ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a6c8a10f777..4f5cf268d2a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -108,6 +108,7 @@ static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_t DWORD min_alignment, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); +static DWORD (WINAPI *pMFMapDXGIFormatToDX9Format)(DXGI_FORMAT dxgi_format); static HWND create_window(void) { @@ -742,6 +743,7 @@ static void init_functions(void) X(MFCreateTransformActivate); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); + X(MFMapDXGIFormatToDX9Format); X(MFPutWaitingWorkItem); X(MFRegisterLocalByteStreamHandler); X(MFRegisterLocalSchemeHandler); @@ -5911,6 +5913,76 @@ static void test_MFFrameRateToAverageTimePerFrame(void) } } +static void test_MFMapDXGIFormatToDX9Format(void) +{ + static const struct format_pair + { + DXGI_FORMAT dxgi_format; + DWORD d3d9_format; + } + formats_map[] = + { + { DXGI_FORMAT_R32G32B32A32_FLOAT, D3DFMT_A32B32G32R32F }, + { DXGI_FORMAT_R16G16B16A16_FLOAT, D3DFMT_A16B16G16R16F }, + { DXGI_FORMAT_R16G16B16A16_UNORM, D3DFMT_A16B16G16R16 }, + { DXGI_FORMAT_R16G16B16A16_SNORM, D3DFMT_Q16W16V16U16 }, + { DXGI_FORMAT_R32G32_FLOAT, D3DFMT_G32R32F }, + { DXGI_FORMAT_R10G10B10A2_UNORM, D3DFMT_A2B10G10R10 }, + { DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D3DFMT_A8R8G8B8 }, + { DXGI_FORMAT_R8G8B8A8_SNORM, D3DFMT_Q8W8V8U8 }, + { DXGI_FORMAT_R16G16_FLOAT, D3DFMT_G16R16F }, + { DXGI_FORMAT_R16G16_UNORM, D3DFMT_G16R16 }, + { DXGI_FORMAT_R16G16_SNORM, D3DFMT_V16U16 }, + { DXGI_FORMAT_D32_FLOAT, D3DFMT_D32F_LOCKABLE }, + { DXGI_FORMAT_R32_FLOAT, D3DFMT_R32F }, + { DXGI_FORMAT_D24_UNORM_S8_UINT, D3DFMT_D24S8 }, + { DXGI_FORMAT_R8G8_SNORM, D3DFMT_V8U8 }, + { DXGI_FORMAT_R16_FLOAT, D3DFMT_R16F }, + { DXGI_FORMAT_R16_UNORM, D3DFMT_L16 }, + { DXGI_FORMAT_R8_UNORM, D3DFMT_L8 }, + { DXGI_FORMAT_A8_UNORM, D3DFMT_A8 }, + { DXGI_FORMAT_BC1_UNORM, D3DFMT_DXT1 }, + { DXGI_FORMAT_BC1_UNORM_SRGB, D3DFMT_DXT1 }, + { DXGI_FORMAT_BC2_UNORM, D3DFMT_DXT2 }, + { DXGI_FORMAT_BC2_UNORM_SRGB, D3DFMT_DXT2 }, + { DXGI_FORMAT_BC3_UNORM, D3DFMT_DXT4 }, + { DXGI_FORMAT_BC3_UNORM_SRGB, D3DFMT_DXT4 }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D3DFMT_A8R8G8B8 }, + { DXGI_FORMAT_B8G8R8X8_UNORM, D3DFMT_X8R8G8B8 }, + { DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D3DFMT_A8R8G8B8 }, + { DXGI_FORMAT_B8G8R8X8_UNORM_SRGB, D3DFMT_X8R8G8B8 }, + { DXGI_FORMAT_AYUV, MAKEFOURCC('A','Y','U','V') }, + { DXGI_FORMAT_Y410, MAKEFOURCC('Y','4','1','0') }, + { DXGI_FORMAT_Y416, MAKEFOURCC('Y','4','1','6') }, + { DXGI_FORMAT_NV12, MAKEFOURCC('N','V','1','2') }, + { DXGI_FORMAT_P010, MAKEFOURCC('P','0','1','0') }, + { DXGI_FORMAT_P016, MAKEFOURCC('P','0','1','6') }, + { DXGI_FORMAT_420_OPAQUE, MAKEFOURCC('4','2','0','O') }, + { DXGI_FORMAT_YUY2, D3DFMT_YUY2 }, + { DXGI_FORMAT_Y210, MAKEFOURCC('Y','2','1','0') }, + { DXGI_FORMAT_Y216, MAKEFOURCC('Y','2','1','6') }, + { DXGI_FORMAT_NV11, MAKEFOURCC('N','V','1','1') }, + { DXGI_FORMAT_AI44, MAKEFOURCC('A','I','4','4') }, + { DXGI_FORMAT_IA44, MAKEFOURCC('I','A','4','4') }, + { DXGI_FORMAT_P8, D3DFMT_P8 }, + { DXGI_FORMAT_A8P8, D3DFMT_A8P8 }, + }; + unsigned int i; + DWORD format; + + if (!pMFMapDXGIFormatToDX9Format) + { + win_skip("MFMapDXGIFormatToDX9Format is not available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(formats_map); ++i) + { + format = pMFMapDXGIFormatToDX9Format(formats_map[i].dxgi_format); + ok(format == formats_map[i].d3d9_format, "Unexpected d3d9 format %#x, dxgi format %#x.\n", format, formats_map[i].dxgi_format); + } +} + START_TEST(mfplat) { char **argv; @@ -5970,6 +6042,7 @@ START_TEST(mfplat) test_MFCreateDXSurfaceBuffer(); test_MFCreateTrackedSample(); test_MFFrameRateToAverageTimePerFrame(); + test_MFMapDXGIFormatToDX9Format(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 8661b41fc4e..77875486e54 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -22,6 +22,7 @@ #include <mfobjects.h> #include <mmreg.h> #include <avrt.h> +#include <dxgiformat.h> #if defined(__cplusplus) extern "C" { @@ -549,6 +550,7 @@ HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 * HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); +DWORD WINAPI MFMapDXGIFormatToDX9Format(DXGI_FORMAT dxgi_format); HRESULT WINAPI MFPutWaitingWorkItem(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *callback, IUnknown *state);

1 0

Nikolay Sivov : mfmediaengine: Add video output topology branch.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 344d3fb8a40e4eb431787187d49156ef4048d19c URL: https://source.winehq.org/git/wine.git/?a=commit;h=344d3fb8a40e4eb431787187… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 3 15:56:03 2020 +0300 mfmediaengine: Add video output topology branch. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 166 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 164 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 64f0ae6d2a1..0817c249b27 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -75,6 +75,7 @@ struct media_engine IMFMediaEngine IMFMediaEngine_iface; IMFAsyncCallback session_events; IMFAsyncCallback load_handler; + IMFSampleGrabberSinkCallback grabber_callback; LONG refcount; IMFMediaEngineNotify *callback; IMFAttributes *attributes; @@ -237,6 +238,11 @@ static struct media_engine *impl_from_load_handler_IMFAsyncCallback(IMFAsyncCall return CONTAINING_RECORD(iface, struct media_engine, load_handler); } +static struct media_engine *impl_from_IMFSampleGrabberSinkCallback(IMFSampleGrabberSinkCallback *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, grabber_callback); +} + static HRESULT WINAPI media_engine_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFAsyncCallback) || @@ -373,6 +379,51 @@ static HRESULT media_engine_create_audio_renderer(struct media_engine *engine, I return hr; } +static HRESULT media_engine_create_video_renderer(struct media_engine *engine, IMFTopologyNode **node) +{ + DXGI_FORMAT output_format; + IMFMediaType *media_type; + IMFActivate *activate; + GUID subtype; + HRESULT hr; + + *node = NULL; + + if (FAILED(IMFAttributes_GetUINT32(engine->attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &output_format))) + { + WARN("Output format was not specified.\n"); + return E_FAIL; + } + + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); + if (!(subtype.Data1 = MFMapDXGIFormatToDX9Format(output_format))) + { + WARN("Unrecognized output format %#x.\n", output_format); + return E_FAIL; + } + + if (FAILED(hr = MFCreateMediaType(&media_type))) + return hr; + + IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &subtype); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &engine->grabber_callback, &activate); + IMFMediaType_Release(media_type); + if (FAILED(hr)) + return hr; + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, node))) + { + IMFTopologyNode_SetObject(*node, (IUnknown *)activate); + IMFTopologyNode_SetUINT32(*node, &MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE); + } + + IMFActivate_Release(activate); + + return hr; +} + static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source) { IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; @@ -455,11 +506,10 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDDATA, 0, 0); - /* TODO: set up video stream nodes */ - if (SUCCEEDED(hr = MFCreateTopology(&topology))) { IMFTopologyNode *sar_node = NULL, *audio_src = NULL; + IMFTopologyNode *grabber_node = NULL, *video_src = NULL; if (sd_audio) { @@ -481,6 +531,27 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi if (audio_src) IMFTopologyNode_Release(audio_src); } + + if (SUCCEEDED(hr) && sd_video) + { + if (FAILED(hr = media_engine_create_source_node(source, pd, sd_video, &video_src))) + WARN("Failed to create video source node, hr %#x.\n", hr); + + if (FAILED(hr = media_engine_create_video_renderer(engine, &grabber_node))) + WARN("Failed to create video grabber node, hr %#x.\n", hr); + + if (grabber_node && video_src) + { + IMFTopology_AddNode(topology, video_src); + IMFTopology_AddNode(topology, grabber_node); + IMFTopologyNode_ConnectOutput(video_src, 0, grabber_node, 0); + } + + if (grabber_node) + IMFTopologyNode_Release(grabber_node); + if (video_src) + IMFTopologyNode_Release(video_src); + } } if (topology) @@ -1225,6 +1296,96 @@ static const IMFMediaEngineVtbl media_engine_vtbl = media_engine_OnVideoStreamTick, }; +static HRESULT WINAPI media_engine_grabber_callback_QueryInterface(IMFSampleGrabberSinkCallback *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFSampleGrabberSinkCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFSampleGrabberSinkCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_grabber_callback_AddRef(IMFSampleGrabberSinkCallback *iface) +{ + struct media_engine *engine = impl_from_IMFSampleGrabberSinkCallback(iface); + return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface); +} + +static ULONG WINAPI media_engine_grabber_callback_Release(IMFSampleGrabberSinkCallback *iface) +{ + struct media_engine *engine = impl_from_IMFSampleGrabberSinkCallback(iface); + return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_grabber_callback_OnClockStart(IMFSampleGrabberSinkCallback *iface, + MFTIME systime, LONGLONG start_offset) +{ + return S_OK; +} + +static HRESULT WINAPI media_engine_grabber_callback_OnClockStop(IMFSampleGrabberSinkCallback *iface, + MFTIME systime) +{ + return S_OK; +} + +static HRESULT WINAPI media_engine_grabber_callback_OnClockPause(IMFSampleGrabberSinkCallback *iface, + MFTIME systime) +{ + return S_OK; +} + +static HRESULT WINAPI media_engine_grabber_callback_OnClockRestart(IMFSampleGrabberSinkCallback *iface, + MFTIME systime) +{ + return S_OK; +} + +static HRESULT WINAPI media_engine_grabber_callback_OnClockSetRate(IMFSampleGrabberSinkCallback *iface, + MFTIME systime, float rate) +{ + return S_OK; +} + +static HRESULT WINAPI media_engine_grabber_callback_OnSetPresentationClock(IMFSampleGrabberSinkCallback *iface, + IMFPresentationClock *clock) +{ + return S_OK; +} + +static HRESULT WINAPI media_engine_grabber_callback_OnProcessSample(IMFSampleGrabberSinkCallback *iface, + REFGUID major_type, DWORD sample_flags, LONGLONG sample_time, LONGLONG sample_duration, + const BYTE *buffer, DWORD sample_size) +{ + return S_OK; +} + +static HRESULT WINAPI media_engine_grabber_callback_OnShutdown(IMFSampleGrabberSinkCallback *iface) +{ + return S_OK; +} + +static const IMFSampleGrabberSinkCallbackVtbl media_engine_grabber_callback_vtbl = +{ + media_engine_grabber_callback_QueryInterface, + media_engine_grabber_callback_AddRef, + media_engine_grabber_callback_Release, + media_engine_grabber_callback_OnClockStart, + media_engine_grabber_callback_OnClockStop, + media_engine_grabber_callback_OnClockPause, + media_engine_grabber_callback_OnClockRestart, + media_engine_grabber_callback_OnClockSetRate, + media_engine_grabber_callback_OnSetPresentationClock, + media_engine_grabber_callback_OnProcessSample, + media_engine_grabber_callback_OnShutdown, +}; + static HRESULT WINAPI media_engine_factory_QueryInterface(IMFMediaEngineClassFactory *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFMediaEngineClassFactory) || @@ -1259,6 +1420,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->load_handler.lpVtbl = &media_engine_load_handler_vtbl; + engine->grabber_callback.lpVtbl = &media_engine_grabber_callback_vtbl; engine->refcount = 1; engine->flags = (flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK) | FLAGS_ENGINE_PAUSED; engine->default_playback_rate = 1.0;

1 0

Nikolay Sivov : mfmediaengine: Issue MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY on first video sample.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 37ffe4444322f2ffaed350dab0a8e47acafc79d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37ffe4444322f2ffaed350da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 3 15:56:08 2020 +0300 mfmediaengine: Issue MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY on first video sample. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 8dbbb889288..9da802f0df6 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -68,6 +68,7 @@ enum media_engine_flags FLAGS_ENGINE_MUTED = 0x400, FLAGS_ENGINE_HAS_AUDIO = 0x800, FLAGS_ENGINE_HAS_VIDEO = 0x1000, + FLAGS_ENGINE_FIRST_FRAME = 0x2000, }; struct media_engine @@ -316,6 +317,10 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface break; case MESessionEnded: + EnterCriticalSection(&engine->cs); + media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, FALSE); + LeaveCriticalSection(&engine->cs); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_ENDED, 0, 0); break; } @@ -1351,6 +1356,12 @@ static HRESULT WINAPI media_engine_grabber_callback_OnClockStart(IMFSampleGrabbe static HRESULT WINAPI media_engine_grabber_callback_OnClockStop(IMFSampleGrabberSinkCallback *iface, MFTIME systime) { + struct media_engine *engine = impl_from_IMFSampleGrabberSinkCallback(iface); + + EnterCriticalSection(&engine->cs); + media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, FALSE); + LeaveCriticalSection(&engine->cs); + return S_OK; } @@ -1382,6 +1393,18 @@ static HRESULT WINAPI media_engine_grabber_callback_OnProcessSample(IMFSampleGra REFGUID major_type, DWORD sample_flags, LONGLONG sample_time, LONGLONG sample_duration, const BYTE *buffer, DWORD sample_size) { + struct media_engine *engine = impl_from_IMFSampleGrabberSinkCallback(iface); + + EnterCriticalSection(&engine->cs); + + if (!(engine->flags & FLAGS_ENGINE_FIRST_FRAME)) + { + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY, 0, 0); + engine->flags |= FLAGS_ENGINE_FIRST_FRAME; + } + + LeaveCriticalSection(&engine->cs); + return S_OK; }

1 0

Austin English : dpwsockx: Add version resource.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: dd54a699ea9b7378773549ea508f54ed9bb14f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd54a699ea9b7378773549ea… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:43 2020 -0500 dpwsockx: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpwsockx/Makefile.in | 2 ++ dlls/dpwsockx/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index 5ed3c7e5e50..5a386a7ac88 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -5,3 +5,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ dpwsockx_main.c + +RC_SRCS = version.rc diff --git a/dlls/dpwsockx/version.rc b/dlls/dpwsockx/version.rc new file mode 100644 index 00000000000..f7db0b69433 --- /dev/null +++ b/dlls/dpwsockx/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine dpwsockx" +#define WINE_FILENAME_STR "dpwsockx.dll" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : ddrawex: Add version resource.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 1940bc2ae0c98c119e818b4a3c1b966cc1486f18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1940bc2ae0c98c119e818b4a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:42 2020 -0500 ddrawex: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/Makefile.in | 2 ++ dlls/ddrawex/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ddrawex/Makefile.in b/dlls/ddrawex/Makefile.in index fc4a50bbab7..056f90a222f 100644 --- a/dlls/ddrawex/Makefile.in +++ b/dlls/ddrawex/Makefile.in @@ -9,3 +9,5 @@ C_SRCS = \ surface.c IDL_SRCS = ddrawex.idl + +RC_SRCS = version.rc diff --git a/dlls/ddrawex/version.rc b/dlls/ddrawex/version.rc new file mode 100644 index 00000000000..b58c91950ff --- /dev/null +++ b/dlls/ddrawex/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine ddrawex" +#define WINE_FILENAME_STR "ddrawex.dll" +#define WINE_FILEVERSION 5,3,0,900 +#define WINE_FILEVERSION_STR "5.3.0.900" +#define WINE_PRODUCTVERSION 5,3,0,900 +#define WINE_PRODUCTVERSION_STR "5.3.0.900" + +#include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : mfmediaengine: Implement OnVideoStreamTick().
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: feb4236e319ff4200aaa88dcfaa57df567a21156 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb4236e319ff4200aaa88dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 3 15:56:09 2020 +0300 mfmediaengine: Implement OnVideoStreamTick(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 33 +++++++++++++++++++++++++++++--- dlls/mfmediaengine/tests/mfmediaengine.c | 15 +++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 9da802f0df6..e126a925b67 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -71,6 +71,11 @@ enum media_engine_flags FLAGS_ENGINE_FIRST_FRAME = 0x2000, }; +struct video_frame +{ + LONGLONG pts; +}; + struct media_engine { IMFMediaEngine IMFMediaEngine_iface; @@ -93,6 +98,7 @@ struct media_engine IMFMediaSession *session; IMFSourceResolver *resolver; BSTR current_source; + struct video_frame video_frame; CRITICAL_SECTION cs; }; @@ -319,6 +325,7 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface EnterCriticalSection(&engine->cs); media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, FALSE); + engine->video_frame.pts = MINLONGLONG; LeaveCriticalSection(&engine->cs); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_ENDED, 0, 0); @@ -1264,11 +1271,28 @@ static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngine *iface, IUn return E_NOTIMPL; } -static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngine *iface, LONGLONG *time) +static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngine *iface, LONGLONG *pts) { - FIXME("(%p, %p): stub.\n", iface, time); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, pts); + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!pts) + hr = E_POINTER; + else + { + *pts = engine->video_frame.pts; + hr = *pts == MINLONGLONG ? S_FALSE : S_OK; + } + + LeaveCriticalSection(&engine->cs); + + return hr; } static const IMFMediaEngineVtbl media_engine_vtbl = @@ -1360,6 +1384,7 @@ static HRESULT WINAPI media_engine_grabber_callback_OnClockStop(IMFSampleGrabber EnterCriticalSection(&engine->cs); media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, FALSE); + engine->video_frame.pts = MINLONGLONG; LeaveCriticalSection(&engine->cs); return S_OK; @@ -1402,6 +1427,7 @@ static HRESULT WINAPI media_engine_grabber_callback_OnProcessSample(IMFSampleGra IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY, 0, 0); engine->flags |= FLAGS_ENGINE_FIRST_FRAME; } + engine->video_frame.pts = sample_time; LeaveCriticalSection(&engine->cs); @@ -1469,6 +1495,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->playback_rate = 1.0; engine->volume = 1.0; engine->duration = NAN; + engine->video_frame.pts = MINLONGLONG; InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 0394bcf6a0e..21ead1b0afa 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -394,6 +394,7 @@ static void test_Play(void) struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; IMFMediaEngine *media_engine; + LONGLONG pts; HRESULT hr; BOOL ret; @@ -402,6 +403,14 @@ static void test_Play(void) ret = IMFMediaEngine_IsPaused(media_engine); ok(ret, "Unexpected state %d.\n", ret); + hr = IMFMediaEngine_OnVideoStreamTick(media_engine, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + pts = 0; + hr = IMFMediaEngine_OnVideoStreamTick(media_engine, &pts); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(pts == MINLONGLONG, "Unexpected timestamp.\n"); + hr = IMFMediaEngine_Play(media_engine); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -414,6 +423,12 @@ static void test_Play(void) hr = IMFMediaEngine_Shutdown(media_engine); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaEngine_OnVideoStreamTick(media_engine, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_OnVideoStreamTick(media_engine, &pts); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ret = IMFMediaEngine_IsPaused(media_engine); ok(!ret, "Unexpected state %d.\n", ret);

1 0

Michael Stefaniuc : mshtml: Use wide-char string literals in struct initialization.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: d5a10e2d2882a8f2a7dbeb7dafb8db2bd96f2cdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a10e2d2882a8f2a7dbeb7d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 23 11:19:59 2020 +0200 mshtml: Use wide-char string literals in struct initialization. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 49 ++--- dlls/mshtml/htmldoc.c | 41 ++--- dlls/mshtml/htmlelem.c | 92 ++++------ dlls/mshtml/htmlevent.c | 136 +++++--------- dlls/mshtml/htmlstyle.c | 463 ++++++++++++++---------------------------------- 5 files changed, 231 insertions(+), 550 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5a10e2d2882a8f2a7db…

1 0

Austin English : ksproxy.ax: Add version resource.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 22fbf7f3241c087ce60f4080163f84cd208769fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=22fbf7f3241c087ce60f4080… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:45 2020 -0500 ksproxy.ax: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ksproxy.ax/Makefile.in | 2 ++ dlls/ksproxy.ax/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ksproxy.ax/Makefile.in b/dlls/ksproxy.ax/Makefile.in index db6565855d3..efc24e78cc0 100644 --- a/dlls/ksproxy.ax/Makefile.in +++ b/dlls/ksproxy.ax/Makefile.in @@ -1,3 +1,5 @@ MODULE = ksproxy.ax EXTRADLLFLAGS = -mno-cygwin + +RC_SRCS = version.rc diff --git a/dlls/ksproxy.ax/version.rc b/dlls/ksproxy.ax/version.rc new file mode 100644 index 00000000000..340f8a47e77 --- /dev/null +++ b/dlls/ksproxy.ax/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine ksproxy.ax" +#define WINE_FILENAME_STR "ksproxy.ax" +#define WINE_FILEVERSION 5,3,0,900 +#define WINE_FILEVERSION_STR "5.3.0.900" +#define WINE_PRODUCTVERSION 5,3,0,900 +#define WINE_PRODUCTVERSION_STR "5.3.0.900" + +#include "wine/wine_common_ver.rc"

1 0

Anton Baskanov : amstream: Wait for the state transition to complete in AMMultiMediaStream::SetState.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: a73460bca0e7f97fc371264bd5ad669357882b68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a73460bca0e7f97fc371264b… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Oct 29 11:40:56 2020 +0700 amstream: Wait for the state transition to complete in AMMultiMediaStream::SetState. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 4 +++ dlls/amstream/tests/amstream.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 82ef4822344..967baacb747 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -156,7 +156,11 @@ static HRESULT WINAPI multimedia_stream_SetState(IAMMultiMediaStream *iface, STR { hr = IMediaControl_Run(This->media_control); if (SUCCEEDED(hr)) + { + FILTER_STATE state; + IMediaControl_GetState(This->media_control, INFINITE, (OAFilterState *)&state); hr = S_OK; + } } else if (new_state == STREAMSTATE_STOP) hr = IMediaControl_Stop(This->media_control); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b436840e407..bd4f94f7327 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -924,11 +924,13 @@ struct testfilter LONGLONG current_position; LONGLONG stop_position; const AM_MEDIA_TYPE *preferred_mt; + HANDLE wait_state_event; HRESULT get_duration_hr; HRESULT get_stop_position_hr; HRESULT set_positions_hr; HRESULT init_stream_hr; HRESULT cleanup_stream_hr; + HRESULT wait_state_hr; }; static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) @@ -947,6 +949,7 @@ static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, un static void testfilter_destroy(struct strmbase_filter *iface) { struct testfilter *filter = impl_from_BaseFilter(iface); + CloseHandle(filter->wait_state_event); strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); } @@ -971,12 +974,27 @@ static HRESULT testfilter_cleanup_stream(struct strmbase_filter *iface) return filter->cleanup_stream_hr; } +static HRESULT testfilter_wait_state(struct strmbase_filter *iface, DWORD timeout) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + HRESULT hr; + + LeaveCriticalSection(&filter->filter.csFilter); + WaitForSingleObject(filter->wait_state_event, timeout); + EnterCriticalSection(&filter->filter.csFilter); + + hr = filter->wait_state_hr; + + return hr; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, .filter_init_stream = testfilter_init_stream, .filter_cleanup_stream = testfilter_cleanup_stream, + .filter_wait_state = testfilter_wait_state, }; static inline struct testfilter *impl_from_base_pin(struct strmbase_pin *iface) @@ -1060,6 +1078,7 @@ static void testfilter_init(struct testfilter *filter) strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); filter->stop_position = 0x8000000000000000ULL; + filter->wait_state_event = CreateEventW(NULL, TRUE, TRUE, NULL); } static inline struct testfilter *impl_from_IMediaSeeking(IMediaSeeking *iface) @@ -2319,11 +2338,25 @@ static void test_initialize(void) IUnknown_Release(graph_inner_unk); } +static IAMMultiMediaStream *mmstream_mmstream; +static STREAM_STATE mmstream_state; + +static DWORD CALLBACK mmstream_set_state(void *param) +{ + HRESULT hr; + + hr = IAMMultiMediaStream_SetState(mmstream_mmstream, mmstream_state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + return 0; +} + static void test_set_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); struct testfilter source; IGraphBuilder *graph; + HANDLE thread; HRESULT hr; ULONG ref; @@ -2353,6 +2386,42 @@ static void test_set_state(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); + source.wait_state_hr = E_FAIL; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + source.wait_state_hr = S_OK; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + source.wait_state_hr = VFW_S_STATE_INTERMEDIATE; + ResetEvent(source.wait_state_event); + + mmstream_mmstream = mmstream; + mmstream_state = STREAMSTATE_RUN; + thread = CreateThread(NULL, 0, mmstream_set_state, NULL, 0, NULL); + + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "SetState returned prematurely.\n"); + + EnterCriticalSection(&source.filter.csFilter); + source.wait_state_hr = S_OK; + SetEvent(source.wait_state_event); + LeaveCriticalSection(&source.filter.csFilter); + + ok(!WaitForSingleObject(thread, 2000), "Wait timed out.\n"); + CloseHandle(thread); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + source.init_stream_hr = E_FAIL; + source.wait_state_hr = VFW_S_STATE_INTERMEDIATE; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + source.init_stream_hr = S_OK; + source.wait_state_hr = S_OK; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); source.cleanup_stream_hr = E_FAIL; @@ -2369,6 +2438,13 @@ static void test_set_state(void) ok(hr == S_FALSE, "Got hr %#x.\n", hr); source.cleanup_stream_hr = S_OK; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + source.wait_state_hr = VFW_S_STATE_INTERMEDIATE; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + source.wait_state_hr = S_OK; + ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IGraphBuilder_Release(graph);

1 0