February 2021 - Wine-commits

Nikolay Sivov : gdiplus/metafile: Fix copy-paste typo when setting resolution (Coverity).
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: c090b35d99e4f7d4e9eb2d7394a54fea67cc4e46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c090b35d99e4f7d4e9eb2d73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 12:59:01 2021 +0300 gdiplus/metafile: Fix copy-paste typo when setting resolution (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3c2e8eb3aa2..d506d0dc8bf 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4078,7 +4078,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, * If clear, metafile was recorded with a DC for a printer */ (*metafile)->printer_display = !(header.EmfPlusFlags & (1u << 31)); (*metafile)->logical_dpix = header.LogicalDpiX; - (*metafile)->logical_dpix = header.LogicalDpiY; + (*metafile)->logical_dpiy = header.LogicalDpiY; list_init(&(*metafile)->containers); TRACE("<-- %p\n", *metafile);

1 0

Nikolay Sivov : mf: Add shutdown state for the standard quality manager.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: a30d43c60ba2b16302bed1c8d3a7980c7abd6def URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30d43c60ba2b16302bed1c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 13:22:06 2021 +0300 mf: Add shutdown state for the standard quality manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 48 ++++++++++++++++++++++++++++++++++++++---------- dlls/mf/tests/mf.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 10 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5034255339c..af58a47ed7a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -319,12 +319,19 @@ struct presentation_clock BOOL is_shut_down; }; +enum quality_manager_state +{ + QUALITY_MANAGER_READY = 0, + QUALITY_MANAGER_SHUT_DOWN, +}; + struct quality_manager { IMFQualityManager IMFQualityManager_iface; LONG refcount; IMFPresentationClock *clock; + unsigned int state; CRITICAL_SECTION cs; }; @@ -4794,24 +4801,35 @@ static HRESULT WINAPI standard_quality_manager_NotifyTopology(IMFQualityManager return S_OK; } +static void standard_quality_manager_release_clock(struct quality_manager *manager) +{ + if (manager->clock) + IMFPresentationClock_Release(manager->clock); + manager->clock = NULL; +} + static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualityManager *iface, IMFPresentationClock *clock) { struct quality_manager *manager = impl_from_IMFQualityManager(iface); + HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, clock); - if (!clock) - return E_POINTER; - EnterCriticalSection(&manager->cs); - if (manager->clock) - IMFPresentationClock_Release(manager->clock); - manager->clock = clock; - IMFPresentationClock_AddRef(manager->clock); + if (manager->state == QUALITY_MANAGER_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!clock) + hr = E_POINTER; + else + { + standard_quality_manager_release_clock(manager); + manager->clock = clock; + IMFPresentationClock_AddRef(manager->clock); + } LeaveCriticalSection(&manager->cs); - return S_OK; + return hr; } static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityManager *iface, IMFTopologyNode *node, @@ -4840,9 +4858,19 @@ static HRESULT WINAPI standard_quality_manager_NotifyQualityEvent(IMFQualityMana static HRESULT WINAPI standard_quality_manager_Shutdown(IMFQualityManager *iface) { - FIXME("%p stub.\n", iface); + struct quality_manager *manager = impl_from_IMFQualityManager(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&manager->cs); + if (manager->state != QUALITY_MANAGER_SHUT_DOWN) + { + standard_quality_manager_release_clock(manager); + manager->state = QUALITY_MANAGER_SHUT_DOWN; + } + LeaveCriticalSection(&manager->cs); + + return S_OK; } static IMFQualityManagerVtbl standard_quality_manager_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 846d311c877..aad1564c3f0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3647,16 +3647,67 @@ failed: static void test_quality_manager(void) { + IMFPresentationClock *clock; IMFQualityManager *manager; HRESULT hr; + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); + + hr = MFCreatePresentationClock(&clock); + ok(hr == S_OK, "Failed to create presentation clock, hr %#x.\n", hr); + hr = MFCreateStandardQualityManager(&manager); ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); + check_interface(manager, &IID_IMFQualityManager, TRUE); +todo_wine + check_interface(manager, &IID_IMFClockStateSink, TRUE); + hr = IMFQualityManager_NotifyPresentationClock(manager, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + /* Set clock, then shutdown. */ + EXPECT_REF(clock, 1); + EXPECT_REF(manager, 1); + hr = IMFQualityManager_NotifyPresentationClock(manager, clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(clock, 2); +todo_wine + EXPECT_REF(manager, 2); + + hr = IMFQualityManager_Shutdown(manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(clock, 1); + + hr = IMFQualityManager_NotifyPresentationClock(manager, clock); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityManager_NotifyPresentationClock(manager, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityManager_Shutdown(manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFQualityManager_Release(manager); + + /* Set clock, then release without shutting down. */ + hr = MFCreateStandardQualityManager(&manager); + ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); + + EXPECT_REF(clock, 1); + hr = IMFQualityManager_NotifyPresentationClock(manager, clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(clock, 2); + IMFQualityManager_Release(manager); +todo_wine + EXPECT_REF(clock, 2); + + IMFPresentationClock_Release(clock); + + hr = MFShutdown(); + ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } static void test_sar(void)

1 0

Nikolay Sivov : mf: Subscribe standard quality manager to clock state change events.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 144dcc1a26f3c2689c80d261ade7c3d036104dde URL: https://source.winehq.org/git/wine.git/?a=commit;h=144dcc1a26f3c2689c80d261… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 13:22:07 2021 +0300 mf: Subscribe standard quality manager to clock state change events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/mf/tests/mf.c | 3 -- 2 files changed, 87 insertions(+), 8 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index af58a47ed7a..36e0c901d80 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -328,6 +328,7 @@ enum quality_manager_state struct quality_manager { IMFQualityManager IMFQualityManager_iface; + IMFClockStateSink IMFClockStateSink_iface; LONG refcount; IMFPresentationClock *clock; @@ -425,6 +426,11 @@ static struct quality_manager *impl_from_IMFQualityManager(IMFQualityManager *if return CONTAINING_RECORD(iface, struct quality_manager, IMFQualityManager_iface); } +static struct quality_manager *impl_from_qm_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct quality_manager, IMFClockStateSink_iface); +} + static struct topo_node *impl_node_from_IMFVideoSampleAllocatorNotify(IMFVideoSampleAllocatorNotify *iface) { return CONTAINING_RECORD(iface, struct topo_node, u.sink.notify_cb); @@ -4751,19 +4757,28 @@ HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock) static HRESULT WINAPI standard_quality_manager_QueryInterface(IMFQualityManager *iface, REFIID riid, void **out) { + struct quality_manager *manager = impl_from_IMFQualityManager(iface); + 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; + } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *out = &manager->IMFClockStateSink_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI standard_quality_manager_AddRef(IMFQualityManager *iface) @@ -4804,7 +4819,10 @@ static HRESULT WINAPI standard_quality_manager_NotifyTopology(IMFQualityManager static void standard_quality_manager_release_clock(struct quality_manager *manager) { if (manager->clock) + { + IMFPresentationClock_RemoveClockStateSink(manager->clock, &manager->IMFClockStateSink_iface); IMFPresentationClock_Release(manager->clock); + } manager->clock = NULL; } @@ -4826,6 +4844,8 @@ static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualit standard_quality_manager_release_clock(manager); manager->clock = clock; IMFPresentationClock_AddRef(manager->clock); + if (FAILED(IMFPresentationClock_AddClockStateSink(manager->clock, &manager->IMFClockStateSink_iface))) + WARN("Failed to set state sink.\n"); } LeaveCriticalSection(&manager->cs); @@ -4886,6 +4906,67 @@ static IMFQualityManagerVtbl standard_quality_manager_vtbl = standard_quality_manager_Shutdown, }; +static HRESULT WINAPI standard_quality_manager_sink_QueryInterface(IMFClockStateSink *iface, + REFIID riid, void **obj) +{ + struct quality_manager *manager = impl_from_qm_IMFClockStateSink(iface); + return IMFQualityManager_QueryInterface(&manager->IMFQualityManager_iface, riid, obj); +} + +static ULONG WINAPI standard_quality_manager_sink_AddRef(IMFClockStateSink *iface) +{ + struct quality_manager *manager = impl_from_qm_IMFClockStateSink(iface); + return IMFQualityManager_AddRef(&manager->IMFQualityManager_iface); +} + +static ULONG WINAPI standard_quality_manager_sink_Release(IMFClockStateSink *iface) +{ + struct quality_manager *manager = impl_from_qm_IMFClockStateSink(iface); + return IMFQualityManager_Release(&manager->IMFQualityManager_iface); +} + +static HRESULT WINAPI standard_quality_manager_sink_OnClockStart(IMFClockStateSink *iface, + MFTIME systime, LONGLONG offset) +{ + return S_OK; +} + +static HRESULT WINAPI standard_quality_manager_sink_OnClockStop(IMFClockStateSink *iface, + MFTIME systime) +{ + return S_OK; +} + +static HRESULT WINAPI standard_quality_manager_sink_OnClockPause(IMFClockStateSink *iface, + MFTIME systime) +{ + return S_OK; +} + +static HRESULT WINAPI standard_quality_manager_sink_OnClockRestart(IMFClockStateSink *iface, + MFTIME systime) +{ + return S_OK; +} + +static HRESULT WINAPI standard_quality_manager_sink_OnClockSetRate(IMFClockStateSink *iface, + MFTIME systime, float rate) +{ + return S_OK; +} + +static const IMFClockStateSinkVtbl standard_quality_manager_sink_vtbl = +{ + standard_quality_manager_sink_QueryInterface, + standard_quality_manager_sink_AddRef, + standard_quality_manager_sink_Release, + standard_quality_manager_sink_OnClockStart, + standard_quality_manager_sink_OnClockStop, + standard_quality_manager_sink_OnClockPause, + standard_quality_manager_sink_OnClockRestart, + standard_quality_manager_sink_OnClockSetRate, +}; + HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager) { struct quality_manager *object; @@ -4897,6 +4978,7 @@ HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager) return E_OUTOFMEMORY; object->IMFQualityManager_iface.lpVtbl = &standard_quality_manager_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &standard_quality_manager_sink_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index aad1564c3f0..ba313adc15c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3661,7 +3661,6 @@ static void test_quality_manager(void) ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); check_interface(manager, &IID_IMFQualityManager, TRUE); -todo_wine check_interface(manager, &IID_IMFClockStateSink, TRUE); hr = IMFQualityManager_NotifyPresentationClock(manager, NULL); @@ -3673,7 +3672,6 @@ todo_wine hr = IMFQualityManager_NotifyPresentationClock(manager, clock); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); EXPECT_REF(clock, 2); -todo_wine EXPECT_REF(manager, 2); hr = IMFQualityManager_Shutdown(manager); @@ -3701,7 +3699,6 @@ todo_wine EXPECT_REF(clock, 2); IMFQualityManager_Release(manager); -todo_wine EXPECT_REF(clock, 2); IMFPresentationClock_Release(clock);

1 0

Nikolay Sivov : mf: Implement NotifyTopology() for the standard quality manager.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 08088da4db9787793875181ade63f6f270dd2b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=08088da4db9787793875181a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 13:22:08 2021 +0300 mf: Implement NotifyTopology() for the standard quality manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 29 +++++++++++++++++++++++++++-- dlls/mf/tests/mf.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 36e0c901d80..94454cd2f2a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -331,6 +331,7 @@ struct quality_manager IMFClockStateSink IMFClockStateSink_iface; LONG refcount; + IMFTopology *topology; IMFPresentationClock *clock; unsigned int state; CRITICAL_SECTION cs; @@ -4802,6 +4803,8 @@ static ULONG WINAPI standard_quality_manager_Release(IMFQualityManager *iface) { if (manager->clock) IMFPresentationClock_Release(manager->clock); + if (manager->topology) + IMFTopology_Release(manager->topology); DeleteCriticalSection(&manager->cs); heap_free(manager); } @@ -4809,11 +4812,32 @@ static ULONG WINAPI standard_quality_manager_Release(IMFQualityManager *iface) return refcount; } +static void standard_quality_manager_set_topology(struct quality_manager *manager, IMFTopology *topology) +{ + if (manager->topology) + IMFTopology_Release(manager->topology); + manager->topology = topology; + if (manager->topology) + IMFTopology_AddRef(manager->topology); +} + static HRESULT WINAPI standard_quality_manager_NotifyTopology(IMFQualityManager *iface, IMFTopology *topology) { - FIXME("%p, %p stub.\n", iface, topology); + struct quality_manager *manager = impl_from_IMFQualityManager(iface); + HRESULT hr = S_OK; - return S_OK; + TRACE("%p, %p.\n", iface, topology); + + EnterCriticalSection(&manager->cs); + if (manager->state == QUALITY_MANAGER_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + standard_quality_manager_set_topology(manager, topology); + } + LeaveCriticalSection(&manager->cs); + + return hr; } static void standard_quality_manager_release_clock(struct quality_manager *manager) @@ -4886,6 +4910,7 @@ static HRESULT WINAPI standard_quality_manager_Shutdown(IMFQualityManager *iface if (manager->state != QUALITY_MANAGER_SHUT_DOWN) { standard_quality_manager_release_clock(manager); + standard_quality_manager_set_topology(manager, NULL); manager->state = QUALITY_MANAGER_SHUT_DOWN; } LeaveCriticalSection(&manager->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ba313adc15c..9bbf82c97e7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3649,6 +3649,7 @@ static void test_quality_manager(void) { IMFPresentationClock *clock; IMFQualityManager *manager; + IMFTopology *topology; HRESULT hr; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); @@ -3666,6 +3667,9 @@ static void test_quality_manager(void) hr = IMFQualityManager_NotifyPresentationClock(manager, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFQualityManager_NotifyTopology(manager, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Set clock, then shutdown. */ EXPECT_REF(clock, 1); EXPECT_REF(manager, 1); @@ -3681,6 +3685,9 @@ static void test_quality_manager(void) hr = IMFQualityManager_NotifyPresentationClock(manager, clock); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFQualityManager_NotifyTopology(manager, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFQualityManager_NotifyPresentationClock(manager, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -3703,6 +3710,48 @@ static void test_quality_manager(void) IMFPresentationClock_Release(clock); + /* Set topology. */ + hr = MFCreateStandardQualityManager(&manager); + ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); + + hr = MFCreateTopology(&topology); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + EXPECT_REF(topology, 1); + hr = IMFQualityManager_NotifyTopology(manager, topology); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(topology, 2); + + hr = IMFQualityManager_NotifyTopology(manager, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(topology, 1); + + hr = IMFQualityManager_NotifyTopology(manager, topology); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + EXPECT_REF(topology, 2); + hr = IMFQualityManager_Shutdown(manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(topology, 1); + + hr = IMFQualityManager_NotifyTopology(manager, topology); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFQualityManager_Release(manager); + + hr = MFCreateStandardQualityManager(&manager); + ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); + + EXPECT_REF(topology, 1); + hr = IMFQualityManager_NotifyTopology(manager, topology); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(topology, 2); + + IMFQualityManager_Release(manager); + EXPECT_REF(topology, 1); + + IMFTopology_Release(topology); + hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); }

1 0

Nikolay Sivov : mfplat: Add a few MF_SA_* attributes for tracing.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 2e64af01dd06aded9f39a5435afccdd3031095e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e64af01dd06aded9f39a543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 13:22:09 2021 +0300 mfplat: Add a few MF_SA_* 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/mftransform.idl | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 54bd70a2fff..3d294ad45f0 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1615,6 +1615,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_PALETTE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_PROVIDER_DEVICE_ID), X(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS), + X(MF_SA_D3D11_USAGE), X(MF_MEDIA_ENGINE_NEEDKEY_CALLBACK), X(MF_MT_GEOMETRIC_APERTURE), X(MF_MT_ORIGINAL_WAVE_FORMAT_TAG), @@ -1630,6 +1631,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_SPATIAL_AUDIO_MAX_DYNAMIC_OBJECTS), X(MF_MT_DECODER_MAX_DPB_COUNT), X(MFSampleExtension_ForwardedDecodeUnits), + X(MF_SA_D3D11_SHARED_WITHOUT_MUTEX), X(MF_MT_DV_AAUX_CTRL_PACK_0), X(MF_MT_YUV_MATRIX), X(MF_EVENT_SOURCE_TOPOLOGY_CANCELED), @@ -1664,6 +1666,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MEDIA_ENGINE_PLAYBACK_VISUAL), X(MF_MT_VIDEO_CHROMA_SITING), X(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY), + X(MF_SA_BUFFERS_PER_SAMPLE), X(MFSampleExtension_3DVideo_SampleFormat), X(MF_MT_H264_RESOLUTION_SCALING), X(MF_MT_VIDEO_LEVEL), @@ -1736,6 +1739,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPONODE_RATELESS), X(MF_EVENT_STREAM_METADATA_CONTENT_KEYIDS), X(MF_TOPONODE_DISABLE_PREROLL), + X(MF_SA_D3D11_ALLOW_DYNAMIC_YUV_TEXTURE), X(MF_MT_VIDEO_3D_FORMAT), X(MF_EVENT_STREAM_METADATA_KEYDATA), X(MF_SINK_WRITER_D3D_MANAGER), @@ -1751,6 +1755,7 @@ const char *debugstr_attr(const GUID *guid) X(MFT_ENUM_HARDWARE_URL_Attribute), X(MF_SOURCE_READER_ASYNC_CALLBACK), X(MF_MT_OUTPUT_BUFFER_NUM), + X(MF_SA_D3D11_BINDFLAGS), X(MFT_ENCODER_SUPPORTS_CONFIG_EVENT), X(MF_MT_AUDIO_FLAC_MAX_BLOCK_SIZE), X(MFT_FRIENDLY_NAME_Attribute), @@ -1772,10 +1777,12 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_SPATIAL_AUDIO_OBJECT_METADATA_LENGTH), X(MF_MT_SPATIAL_AUDIO_OBJECT_METADATA_FORMAT_ID), X(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK), + X(MF_SA_D3D11_SHARED), X(MF_MT_PAN_SCAN_ENABLED), X(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID), X(MF_MT_DV_VAUX_CTRL_PACK), X(MFSampleExtension_ForwardedDecodeUnitType), + X(MF_SA_D3D11_AWARE), X(MF_MT_AUDIO_AVG_BYTES_PER_SECOND), X(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS), X(MF_MT_SPATIAL_AUDIO_MIN_METADATA_ITEM_OFFSET_SPACING), @@ -1802,6 +1809,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_H264_RATE_CONTROL_MODES), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK), X(MF_READWRITE_D3D_OPTIONAL), + X(MF_SA_D3D11_HW_PROTECTED), X(MF_MEDIA_ENGINE_DXGI_MANAGER), X(MF_READWRITE_MMCSS_CLASS_AUDIO), X(MF_MEDIA_ENGINE_COREWINDOW), diff --git a/include/mftransform.idl b/include/mftransform.idl index 3f4b5500204..e49c7200185 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -198,7 +198,15 @@ interface IMFTransform : IUnknown cpp_quote("HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate);") -cpp_quote("EXTERN_GUID(MF_SA_D3D_AWARE, 0xeaa35c29, 0x775e, 0x488e, 0x9b, 0x61, 0xb3, 0x28, 0x3e, 0x49, 0x58, 0x3b);") +cpp_quote("EXTERN_GUID(MF_SA_BUFFERS_PER_SAMPLE, 0x873c5171, 0x1e3d, 0x4e25, 0x98, 0x8d, 0xb4, 0x33, 0xce, 0x04, 0x19, 0x83);") +cpp_quote("EXTERN_GUID(MF_SA_D3D_AWARE, 0xeaa35c29, 0x775e, 0x488e, 0x9b, 0x61, 0xb3, 0x28, 0x3e, 0x49, 0x58, 0x3b);") +cpp_quote("EXTERN_GUID(MF_SA_D3D11_ALLOW_DYNAMIC_YUV_TEXTURE, 0xce06d49f, 0x0613, 0x4b9d, 0x86, 0xa6, 0xd8, 0xc4, 0xf9, 0xc1, 0x00, 0x75);") +cpp_quote("EXTERN_GUID(MF_SA_D3D11_AWARE, 0x206b4fc8, 0xfcf9, 0x4c51, 0xaf, 0xe3, 0x97, 0x64, 0x36, 0x9e, 0x33, 0xa0);") +cpp_quote("EXTERN_GUID(MF_SA_D3D11_BINDFLAGS, 0xeacf97ad, 0x065c, 0x4408, 0xbe, 0xe3, 0xfd, 0xcb, 0xfd, 0x12, 0x8b, 0xe2);") +cpp_quote("EXTERN_GUID(MF_SA_D3D11_HW_PROTECTED, 0x3a8ba9d9, 0x92ca, 0x4307, 0xa3, 0x91, 0x69, 0x99, 0xdb, 0xf3, 0xb6, 0xce);") +cpp_quote("EXTERN_GUID(MF_SA_D3D11_SHARED, 0x7b8f32c3, 0x6d96, 0x4b89, 0x92, 0x03, 0xdd, 0x38, 0xb6, 0x14, 0x14, 0xf3);") +cpp_quote("EXTERN_GUID(MF_SA_D3D11_SHARED_WITHOUT_MUTEX, 0x39dbd44d, 0x2e44, 0x4931, 0xa4, 0xc8, 0x35, 0x2d, 0x3d, 0xc4, 0x21, 0x15);") +cpp_quote("EXTERN_GUID(MF_SA_D3D11_USAGE, 0xe85fe442, 0x2ca3, 0x486e, 0xa9, 0xc7, 0x10, 0x9d, 0xda, 0x60, 0x98, 0x80);") cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT, 0x18802c61, 0x324b, 0x4952, 0xab, 0xd0, 0x17, 0x6f, 0xf5, 0xc6, 0x96, 0xff);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC, 0xf81a699a, 0x649a, 0x497d, 0x8c, 0x73, 0x29, 0xf8, 0xfe, 0xd6, 0xad, 0x7a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC_UNLOCK, 0xe5666d6b, 0x3422, 0x4eb6, 0xa4, 0x21, 0xda, 0x7d, 0xb1, 0xf8, 0xe2, 0x07);")

1 0

Nikolay Sivov : mf/tests: Add some more tests for video processor transform.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: e9248486d7b1f4a8b811a68d2dba77f2353a1285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9248486d7b1f4a8b811a68d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 13:22:10 2021 +0300 mf/tests: Add some more tests for video processor transform. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 25 ++++++++++--- include/mfidl.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 6 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9bbf82c97e7..11eff78b645 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3347,7 +3347,7 @@ static void test_video_processor(void) IMFTransform *transform; IMFMediaBuffer *buffer; IMFMediaEvent *event; - IUnknown *unk; + unsigned int value; HRESULT hr; GUID guid; @@ -3362,15 +3362,28 @@ static void test_video_processor(void) goto failed; } - hr = IMFTransform_QueryInterface(transform, &IID_IMFMediaEventGenerator, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - - hr = IMFTransform_QueryInterface(transform, &IID_IMFShutdown, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); +todo_wine + check_interface(transform, &IID_IMFVideoProcessorControl, TRUE); +todo_wine + check_interface(transform, &IID_IMFRealTimeClientEx, TRUE); + check_interface(transform, &IID_IMFMediaEventGenerator, FALSE); + check_interface(transform, &IID_IMFShutdown, FALSE); /* Transform global attributes. */ hr = IMFTransform_GetAttributes(transform, &attributes); ok(hr == S_OK, "Failed to get attributes, hr %#x.\n", hr); + + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(!!count, "Unexpected attribute count %u.\n", count); + + value = 0; + hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_AWARE, &value); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 1, "Unexpected attribute value %u.\n", value); +} hr = IMFTransform_GetAttributes(transform, &attributes2); ok(hr == S_OK, "Failed to get attributes, hr %#x.\n", hr); ok(attributes == attributes2, "Unexpected instance.\n"); diff --git a/include/mfidl.idl b/include/mfidl.idl index dd5de8d0d2f..46c715a3752 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1163,6 +1163,112 @@ interface IMFVideoSampleAllocatorEx : IMFVideoSampleAllocator ); } +typedef enum _MF_VIDEO_PROCESSOR_MIRROR +{ + MIRROR_NONE, + MIRROR_HORIZONTAL, + MIRROR_VERTICAL +} MF_VIDEO_PROCESSOR_MIRROR; + +typedef enum _MF_VIDEO_PROCESSOR_ROTATION +{ + ROTATION_NONE, + ROTATION_NORMAL +} MF_VIDEO_PROCESSOR_ROTATION; + +[ + object, + uuid(a3f675d5-6119-4f7f-a100-1d8b280f0efb), + local, + pointer_default(unique) +] +interface IMFVideoProcessorControl : IUnknown +{ + HRESULT SetBorderColor( + [in] MFARGB *color + ); + + HRESULT SetSourceRectangle( + [in] RECT *rect + ); + + HRESULT SetDestinationRectangle( + [in] RECT *rect + ); + + HRESULT SetMirror( + [in] MF_VIDEO_PROCESSOR_MIRROR mirror + ); + + HRESULT SetRotation( + [in] MF_VIDEO_PROCESSOR_ROTATION rotation + ); + + HRESULT SetConstrictionSize( + [in] SIZE *size + ); +} + +[ + object, + uuid(bde633d3-e1dc-4a7f-a693-bbae399c4a20), + local, + pointer_default(unique) +] +interface IMFVideoProcessorControl2 : IMFVideoProcessorControl +{ + HRESULT SetRotationOverride( + [in] UINT rotation + ); + + HRESULT EnableHardwareEffects( + [in] BOOL enabled + ); + + HRESULT GetSupportedHardwareEffects( + [out, retval] UINT *support + ); +} + +[ + object, + uuid(2347d60b-3fb5-480c-8803-8df3adcd3ef0), + local +] +interface IMFRealTimeClient : IUnknown +{ + HRESULT RegisterThreads( + [in] DWORD task_index, + [in] LPCWSTR classname + ); + + HRESULT UnregisterThreads(); + + HRESULT SetWorkQueue( + [in] DWORD queue_id + ); +} + +[ + object, + uuid(03910848-ab16-4611-b100-17b88ae2f248), +] +interface IMFRealTimeClientEx : IUnknown +{ + HRESULT RegisterThreadsEx( + [in, out] DWORD *task_index, + [in] LPCWSTR classname, + [in] LONG basepriority + ); + + HRESULT UnregisterThreads( ); + + HRESULT SetWorkQueueEx( + [in] DWORD mtqueue_id, + [in] LONG base_priority + ); +} + enum { MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001,

1 0

Ziqing Hui : windowscodecs/tests: Fix an argument typo in ok().
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 33608a2c9ce1779dd4fe1280e6200ecbc3975906 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33608a2c9ce1779dd4fe1280… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jan 29 13:02:40 2021 +0800 windowscodecs/tests: Fix an argument typo in ok(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index b7b002d380d..28554e77c9b 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -495,7 +495,7 @@ static IWICBitmapDecoder *create_decoder(void) hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); ok(hr == S_OK, "GetContainerFormat failed, hr %#x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatDds), - "Got unexpected container format %s\n", debugstr_guid(&GUID_ContainerFormatDds)); + "Got unexpected container format %s\n", debugstr_guid(&guidresult)); return decoder; }

1 0

Rémi Bernon : widl: Support WinRT flags attribute parsing.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 1a62712e259bad8033d9625a06fbd7750ac56a6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a62712e259bad8033d9625a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 29 09:50:05 2021 +0100 widl: Support WinRT flags attribute parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6bbfed5e80b..450d92f5926 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -362,6 +362,7 @@ static const struct keyword attr_keywords[] = {"exclusiveto", tEXCLUSIVETO, 1}, {"explicit_handle", tEXPLICITHANDLE, 0}, {"fault_status", tFAULTSTATUS, 0}, + {"flags", tFLAGS, 1}, {"force_allocate", tFORCEALLOCATE, 0}, {"free", tFREE, 0}, {"handle", tHANDLE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d12caa06b63..ef54bf13ded 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -201,6 +201,7 @@ static typelib_t *current_typelib; %token tEXPLICITHANDLE tEXTERN %token tFALSE %token tFASTCALL tFAULTSTATUS +%token tFLAGS %token tFLOAT tFORCEALLOCATE %token tHANDLE %token tHANDLET @@ -576,6 +577,7 @@ attribute: { $$ = NULL; } $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tFAULTSTATUS { $$ = make_attr(ATTR_FAULTSTATUS); } + | tFLAGS { $$ = make_attr(ATTR_FLAGS); } | tFORCEALLOCATE { $$ = make_attr(ATTR_FORCEALLOCATE); } | tHANDLE { $$ = make_attr(ATTR_HANDLE); } | tHELPCONTEXT '(' expr_int_const ')' { $$ = make_attrp(ATTR_HELPCONTEXT, $3); } @@ -2259,6 +2261,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, + /* ATTR_FLAGS */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "flags" }, /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, /* ATTR_HANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "handle" }, /* ATTR_HELPCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "helpcontext" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 46a44dac039..7b634c82242 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -106,6 +106,7 @@ enum attr_type ATTR_EXCLUSIVETO, ATTR_EXPLICIT_HANDLE, ATTR_FAULTSTATUS, + ATTR_FLAGS, ATTR_FORCEALLOCATE, ATTR_HANDLE, ATTR_HELPCONTEXT,

1 0

Rémi Bernon : widl: Support WinRT eventadd/eventremove attributes.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 8233b3d537eed2aa69d739df67a99a095dd7764b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8233b3d537eed2aa69d739df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 29 09:50:06 2021 +0100 widl: Support WinRT eventadd/eventremove attributes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 4 ++++ tools/widl/parser.l | 2 ++ tools/widl/parser.y | 7 +++++++ tools/widl/widltypes.h | 2 ++ 4 files changed, 15 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index ad205df0d05..63389440c94 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -185,6 +185,10 @@ const char *get_name(const var_t *v) { static char *buffer; free( buffer ); + if (is_attr( v->attrs, ATTR_EVENTADD )) + return buffer = strmake( "add_%s", v->name ); + if (is_attr( v->attrs, ATTR_EVENTREMOVE )) + return buffer = strmake( "remove_%s", v->name ); if (is_attr( v->attrs, ATTR_PROPGET )) return buffer = strmake( "get_%s", v->name ); if (is_attr( v->attrs, ATTR_PROPPUT )) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 450d92f5926..7e20d30e7f0 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -359,6 +359,8 @@ static const struct keyword attr_keywords[] = {"encode", tENCODE, 0}, {"endpoint", tENDPOINT, 0}, {"entry", tENTRY, 0}, + {"eventadd", tEVENTADD, 1}, + {"eventremove", tEVENTREMOVE, 1}, {"exclusiveto", tEXCLUSIVETO, 1}, {"explicit_handle", tEXPLICITHANDLE, 0}, {"fault_status", tFAULTSTATUS, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ef54bf13ded..480552e3723 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -197,6 +197,7 @@ static typelib_t *current_typelib; %token tDLLNAME tDONTFREE tDOUBLE tDUAL %token tENABLEALLOCATE tENCODE tENDPOINT %token tENTRY tENUM tERRORSTATUST +%token tEVENTADD tEVENTREMOVE %token tEXCLUSIVETO %token tEXPLICITHANDLE tEXTERN %token tFALSE @@ -572,6 +573,8 @@ attribute: { $$ = NULL; } | tENCODE { $$ = make_attr(ATTR_ENCODE); } | tENDPOINT '(' str_list ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } | tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY, $3); } + | tEVENTADD { $$ = make_attr(ATTR_EVENTADD); } + | tEVENTREMOVE { $$ = make_attr(ATTR_EVENTREMOVE); } | tEXCLUSIVETO '(' decl_spec ')' { if ($3->type->type_type != TYPE_RUNTIMECLASS) error_loc("type %s is not a runtimeclass\n", $3->type->name); $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } @@ -2258,6 +2261,8 @@ struct allowed_attr allowed_attr[] = /* ATTR_ENCODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "encode" }, /* ATTR_ENDPOINT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "endpoint" }, /* ATTR_ENTRY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "entry" }, + /* ATTR_EVENTADD */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "eventadd" }, + /* ATTR_EVENTREMOVE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "eventremove" }, /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, @@ -2932,6 +2937,8 @@ static void check_functions(const type_t *iface, int is_inside_library) { if (func == func_iter) break; if (strcmp(func->name, func_iter->name)) continue; + if (is_attr(func->attrs, ATTR_EVENTADD) != is_attr(func_iter->attrs, ATTR_EVENTADD)) continue; + if (is_attr(func->attrs, ATTR_EVENTREMOVE) != is_attr(func_iter->attrs, ATTR_EVENTREMOVE)) continue; if (is_attr(func->attrs, ATTR_PROPGET) != is_attr(func_iter->attrs, ATTR_PROPGET)) continue; if (is_attr(func->attrs, ATTR_PROPPUT) != is_attr(func_iter->attrs, ATTR_PROPPUT)) continue; if (is_attr(func->attrs, ATTR_PROPPUTREF) != is_attr(func_iter->attrs, ATTR_PROPPUTREF)) continue; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7b634c82242..0fba33d6a09 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -103,6 +103,8 @@ enum attr_type ATTR_ENCODE, ATTR_ENDPOINT, ATTR_ENTRY, + ATTR_EVENTADD, + ATTR_EVENTREMOVE, ATTR_EXCLUSIVETO, ATTR_EXPLICIT_HANDLE, ATTR_FAULTSTATUS,

1 0

Rémi Bernon : include: Define DECLSPEC_SELECTANY on MinGW.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 9138508a9430c42be040b01855359283276b3f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9138508a9430c42be040b018… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 29 09:50:07 2021 +0100 include: Define DECLSPEC_SELECTANY on MinGW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 5b3efe61385..bb045fa2745 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -110,6 +110,8 @@ extern "C" { #ifndef DECLSPEC_SELECTANY #if defined(_MSC_VER) && (_MSC_VER >= 1100) #define DECLSPEC_SELECTANY __declspec(selectany) +#elif defined(__MINGW32__) +#define DECLSPEC_SELECTANY __attribute__((selectany)) #else #define DECLSPEC_SELECTANY #endif

1 0