wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Nikolay Sivov : mf: Add IMFMediaTypeHandler stub for grabber stream.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: a2c8658bd2683e97226d26dea2717e6dcef0da39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c8658bd2683e97226d26de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:29 2019 +0300 mf: Add IMFMediaTypeHandler stub for grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf.c | 37 ++++++++----------- 2 files changed, 112 insertions(+), 23 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 997c9db..a6a18dd 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); struct sample_grabber_stream { IMFStreamSink IMFStreamSink_iface; + IMFMediaTypeHandler IMFMediaTypeHandler_iface; LONG refcount; IMFMediaSink *sink; }; @@ -69,6 +70,11 @@ static struct sample_grabber_stream *impl_from_IMFStreamSink(IMFStreamSink *ifac return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFStreamSink_iface); } +static struct sample_grabber_stream *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFMediaTypeHandler_iface); +} + static HRESULT WINAPI sample_grabber_stream_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); @@ -80,6 +86,10 @@ static HRESULT WINAPI sample_grabber_stream_QueryInterface(IMFStreamSink *iface, { *obj = &stream->IMFStreamSink_iface; } + else if (IsEqualIID(riid, &IID_IMFMediaTypeHandler)) + { + *obj = &stream->IMFMediaTypeHandler_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -172,9 +182,14 @@ static HRESULT WINAPI sample_grabber_stream_GetIdentifier(IMFStreamSink *iface, static HRESULT WINAPI sample_grabber_stream_GetMediaTypeHandler(IMFStreamSink *iface, IMFMediaTypeHandler **handler) { - FIXME("%p, %p.\n", iface, handler); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, handler); + + *handler = &stream->IMFMediaTypeHandler_iface; + IMFMediaTypeHandler_AddRef(*handler); + + return S_OK; } static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, IMFSample *sample) @@ -216,6 +231,84 @@ static const IMFStreamSinkVtbl sample_grabber_stream_vtbl = sample_grabber_stream_Flush, }; +static HRESULT WINAPI sample_grabber_stream_type_handler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, + void **obj) +{ + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_QueryInterface(&stream->IMFStreamSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_stream_type_handler_AddRef(IMFMediaTypeHandler *iface) +{ + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_AddRef(&stream->IMFStreamSink_iface); +} + +static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandler *iface) +{ + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_Release(&stream->IMFStreamSink_iface); +} + +static HRESULT WINAPI sample_grabber_stream_type_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 sample_grabber_stream_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + FIXME("%p, %p.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_stream_type_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, + IMFMediaType *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, + IMFMediaType **type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = +{ + sample_grabber_stream_type_handler_QueryInterface, + sample_grabber_stream_type_handler_AddRef, + sample_grabber_stream_type_handler_Release, + sample_grabber_stream_type_handler_IsMediaTypeSupported, + sample_grabber_stream_type_handler_GetMediaTypeCount, + sample_grabber_stream_type_handler_GetMediaTypeByIndex, + sample_grabber_stream_type_handler_SetCurrentMediaType, + sample_grabber_stream_type_handler_GetCurrentMediaType, + sample_grabber_stream_type_handler_GetMajorType, +}; + static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); @@ -424,6 +517,7 @@ static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink ** return E_OUTOFMEMORY; object->IMFStreamSink_iface.lpVtbl = &sample_grabber_stream_vtbl; + object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; object->refcount = 1; object->sink = sink; IMFMediaSink_AddRef(object->sink); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2987e86..b37fdba 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1724,22 +1724,19 @@ todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); hr = IMFStreamSink_QueryInterface(stream, &IID_IMFMediaTypeHandler, (void **)&handler2); -todo_wine ok(hr == S_OK, "Failed to get handler interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); - ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); - hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); - ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); - ok(count == 0, "Unexpected count %u.\n", count); + hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); +todo_wine { + ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); + ok(count == 0, "Unexpected count %u.\n", count); +} + ok(handler == handler2, "Unexpected handler.\n"); - ok(handler == handler2, "Unexpected handler.\n"); - - IMFMediaTypeHandler_Release(handler); - IMFMediaTypeHandler_Release(handler2); - } + IMFMediaTypeHandler_Release(handler); + IMFMediaTypeHandler_Release(handler2); hr = IMFActivate_ShutdownObject(activate); todo_wine @@ -1773,16 +1770,14 @@ todo_wine ok(id == 0, "Unexpected id %#x.\n", id); hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); -todo_wine ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); - ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); - ok(count == 0, "Unexpected count %u.\n", count); - IMFMediaTypeHandler_Release(handler); - } + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); +todo_wine { + ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); + ok(count == 0, "Unexpected count %u.\n", count); +} + IMFMediaTypeHandler_Release(handler); IMFMediaSink_Release(sink); IMFStreamSink_Release(stream);

1 0

Nikolay Sivov : mf: Add sample grabber sink stub.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: dfd8457fd5686b105d9356a38e5aff8243de89fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfd8457fd5686b105d9356a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:28 2019 +0300 mf: Add sample grabber sink stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 2 +- dlls/mf/samplegrabber.c | 422 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf.c | 139 +++++++++++++++- include/mferror.h | 14 ++ include/mfidl.idl | 32 ++++ 5 files changed, 602 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dfd8457fd5686b105d93…

1 0

Huw Davies : explorer: Set the default driver to mac, x11 in all cases.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: e73d824121e5e3dcac3a734d4f2913c5ff43c5d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e73d824121e5e3dcac3a734d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 20 14:43:59 2019 +0100 explorer: Set the default driver to mac,x11 in all cases. The host specific options won't work with the PE build anyway. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 2857fcf..d4925f7 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -37,11 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff -#ifdef __APPLE__ static const WCHAR default_driver[] = {'m','a','c',',','x','1','1',0}; -#else -static const WCHAR default_driver[] = {'x','1','1',0}; -#endif static BOOL using_root;

1 0

Nikolay Sivov : kernelbase: Add remaining string handling functions from shlwapi.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 4960e415e2c60a7c2a5c041ef3e7e1332d59b9d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4960e415e2c60a7c2a5c041e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 16:40:29 2019 +0300 kernelbase: Add remaining string handling functions from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 34 ++--- dlls/kernelbase/string.c | 306 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 323 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4960e415e2c60a7c2a5c…

1 0

Zebediah Figura : mshtml: Avoid passing invalid memory to DispCallFunc().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 23e0d22b7c8c350b47e76c611218a4e7ff5ac570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23e0d22b7c8c350b47e76c61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 10:33:25 2019 -0500 mshtml: Avoid passing invalid memory to DispCallFunc(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47222 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 2033e90..4363067 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -295,22 +295,28 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, assert(info->argc < MAX_ARGS); assert(desc->funckind == FUNC_DISPATCH); - info->arg_types = heap_alloc(sizeof(*info->arg_types) * info->argc); - if(!info->arg_types) - return; info->arg_info = heap_alloc_zero(sizeof(*info->arg_info) * info->argc); if(!info->arg_info) return; - for(i=0; i < info->argc; i++) - info->arg_types[i] = desc->lprgelemdescParam[i].tdesc.vt; - info->prop_vt = desc->elemdescFunc.tdesc.vt; if(info->prop_vt != VT_VOID && info->prop_vt != VT_PTR && !is_arg_type_supported(info->prop_vt)) { TRACE("%s: return type %d\n", debugstr_w(info->name), info->prop_vt); return; /* Fallback to ITypeInfo::Invoke */ } + info->arg_types = heap_alloc(sizeof(*info->arg_types) * (info->argc + (info->prop_vt == VT_VOID ? 0 : 1))); + if(!info->arg_types) + return; + + for(i=0; i < info->argc; i++) + info->arg_types[i] = desc->lprgelemdescParam[i].tdesc.vt; + + if(info->prop_vt == VT_PTR) + info->arg_types[info->argc] = VT_BYREF | VT_DISPATCH; + else if(info->prop_vt != VT_VOID) + info->arg_types[info->argc] = VT_BYREF | info->prop_vt; + if(desc->cParamsOpt) { TRACE("%s: optional params\n", debugstr_w(info->name)); return; /* Fallback to ITypeInfo::Invoke */

1 0

Zebediah Figura : mshtml: Fix a copy-paste error.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: f8fffe9e86fbadb4af7185297052f9937322a550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8fffe9e86fbadb4af718529… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 10:33:24 2019 -0500 mshtml: Fix a copy-paste error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e637f13..2033e90 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -299,7 +299,7 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, if(!info->arg_types) return; info->arg_info = heap_alloc_zero(sizeof(*info->arg_info) * info->argc); - if(!info->arg_types) + if(!info->arg_info) return; for(i=0; i < info->argc; i++)

1 0

Andrew Eikum : winebus.sys: Add missing padding between hatswitch and constant.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: f8ebb3ac3754fbdd47201328cced0b156a1b820f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ebb3ac3754fbdd47201328… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 20 10:31:06 2019 -0500 winebus.sys: Add missing padding between hatswitch and constant. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d79c200..2b367e5 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -548,19 +548,23 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) BYTE *report_ptr; INT i, descript_size; + static const int BUTTON_BIT_COUNT = CONTROLLER_NUM_BUTTONS + CONTROLLER_NUM_HATSWITCHES * 4; + descript_size = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); descript_size += sizeof(CONTROLLER_AXIS); descript_size += sizeof(CONTROLLER_TRIGGERS); descript_size += sizeof(CONTROLLER_BUTTONS); descript_size += sizeof(REPORT_HATSWITCH); descript_size += sizeof(REPORT_PADDING); + if (BUTTON_BIT_COUNT % 8 != 0) + descript_size += sizeof(REPORT_PADDING); descript_size += test_haptic(ext); ext->axis_start = 0; ext->button_start = CONTROLLER_NUM_AXES * sizeof(WORD); ext->hat_bit_offs = CONTROLLER_NUM_BUTTONS; - ext->buffer_length = (CONTROLLER_NUM_BUTTONS + CONTROLLER_NUM_HATSWITCHES * 4 + 7) / 8 + ext->buffer_length = (BUTTON_BIT_COUNT + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD) + 2/* unknown constant*/; @@ -586,6 +590,8 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) memcpy(report_ptr, CONTROLLER_BUTTONS, sizeof(CONTROLLER_BUTTONS)); report_ptr += sizeof(CONTROLLER_BUTTONS); report_ptr = add_hatswitch(report_ptr, 1); + if (BUTTON_BIT_COUNT % 8 != 0) + report_ptr = add_padding_block(report_ptr, 8 - (BUTTON_BIT_COUNT % 8));/* unused bits between hatswitch and following constant */ report_ptr = add_padding_block(report_ptr, 16);/* unknown constant */ report_ptr += build_haptic(ext, report_ptr); memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL)); @@ -606,8 +612,8 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); /* unknown constant */ - ext->report_buffer[12] = 0x89; - ext->report_buffer[13] = 0xc5; + ext->report_buffer[14] = 0x89; + ext->report_buffer[15] = 0xc5; return TRUE; }

1 0

Nikolay Sivov : mfplat: Create system clock instance per system time source.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 5904eb841997a5568f42f3b3a8340f6158e90f3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5904eb841997a5568f42f3b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:25:58 2019 +0300 mfplat: Create system clock instance per system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 150 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 65 +++++++++++++++++++- 2 files changed, 212 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5904eb841997a5568f42…

1 0

Nikolay Sivov : mfplat: Return properties for system time source.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: ac2038ef308557927500dfeae12a71c24ebbd916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac2038ef308557927500dfea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:25:57 2019 +0300 mfplat: Return properties for system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 12 ++++++++++-- dlls/mfplat/tests/mfplat.c | 17 +++++++++++++++++ include/mfidl.idl | 6 ++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e80408d..77edabe 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -6633,9 +6633,17 @@ static HRESULT WINAPI system_time_source_GetState(IMFPresentationTimeSource *ifa static HRESULT WINAPI system_time_source_GetProperties(IMFPresentationTimeSource *iface, MFCLOCK_PROPERTIES *props) { - FIXME("%p, %p.\n", iface, props); + TRACE("%p, %p.\n", iface, props); - return E_NOTIMPL; + if (!props) + return E_POINTER; + + memset(props, 0, sizeof(*props)); + props->qwClockFrequency = MFCLOCK_FREQUENCY_HNS; + props->dwClockTolerance = MFCLOCK_TOLERANCE_UNKNOWN; + props->dwClockJitter = 1; + + return S_OK; } static HRESULT WINAPI system_time_source_GetUnderlyingClock(IMFPresentationTimeSource *iface, IMFClock **clock) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7fa3ddd..4adfb1b8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2542,6 +2542,7 @@ static void test_system_time_source(void) }; IMFPresentationTimeSource *time_source; IMFClockStateSink *statesink; + MFCLOCK_PROPERTIES props; MFCLOCK_STATE state; unsigned int i; DWORD value; @@ -2595,6 +2596,22 @@ static void test_system_time_source(void) IMFClockStateSink_Release(statesink); + /* Properties. */ + hr = IMFPresentationTimeSource_GetProperties(time_source, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetProperties(time_source, &props); + ok(hr == S_OK, "Failed to get clock properties, hr %#x.\n", hr); + + ok(props.qwCorrelationRate == 0, "Unexpected correlation rate %s.\n", + wine_dbgstr_longlong(props.qwCorrelationRate)); + ok(IsEqualGUID(&props.guidClockId, &GUID_NULL), "Unexpected clock id %s.\n", wine_dbgstr_guid(&props.guidClockId)); + ok(props.dwClockFlags == 0, "Unexpected flags %#x.\n", props.dwClockFlags); + ok(props.qwClockFrequency == MFCLOCK_FREQUENCY_HNS, "Unexpected frequency %s.\n", + wine_dbgstr_longlong(props.qwClockFrequency)); + ok(props.dwClockTolerance == MFCLOCK_TOLERANCE_UNKNOWN, "Unexpected tolerance %u.\n", props.dwClockTolerance); + ok(props.dwClockJitter == 1, "Unexpected jitter %u.\n", props.dwClockJitter); + IMFPresentationTimeSource_Release(time_source); } diff --git a/include/mfidl.idl b/include/mfidl.idl index c024e67..8855c9a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -47,6 +47,12 @@ typedef enum MF_OBJECT_TYPE MF_OBJECT_INVALID } MF_OBJECT_TYPE; +cpp_quote("#define MFCLOCK_FREQUENCY_HNS 10000000") +cpp_quote("#define MFCLOCK_TOLERANCE_UNKNOWN 50000") +cpp_quote("#define MFCLOCK_JITTER_ISR 1000") +cpp_quote("#define MFCLOCK_JITTER_DPC 4000") +cpp_quote("#define MFCLOCK_JITTER_PASSIVE 10000") + typedef struct _MFCLOCK_PROPERTIES { unsigned __int64 qwCorrelationRate;

1 0

Dmitry Timoshkov : urlmon: Add CoInternetGetBrowserProfile stub.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 9f89464e0e4058dd5e2d036c93fadb992fadb526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f89464e0e4058dd5e2d036c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 16 13:54:29 2019 +0800 urlmon: Add CoInternetGetBrowserProfile stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/urlmon.spec | 1 + dlls/urlmon/urlmon_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 0f9f075..d6a6b43 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -111,4 +111,5 @@ 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState 445 stdcall @(long long) MapBrowserEmulationModeToUserAgent +446 stdcall @(long) CoInternetGetBrowserProfile 455 stdcall @() FlushUrlmonZonesCache diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 5dc0d24..aea1a5c 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -811,6 +811,16 @@ int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) } /*********************************************************************** + * CoInternetGetBrowserProfile (URLMON.446) + * Undocumented, added in IE8 + */ +HRESULT WINAPI CoInternetGetBrowserProfile(DWORD unk) +{ + FIXME("%x: stub\n", unk); + return E_NOTIMPL; +} + +/*********************************************************************** * FlushUrlmonZonesCache (URLMON.455) * Undocumented, added in IE8 */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019