March 2019 - Wine-commits - list.winehq.org

Michael Stefaniuc : winmm: Remove useless casts to self.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: de2854bebdf499d41eaafc92e87b003a203d5eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de2854bebdf499d41eaafc92… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 21:39:46 2019 +0100 winmm: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 959773c..afdf9d3 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3124,9 +3124,9 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) return MMSYSERR_ERROR; } - vols[0] = (float)((DWORD)(in & 0xFFFF) / (float)0xFFFF); + vols[0] = (float)((in & 0xFFFF) / (float)0xFFFF); if(channels > 1) - vols[1] = (float)((DWORD)(in >> 16) / (float)0xFFFF); + vols[1] = (float)((in >> 16) / (float)0xFFFF); hr = IAudioStreamVolume_SetAllVolumes(device->volume, channels, vols); if(FAILED(hr)){

1 0

Alistair Leslie-Hughes : secur32: Stop memory leak (Coverity).
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: fb78d19881236306bfa30120ee84065cff29c4ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb78d19881236306bfa30120… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 3 22:05:19 2019 +0000 secur32: Stop memory leak (Coverity). CID 1442946 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7c6bb96..8ac5bee 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -668,6 +668,7 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, ULONG *size) heap_free(path); return NULL; } + heap_free(path); if (!RegQueryValueExW(hkey, keyexchangeW, 0, &type, NULL, &len)) spec = AT_KEYEXCHANGE; else if (!RegQueryValueExW(hkey, signatureW, 0, &type, NULL, &len)) spec = AT_SIGNATURE; @@ -699,7 +700,6 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, ULONG *size) else heap_free(buf); RegCloseKey(hkey); - heap_free(path); return ret; }

1 0

Nikolay Sivov : mfplat: Implement periodic callbacks.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: b22b28e2313b2338baff729dcb8826cc950c54aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b22b28e2313b2338baff729d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:41 2019 +0300 mfplat: Implement periodic callbacks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 6 +- dlls/mfplat/queue.c | 194 +++++++++++++++++++++++++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 48 +++++++++++ include/mfapi.h | 4 + 4 files changed, 242 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b22b28e2313b2338baff…

1 0

Nikolay Sivov : mf: Implement MFShutdownObject().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 2f1666903e7b35f4addc747e3cb48c80b972ce61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f1666903e7b35f4addc747e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:42 2019 +0300 mf: Implement MFShutdownObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 18 ++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 17 +++++++++++++++ 4 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 73cd6aa..b3573d7 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -74,3 +74,21 @@ HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID riid, void IMFGetService_Release(gs); return hr; } + +/*********************************************************************** + * MFShutdownObject (mf.@) + */ +HRESULT WINAPI MFShutdownObject(IUnknown *object) +{ + IMFShutdown *shutdown; + + TRACE("%p.\n", object); + + if (object && SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFShutdown, (void **)&shutdown))) + { + IMFShutdown_Shutdown(shutdown); + IMFShutdown_Release(shutdown); + } + + return S_OK; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 64f0b1d..7ec8e57 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -78,6 +78,6 @@ @ stub MFGetTopoNodeCurrentType @ stub MFReadSequencerSegmentOffset @ stub MFRequireProtectedEnvironment -@ stub MFShutdownObject +@ stdcall MFShutdownObject(ptr) @ stub MFTranscodeGetAudioOutputAvailableTypes @ stub MergePropertyStore diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ba11a27..915b851 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -502,6 +502,66 @@ static void test_topology_loader(void) IMFTopoLoader_Release(loader); } +static HRESULT WINAPI testshutdown_QueryInterface(IMFShutdown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFShutdown) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFShutdown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testshutdown_AddRef(IMFShutdown *iface) +{ + return 2; +} + +static ULONG WINAPI testshutdown_Release(IMFShutdown *iface) +{ + return 1; +} + +static HRESULT WINAPI testshutdown_Shutdown(IMFShutdown *iface) +{ + return 0xdead; +} + +static HRESULT WINAPI testshutdown_GetShutdownStatus(IMFShutdown *iface, MFSHUTDOWN_STATUS *status) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IMFShutdownVtbl testshutdownvtbl = +{ + testshutdown_QueryInterface, + testshutdown_AddRef, + testshutdown_Release, + testshutdown_Shutdown, + testshutdown_GetShutdownStatus, +}; + +static void test_MFShutdownObject(void) +{ + IMFShutdown testshutdown = { &testshutdownvtbl }; + IUnknown testshutdown2 = { &testservicevtbl }; + HRESULT hr; + + hr = MFShutdownObject(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFShutdownObject((IUnknown *)&testshutdown); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = MFShutdownObject(&testshutdown2); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mf) { test_topology(); @@ -509,4 +569,5 @@ START_TEST(mf) test_MFGetService(); test_MFCreateSequencerSource(); test_media_session(); + test_MFShutdownObject(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 01e86ef..be8795c 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -329,6 +329,7 @@ cpp_quote("HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") +cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);") [ object, @@ -381,6 +382,22 @@ interface IMFMediaSink : IUnknown HRESULT Shutdown(); } +typedef enum _MFSHUTDOWN_STATUS +{ + MFSHUTDOWN_INITIATED, + MFSHUTDOWN_COMPLETED, +} MFSHUTDOWN_STATUS; + +[ + object, + uuid(97ec2ea4-0e42-4937-97ac-9d6d328824e1) +] +interface IMFShutdown : IUnknown +{ + HRESULT Shutdown(); + HRESULT GetShutdownStatus([out] MFSHUTDOWN_STATUS *status); +} + cpp_quote("#define MF_RESOLUTION_MEDIASOURCE 0x00000001") cpp_quote("#define MF_RESOLUTION_BYTESTREAM 0x00000002") cpp_quote("#define MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE 0x00000010")

1 0

Nikolay Sivov : mfplat: Implement media event queue.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: eff5a7aebc65e98cacf0d6a0ccc6101ffa552aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eff5a7aebc65e98cacf0d6a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:43 2019 +0300 mfplat: Implement media event queue. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 336 ++++++++++++++++++++++++++++++++++----------- dlls/mfplat/tests/mfplat.c | 202 +++++++++++++++++++++++++-- include/mferror.h | 1 + include/mfobjects.idl | 2 + 4 files changed, 455 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eff5a7aebc65e98cacf0…

1 0

Nikolay Sivov : mf/tests: Add some tests for session events support.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: c7f0a4cb652b3564580ea1d7737237daebcb52c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f0a4cb652b3564580ea1d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:44 2019 +0300 mf/tests: Add some tests for session events support. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 4 ++ dlls/mf/tests/mf.c | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index fda3ec7..b576a0f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -171,8 +171,12 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) { + struct media_session *session = impl_from_IMFMediaSession(iface); + FIXME("(%p)\n", iface); + IMFMediaEventQueue_Shutdown(session->event_queue); + return E_NOTIMPL; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 915b851..2d00554 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -33,6 +33,8 @@ #include "wine/test.h" +DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + static void test_topology(void) { IMFCollection *collection, *collection2; @@ -467,6 +469,175 @@ static void test_MFCreateSequencerSource(void) ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } +struct test_callback +{ + IMFAsyncCallback IMFAsyncCallback_iface; + HANDLE event; +}; + +static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct test_callback, IMFAsyncCallback_iface); +} + +static HRESULT WINAPI testcallback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testcallback_AddRef(IMFAsyncCallback *iface) +{ + return 2; +} + +static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) +{ + return 1; +} + +static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + ok(flags != NULL && queue != NULL, "Unexpected arguments.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + IMFMediaSession *session; + IUnknown *state, *obj; + HRESULT hr; + + ok(result != NULL, "Unexpected result object.\n"); + + state = IMFAsyncResult_GetStateNoAddRef(result); + if (state && SUCCEEDED(IUnknown_QueryInterface(state, &IID_IMFMediaSession, (void **)&session))) + { + IMFMediaEvent *event; + + hr = IMFMediaSession_EndGetEvent(session, result, &event); + ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); + + hr = IMFAsyncResult_GetObject(result, &obj); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + IMFMediaEvent_Release(event); + + hr = IMFMediaSession_EndGetEvent(session, result, &event); + ok(hr == E_FAIL, "Unexpected result, hr %#x.\n", hr); + + IMFMediaSession_Release(session); + + SetEvent(callback->event); + } + + return E_NOTIMPL; +} + +static const IMFAsyncCallbackVtbl testcallbackvtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + testcallback_Invoke, +}; + +static void init_test_callback(struct test_callback *callback) +{ + callback->IMFAsyncCallback_iface.lpVtbl = &testcallbackvtbl; + callback->event = NULL; +} + +static void test_session_events(IMFMediaSession *session) +{ + struct test_callback callback, callback2; + IMFAsyncResult *result; + IMFMediaEvent *event; + HRESULT hr; + DWORD ret; + + init_test_callback(&callback); + init_test_callback(&callback2); + + hr = IMFMediaSession_GetEvent(session, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + + /* Async case. */ + hr = IMFMediaSession_BeginGetEvent(session, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_BeginGetEvent(session, &callback.IMFAsyncCallback_iface, (IUnknown *)session); + ok(hr == S_OK, "Failed to Begin*, hr %#x.\n", hr); + + /* Same callback, same state. */ + hr = IMFMediaSession_BeginGetEvent(session, &callback.IMFAsyncCallback_iface, (IUnknown *)session); + ok(hr == MF_S_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); + + /* Same callback, different state. */ + hr = IMFMediaSession_BeginGetEvent(session, &callback.IMFAsyncCallback_iface, (IUnknown *)&callback); + ok(hr == MF_E_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); + + /* Different callback, same state. */ + hr = IMFMediaSession_BeginGetEvent(session, &callback2.IMFAsyncCallback_iface, (IUnknown *)session); + ok(hr == MF_E_MULTIPLE_SUBSCRIBERS, "Unexpected hr %#x.\n", hr); + + /* Different callback, different state. */ + hr = IMFMediaSession_BeginGetEvent(session, &callback2.IMFAsyncCallback_iface, (IUnknown *)&callback.IMFAsyncCallback_iface); + ok(hr == MF_E_MULTIPLE_SUBSCRIBERS, "Unexpected hr %#x.\n", hr); + + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); + + hr = IMFMediaSession_QueueEvent(session, MEError, &GUID_NULL, E_FAIL, NULL); + ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); + + ret = WaitForSingleObject(callback.event, 100); + ok(ret == WAIT_OBJECT_0, "Unexpected return value %#x.\n", ret); + + CloseHandle(callback.event); + + hr = MFCreateAsyncResult(NULL, &callback.IMFAsyncCallback_iface, NULL, &result); + ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr); + + hr = IMFMediaSession_EndGetEvent(session, result, &event); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + /* Shutdown behavior. */ + hr = IMFMediaSession_Shutdown(session); +todo_wine + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = IMFMediaSession_GetEvent(session, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_QueueEvent(session, MEError, &GUID_NULL, E_FAIL, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_BeginGetEvent(session, &callback.IMFAsyncCallback_iface, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_BeginGetEvent(session, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_EndGetEvent(session, result, &event); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFAsyncResult_Release(result); + + /* Already shut down. */ + hr = IMFMediaSession_Shutdown(session); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); +} + static void test_media_session(void) { IMFMediaSession *session; @@ -482,6 +653,8 @@ static void test_media_session(void) hr = IMFMediaSession_QueryInterface(session, &IID_IMFAttributes, (void **)&unk); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + test_session_events(session); + IMFMediaSession_Release(session); hr = MFShutdown();

1 0

Nikolay Sivov : mfplat: Move media type object code to separate file.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: f4e849468e26deef7657dfd10a8bc70020848ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4e849468e26deef7657dfd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:45 2019 +0300 mfplat: Move media type object code to separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 1 + dlls/mfplat/main.c | 366 +------------------------------------------ dlls/mfplat/mediatype.c | 366 +++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat_private.h | 10 ++ dlls/mfplat/queue.c | 1 - 5 files changed, 378 insertions(+), 366 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4e849468e26deef7657…

1 0

Nikolay Sivov : mfplat: Move stream descriptor implementation to separate file.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 76a6f1aa941b27ab4096a705cb4047da31cfed94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a6f1aa941b27ab4096a705… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:46 2019 +0300 mfplat: Move stream descriptor implementation to separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 323 ------------------------------------------- dlls/mfplat/mediatype.c | 316 ++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat_private.h | 1 + 3 files changed, 317 insertions(+), 323 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76a6f1aa941b27ab4096…

1 0

Nikolay Sivov : mfplat: Return stub interface for stream descriptor type handler.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: d5634ac1506528fb1427d1d2995a72f8d23edaa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5634ac1506528fb1427d1d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:47 2019 +0300 mfplat: Return stub interface for stream descriptor type handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 100 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 11f5eab..79d3440 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -35,6 +35,7 @@ struct stream_desc { struct attributes attributes; IMFStreamDescriptor IMFStreamDescriptor_iface; + IMFMediaTypeHandler IMFMediaTypeHandler_iface; }; static inline struct media_type *impl_from_IMFMediaType(IMFMediaType *iface) @@ -47,6 +48,11 @@ static inline struct stream_desc *impl_from_IMFStreamDescriptor(IMFStreamDescrip return CONTAINING_RECORD(iface, struct stream_desc, IMFStreamDescriptor_iface); } +static struct stream_desc *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct stream_desc, IMFMediaTypeHandler_iface); +} + static HRESULT WINAPI mediatype_QueryInterface(IMFMediaType *iface, REFIID riid, void **out) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); @@ -616,9 +622,14 @@ static HRESULT WINAPI stream_descriptor_GetStreamIdentifier(IMFStreamDescriptor static HRESULT WINAPI stream_descriptor_GetMediaTypeHandler(IMFStreamDescriptor *iface, IMFMediaTypeHandler **handler) { - FIXME("%p, %p.\n", iface, handler); + struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, handler); + + *handler = &stream_desc->IMFMediaTypeHandler_iface; + IMFStreamDescriptor_AddRef(iface); + + return S_OK; } static const IMFStreamDescriptorVtbl streamdescriptorvtbl = @@ -660,6 +671,92 @@ static const IMFStreamDescriptorVtbl streamdescriptorvtbl = stream_descriptor_GetMediaTypeHandler }; +static HRESULT WINAPI mediatype_handler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaTypeHandler) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaTypeHandler_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI mediatype_handler_AddRef(IMFMediaTypeHandler *iface) +{ + struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamDescriptor_AddRef(&stream_desc->IMFStreamDescriptor_iface); +} + +static ULONG WINAPI mediatype_handler_Release(IMFMediaTypeHandler *iface) +{ + struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamDescriptor_Release(&stream_desc->IMFStreamDescriptor_iface); +} + +static HRESULT WINAPI mediatype_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, + IMFMediaType **out_type) +{ + FIXME("%p, %p, %p.\n", iface, in_type, out_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mediatype_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + FIXME("%p, %p.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mediatype_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mediatype_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mediatype_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mediatype_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static const IMFMediaTypeHandlerVtbl mediatypehandlervtbl = +{ + mediatype_handler_QueryInterface, + mediatype_handler_AddRef, + mediatype_handler_Release, + mediatype_handler_IsMediaTypeSupported, + mediatype_handler_GetMediaTypeCount, + mediatype_handler_GetMediaTypeByIndex, + mediatype_handler_SetCurrentMediaType, + mediatype_handler_GetCurrentMediaType, + mediatype_handler_GetMajorType, +}; + /*********************************************************************** * MFCreateStreamDescriptor (mfplat.@) */ @@ -676,6 +773,7 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, init_attribute_object(&object->attributes, 0); object->IMFStreamDescriptor_iface.lpVtbl = &streamdescriptorvtbl; + object->IMFMediaTypeHandler_iface.lpVtbl = &mediatypehandlervtbl; *descriptor = &object->IMFStreamDescriptor_iface; return S_OK;

1 0

Nikolay Sivov : mfplat: Keep stream descriptor identifier.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 0eeb40943242a0ffb75a8082609d8375c5811479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eeb40943242a0ffb75a8082… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:48 2019 +0300 mfplat: Keep stream descriptor identifier. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 79d3440..1bd32cd 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -36,6 +36,7 @@ struct stream_desc struct attributes attributes; IMFStreamDescriptor IMFStreamDescriptor_iface; IMFMediaTypeHandler IMFMediaTypeHandler_iface; + DWORD identifier; }; static inline struct media_type *impl_from_IMFMediaType(IMFMediaType *iface) @@ -615,9 +616,13 @@ static HRESULT WINAPI stream_descriptor_CopyAllItems(IMFStreamDescriptor *iface, static HRESULT WINAPI stream_descriptor_GetStreamIdentifier(IMFStreamDescriptor *iface, DWORD *identifier) { - FIXME("%p, %p.\n", iface, identifier); + struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, identifier); + + *identifier = stream_desc->identifier; + + return S_OK; } static HRESULT WINAPI stream_descriptor_GetMediaTypeHandler(IMFStreamDescriptor *iface, IMFMediaTypeHandler **handler) @@ -774,6 +779,8 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, init_attribute_object(&object->attributes, 0); object->IMFStreamDescriptor_iface.lpVtbl = &streamdescriptorvtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &mediatypehandlervtbl; + object->identifier = identifier; + *descriptor = &object->IMFStreamDescriptor_iface; return S_OK;

1 0