October 2019 - Wine-commits

Vijay Kiran Kamuju : msvcrt: Implement %h format for strftime.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 8e1435ef81d4a41b2e2b46eae1c9bcb9df0e946c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e1435ef81d4a41b2e2b46ea… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Oct 4 19:53:20 2019 +0200 msvcrt: Implement %h format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 3 +++ dlls/ucrtbase/tests/misc.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 9795c92baf..7eea78367d 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -628,6 +628,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%h", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index cbffd77f32..6108ad17cc 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1142,6 +1142,9 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; case 'b': +#if _MSVCR_VER>=140 + case 'h': +#endif if(mstm->tm_mon<0 || mstm->tm_mon>11) goto einval_error; if(!strftime_str(str, &ret, max, time_data->str.names.short_mon[mstm->tm_mon])) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index aecbc9dca5..d056bf7de1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -938,6 +938,10 @@ static void test_strftime(void) retA = p_strftime(bufA, sizeof(bufA), "%#T", &epoch); ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); + ok(retA == 3, "expected 3, got %d\n", (int)retA); + ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); } static LONG* get_failures_counter(HANDLE *map)

1 0

Sven Baars : ucrtbase: Don't differentiate for 64-bit in __fpe_flt_rounds.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: f6ec5d1819c27e850e51a157ce161f2efd2a83f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ec5d1819c27e850e51a157… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 5 13:39:47 2019 +0200 ucrtbase: Don't differentiate for 64-bit in __fpe_flt_rounds. The previous behavior was only present on w1064v1507, and not on any other version of Windows (both older and newer). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 5 ----- dlls/ucrtbase/tests/misc.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6651df8c12..54f1853e33 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1274,13 +1274,8 @@ int CDECL __fpe_flt_rounds(void) switch(fpc) { case MSVCRT__RC_CHOP: return 0; case MSVCRT__RC_NEAR: return 1; -#ifdef _WIN64 - case MSVCRT__RC_UP: return 3; - default: return 2; -#else case MSVCRT__RC_UP: return 2; default: return 3; -#endif } } #endif diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index d056bf7de1..0d865fdcb8 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -361,11 +361,11 @@ static void test___fpe_flt_rounds(void) ok((p__controlfp(_RC_UP, _RC_CHOP) & _RC_CHOP) == _RC_UP, "_controlfp(_RC_UP, _RC_CHOP) failed\n"); ret = p___fpe_flt_rounds(); - ok(ret == 2 + (sizeof(void*)>sizeof(int)), "__fpe_flt_rounds returned %d\n", ret); + ok(ret == 2 || broken(ret == 3) /* w1064v1507 */, "__fpe_flt_rounds returned %d\n", ret); ok((p__controlfp(_RC_DOWN, _RC_CHOP) & _RC_CHOP) == _RC_DOWN, "_controlfp(_RC_DOWN, _RC_CHOP) failed\n"); ret = p___fpe_flt_rounds(); - ok(ret == 3 - (sizeof(void*)>sizeof(int)), "__fpe_flt_rounds returned %d\n", ret); + ok(ret == 3 || broken(ret == 2) /* w1064v1507 */, "__fpe_flt_rounds returned %d\n", ret); ok((p__controlfp(_RC_CHOP, _RC_CHOP) & _RC_CHOP) == _RC_CHOP, "_controlfp(_RC_CHOP, _RC_CHOP) failed\n"); ret = p___fpe_flt_rounds();

1 0

Nikolay Sivov : mf: Add IMFLocalMFTRegistration stub.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 7692394231ce2c8f9ee653115ab6c040b26f572d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7692394231ce2c8f9ee65311… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 7 15:56:58 2019 +0300 mf: Add IMFLocalMFTRegistration stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------ dlls/mf/tests/mf.c | 7 +++++++ include/mfidl.idl | 22 ++++++++++++++++++++ 3 files changed, 83 insertions(+), 6 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a3c0ee717f..5ed29c8525 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -265,6 +265,52 @@ static struct quality_manager *impl_from_IMFQualityManager(IMFQualityManager *if return CONTAINING_RECORD(iface, struct quality_manager, IMFQualityManager_iface); } +/* IMFLocalMFTRegistration */ +static HRESULT WINAPI local_mft_registration_QueryInterface(IMFLocalMFTRegistration *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFLocalMFTRegistration) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFLocalMFTRegistration_AddRef(iface); + return S_OK; + } + + WARN("Unexpected %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI local_mft_registration_AddRef(IMFLocalMFTRegistration *iface) +{ + return 2; +} + +static ULONG WINAPI local_mft_registration_Release(IMFLocalMFTRegistration *iface) +{ + return 1; +} + +static HRESULT WINAPI local_mft_registration_RegisterMFTs(IMFLocalMFTRegistration *iface, MFT_REGISTRATION_INFO *info, + DWORD count) +{ + FIXME("%p, %p, %u.\n", iface, info, count); + + return E_NOTIMPL; +} + +static const IMFLocalMFTRegistrationVtbl local_mft_registration_vtbl = +{ + local_mft_registration_QueryInterface, + local_mft_registration_AddRef, + local_mft_registration_Release, + local_mft_registration_RegisterMFTs, +}; + +static IMFLocalMFTRegistration local_mft_registration = { &local_mft_registration_vtbl }; + static HRESULT WINAPI session_op_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -915,16 +961,18 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { *obj = &session->IMFRateControl_iface; } - - if (*obj) - IUnknown_AddRef((IUnknown *)*obj); - - return *obj ? S_OK : E_NOINTERFACE; + } + else if (IsEqualGUID(service, &MF_LOCAL_MFT_REGISTRATION_SERVICE)) + { + return IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); } else FIXME("Unsupported service %s.\n", debugstr_guid(service)); - return E_NOTIMPL; + if (*obj) + IUnknown_AddRef((IUnknown *)*obj); + + return *obj ? S_OK : E_NOINTERFACE; } static const IMFGetServiceVtbl session_get_service_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e118c36ec7..7cebb4c555 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -952,6 +952,7 @@ static void test_session_events(IMFMediaSession *session) static void test_media_session(void) { IMFRateControl *rate_control, *rate_control2; + IMFLocalMFTRegistration *local_reg; MFCLOCK_PROPERTIES clock_props; IMFRateSupport *rate_support; IMFAttributes *attributes; @@ -981,6 +982,12 @@ static void test_media_session(void) hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); + hr = IMFGetService_GetService(gs, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, + (void **)&local_reg); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get registration service, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFLocalMFTRegistration_Release(local_reg); + hr = IMFRateSupport_QueryInterface(rate_support, &IID_IMFMediaSession, (void **)&unk); ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr); ok(unk == (IUnknown *)session, "Unexpected pointer.\n"); diff --git a/include/mfidl.idl b/include/mfidl.idl index ab6d0d9984..908c659f1d 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -762,6 +762,27 @@ interface IMFQualityManager : IUnknown HRESULT Shutdown(); } +typedef struct _MFT_REGISTRATION_INFO +{ + CLSID clsid; + GUID guidCategory; + UINT32 uiFlags; + LPCWSTR pszName; + DWORD cInTypes; + [size_is(cInTypes)] MFT_REGISTER_TYPE_INFO *pInTypes; + DWORD cOutTypes; + [size_is(cOutTypes)] MFT_REGISTER_TYPE_INFO *pOutTypes; +} MFT_REGISTRATION_INFO; + +[ + object, + uuid(149c4d73-b4be-4f8d-8b87-079e926b6add) +] +interface IMFLocalMFTRegistration : IUnknown +{ + HRESULT RegisterMFTs([in, size_is(count)] MFT_REGISTRATION_INFO *info, [in] DWORD count); +} + 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") @@ -862,6 +883,7 @@ cpp_quote("EXTERN_GUID(MF_TOPOLOGY_START_TIME_ON_PRESENTATION_SWITCH, 0xc8cc113f cpp_quote("EXTERN_GUID(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS, 0xb86cac42, 0x41a6, 0x4b79, 0x89, 0x7a, 0x1a, 0xb0, 0xe5, 0x2b, 0x4a, 0x1b);") cpp_quote("EXTERN_GUID(MF_RATE_CONTROL_SERVICE, 0x866fa297, 0xb802, 0x4bf8, 0x9d, 0xc9, 0x5e, 0x3b, 0x6a, 0x9f, 0x53, 0xc9);") +cpp_quote("EXTERN_GUID(MF_LOCAL_MFT_REGISTRATION_SERVICE, 0xddf5cf9c, 0x4506, 0x45aa, 0xab, 0xf0, 0x6d, 0x5d, 0x94, 0xdd, 0x1b, 0x4a);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);")

1 0

Nikolay Sivov : mfplat: Add MFTRegisterLocalByCLSID() stub.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 7dcc9ff458fa54c87fba3821d1e073917d875da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dcc9ff458fa54c87fba3821… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 7 15:56:59 2019 +0300 mfplat: Add MFTRegisterLocalByCLSID() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 11 +++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 19178d9d51..48e64adeef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -330,6 +330,17 @@ HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWST return S_OK; } +HRESULT WINAPI MFTRegisterLocalByCLSID(REFCLSID clsid, REFGUID category, LPCWSTR name, UINT32 flags, + UINT32 input_count, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 output_count, + const MFT_REGISTER_TYPE_INFO *output_types) +{ + + FIXME("%s, %s, %s, %#x, %u, %p, %u, %p.\n", debugstr_guid(clsid), debugstr_guid(category), debugstr_w(name), flags, + input_count, input_types, output_count, output_types); + + return E_NOTIMPL; +} + HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) { FIXME("(%p)\n", factory); diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index cc440c5ee0..e48242fa15 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -147,7 +147,7 @@ @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) @ stdcall MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) -@ stub MFTRegisterLocalByCLSID +@ stdcall MFTRegisterLocalByCLSID(ptr ptr wstr long long ptr long ptr) @ stdcall MFTUnregister(int128) @ stdcall MFTUnregisterLocal(ptr) @ stub MFTUnregisterLocalByCLSID diff --git a/include/mfapi.h b/include/mfapi.h index 43f5cd6087..182fb19dbf 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -441,6 +441,9 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); +HRESULT WINAPI MFTRegisterLocalByCLSID(REFCLSID clsid, REFGUID category, LPCWSTR name, UINT32 flags, + UINT32 input_count, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 output_count, + const MFT_REGISTER_TYPE_INFO *output_types); HRESULT WINAPI MFRemovePeriodicCallback(DWORD key); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags);

1 0

Nikolay Sivov : mf: Add RegisterMFTs() implementation.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 88c8578459246caab6cd7d1f822837d08f07a41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=88c8578459246caab6cd7d1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 7 15:57:00 2019 +0300 mf: Add RegisterMFTs() implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5ed29c8525..7a49401d83 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -296,9 +296,21 @@ static ULONG WINAPI local_mft_registration_Release(IMFLocalMFTRegistration *ifac static HRESULT WINAPI local_mft_registration_RegisterMFTs(IMFLocalMFTRegistration *iface, MFT_REGISTRATION_INFO *info, DWORD count) { - FIXME("%p, %p, %u.\n", iface, info, count); + HRESULT hr = S_OK; + DWORD i; - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, info, count); + + for (i = 0; i < count; ++i) + { + if (FAILED(hr = MFTRegisterLocalByCLSID(&info[i].clsid, &info[i].guidCategory, info[i].pszName, + info[i].uiFlags, info[i].cInTypes, info[i].pInTypes, info[i].cOutTypes, info[i].pOutTypes))) + { + break; + } + } + + return hr; } static const IMFLocalMFTRegistrationVtbl local_mft_registration_vtbl =

1 0

Nikolay Sivov : mf: Clone node connections when cloning topology.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: bc7ae4d83c1bf89d607d0ee75af440ac625d0c1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc7ae4d83c1bf89d607d0ee7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 7 15:57:01 2019 +0300 mf: Clone node connections when cloning topology. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 126 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 45 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index dacb57d264..8d928ad3f9 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -111,6 +111,10 @@ static struct topology_node *unsafe_impl_from_IMFTopologyNode(IMFTopologyNode *i return impl_from_IMFTopologyNode(iface); } +static HRESULT create_topology_node(MF_TOPOLOGY_TYPE node_type, struct topology_node **node); +static HRESULT topology_node_connect_output(struct topology_node *node, DWORD output_index, + struct topology_node *connection, DWORD input_index); + static struct topology *unsafe_impl_from_IMFTopology(IMFTopology *iface); static struct topology_loader *impl_from_IMFTopoLoader(IMFTopoLoader *iface) @@ -568,7 +572,6 @@ static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID i if (topology->nodes.nodes[i]->id == id) { *node = topology->nodes.nodes[i]; - IMFTopologyNode_AddRef(&(*node)->IMFTopologyNode_iface); return S_OK; } } @@ -576,19 +579,15 @@ static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID i return MF_E_NOT_FOUND; } -static HRESULT topology_add_node(struct topology *topology, IMFTopologyNode *node_iface) +static HRESULT topology_add_node(struct topology *topology, struct topology_node *node) { - struct topology_node *node = unsafe_impl_from_IMFTopologyNode(node_iface); struct topology_node *match; if (!node) return E_POINTER; if (SUCCEEDED(topology_get_node_by_id(topology, node->id, &match))) - { - IMFTopologyNode_Release(&match->IMFTopologyNode_iface); return E_INVALIDARG; - } if (!mf_array_reserve((void **)&topology->nodes.nodes, &topology->nodes.size, topology->nodes.count + 1, sizeof(*topology->nodes.nodes))) @@ -602,11 +601,12 @@ static HRESULT topology_add_node(struct topology *topology, IMFTopologyNode *nod return S_OK; } -static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node) +static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node_iface) { struct topology *topology = impl_from_IMFTopology(iface); + struct topology_node *node = unsafe_impl_from_IMFTopologyNode(node_iface); - TRACE("%p, %p.\n", iface, node); + TRACE("%p, %p.\n", iface, node_iface); return topology_add_node(topology, node); } @@ -684,9 +684,9 @@ static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src) { struct topology *topology = impl_from_IMFTopology(iface); struct topology *src_topology = unsafe_impl_from_IMFTopology(src); - IMFTopologyNode *node; + struct topology_node *node; + size_t i, j; HRESULT hr; - size_t i; TRACE("%p, %p.\n", iface, src); @@ -695,19 +695,36 @@ static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src) /* Clone nodes. */ for (i = 0; i < src_topology->nodes.count; ++i) { - if (FAILED(hr = MFCreateTopologyNode(src_topology->nodes.nodes[i]->node_type, &node))) + if (FAILED(hr = create_topology_node(src_topology->nodes.nodes[i]->node_type, &node))) { WARN("Failed to create a node, hr %#x.\n", hr); break; } - if (SUCCEEDED(hr = IMFTopologyNode_CloneFrom(node, &src_topology->nodes.nodes[i]->IMFTopologyNode_iface))) + if (SUCCEEDED(hr = IMFTopologyNode_CloneFrom(&node->IMFTopologyNode_iface, + &src_topology->nodes.nodes[i]->IMFTopologyNode_iface))) + { topology_add_node(topology, node); + } - IMFTopologyNode_Release(node); + IMFTopologyNode_Release(&node->IMFTopologyNode_iface); } - FIXME("Clone node connections.\n"); + /* Clone connections. */ + for (i = 0; i < src_topology->nodes.count; ++i) + { + const struct node_streams *outputs = &src_topology->nodes.nodes[i]->outputs; + + for (j = 0; j < outputs->count; ++j) + { + DWORD input_index = outputs->streams[j].connection_stream; + TOPOID id = outputs->streams[j].connection->id; + + /* Skip node lookup in destination topology, assuming same node order. */ + if (SUCCEEDED(hr = topology_get_node_by_id(topology, id, &node))) + topology_node_connect_output(topology->nodes.nodes[i], j, node, input_index); + } + } /* Copy attributes and id. */ hr = IMFTopology_CopyAllItems(src, (IMFAttributes *)&topology->IMFTopology_iface); @@ -726,7 +743,10 @@ static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTop TRACE("%p, %p.\n", iface, ret); if (SUCCEEDED(hr = topology_get_node_by_id(topology, id, &node))) + { *ret = &node->IMFTopologyNode_iface; + IMFTopologyNode_AddRef(*ret); + } else *ret = NULL; @@ -1358,22 +1378,12 @@ static HRESULT WINAPI topology_node_GetOutputCount(IMFTopologyNode *iface, DWORD return S_OK; } -static HRESULT WINAPI topology_node_ConnectOutput(IMFTopologyNode *iface, DWORD output_index, - IMFTopologyNode *peer, DWORD input_index) +static HRESULT topology_node_connect_output(struct topology_node *node, DWORD output_index, + struct topology_node *connection, DWORD input_index) { - struct topology_node *node = impl_from_IMFTopologyNode(iface); - struct topology_node *connection = unsafe_impl_from_IMFTopologyNode(peer); struct node_stream *stream; HRESULT hr; - TRACE("%p, %u, %p, %u.\n", iface, output_index, peer, input_index); - - if (!connection) - { - WARN("External node implementations are not supported.\n"); - return E_UNEXPECTED; - } - if (node->node_type == MF_TOPOLOGY_OUTPUT_NODE || connection->node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) return E_FAIL; @@ -1408,6 +1418,23 @@ static HRESULT WINAPI topology_node_ConnectOutput(IMFTopologyNode *iface, DWORD return hr; } +static HRESULT WINAPI topology_node_ConnectOutput(IMFTopologyNode *iface, DWORD output_index, + IMFTopologyNode *peer, DWORD input_index) +{ + struct topology_node *node = impl_from_IMFTopologyNode(iface); + struct topology_node *connection = unsafe_impl_from_IMFTopologyNode(peer); + + TRACE("%p, %u, %p, %u.\n", iface, output_index, peer, input_index); + + if (!connection) + { + WARN("External node implementations are not supported.\n"); + return E_UNEXPECTED; + } + + return topology_node_connect_output(node, output_index, connection, input_index); +} + static HRESULT WINAPI topology_node_DisconnectOutput(IMFTopologyNode *iface, DWORD output_index) { struct topology_node *node = impl_from_IMFTopologyNode(iface); @@ -1684,6 +1711,29 @@ static const IMFTopologyNodeVtbl topologynodevtbl = topology_node_CloneFrom, }; +static HRESULT create_topology_node(MF_TOPOLOGY_TYPE node_type, struct topology_node **node) +{ + HRESULT hr; + + *node = heap_alloc_zero(sizeof(**node)); + if (!*node) + return E_OUTOFMEMORY; + + (*node)->IMFTopologyNode_iface.lpVtbl = &topologynodevtbl; + (*node)->refcount = 1; + (*node)->node_type = node_type; + hr = MFCreateAttributes(&(*node)->attributes, 0); + if (FAILED(hr)) + { + heap_free(*node); + return hr; + } + (*node)->id = ((TOPOID)GetCurrentProcessId() << 32) | InterlockedIncrement(&next_node_id); + InitializeCriticalSection(&(*node)->cs); + + return S_OK; +} + /*********************************************************************** * MFCreateTopologyNode (mf.@) */ @@ -1692,30 +1742,16 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode struct topology_node *object; HRESULT hr; - TRACE("(%p)\n", node); + TRACE("%d, %p.\n", node_type, node); if (!node) return E_POINTER; - object = heap_alloc_zero(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - object->IMFTopologyNode_iface.lpVtbl = &topologynodevtbl; - object->refcount = 1; - object->node_type = node_type; - hr = MFCreateAttributes(&object->attributes, 0); - if (FAILED(hr)) - { - heap_free(object); - return hr; - } - object->id = ((TOPOID)GetCurrentProcessId() << 32) | InterlockedIncrement(&next_node_id); - InitializeCriticalSection(&object->cs); - - *node = &object->IMFTopologyNode_iface; + hr = create_topology_node(node_type, &object); + if (SUCCEEDED(hr)) + *node = &object->IMFTopologyNode_iface; - return S_OK; + return hr; } static HRESULT WINAPI topology_loader_QueryInterface(IMFTopoLoader *iface, REFIID riid, void **out)

1 0

Nikolay Sivov : mf: Add IMFMediaSourceTopologyProvider for sequencer source stub.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: eeed0262e2ab3139bd3c283393dedaf8168537cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeed0262e2ab3139bd3c2833… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 7 15:57:02 2019 +0300 mf: Add IMFMediaSourceTopologyProvider for sequencer source stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 9 ++++++-- dlls/mf/topology.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++------ include/mfidl.idl | 9 ++++++++ 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7cebb4c555..2a5efc99e8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -785,8 +785,9 @@ static void test_MFGetService(void) ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); } -static void test_MFCreateSequencerSource(void) +static void test_sequencer_source(void) { + IMFMediaSourceTopologyProvider *provider; IMFSequencerSource *seq_source; HRESULT hr; @@ -796,6 +797,10 @@ static void test_MFCreateSequencerSource(void) hr = MFCreateSequencerSource(NULL, &seq_source); ok(hr == S_OK, "Failed to create sequencer source, hr %#x.\n", hr); + hr = IMFSequencerSource_QueryInterface(seq_source, &IID_IMFMediaSourceTopologyProvider, (void **)&provider); + ok(hr == S_OK, "Failed to get provider interface, hr %#x.\n", hr); + IMFMediaSourceTopologyProvider_Release(provider); + IMFSequencerSource_Release(seq_source); hr = MFShutdown(); @@ -2455,7 +2460,7 @@ START_TEST(mf) test_topology(); test_topology_loader(); test_MFGetService(); - test_MFCreateSequencerSource(); + test_sequencer_source(); test_media_session(); test_MFShutdownObject(); test_presentation_clock(); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 8d928ad3f9..ad89739d4a 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -89,6 +89,7 @@ struct topology_loader struct seq_source { IMFSequencerSource IMFSequencerSource_iface; + IMFMediaSourceTopologyProvider IMFMediaSourceTopologyProvider_iface; LONG refcount; }; @@ -127,6 +128,11 @@ static struct seq_source *impl_from_IMFSequencerSource(IMFSequencerSource *iface return CONTAINING_RECORD(iface, struct seq_source, IMFSequencerSource_iface); } +static struct seq_source *impl_from_IMFMediaSourceTopologyProvider(IMFMediaSourceTopologyProvider *iface) +{ + return CONTAINING_RECORD(iface, struct seq_source, IMFMediaSourceTopologyProvider_iface); +} + static HRESULT topology_node_reserve_streams(struct node_streams *streams, DWORD index) { if (!mf_array_reserve((void **)&streams->streams, &streams->size, index + 1, sizeof(*streams->streams))) @@ -1875,20 +1881,29 @@ static HRESULT WINAPI seq_source_QueryInterface(IMFSequencerSource *iface, REFII { struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + + *out = NULL; if (IsEqualIID(riid, &IID_IMFSequencerSource) || IsEqualIID(riid, &IID_IUnknown)) { *out = &seq_source->IMFSequencerSource_iface; - IMFSequencerSource_AddRef(iface); - return S_OK; + } + else if (IsEqualIID(riid, &IID_IMFMediaSourceTopologyProvider)) + { + *out = &seq_source->IMFMediaSourceTopologyProvider_iface; + } + else + { + WARN("Unimplemented %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - WARN("Unimplemented %s.\n", debugstr_guid(riid)); - *out = NULL; + if (*out) + IUnknown_AddRef((IUnknown *)*out); - return E_NOINTERFACE; + return S_OK; } static ULONG WINAPI seq_source_AddRef(IMFSequencerSource *iface) @@ -1954,6 +1969,41 @@ static HRESULT WINAPI seq_source_UpdateTopologyFlags(IMFSequencerSource *iface, return E_NOTIMPL; } +static HRESULT WINAPI seq_source_topology_provider_QueryInterface(IMFMediaSourceTopologyProvider *iface, REFIID riid, + void **obj) +{ + struct seq_source *seq_source = impl_from_IMFMediaSourceTopologyProvider(iface); + return IMFSequencerSource_QueryInterface(&seq_source->IMFSequencerSource_iface, riid, obj); +} + +static ULONG WINAPI seq_source_topology_provider_AddRef(IMFMediaSourceTopologyProvider *iface) +{ + struct seq_source *seq_source = impl_from_IMFMediaSourceTopologyProvider(iface); + return IMFSequencerSource_AddRef(&seq_source->IMFSequencerSource_iface); +} + +static ULONG WINAPI seq_source_topology_provider_Release(IMFMediaSourceTopologyProvider *iface) +{ + struct seq_source *seq_source = impl_from_IMFMediaSourceTopologyProvider(iface); + return IMFSequencerSource_Release(&seq_source->IMFSequencerSource_iface); +} + +static HRESULT WINAPI seq_source_topology_provider_GetMediaSourceTopology(IMFMediaSourceTopologyProvider *iface, + IMFPresentationDescriptor *pd, IMFTopology **topology) +{ + FIXME("%p, %p, %p.\n", iface, pd, topology); + + return E_NOTIMPL; +} + +static const IMFMediaSourceTopologyProviderVtbl seq_source_topology_provider_vtbl = +{ + seq_source_topology_provider_QueryInterface, + seq_source_topology_provider_AddRef, + seq_source_topology_provider_Release, + seq_source_topology_provider_GetMediaSourceTopology, +}; + static const IMFSequencerSourceVtbl seqsourcevtbl = { seq_source_QueryInterface, @@ -1983,6 +2033,7 @@ HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource ** return E_OUTOFMEMORY; object->IMFSequencerSource_iface.lpVtbl = &seqsourcevtbl; + object->IMFMediaSourceTopologyProvider_iface.lpVtbl = &seq_source_topology_provider_vtbl; object->refcount = 1; *seq_source = &object->IMFSequencerSource_iface; diff --git a/include/mfidl.idl b/include/mfidl.idl index 908c659f1d..df48cb3ab9 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -783,6 +783,15 @@ interface IMFLocalMFTRegistration : IUnknown HRESULT RegisterMFTs([in, size_is(count)] MFT_REGISTRATION_INFO *info, [in] DWORD count); } +[ + object, + uuid(0e1d6009-c9f3-442d-8c51-a42d2d49452f), +] +interface IMFMediaSourceTopologyProvider : IUnknown +{ + HRESULT GetMediaSourceTopology([in] IMFPresentationDescriptor *pd, [out] IMFTopology **topology); +} + 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

Sven Baars : advapi32/tests: Remove a superfluous CloseServiceHandle call (Coverity).
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 1f2c17d2bcf0efb5042c4c2aa6a9323a5ffcc22d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2c17d2bcf0efb5042c4c2a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Oct 7 18:41:54 2019 +0200 advapi32/tests: Remove a superfluous CloseServiceHandle call (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 83c0a9b257..f91ea185ae 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1852,7 +1852,6 @@ static void test_wow64(void) ret = DeleteFileA("C:\\windows\\sysnative\\winetestsvc.exe"); ok(ret, "Failed to delete file, error %u.\n", GetLastError()); - CloseServiceHandle(service); CloseServiceHandle(manager); }

1 0

Zebediah Figura : strmbase: Introduce a helper to trace reference time.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: a9b87a8216ba62ceee7202fa51ce3644de6dadfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b87a8216ba62ceee7202fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:49 2019 -0500 strmbase: Introduce a helper to trace reference time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 2 +- dlls/strmbase/pin.c | 6 ++++-- dlls/strmbase/pospass.c | 6 +++--- dlls/strmbase/qualitycontrol.c | 32 ++++++++++++++------------------ dlls/strmbase/renderer.c | 3 ++- dlls/strmbase/strmbase_private.h | 18 ++++++++++++++++++ dlls/strmbase/transform.c | 5 +++-- 7 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 2de0a78f7a..c9d15e31c7 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -153,7 +153,7 @@ HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start) { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + TRACE("iface %p, start %s.\n", iface, debugstr_time(start)); EnterCriticalSection(&filter->csFilter); filter->state = State_Running; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index cc7db119fa..42b150be67 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -346,7 +346,8 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER { struct strmbase_pin *This = impl_from_IPin(iface); - TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); This->tStart = tStart; This->tStop = tStop; @@ -858,7 +859,8 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; - TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); args.tStart = This->pin.tStart = tStart; args.tStop = This->pin.tStop = tStop; diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 2c5c274bba..148d4fae3c 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -743,7 +743,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_CurrentPosition(IMediaPosition * IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { @@ -797,7 +797,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_StopTime(IMediaPosition *iface, IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { @@ -833,7 +833,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_PrerollTime(IMediaPosition *ifac IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 139c4dfe86..b3e93b7baa 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,9 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -#define XTIME_FMT "%u.%03u" -#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) - HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { QualityControlImpl *This; @@ -80,9 +77,8 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se QualityControlImpl *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; - TRACE("%p %p { 0x%x %u " XTIME_FMT " " XTIME_FMT " }\n", - This, sender, qm.Type, qm.Proportion, - XTIME(qm.Late), XTIME(qm.TimeStamp)); + TRACE("iface %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + iface, sender, qm.Type, qm.Proportion, debugstr_time(qm.Late), debugstr_time(qm.TimeStamp)); if (This->tonotify) return IQualityControl_Notify(This->tonotify, This->self, qm); @@ -126,7 +122,6 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) { - TRACE("%p " XTIME_FMT "\n", This, XTIME(tStart)); This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; @@ -147,8 +142,8 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME { REFERENCE_TIME max_lateness = 200000; - TRACE("%p " XTIME_FMT " " XTIME_FMT " " XTIME_FMT "\n", - This, XTIME(jitter), XTIME(start), XTIME(stop)); + TRACE("jitter %s, start %s, stop %s.\n", debugstr_time(jitter), + debugstr_time(start), debugstr_time(stop)); /* we can add a valid stop time */ if (stop >= start) @@ -217,12 +212,12 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) pt = priv->avg_pt; } - TRACE("start: " XTIME_FMT ", entered " XTIME_FMT ", left " XTIME_FMT ", pt: " XTIME_FMT ", " - "duration " XTIME_FMT ", jitter " XTIME_FMT "\n", XTIME(start), XTIME(entered), - XTIME(left), XTIME(pt), XTIME(duration), XTIME(jitter)); + TRACE("start %s, entered %s, left %s, pt %s, duration %s, jitter %s.\n", + debugstr_time(start), debugstr_time(entered), debugstr_time(left), + debugstr_time(pt), debugstr_time(duration), debugstr_time(jitter)); - TRACE("avg_duration: " XTIME_FMT ", avg_pt: " XTIME_FMT ", avg_rate: %g\n", - XTIME(priv->avg_duration), XTIME(priv->avg_pt), priv->avg_rate); + TRACE("average duration %s, average pt %s, average rate %.16e.\n", + debugstr_time(priv->avg_duration), debugstr_time(priv->avg_pt), priv->avg_rate); /* collect running averages. for first observations, we copy the * values */ @@ -274,7 +269,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) q.Proportion = 5000; q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; - TRACE("Late: %i from %i, rate: %g\n", (int)(q.Late/10000), (int)(q.TimeStamp/10000), 1./priv->avg_rate); + TRACE("Late: %s from %s, rate: %g\n", debugstr_time(q.Late), debugstr_time(q.TimeStamp), 1./priv->avg_rate); hr = IQualityControl_Notify(&priv->IQualityControl_iface, priv->self, q); priv->qos_handled = hr == S_OK; } @@ -302,8 +297,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s /* FIXME: This isn't correct; we don't drop samples, nor should. */ This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); - TRACE("Dropped: %i %i %i %i\n", This->is_dropped, (int)(start/10000), - (int)(stop/10000), (int)(This->current_jitter / 10000)); + TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, + debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); if (This->is_dropped) This->dropped++; else @@ -313,7 +308,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s return; IReferenceClock_GetTime(This->clock, &This->start); - TRACE("at: " XTIME_FMT "\n", XTIME(This->start)); + + TRACE("Starting at %s.\n", debugstr_time(This->start)); } void QualityControlRender_EndRender(QualityControlImpl *This) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7d8420e73c..270a6f260f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -426,7 +426,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { BaseRenderer *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); + + TRACE("iface %p, start %s.\n", iface, debugstr_time(tStart)); EnterCriticalSection(&This->csRenderLock); This->stream_start = tStart; diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 4dd7caa924..d0f5029765 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -32,6 +32,24 @@ #include "wine/list.h" #include "wine/strmbase.h" +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + unsigned int i = 0, j = 0; + char buffer[22], rev[22]; + + while (time || i <= 8) + { + buffer[i++] = '0' + (time % 10); + time /= 10; + if (i == 7) buffer[i++] = '.'; + } + + while (i--) rev[j++] = buffer[i]; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + /* Quality Control */ typedef struct QualityControlImpl { IQualityControl IQualityControl_iface; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index abf5ed34b3..bd70b8a90c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -254,7 +254,7 @@ static HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME HRESULT hr = S_OK; TransformFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); + TRACE("iface %p, start %s.\n", iface, debugstr_time(tStart)); EnterCriticalSection(&This->csReceive); { @@ -453,7 +453,8 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC TransformFilter *pTransform = impl_from_sink_IPin(iface); HRESULT hr = S_OK; - TRACE("(%p)->(%s %s %e)\n", iface, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); EnterCriticalSection(&pTransform->filter.csFilter); if (pTransform->pFuncsTable->pfnNewSegment)

1 0

Zebediah Figura : strmbase: Introduce a helper to more thoroughly trace media type.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: b33f05830811b96ad7ff7534383e7007677ac85c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b33f05830811b96ad7ff7534… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:50 2019 -0500 strmbase: Introduce a helper to more thoroughly trace media type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 110 +++++++++++++++++++++++++++++++++++++++++++--- dlls/strmbase/pin.c | 21 +++------ dlls/strmbase/renderer.c | 4 ++ dlls/strmbase/transform.c | 1 + include/wine/strmbase.h | 2 + 5 files changed, 116 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b33f05830811b96ad7ff…

1 0