February 2020 - Wine-Commits

Alexandre Julliard : unicode: Add support for high Unicode planes in decomposition tables.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: c658731975d7755d2ae0d05af43f1af6332292b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c658731975d7755d2ae0d05a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 10:44:04 2020 +0100 unicode: Add support for high Unicode planes in decomposition tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 23 +- dlls/kernelbase/decompose.c | 1588 +++++++++++---- dlls/ntdll/decompose.c | 4440 ++++++++++++++++++++++++++++++------------ dlls/ntdll/locale.c | 99 +- tools/make_unicode | 23 +- 5 files changed, 4478 insertions(+), 1695 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c658731975d7755d2ae0…

1 0

Alexandre Julliard : unicode: Take into account explicit composition exclusions.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 2b9d720ea018c746907b0a7f0543ec9718352109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b9d720ea018c746907b0a7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 11:54:07 2020 +0100 unicode: Take into account explicit composition exclusions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/compose.c | 96 ++++++++++------------------------------------- dlls/ntdll/compose.c | 96 ++++++++++------------------------------------- tools/make_unicode | 19 ++++++++++ 3 files changed, 59 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b9d720ea018c746907b…

1 0

Alex Henrie : iphlpapi: Implement GetTcp6Table on Linux.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 94588567afc2bed740e10f659431ef2305ff3060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94588567afc2bed740e10f65… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 13 23:51:51 2020 -0700 iphlpapi: Implement GetTcp6Table on Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 26 +++++-- dlls/iphlpapi/ipstats.c | 168 ++++++++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ipstats.h | 1 + 3 files changed, 187 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8c7c9018c4..429958198d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2393,15 +2393,25 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != WS_AF_INET) - { - FIXME("ulAf = %u not supported\n", ulAf); - return ERROR_NOT_SUPPORTED; - } if (TableClass >= TCP_TABLE_OWNER_MODULE_LISTENER) FIXME("module classes not fully supported\n"); - if ((ret = build_tcp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size))) + switch (ulAf) + { + case WS_AF_INET: + ret = build_tcp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + case WS_AF_INET6: + ret = build_tcp6_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + default: + FIXME("ulAf = %u not supported\n", ulAf); + ret = ERROR_NOT_SUPPORTED; + } + + if (ret) return ret; if (!pTcpTable || *pdwSize < size) @@ -3054,8 +3064,8 @@ ULONG WINAPI GetTcpTable2(PMIB_TCPTABLE2 table, PULONG size, BOOL order) */ ULONG WINAPI GetTcp6Table(PMIB_TCP6TABLE table, PULONG size, BOOL order) { - FIXME("pTcp6Table %p, size %p, order %d: stub\n", table, size, order); - return ERROR_NOT_SUPPORTED; + TRACE("(table %p, size %p, order %d)\n", table, size, order); + return GetExtendedTcpTable(table, size, order, WS_AF_INET6, TCP_TABLE_BASIC_ALL, 0); } /****************************************************************** diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 6ce322a8d1..5fff824372 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2545,6 +2545,71 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE return ret; } +static DWORD get_tcp6_table_sizes( TCP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) +{ + DWORD table_size; + + switch (class) + { + case TCP_TABLE_BASIC_LISTENER: + case TCP_TABLE_BASIC_CONNECTIONS: + case TCP_TABLE_BASIC_ALL: + { + table_size = FIELD_OFFSET(MIB_TCP6TABLE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_TCP6ROW); + break; + } + case TCP_TABLE_OWNER_PID_LISTENER: + case TCP_TABLE_OWNER_PID_CONNECTIONS: + case TCP_TABLE_OWNER_PID_ALL: + { + table_size = FIELD_OFFSET(MIB_TCP6TABLE_OWNER_PID, table[row_count]); + if (row_size) *row_size = sizeof(MIB_TCP6ROW_OWNER_PID); + break; + } + case TCP_TABLE_OWNER_MODULE_LISTENER: + case TCP_TABLE_OWNER_MODULE_CONNECTIONS: + case TCP_TABLE_OWNER_MODULE_ALL: + { + table_size = FIELD_OFFSET(MIB_TCP6TABLE_OWNER_MODULE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_TCP6ROW_OWNER_MODULE); + break; + } + default: + ERR("unhandled class %u\n", class); + return 0; + } + return table_size; +} + +static int compare_tcp6_basic_rows(const void *a, const void *b) +{ + const MIB_TCP6ROW *rowA = a; + const MIB_TCP6ROW *rowB = b; + int ret; + + if ((ret = memcmp(&rowA->LocalAddr, &rowB->LocalAddr, sizeof(rowA->LocalAddr)) != 0)) return ret; + if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; + if ((ret = rowA->dwLocalPort - rowB->dwLocalPort) != 0) return ret; + if ((ret = memcmp(&rowA->RemoteAddr, &rowB->RemoteAddr, sizeof(rowA->RemoteAddr)) != 0)) return ret; + if ((ret = rowA->dwRemoteScopeId - rowB->dwRemoteScopeId) != 0) return ret; + return rowA->dwRemotePort - rowB->dwRemotePort; +} + +static int compare_tcp6_owner_rows(const void *a, const void *b) +{ + const MIB_TCP6ROW_OWNER_PID *rowA = a; + const MIB_TCP6ROW_OWNER_PID *rowB = b; + int ret; + + if ((ret = memcmp(&rowA->ucLocalAddr, &rowB->ucLocalAddr, sizeof(rowA->ucLocalAddr)) != 0)) return ret; + if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; + if ((ret = rowA->dwLocalPort - rowB->dwLocalPort) != 0) return ret; + if ((ret = memcmp(&rowA->ucRemoteAddr, &rowB->ucRemoteAddr, sizeof(rowA->ucRemoteAddr)) != 0)) return ret; + if ((ret = rowA->dwRemoteScopeId - rowB->dwRemoteScopeId) != 0) return ret; + return rowA->dwRemotePort - rowB->dwRemotePort; +} + static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) { DWORD table_size; @@ -2681,6 +2746,109 @@ static DWORD find_ipv6_addr_scope(const IN6_ADDR *addr, const struct ipv6_addr_s return -1; } +DWORD build_tcp6_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, + DWORD *size ) +{ + MIB_TCP6TABLE *table; + MIB_TCP6ROW_OWNER_MODULE row; + DWORD ret = NO_ERROR, count = 16, table_size, row_size; + + if (!(table_size = get_tcp6_table_sizes( class, count, &row_size ))) + return ERROR_INVALID_PARAMETER; + + if (!(table = HeapAlloc( heap, flags, table_size ))) + return ERROR_OUTOFMEMORY; + + table->dwNumEntries = 0; + +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen( "/proc/net/tcp6", "r" ))) + { + char buf[512], *ptr; + struct pid_map *map = NULL; + unsigned int num_entries = 0; + struct ipv6_addr_scope *addr_scopes; + unsigned int addr_scopes_size = 0; + int inode; + + addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); + + if (class >= TCP_TABLE_OWNER_PID_LISTENER) map = get_pid_map( &num_entries ); + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + DWORD *local_addr = (DWORD *)&row.ucLocalAddr; + DWORD *remote_addr = (DWORD *)&row.ucRemoteAddr; + + if (sscanf( ptr, "%*u: %8x%8x%8x%8x:%x %8x%8x%8x%8x:%x %x %*s %*s %*s %*s %*s %*s %*s %d", + &local_addr[0], &local_addr[1], &local_addr[2], &local_addr[3], &row.dwLocalPort, + &remote_addr[0], &remote_addr[1], &remote_addr[2], &remote_addr[3], &row.dwRemotePort, + &row.dwState, &inode ) != 12) + continue; + row.dwState = TCPStateToMIBState( row.dwState ); + if (!match_class( class, row.dwState )) continue; + row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); + row.dwLocalPort = htons( row.dwLocalPort ); + row.dwRemoteScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucRemoteAddr, addr_scopes, addr_scopes_size); + row.dwRemotePort = htons( row.dwRemotePort ); + + if (class <= TCP_TABLE_BASIC_ALL) + { + /* MIB_TCP6ROW has a different field order */ + MIB_TCP6ROW basic_row; + basic_row.State = row.dwState; + memcpy( &basic_row.LocalAddr, &row.ucLocalAddr, sizeof(row.ucLocalAddr) ); + basic_row.dwLocalScopeId = row.dwLocalScopeId; + basic_row.dwLocalPort = row.dwLocalPort; + memcpy( &basic_row.RemoteAddr, &row.ucRemoteAddr, sizeof(row.ucRemoteAddr) ); + basic_row.dwRemoteScopeId = row.dwRemoteScopeId; + basic_row.dwRemotePort = row.dwRemotePort; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &basic_row, row_size ))) + break; + continue; + } + + row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= TCP_TABLE_OWNER_MODULE_LISTENER) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) + break; + } + HeapFree( GetProcessHeap(), 0, map ); + HeapFree( GetProcessHeap(), 0, addr_scopes ); + fclose( fp ); + } + else ret = ERROR_NOT_SUPPORTED; + } +#else + FIXME( "not implemented\n" ); + ret = ERROR_NOT_SUPPORTED; +#endif + + if (!table) return ERROR_OUTOFMEMORY; + if (!ret) + { + if (order && table->dwNumEntries) + { + qsort( table->table, table->dwNumEntries, row_size, + class <= TCP_TABLE_BASIC_ALL ? compare_tcp6_basic_rows : compare_tcp6_owner_rows ); + } + *tablep = table; + } + else HeapFree( heap, flags, table ); + if (size) *size = get_tcp6_table_sizes( class, count, NULL ); + TRACE( "returning ret %u table %p\n", ret, table ); + return ret; +} + DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, DWORD *size ) { diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index acf43ee27c..68bcb9c9ad 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -33,6 +33,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDEN; DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; +DWORD build_tcp6_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp6_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN;

1 0

Jacek Caban : configure: Use -nostartfiles -nodefaultlibs in cross compiler checks.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: f29d4a43e203303c2d4aaec388f281d01f17764c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f29d4a43e203303c2d4aaec3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 17 12:50:40 2020 +0100 configure: Use -nostartfiles -nodefaultlibs in cross compiler checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 4 +- configure | 118 +++++++++++++++++++++++++++++++---------------------------- configure.ac | 2 +- 3 files changed, 65 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f29d4a43e203303c2d4a…

1 0

Alexandre Julliard : unicode: Add support for high Unicode planes in composition tables.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 64e6d72284cdcaf757b7e937828437152e137388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64e6d72284cdcaf757b7e937… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 10:45:27 2020 +0100 unicode: Add support for high Unicode planes in composition tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/compose.c | 653 ++++++++++++++++++++++++---------------------- dlls/kernelbase/locale.c | 57 ++-- dlls/ntdll/compose.c | 653 ++++++++++++++++++++++++---------------------- dlls/ntdll/locale.c | 54 ++-- tools/make_unicode | 29 +- 5 files changed, 756 insertions(+), 690 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=64e6d72284cdcaf757b7…

1 0

Dmitry Timoshkov : widl: Generate name for a tagless union.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 8d0f8da652c7547af1348a06b1e690c1502eec30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d0f8da652c7547af1348a06… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 14 20:56:12 2020 +0800 widl: Generate name for a tagless union. Otherwise widl crashes while generating a typelib for typedef struct _s { int type; union { int field; } u; } s; Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3a11d2ddd7..b70057eda1 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2208,6 +2208,9 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) if (-1 < tunion->typelib_idx) return; + if (!tunion->name) + tunion->name = gen_name(); + tunion->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_UNION, tunion->name, tunion->attrs); msft_typeinfo->typeinfo->size = 0;

1 0

Dmitry Timoshkov : widl: If a variable doesn't have a name provide an autogenerated one.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 2c501aa7502dbedeef9517dea408deb4a73c5811 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c501aa7502dbedeef9517de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 14 20:56:21 2020 +0800 widl: If a variable doesn't have a name provide an autogenerated one. Otherwise widl crashes while generating a typelib for a structure with an embedded anonymous union: typedef struct _s { int type; union { int f; }; } s; Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index b70057eda1..7cfe9e146c 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1630,6 +1630,9 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) unsigned char *namedata; int var_num = (typeinfo->typeinfo->cElement >> 16) & 0xffff; + if (!var->name) + var->name = gen_name(); + chat("add_var_desc(%d, %s)\n", index, var->name); id = 0x40000000 + index;

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetTransform() and d3d9_device_MultiplyTransform().
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 11b734b8261554152e4180bfeae85a5153215fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11b734b8261554152e4180bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 13 18:51:02 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetTransform() and d3d9_device_MultiplyTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index fafdec10d8..8a79585f37 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2107,8 +2107,6 @@ static HRESULT WINAPI d3d9_device_SetTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); - if (!device->recording) - wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; @@ -2139,7 +2137,6 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix); - wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : strmbase: Don't check the subtype when determining if a media type is partial.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 7c35fccbcc8f961a19b1910f5a0d6cbdc534ceee URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c35fccbcc8f961a19b1910f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 16 23:31:50 2020 -0600 strmbase: Don't check the subtype when determining if a media type is partial. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 7 +------ dlls/quartz/tests/mpegsplit.c | 7 +------ dlls/strmbase/pin.c | 4 +++- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 240938fdc0..002966d276 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -1200,12 +1200,7 @@ static void test_connect_pin(void) ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, source); - IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_I420; /* Connection with wildcards. */ diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index ff86dd5acc..c8b368e4b6 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1435,12 +1435,7 @@ static void test_connect_pin(void) ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, source); - IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_MPEG1AudioPayload; /* Connection with wildcards. */ diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 19485abb5c..844619b8fd 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -482,8 +482,10 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP return VFW_E_NOT_STOPPED; } + /* We don't check the subtype here. The rationale (as given by the DirectX + * documentation) is that the format type is supposed to provide at least + * as much information as the subtype. */ if (mt && !IsEqualGUID(&mt->majortype, &GUID_NULL) - && !IsEqualGUID(&mt->subtype, &GUID_NULL) && !IsEqualGUID(&mt->formattype, &GUID_NULL)) { hr = pin->pFuncsTable->pfnAttemptConnection(pin, peer, mt);

1 0

Zebediah Figura : strmbase: Also match a GUID_NULL formattype as a wildcard in source_Connect().
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 4f1df5246c0e81fbc65665bd027c9b5f8fea6e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1df5246c0e81fbc65665bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 16 23:31:49 2020 -0600 strmbase: Also match a GUID_NULL formattype as a wildcard in source_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 16 +++------------- dlls/qedit/tests/samplegrabber.c | 22 +++++++--------------- dlls/quartz/tests/avisplit.c | 15 +++++---------- dlls/quartz/tests/filesource.c | 2 +- dlls/quartz/tests/mpegsplit.c | 10 +++------- dlls/quartz/tests/videorenderer.c | 3 --- dlls/quartz/tests/vmr7.c | 3 --- dlls/quartz/tests/vmr9.c | 3 --- dlls/strmbase/pin.c | 9 ++++++++- 9 files changed, 27 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f1df5246c0e81fbc656…

1 0