September 2019 - Wine-Commits

Nikolay Sivov : mf: Create topology loader of session creation.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 76a347a53eba882d28b2a0868a45ae22405200ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a347a53eba882d28b2a086… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 24 12:01:59 2019 +0300 mf: Create topology loader of session creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 20 ++++++++++++++++++++ dlls/mf/tests/mf.c | 14 ++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index ecee112c3f..89128b7b6a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -69,6 +69,7 @@ struct media_session IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; IMFRateControl *clock_rate_control; + IMFTopoLoader *topo_loader; struct list topologies; enum session_state state; CRITICAL_SECTION cs; @@ -329,6 +330,8 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) IMFPresentationClock_Release(session->clock); if (session->clock_rate_control) IMFRateControl_Release(session->clock_rate_control); + if (session->topo_loader) + IMFTopoLoader_Release(session->topo_loader); DeleteCriticalSection(&session->cs); heap_free(session); } @@ -791,6 +794,23 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses goto failed; } + if (config) + { + GUID clsid; + + if (SUCCEEDED(IMFAttributes_GetGUID(config, &MF_SESSION_TOPOLOADER, &clsid))) + { + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTopoLoader, + (void **)&object->topo_loader))) + { + WARN("Failed to create custom topology loader, hr %#x.\n", hr); + } + } + } + + if (!object->topo_loader && FAILED(hr = MFCreateTopoLoader(&object->topo_loader))) + goto failed; + *session = &object->IMFMediaSession_iface; return S_OK; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 00dc2daed5..64329846cd 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -954,6 +954,7 @@ static void test_media_session(void) IMFRateControl *rate_control, *rate_control2; MFCLOCK_PROPERTIES clock_props; IMFRateSupport *rate_support; + IMFAttributes *attributes; IMFMediaSession *session; IMFGetService *gs; IMFClock *clock; @@ -1043,6 +1044,19 @@ todo_wine IMFMediaSession_Release(session); + /* Custom topology loader, GUID is not registered. */ + hr = MFCreateAttributes(&attributes, 1); + ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + + hr = IMFAttributes_SetGUID(attributes, &MF_SESSION_TOPOLOADER, &MF_SESSION_TOPOLOADER); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateMediaSession(attributes, &session); + ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + IMFMediaSession_Release(session); + + IMFAttributes_Release(attributes); + hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); }

1 0

Nikolay Sivov : mf: Add stub implementation for standard quality manager.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 000a552d4f25bfe49c73df8fc965777e4c6d47b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000a552d4f25bfe49c73df8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 24 12:01:58 2019 +0300 mf: Add stub implementation for standard quality manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf.spec | 2 +- dlls/mf/session.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 12 +++++ include/mfidl.idl | 24 ++++++++++ 4 files changed, 167 insertions(+), 1 deletion(-) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 6e64404ba6..f13a2451fb 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -58,7 +58,7 @@ @ stub MFCreateSequencerSourceRemoteStream @ stub MFCreateSimpleTypeHandler @ stdcall MFCreateSourceResolver(ptr) mfplat.MFCreateSourceResolver -@ stub MFCreateStandardQualityManager +@ stdcall MFCreateStandardQualityManager(ptr) @ stdcall MFCreateTopoLoader(ptr) @ stdcall MFCreateTopology(ptr) @ stdcall MFCreateTopologyNode(long ptr) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 1276f2ec92..ecee112c3f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -133,6 +133,12 @@ struct presentation_clock CRITICAL_SECTION cs; }; +struct quality_manager +{ + IMFQualityManager IMFQualityManager_iface; + LONG refcount; +}; + static inline struct media_session *impl_from_IMFMediaSession(IMFMediaSession *iface) { return CONTAINING_RECORD(iface, struct media_session, IMFMediaSession_iface); @@ -193,6 +199,11 @@ static struct sink_notification *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct sink_notification, IUnknown_iface); } +static struct quality_manager *impl_from_IMFQualityManager(IMFQualityManager *iface) +{ + return CONTAINING_RECORD(iface, struct quality_manager, IMFQualityManager_iface); +} + static HRESULT WINAPI session_op_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -1542,3 +1553,122 @@ HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock) return S_OK; } + +static HRESULT WINAPI standard_quality_manager_QueryInterface(IMFQualityManager *iface, REFIID riid, void **out) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFQualityManager) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + IMFQualityManager_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI standard_quality_manager_AddRef(IMFQualityManager *iface) +{ + struct quality_manager *manager = impl_from_IMFQualityManager(iface); + ULONG refcount = InterlockedIncrement(&manager->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI standard_quality_manager_Release(IMFQualityManager *iface) +{ + struct quality_manager *manager = impl_from_IMFQualityManager(iface); + ULONG refcount = InterlockedDecrement(&manager->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(manager); + } + + return refcount; +} + +static HRESULT WINAPI standard_quality_manager_NotifyTopology(IMFQualityManager *iface, IMFTopology *topology) +{ + FIXME("%p, %p stub.\n", iface, topology); + + return E_NOTIMPL; +} + +static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualityManager *iface, + IMFPresentationClock *clock) +{ + FIXME("%p, %p stub.\n", iface, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityManager *iface, IMFTopologyNode *node, + LONG input_index, IMFSample *sample) +{ + FIXME("%p, %p, %d, %p stub.\n", iface, node, input_index, sample); + + return E_NOTIMPL; +} + +static HRESULT WINAPI standard_quality_manager_NotifyProcessOutput(IMFQualityManager *iface, IMFTopologyNode *node, + LONG output_index, IMFSample *sample) +{ + FIXME("%p, %p, %d, %p stub.\n", iface, node, output_index, sample); + + return E_NOTIMPL; +} + +static HRESULT WINAPI standard_quality_manager_NotifyQualityEvent(IMFQualityManager *iface, IUnknown *object, + IMFMediaEvent *event) +{ + FIXME("%p, %p, %p stub.\n", iface, object, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI standard_quality_manager_Shutdown(IMFQualityManager *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static IMFQualityManagerVtbl standard_quality_manager_vtbl = +{ + standard_quality_manager_QueryInterface, + standard_quality_manager_AddRef, + standard_quality_manager_Release, + standard_quality_manager_NotifyTopology, + standard_quality_manager_NotifyPresentationClock, + standard_quality_manager_NotifyProcessInput, + standard_quality_manager_NotifyProcessOutput, + standard_quality_manager_NotifyQualityEvent, + standard_quality_manager_Shutdown, +}; + +HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager) +{ + struct quality_manager *object; + + TRACE("%p.\n", manager); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFQualityManager_iface.lpVtbl = &standard_quality_manager_vtbl; + object->refcount = 1; + + *manager = &object->IMFQualityManager_iface; + + return S_OK; +} diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0a8a88d6c3..00dc2daed5 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2398,6 +2398,17 @@ failed: CoUninitialize(); } +static void test_quality_manager(void) +{ + IMFQualityManager *manager; + HRESULT hr; + + hr = MFCreateStandardQualityManager(&manager); + ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); + + IMFQualityManager_Release(manager); +} + START_TEST(mf) { test_topology(); @@ -2409,4 +2420,5 @@ START_TEST(mf) test_presentation_clock(); test_sample_grabber(); test_video_processor(); + test_quality_manager(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index f40f16e480..ab6d0d9984 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -577,6 +577,7 @@ cpp_quote("HRESULT WINAPI MFCreateSampleGrabberSinkActivate(IMFMediaType *media_ cpp_quote(" IMFSampleGrabberSinkCallback *callback, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") +cpp_quote("HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **time_source);") @@ -738,6 +739,29 @@ interface IMFShutdown : IUnknown HRESULT GetShutdownStatus([out] MFSHUTDOWN_STATUS *status); } +[ + object, + uuid(8d009d86-5b9f-4115-b1fc-9f80d52ab8ab), + local +] +interface IMFQualityManager : IUnknown +{ + HRESULT NotifyTopology([in] IMFTopology *topology); + HRESULT NotifyPresentationClock([in] IMFPresentationClock *clock); + HRESULT NotifyProcessInput( + [in] IMFTopologyNode *node, + [in] LONG input_index, + [in] IMFSample *sample); + HRESULT NotifyProcessOutput( + [in] IMFTopologyNode *node, + [in] LONG output_index, + [in] IMFSample *sample); + HRESULT NotifyQualityEvent( + [in] IUnknown *object, + [in] IMFMediaEvent *event); + HRESULT Shutdown(); +} + 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: Add Media Session attributes for tracing.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 27901739f5564e8f47fbbcca6f6a090a161008ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=27901739f5564e8f47fbbcca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 24 12:01:57 2019 +0300 mfplat: Add Media Session attributes for tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 8 ++++++++ include/mfidl.idl | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5cbf1212f7..30810daa44 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -630,6 +630,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_SOURCE_READER_ENABLE_TRANSCODE_ONLY_TRANSFORMS), X(MF_TOPOLOGY_DYNAMIC_CHANGE_NOT_ALLOWED), X(MF_MT_ALPHA_MODE), + X(MF_PMP_SERVER_CONTEXT), X(MF_TOPOLOGY_PLAYBACK_MAX_DIMS), X(MF_LOW_LATENCY), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), @@ -638,6 +639,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_WRAPPED_TYPE), X(MF_MT_AVG_BITRATE), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), + X(MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_MAX_BUFFERS), X(MF_MT_AUDIO_BLOCK_ALIGNMENT), X(MF_PD_PMPHOST_CONTEXT), @@ -693,6 +695,10 @@ const char *debugstr_attr(const GUID *guid) X(MF_SD_LANGUAGE), X(MF_MT_AUDIO_WMADRC_AVGTARGET), X(MF_SD_PROTECTED), + X(MF_SESSION_TOPOLOADER), + X(MF_SESSION_GLOBAL_TIME), + X(MF_SESSION_QUALITY_MANAGER), + X(MF_SESSION_CONTENT_PROTECTION_MANAGER), X(MF_READWRITE_MMCSS_PRIORITY_AUDIO), X(MF_BYTESTREAM_ORIGIN_NAME), X(MF_BYTESTREAM_CONTENT_TYPE), @@ -710,6 +716,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_MAJOR_TYPE), X(MF_EVENT_SOURCE_CHARACTERISTICS), X(MF_EVENT_SOURCE_CHARACTERISTICS_OLD), + X(MF_SESSION_SERVER_CONTEXT), X(MF_MT_VIDEO_3D_FIRST_IS_LEFT), X(MF_PD_ADAPTIVE_STREAMING), X(MFSampleExtension_Timestamp), @@ -781,6 +788,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_MFT_CONTEXT), X(MF_MT_FORWARD_CUSTOM_SEI), X(MF_TOPONODE_CONNECT_METHOD), + X(MF_SESSION_REMOTE_SOURCE_MODE), X(MF_MT_DEPTH_VALUE_UNIT), X(MF_MT_AUDIO_NUM_CHANNELS), X(MF_TOPOLOGY_DXVA_MODE), diff --git a/include/mfidl.idl b/include/mfidl.idl index 5f8913384c..f40f16e480 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -842,4 +842,13 @@ cpp_quote("EXTERN_GUID(MF_RATE_CONTROL_SERVICE, 0x866fa297, 0xb802, 0x4bf8, 0x9d 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);") +cpp_quote("EXTERN_GUID(MF_SESSION_TOPOLOADER, 0x1e83d482, 0x1f1c, 0x4571, 0x84, 0x05, 0x88, 0xf4, 0xb2, 0x18, 0x1f, 0x71);") +cpp_quote("EXTERN_GUID(MF_SESSION_GLOBAL_TIME, 0x1e83d482, 0x1f1c, 0x4571, 0x84, 0x05, 0x88, 0xf4, 0xb2, 0x18, 0x1f, 0x72);") +cpp_quote("EXTERN_GUID(MF_SESSION_QUALITY_MANAGER, 0x1e83d482, 0x1f1c, 0x4571, 0x84, 0x05, 0x88, 0xf4, 0xb2, 0x18, 0x1f, 0x73);") +cpp_quote("EXTERN_GUID(MF_SESSION_CONTENT_PROTECTION_MANAGER, 0x1e83d482, 0x1f1c, 0x4571, 0x84, 0x05, 0x88, 0xf4, 0xb2, 0x18, 0x1f, 0x74);") +cpp_quote("EXTERN_GUID(MF_SESSION_SERVER_CONTEXT, 0xafe5b291, 0x50fa, 0x46e8, 0xb9, 0xbe, 0x0c, 0x0c, 0x3c, 0xe4, 0xb3, 0xa5);") +cpp_quote("EXTERN_GUID(MF_SESSION_REMOTE_SOURCE_MODE, 0xf4033ef4, 0x9bb3, 0x4378, 0x94, 0x1f, 0x85, 0xa0, 0x85, 0x6b, 0xc2, 0x44);") +cpp_quote("EXTERN_GUID(MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME, 0x190e852f, 0x6238, 0x42d1, 0xb5, 0xaf, 0x69, 0xea, 0x33, 0x8e, 0xf8, 0x50);") +cpp_quote("EXTERN_GUID(MF_PMP_SERVER_CONTEXT, 0x2f00c910, 0xd2cf, 0x4278, 0x8b, 0x6a, 0xd0, 0x77, 0xfa, 0xc3, 0xa2, 0x5f);") + cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")

1 0

Piotr Caban : mountmgr.sys: Null terminate serial_search_paths and parallel_search_paths tables.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 93ea9713c2256d1f306fc37af67da34ec92fdf56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93ea9713c2256d1f306fc37a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 16:14:55 2019 +0200 mountmgr.sys: Null terminate serial_search_paths and parallel_search_paths tables. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 6604b69ef8..22a9e69dd9 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1161,16 +1161,14 @@ static void create_port_devices( DRIVER_OBJECT *driver ) "/dev/cuau%u", #elif defined(__DragonFly__) "/dev/cuaa%u", -#else - "", #endif + NULL }; static const char *parallel_search_paths[] = { #ifdef linux "/dev/lp%u", -#else - "", #endif + NULL }; static const WCHAR serialcomm_keyW[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -1183,7 +1181,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) char *dosdevices_path, *p; HKEY wine_ports_key = NULL, windows_ports_key = NULL; char unix_path[256]; - int num_search_paths, i, j, n; + int i, j, n; if (!(dosdevices_path = get_dosdevices_path( &p ))) return; @@ -1194,7 +1192,6 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[1] = 'o'; p[2] = 'm'; search_paths = serial_search_paths; - num_search_paths = ARRAY_SIZE(serial_search_paths); windows_ports_key_name = serialcomm_keyW; } else @@ -1203,7 +1200,6 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[1] = 'p'; p[2] = 't'; search_paths = parallel_search_paths; - num_search_paths = ARRAY_SIZE(parallel_search_paths); windows_ports_key_name = parallel_ports_keyW; } p += 3; @@ -1223,7 +1219,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) /* look for ports in the usual places */ n = 1; - for (i = 0; i < num_search_paths; i++) + for (i = 0; search_paths[i]; i++) { for (j = 0; n <= MAX_PORTS; j++) {

1 0

Alistair Leslie-Hughes : bcrypt: Fix key_asymmetric_init function for macos.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: e95215d08c8dedf6432994d6fde49c4e90457f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e95215d08c8dedf6432994d6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 24 12:52:59 2019 +0000 bcrypt: Fix key_asymmetric_init function for macos. Regression introduced in 98b230f851f859e9240e8381e3deec5016082ceb 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/bcrypt/macos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 0f7b14ff95..fbd0321021 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -200,7 +200,7 @@ NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, ULONG bitl } NTSTATUS key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len, ULONG *ret_len ) + ULONG output_len, ULONG *ret_len, ULONG flags ) { FIXME( "not implemented on Mac\n" ); return STATUS_NOT_IMPLEMENTED;

1 0

Zebediah Figura : strmbase: Get rid of the BasePin typedef.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 8619eb9838f7cc35ed402fe6eea5f1c04dd413c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8619eb9838f7cc35ed402fe6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 23 19:33:24 2019 -0500 strmbase: Get rid of the BasePin typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 16 +++++++-------- dlls/qcap/avimux.c | 14 ++++++------- dlls/qcap/smartteefilter.c | 30 +++++++++++++-------------- dlls/qcap/vfwcapture.c | 10 ++++----- dlls/quartz/filesource.c | 10 ++++----- dlls/strmbase/mediatype.c | 4 ++-- dlls/strmbase/pin.c | 30 +++++++++++++-------------- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/strmbase_private.h | 2 +- dlls/strmbase/transform.c | 6 +++--- dlls/strmbase/video.c | 2 +- dlls/strmbase/window.c | 2 +- dlls/winegstreamer/gstdemux.c | 14 ++++++------- dlls/wineqtdecoder/qtsplitter.c | 12 +++++------ include/wine/strmbase.h | 44 +++++++++++++++++++--------------------- 15 files changed, 97 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8619eb9838f7cc35ed40…

1 0

Zebediah Figura : wineqtdecoder: Use BasePinImpl_QueryAccept() and BasePinImpl_EnumMediaTypes().
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 55b30a0481df54cd60785abed873af8cb8346f2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b30a0481df54cd60785abe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 23 19:33:20 2019 -0500 wineqtdecoder: Use BasePinImpl_QueryAccept() and BasePinImpl_EnumMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 56 +++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 599407d4ca..d713cd14bd 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -199,6 +199,11 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) return CONTAINING_RECORD(iface, QTSplitter, filter.IBaseFilter_iface); } +static inline QTInPin *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); +} + /* * Base Filter */ @@ -285,6 +290,24 @@ static const struct strmbase_filter_ops filter_ops = .filter_destroy = qt_splitter_destroy, }; +static HRESULT WINAPI sink_CheckMediaType(BasePin *iface, const AM_MEDIA_TYPE *mt) +{ + QTInPin *pin = impl_from_IPin(&iface->IPin_iface); + + if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) + { + pin->subType = mt->subtype; + return S_OK; + } + return S_FALSE; +} + +static const BasePinFuncTable sink_ops = +{ + .pfnCheckMediaType = sink_CheckMediaType, + .pfnGetMediaType = BasePinImpl_GetMediaType, +}; + IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) { QTSplitter *This; @@ -318,6 +341,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) lstrcpynW(This->pInputPin.pin.name, wcsInputPinName, ARRAY_SIZE(This->pInputPin.pin.name)); This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; This->pInputPin.pin.pConnectedTo = NULL; + This->pInputPin.pin.pFuncsTable = &sink_ops; SourceSeeking_Init(&This->sourceSeeking, &QT_Seeking_Vtbl, QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate, &This->filter.csFilter); @@ -812,11 +836,6 @@ static HRESULT QT_RemoveOutputPins(QTSplitter *This) return S_OK; } -static inline QTInPin *impl_from_IPin( IPin *iface ) -{ - return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); -} - static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) { AM_MEDIA_TYPE amt; @@ -1154,20 +1173,6 @@ static HRESULT WINAPI QTInPin_Disconnect(IPin *iface) return hr; } -static HRESULT WINAPI QTInPin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *pmt) -{ - QTInPin *This = impl_from_IPin(iface); - - TRACE("(%p)->(%p)\n", This, pmt); - - if (IsEqualIID(&pmt->majortype, &MEDIATYPE_Stream)) - { - This->subType = pmt->subtype; - return S_OK; - } - return S_FALSE; -} - static HRESULT WINAPI QTInPin_EndOfStream(IPin *iface) { FIXME("iface %p, stub!\n", iface); @@ -1219,15 +1224,6 @@ static HRESULT WINAPI QTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * return E_NOINTERFACE; } -static HRESULT WINAPI QTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) -{ - QTInPin *This = impl_from_IPin(iface); - - TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); - - return EnumMediaTypes_Construct(&This->pin, BasePinImpl_GetMediaType, BasePinImpl_GetMediaTypeVersion, ppEnum); -} - static const IPinVtbl QT_InputPin_Vtbl = { QTInPin_QueryInterface, BasePinImpl_AddRef, @@ -1240,8 +1236,8 @@ static const IPinVtbl QT_InputPin_Vtbl = { BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - QTInPin_QueryAccept, - QTInPin_EnumMediaTypes, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, QTInPin_EndOfStream, QTInPin_BeginFlush,

1 0

Brendan Shanks : user32/tests: Test GetWindowInfo error conditions and incorrect cbSize.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 38dd9faf96eb8ea464ee095c92faa83761c032ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=38dd9faf96eb8ea464ee095c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Sep 23 10:41:06 2019 -0700 user32/tests: Test GetWindowInfo error conditions and incorrect cbSize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47783 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 75 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c6fbd7c12a..6b600cb1bc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -24,6 +24,7 @@ #define _WIN32_WINNT 0x0501 #include <assert.h> +#include <limits.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -996,6 +997,61 @@ if (0) "wrong wCreatorVersion %04x for %p in hook %s\n", info->wCreatorVersion, hwnd, hook); } +static void test_window_info(const char *hook, HWND hwnd) +{ + WINDOWINFO info, info2; + + if (0) /* crashes on Win10 */ + ok(!pGetWindowInfo(hwnd, NULL), "GetWindowInfo should fail\n"); + + if (0) { /* crashes on XP, 2003 */ + SetLastError(0xdeadbeef); + ok(!pGetWindowInfo(0, NULL), "GetWindowInfo should fail\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ok(!pGetWindowInfo(0, &info), "GetWindowInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); + + info.cbSize = sizeof(WINDOWINFO); + ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); + verify_window_info(hook, hwnd, &info); + + /* test different cbSize values. + * Windows ignores it (except for Win98, according to an old comment). + */ + memset(&info, 0xcc, sizeof(WINDOWINFO)); + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + + info.cbSize = sizeof(WINDOWINFO); + info2.cbSize = sizeof(WINDOWINFO); + + ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "identical GetWindowInfo calls produce different result\n"); + + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + info2.cbSize = 0; + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + info2.cbSize = sizeof(WINDOWINFO); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "GetWindowInfo cbSize should be ignored\n"); + + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + info2.cbSize = sizeof(WINDOWINFO)/2; + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + info2.cbSize = sizeof(WINDOWINFO); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "GetWindowInfo cbSize should be ignored\n"); + + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + info2.cbSize = UINT_MAX; + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + info2.cbSize = sizeof(WINDOWINFO); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "GetWindowInfo cbSize should be ignored\n"); +} + static void FixedAdjustWindowRectEx(RECT* rc, LONG style, BOOL menu, LONG exstyle) { AdjustWindowRectEx(rc, style, menu, exstyle); @@ -1172,12 +1228,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) ok(createwnd->hwndInsertAfter == HWND_TOP, "hwndInsertAfter should be always HWND_TOP\n"); if (pGetWindowInfo) - { - WINDOWINFO info; - info.cbSize = sizeof(WINDOWINFO); - ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); - verify_window_info(code_name, hwnd, &info); - } + test_window_info(code_name, hwnd); /* WS_VISIBLE should be turned off yet */ style = createwnd->lpcs->style & ~WS_VISIBLE; @@ -1238,17 +1289,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) case HCBT_MINMAX: case HCBT_ACTIVATE: if (pGetWindowInfo && IsWindow(hwnd)) - { - WINDOWINFO info; - - /* Win98 actually does check the info.cbSize and doesn't allow - * it to be anything except sizeof(WINDOWINFO), while Win95, Win2k, - * WinXP do not check it at all. - */ - info.cbSize = sizeof(WINDOWINFO); - ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); - verify_window_info(code_name, hwnd, &info); - } + test_window_info(code_name, hwnd); break; /* window state is undefined */ case HCBT_SETFOCUS:

1 0

Zebediah Figura : strmbase: Get rid of the "enumMediaFunction" field from IEnumMediaTypesImpl.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: 750efd19a75c8b3259baee45795c1a9e94fbaf7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=750efd19a75c8b3259baee45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 23 19:33:23 2019 -0500 strmbase: Get rid of the "enumMediaFunction" field from IEnumMediaTypesImpl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 20 +++++--------------- dlls/strmbase/pin.c | 2 +- dlls/strmbase/strmbase_private.h | 3 +-- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index bb59a81584..af6832a571 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -82,7 +82,6 @@ typedef struct IEnumMediaTypesImpl IEnumMediaTypes IEnumMediaTypes_iface; LONG refCount; BasePin *basePin; - BasePin_GetMediaType enumMediaFunction; ULONG count; ULONG uIndex; } IEnumMediaTypesImpl; @@ -94,11 +93,9 @@ static inline IEnumMediaTypesImpl *impl_from_IEnumMediaTypes(IEnumMediaTypes *if static const struct IEnumMediaTypesVtbl IEnumMediaTypesImpl_Vtbl; -HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType enumFunc, IEnumMediaTypes **ppEnum) +HRESULT enum_media_types_create(BasePin *basePin, IEnumMediaTypes **ppEnum) { - ULONG i; IEnumMediaTypesImpl * pEnumMediaTypes = CoTaskMemAlloc(sizeof(IEnumMediaTypesImpl)); - AM_MEDIA_TYPE amt; *ppEnum = NULL; @@ -108,18 +105,11 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e pEnumMediaTypes->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypesImpl_Vtbl; pEnumMediaTypes->refCount = 1; pEnumMediaTypes->uIndex = 0; - pEnumMediaTypes->enumMediaFunction = enumFunc; IPin_AddRef(&basePin->IPin_iface); pEnumMediaTypes->basePin = basePin; - i = 0; - while (enumFunc(basePin, i, &amt) == S_OK) - { - FreeMediaType(&amt); - i++; - } + IEnumMediaTypes_Reset(&pEnumMediaTypes->IEnumMediaTypes_iface); - pEnumMediaTypes->count = i; *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; return S_OK; } @@ -179,7 +169,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes *iface, for (i = 0; i < count && enummt->uIndex + i < enummt->count; i++) { if (!(mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))) - || FAILED(enummt->enumMediaFunction(enummt->basePin, enummt->uIndex + i, mts[i]))) + || FAILED(enummt->basePin->pFuncsTable->pfnGetMediaType(enummt->basePin, enummt->uIndex + i, mts[i]))) { while (i--) DeleteMediaType(mts[i]); @@ -216,7 +206,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) TRACE("(%p)->()\n", iface); i = 0; - while (This->enumMediaFunction(This->basePin, i, &amt) == S_OK) + while (This->basePin->pFuncsTable->pfnGetMediaType(This->basePin, i, &amt) == S_OK) { FreeMediaType(&amt); i++; @@ -234,7 +224,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMe TRACE("(%p)->(%p)\n", iface, ppEnum); - hr = EnumMediaTypes_Construct(This->basePin, This->enumMediaFunction, ppEnum); + hr = enum_media_types_create(This->basePin, ppEnum); if (FAILED(hr)) return hr; return IEnumMediaTypes_Skip(*ppEnum, This->uIndex); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 7991fdc547..e8fcbf90f1 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -301,7 +301,7 @@ HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_me TRACE("iface %p, enum_media_types %p.\n", iface, enum_media_types); - return EnumMediaTypes_Construct(pin, pin->pFuncsTable->pfnGetMediaType, enum_media_types); + return enum_media_types_create(pin, enum_media_types); } HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index b5e6d4bd18..98a5a25d71 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -63,8 +63,7 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s void QualityControlRender_EndRender(QualityControlImpl *This); HRESULT enum_pins_create(struct strmbase_filter *filter, IEnumPins **enum_pins); -HRESULT WINAPI EnumMediaTypes_Construct(BasePin *pin, BasePin_GetMediaType enumFunc, - IEnumMediaTypes **enum_media_types) DECLSPEC_HIDDEN; +HRESULT enum_media_types_create(BasePin *pin, IEnumMediaTypes **enum_media_types) DECLSPEC_HIDDEN; HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface);

1 0

Zebediah Figura : strmbase: Don't expose EnumMediaTypes_Construct().
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: wine Branch: master Commit: b68498c875f7db2969ff4fbaeaa5b2e4db5a3163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b68498c875f7db2969ff4fba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 23 19:33:21 2019 -0500 strmbase: Don't expose EnumMediaTypes_Construct(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/strmbase_private.h | 2 ++ include/wine/strmbase.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 9904754e4a..4b94735eb6 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -63,6 +63,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s void QualityControlRender_EndRender(QualityControlImpl *This); HRESULT enum_pins_create(struct strmbase_filter *filter, IEnumPins **enum_pins); +HRESULT WINAPI EnumMediaTypes_Construct(BasePin *pin, BasePin_GetMediaType enumFunc, + BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes **enum_media_types) DECLSPEC_HIDDEN; HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 85801ebabc..169046d64d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -199,9 +199,6 @@ void strmbase_filter_init(struct strmbase_filter *filter, const IBaseFilterVtbl const CLSID *clsid, const struct strmbase_filter_ops *func_table); void strmbase_filter_cleanup(struct strmbase_filter *filter); -/* Enums */ -HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum); - /* Transform Filter */ typedef struct TransformFilter {

1 0