June 2020 - Wine-devel - list.winehq.org

[PATCH v2 3/4] winemac.drv: Use helpers to get and release display device init mutex.
by Zhiyi Zhang 16 Jun '20

16 Jun '20

This makes later patches smaller. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1a3cc349b52..8ff83682145 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -136,6 +136,21 @@ static CRITICAL_SECTION modes_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL inited_original_display_mode; +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + static BOOL get_display_device_reg_key(char *key, unsigned len) { static const char display_device_guid_prop[] = "__wine_display_device_guid"; @@ -1673,7 +1688,6 @@ static void cleanup_devices(void) */ void macdrv_init_display_devices(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct macdrv_gpu *gpus = NULL; struct macdrv_adapter *adapters = NULL; @@ -1689,8 +1703,7 @@ void macdrv_init_display_devices(BOOL force) LUID gpu_luid; UINT output_id = 0; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -1758,8 +1771,7 @@ done: SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); macdrv_free_gpus(gpus); macdrv_free_adapters(adapters); -- 2.25.1

2 1

[PATCH vkd3d] vkd3d: Discard VK_PIPELINE_BIND_POINT_RANGE_SIZE.
by Jactry Zeng 16 Jun '20

16 Jun '20

VK_PIPELINE_BIND_POINT_RANGE_SIZE was discarded since vulkan 1.2.140. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- libs/vkd3d/vkd3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 1cc7864..97f9ea0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -961,7 +961,7 @@ struct d3d12_command_list VkPipeline current_pipeline; VkRenderPass pso_render_pass; VkRenderPass current_render_pass; - struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE]; + struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_COMPUTE - VK_PIPELINE_BIND_POINT_GRAPHICS + 1]; struct d3d12_pipeline_state *state; -- 2.27.0

1 0

[PATCH v3 3/3] msado15: Implement IConnectionPoint::Advise/Unadvise.
by Aaro Altonen 16 Jun '20

16 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49388 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v3: change object state only after the allocation (thanks Hans) --- dlls/msado15/connection.c | 59 +++++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 4 --- 2 files changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 35202d14aa..405a691c0c 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -40,6 +40,8 @@ struct connection_point IConnectionPoint IConnectionPoint_iface; struct connection *conn; const IID *riid; + IUnknown **sinks; + ULONG sinks_size; }; struct connection @@ -87,6 +89,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + heap_free( connection->cp_connev.sinks ); heap_free( connection->datasource ); heap_free( connection ); } @@ -548,15 +551,61 @@ static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_s DWORD *cookie ) { struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %p, %p\n", connpoint, unk_sink, cookie ); - return E_NOTIMPL; + IUnknown *sink, **tmp; + ULONG new_size; + HRESULT hr; + DWORD i; + + TRACE( "%p, %p, %u\n", iface, unk_sink, cookie ); + + if (!unk_sink || !cookie) return E_FAIL; + + if (FAILED(hr = IUnknown_QueryInterface( unk_sink, &IID_ConnectionEventsVt, (void**)&sink ))) + { + *cookie = 0; + return E_FAIL; + } + + if (connpoint->sinks) + { + for (i = 0; i < connpoint->sinks_size; ++i) + { + if (!connpoint->sinks[i]) + break; + } + + if (i == connpoint->sinks_size) + { + new_size = connpoint->sinks_size * 2; + if (!(tmp = heap_realloc_zero( connpoint->sinks, new_size * sizeof(*connpoint->sinks) ))) + return E_OUTOFMEMORY; + connpoint->sinks = tmp; + connpoint->sinks_size = new_size; + } + } + else + { + if (!(connpoint->sinks = heap_alloc_zero( sizeof(*connpoint->sinks) ))) return E_OUTOFMEMORY; + connpoint->sinks_size = 1; + i = 0; + } + + connpoint->sinks[i] = sink; + *cookie = i + 1; + return S_OK; } static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie ) { struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %d\n", connpoint, cookie ); - return E_NOTIMPL; + TRACE( "%p, %u\n", connpoint, cookie ); + + if (!cookie || cookie > connpoint->sinks_size || !connpoint->sinks || !connpoint->sinks[cookie - 1]) + return E_FAIL; + + IUnknown_Release( connpoint->sinks[cookie - 1] ); + connpoint->sinks[cookie - 1] = NULL; + return S_OK; } static HRESULT WINAPI connpoint_EnumConnections( IConnectionPoint *iface, @@ -595,6 +644,8 @@ HRESULT Connection_create( void **obj ) connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; connection->cp_connev.IConnectionPoint_iface.lpVtbl = &connpoint_vtbl; + connection->cp_connev.sinks = NULL; + connection->cp_connev.sinks_size = 0; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 3e3997ed41..5f43307af7 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -987,7 +987,6 @@ static void test_ConnectionPoint(void) hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); ok( hr == S_OK, "got %08x\n", hr ); -todo_wine { /* nothing advised yet */ hr = IConnectionPoint_Unadvise( point, 3 ); ok( hr == E_FAIL, "got %08x\n", hr ); @@ -1001,10 +1000,8 @@ todo_wine { cookie = 0xdeadbeef; hr = IConnectionPoint_Advise( point, NULL, &cookie ); ok( hr == E_FAIL, "got %08x\n", hr ); -} ok( cookie == 0xdeadbeef, "got %08x\n", cookie ); -todo_wine { /* unsupported sink */ cookie = 0xdeadbeef; hr = IConnectionPoint_Advise( point, (void*)&support_err_sink, &cookie ); @@ -1026,7 +1023,6 @@ todo_wine { hr = IConnectionPoint_Unadvise( point, cookie ); ok( hr == S_OK, "got %08x\n", hr ); -} refs = IConnectionPoint_Release( point ); ok( refs == 1, "got %u", refs ); -- 2.27.0

2 2

[PATCH v2] user32: Change slave to a more neutral word.
by Zhiyi Zhang 16 Jun '20

16 Jun '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 187121. Use 'replica' instead to avoid confusion. dlls/user32/sysparams.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 82ed8513646..768aeb5d4fb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3910,7 +3910,7 @@ static BOOL update_monitor_cache(void) HANDLE mutex = NULL; DWORD state_flags; BOOL ret = FALSE; - BOOL mirrored_slave; + BOOL is_replica; DWORD i = 0, j; DWORD type; @@ -3956,17 +3956,17 @@ static BOOL update_monitor_cache(void) (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) goto fail; - /* Mirrored slave monitors also don't get enumerated */ - mirrored_slave = FALSE; + /* Replicas in mirroring monitor sets don't get enumerated */ + is_replica = FALSE; for (j = 0; j < monitor_count; j++) { if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) { - mirrored_slave = TRUE; + is_replica = TRUE; break; } } - if (mirrored_slave) + if (is_replica) continue; if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, -- 2.25.1

2 1

[PATCH] dwrite: Add missing script tags.
by Nikolay Sivov 16 Jun '20

16 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f3eca12f96b..f11388628e6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -194,10 +194,10 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Medf */ { 0x6664654d, 265, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('m','e','d','f') } }, { /* Sogo */ { 0x6f676f53, 142, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('s','o','g','o') } }, { /* Sogd */ { 0x64676f53, 141, 8, 0x0020, 1, 1, 0, 0, 0, 1, 1 }, { _OT('s','o','g','d') } }, - { /* Elym */ { 0x6d796c45, 128, 1, 0x0020, 0, 0, 1, 0, 0, 0, 0 } }, - { /* Hmnp */ { 0x706e6d48, 451, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 } }, - { /* Nand */ { 0x646e614e, 311, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, - { /* Wcho */ { 0x6f686357, 283, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 } }, + { /* Elym */ { 0x6d796c45, 128, 1, 0x0020, 0, 0, 1, 0, 0, 0, 0 }, { _OT('e','l','y','m') } }, + { /* Hmnp */ { 0x706e6d48, 451, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('h','m','n','p') } }, + { /* Nand */ { 0x646e614e, 311, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, { _OT('n','a','n','d') } }, + { /* Wcho */ { 0x6f686357, 283, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('w','c','h','o') } }, }; #undef _OT -- 2.27.0

1 0

[PATCH 5/7] user32: Change slave to a more neutral word
by André Hentschel 16 Jun '20

16 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/user32/sysparams.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 82ed8513646..3094251cca9 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3910,7 +3910,7 @@ static BOOL update_monitor_cache(void) HANDLE mutex = NULL; DWORD state_flags; BOOL ret = FALSE; - BOOL mirrored_slave; + BOOL mirrored_secondary; DWORD i = 0, j; DWORD type; @@ -3956,17 +3956,17 @@ static BOOL update_monitor_cache(void) (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) goto fail; - /* Mirrored slave monitors also don't get enumerated */ - mirrored_slave = FALSE; + /* Mirrored secondary monitors also don't get enumerated */ + mirrored_secondary = FALSE; for (j = 0; j < monitor_count; j++) { if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) { - mirrored_slave = TRUE; + mirrored_secondary = TRUE; break; } } - if (mirrored_slave) + if (mirrored_secondary) continue; if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, -- 2.17.1

3 2

[PATCH 6/7] cabinet: Change black-/whitelist to more neutral words
by André Hentschel 16 Jun '20

16 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/cabinet/deflate.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/deflate.c b/dlls/cabinet/deflate.c index 681f187ecda..891bdc985f2 100644 --- a/dlls/cabinet/deflate.c +++ b/dlls/cabinet/deflate.c @@ -715,9 +715,9 @@ static void compress_block( deflate_state *s, const ct_data *ltree, const ct_dat * Check if the data type is TEXT or BINARY, using the following algorithm: * - TEXT if the two conditions below are satisfied: * a) There are no non-portable control characters belonging to the - * "black list" (0..6, 14..25, 28..31). + * "block list" (0..6, 14..25, 28..31). * b) There is at least one printable character belonging to the - * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). + * "allow list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). * - BINARY otherwise. * - The following partially-portable control characters form a * "gray list" that is ignored in this detection algorithm: @@ -726,19 +726,19 @@ static void compress_block( deflate_state *s, const ct_data *ltree, const ct_dat */ static int detect_data_type( deflate_state *s ) { - /* black_mask is the bit mask of black-listed bytes + /* block_mask is the bit mask of block-listed bytes * set bits 0..6, 14..25, and 28..31 * 0xf3ffc07f = binary 11110011111111111100000001111111 */ - unsigned long black_mask = 0xf3ffc07fUL; + unsigned long block_mask = 0xf3ffc07fUL; int n; - /* Check for non-textual ("black-listed") bytes. */ - for (n = 0; n <= 31; n++, black_mask >>= 1) - if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0)) + /* Check for non-textual ("block-listed") bytes. */ + for (n = 0; n <= 31; n++, block_mask >>= 1) + if ((block_mask & 1) && (s->dyn_ltree[n].Freq != 0)) return Z_BINARY; - /* Check for textual ("white-listed") bytes. */ + /* Check for textual ("allow-listed") bytes. */ if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 || s->dyn_ltree[13].Freq != 0) return Z_TEXT; @@ -746,7 +746,7 @@ static int detect_data_type( deflate_state *s ) if (s->dyn_ltree[n].Freq != 0) return Z_TEXT; - /* There are no "black-listed" or "white-listed" bytes: + /* There are no "block-listed" or "allow-listed" bytes: * this stream either is empty or has tolerated ("gray-listed") bytes only. */ return Z_BINARY; -- 2.17.1

2 1

[PATCH 7/7] opcservices: Change black-/whitelist to more neutral words
by André Hentschel 16 Jun '20

16 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/opcservices/deflate.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/opcservices/deflate.c b/dlls/opcservices/deflate.c index 681f187ecda..891bdc985f2 100644 --- a/dlls/opcservices/deflate.c +++ b/dlls/opcservices/deflate.c @@ -715,9 +715,9 @@ static void compress_block( deflate_state *s, const ct_data *ltree, const ct_dat * Check if the data type is TEXT or BINARY, using the following algorithm: * - TEXT if the two conditions below are satisfied: * a) There are no non-portable control characters belonging to the - * "black list" (0..6, 14..25, 28..31). + * "block list" (0..6, 14..25, 28..31). * b) There is at least one printable character belonging to the - * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). + * "allow list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). * - BINARY otherwise. * - The following partially-portable control characters form a * "gray list" that is ignored in this detection algorithm: @@ -726,19 +726,19 @@ static void compress_block( deflate_state *s, const ct_data *ltree, const ct_dat */ static int detect_data_type( deflate_state *s ) { - /* black_mask is the bit mask of black-listed bytes + /* block_mask is the bit mask of block-listed bytes * set bits 0..6, 14..25, and 28..31 * 0xf3ffc07f = binary 11110011111111111100000001111111 */ - unsigned long black_mask = 0xf3ffc07fUL; + unsigned long block_mask = 0xf3ffc07fUL; int n; - /* Check for non-textual ("black-listed") bytes. */ - for (n = 0; n <= 31; n++, black_mask >>= 1) - if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0)) + /* Check for non-textual ("block-listed") bytes. */ + for (n = 0; n <= 31; n++, block_mask >>= 1) + if ((block_mask & 1) && (s->dyn_ltree[n].Freq != 0)) return Z_BINARY; - /* Check for textual ("white-listed") bytes. */ + /* Check for textual ("allow-listed") bytes. */ if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 || s->dyn_ltree[13].Freq != 0) return Z_TEXT; @@ -746,7 +746,7 @@ static int detect_data_type( deflate_state *s ) if (s->dyn_ltree[n].Freq != 0) return Z_TEXT; - /* There are no "black-listed" or "white-listed" bytes: + /* There are no "block-listed" or "allow-listed" bytes: * this stream either is empty or has tolerated ("gray-listed") bytes only. */ return Z_BINARY; -- 2.17.1

1 0

[PATCH 4/7] winegstreamer: Change blacklist to a more neutral word
by André Hentschel 16 Jun '20

16 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/winegstreamer/gst_cbs.c | 16 ++++++++-------- dlls/winegstreamer/gst_cbs.h | 8 ++++---- dlls/winegstreamer/gstdemux.c | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index bf7103b1606..8cf838bef5f 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -261,20 +261,20 @@ void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, +GstAutoplugSelectResult autoplug_blocklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { - struct cb_data cbdata = { AUTOPLUG_BLACKLIST }; + struct cb_data cbdata = { AUTOPLUG_BLOCKLIST }; - cbdata.u.autoplug_blacklist_data.bin = bin; - cbdata.u.autoplug_blacklist_data.pad = pad; - cbdata.u.autoplug_blacklist_data.caps = caps; - cbdata.u.autoplug_blacklist_data.fact = fact; - cbdata.u.autoplug_blacklist_data.user = user; + cbdata.u.autoplug_blocklist_data.bin = bin; + cbdata.u.autoplug_blocklist_data.pad = pad; + cbdata.u.autoplug_blocklist_data.caps = caps; + cbdata.u.autoplug_blocklist_data.fact = fact; + cbdata.u.autoplug_blocklist_data.user = user; call_cb(&cbdata); - return cbdata.u.autoplug_blacklist_data.ret; + return cbdata.u.autoplug_blocklist_data.ret; } void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 4725f23ad1a..f82683885fd 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -40,7 +40,7 @@ enum CB_TYPE { EVENT_SINK, GOT_DATA_SINK, REMOVED_DECODED_PAD, - AUTOPLUG_BLACKLIST, + AUTOPLUG_BLOCKLIST, UNKNOWN_TYPE, QUERY_SINK, GSTDEMUX_MAX @@ -108,14 +108,14 @@ struct cb_data { GstPad *pad; gpointer user; } pad_removed_data; - struct autoplug_blacklist_data { + struct autoplug_blocklist_data { GstElement *bin; GstPad *pad; GstCaps *caps; GstElementFactory *fact; gpointer user; GstAutoplugSelectResult ret; - } autoplug_blacklist_data; + } autoplug_blocklist_data; struct unknown_type_data { GstElement *bin; GstPad *pad; @@ -150,7 +150,7 @@ gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DEC GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; +GstAutoplugSelectResult autoplug_blocklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b9c91245f82..8090bf8676c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1232,12 +1232,12 @@ static void no_more_pads(GstElement *decodebin, gpointer user) SetEvent(filter->no_more_pads_event); } -static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) +static GstAutoplugSelectResult autoplug_blocklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); if (strstr(name, "Player protection")) { - WARN("Blacklisted a/52 decoder because it only works in Totem\n"); + WARN("Blocklisted a/52 decoder because it only works in Totem\n"); return GST_AUTOPLUG_SELECT_SKIP; } if (!strcmp(name, "Fluendo Hardware Accelerated Video Decoder")) { @@ -1619,7 +1619,7 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); - g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter); + g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blocklist_wrapper), filter); g_signal_connect(element, "unknown-type", G_CALLBACK(unknown_type_wrapper), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); @@ -2276,10 +2276,10 @@ void perform_cb_gstdemux(struct cb_data *cbdata) removed_decoded_pad(data->element, data->pad, data->user); break; } - case AUTOPLUG_BLACKLIST: + case AUTOPLUG_BLOCKLIST: { - struct autoplug_blacklist_data *data = &cbdata->u.autoplug_blacklist_data; - cbdata->u.autoplug_blacklist_data.ret = autoplug_blacklist(data->bin, + struct autoplug_blocklist_data *data = &cbdata->u.autoplug_blocklist_data; + cbdata->u.autoplug_blocklist_data.ret = autoplug_blocklist(data->bin, data->pad, data->caps, data->fact, data->user); break; } -- 2.17.1

1 0

[PATCH v3 2/3] msado15/tests: Add tests for IConnectionPoint::Advise/Unadvise.
by Aaro Altonen 16 Jun '20

16 Jun '20

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/msado15/tests/msado15.c | 172 +++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 59c00948c8..3e3997ed41 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -837,10 +837,141 @@ static void test_Command(void) _Command_Release( command ); } +static HRESULT WINAPI conneventvt_QueryInterface( ConnectionEventsVt *iface, REFIID riid, void **obj ) +{ + if (IsEqualGUID( &IID_ConnectionEventsVt, riid )) + { + *obj = iface; + return S_OK; + } + + ok( 0, "unexpected call\n" ); + return E_NOINTERFACE; +} + +static ULONG WINAPI conneventvt_AddRef( ConnectionEventsVt *iface ) +{ + return 2; +} + +static ULONG WINAPI conneventvt_Release( ConnectionEventsVt *iface ) +{ + return 1; +} + +static HRESULT WINAPI conneventvt_InfoMessage( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *Connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_BeginTransComplete( ConnectionEventsVt *iface, LONG TransactionLevel, + Error *error, EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_CommitTransComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_RollbackTransComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_WillExecute( ConnectionEventsVt *iface, BSTR *source, + CursorTypeEnum *cursor_type, LockTypeEnum *lock_type, LONG *options, EventStatusEnum *status, + _Command *command, _Recordset *record_set, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_ExecuteComplete( ConnectionEventsVt *iface, LONG records_affected, + Error *error, EventStatusEnum *status, _Command *command, _Recordset *record_set, + _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_WillConnect( ConnectionEventsVt *iface, BSTR *string, BSTR *userid, + BSTR *password, LONG *options, EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_ConnectComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_Disconnect( ConnectionEventsVt *iface, EventStatusEnum *status, + _Connection *connection ) +{ + return E_NOTIMPL; +} + +static const ConnectionEventsVtVtbl conneventvt_vtbl = { + conneventvt_QueryInterface, + conneventvt_AddRef, + conneventvt_Release, + conneventvt_InfoMessage, + conneventvt_BeginTransComplete, + conneventvt_CommitTransComplete, + conneventvt_RollbackTransComplete, + conneventvt_WillExecute, + conneventvt_ExecuteComplete, + conneventvt_WillConnect, + conneventvt_ConnectComplete, + conneventvt_Disconnect +}; + +static HRESULT WINAPI supporterror_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + if (IsEqualGUID( &IID_ISupportErrorInfo, riid )) + { + *obj = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI supporterror_AddRef( ISupportErrorInfo *iface ) +{ + return 2; +} + +static ULONG WINAPI supporterror_Release( ISupportErrorInfo *iface ) +{ + return 1; +} + +static HRESULT WINAPI supporterror_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + return E_NOTIMPL; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + supporterror_QueryInterface, + supporterror_AddRef, + supporterror_Release, + supporterror_InterfaceSupportsErrorInfo +}; + +static ConnectionEventsVt conn_event_sink = { &conneventvt_vtbl }; +static ISupportErrorInfo support_err_sink = { &support_error_vtbl }; + static void test_ConnectionPoint(void) { HRESULT hr; ULONG refs; + DWORD cookie; IConnectionPoint *point; IConnectionPointContainer *pointcontainer; @@ -856,6 +987,47 @@ static void test_ConnectionPoint(void) hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); ok( hr == S_OK, "got %08x\n", hr ); +todo_wine { + /* nothing advised yet */ + hr = IConnectionPoint_Unadvise( point, 3 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Advise( point, NULL, NULL ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Advise( point, (void*)&conn_event_sink, NULL ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + cookie = 0xdeadbeef; + hr = IConnectionPoint_Advise( point, NULL, &cookie ); + ok( hr == E_FAIL, "got %08x\n", hr ); +} + ok( cookie == 0xdeadbeef, "got %08x\n", cookie ); + +todo_wine { + /* unsupported sink */ + cookie = 0xdeadbeef; + hr = IConnectionPoint_Advise( point, (void*)&support_err_sink, &cookie ); + ok( hr == E_FAIL, "got %08x\n", hr ); + ok( !cookie, "got %08x\n", cookie ); + + cookie = 0; + hr = IConnectionPoint_Advise( point, (void*)&conn_event_sink, &cookie ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cookie, "got %08x\n", cookie ); + + /* invalid cookie */ + hr = IConnectionPoint_Unadvise( point, 0 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + /* wrong cookie */ + hr = IConnectionPoint_Unadvise( point, cookie + 1 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Unadvise( point, cookie ); + ok( hr == S_OK, "got %08x\n", hr ); +} + refs = IConnectionPoint_Release( point ); ok( refs == 1, "got %u", refs ); -- 2.27.0

1 0