February 2020 - Wine-commits

Dmitry Timoshkov : activeds.tlb: Add typelib.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 5385937a9038831d316cb51c55ba45575a921fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5385937a9038831d316cb51c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 14 20:56:30 2020 +0800 activeds.tlb: Add typelib. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/activeds.tlb/Makefile.in | 3 +++ dlls/activeds.tlb/activeds.tlb.spec | 1 + dlls/activeds.tlb/activeds_tlb.idl | 21 +++++++++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/configure b/configure index e2e5d2d816..ad49cd2550 100755 --- a/configure +++ b/configure @@ -905,6 +905,7 @@ enable_largefile with_x enable_acledit enable_aclui +enable_activeds_tlb enable_activeds enable_actxprxy enable_adsiid @@ -20040,6 +20041,7 @@ fi wine_fn_config_makefile dlls/acledit enable_acledit wine_fn_config_makefile dlls/aclui enable_aclui +wine_fn_config_makefile dlls/activeds.tlb enable_activeds_tlb wine_fn_config_makefile dlls/activeds enable_activeds wine_fn_config_makefile dlls/actxprxy enable_actxprxy wine_fn_config_makefile dlls/adsiid enable_adsiid diff --git a/configure.ac b/configure.ac index 2e102990b5..ca932ebaad 100644 --- a/configure.ac +++ b/configure.ac @@ -2785,6 +2785,7 @@ WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$wi WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui) +WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) WINE_CONFIG_MAKEFILE(dlls/activeds) WINE_CONFIG_MAKEFILE(dlls/actxprxy) WINE_CONFIG_MAKEFILE(dlls/adsiid) diff --git a/dlls/activeds.tlb/Makefile.in b/dlls/activeds.tlb/Makefile.in new file mode 100644 index 0000000000..60739d2d4a --- /dev/null +++ b/dlls/activeds.tlb/Makefile.in @@ -0,0 +1,3 @@ +MODULE = activeds.tlb + +IDL_SRCS = activeds_tlb.idl diff --git a/dlls/activeds.tlb/activeds.tlb.spec b/dlls/activeds.tlb/activeds.tlb.spec new file mode 100644 index 0000000000..b427b2913c --- /dev/null +++ b/dlls/activeds.tlb/activeds.tlb.spec @@ -0,0 +1 @@ +# no exported entry points diff --git a/dlls/activeds.tlb/activeds_tlb.idl b/dlls/activeds.tlb/activeds_tlb.idl new file mode 100644 index 0000000000..f8c09a1d97 --- /dev/null +++ b/dlls/activeds.tlb/activeds_tlb.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "iads.idl"

1 0

Alex Henrie : iphlpapi/tests: Add tests for GetTcp6Table.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 748bed3d10737ad9b7c63df546f4d59608352318 URL: https://source.winehq.org/git/wine.git/?a=commit;h=748bed3d10737ad9b7c63df5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 13 23:51:50 2020 -0700 iphlpapi/tests: Add tests for GetTcp6Table. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 7a4821aae7..8ccbf5f9b6 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -56,6 +56,7 @@ static DWORD (WINAPI *pAllocateAndGetTcpExTableFromStack)(void**,BOOL,HANDLE,DWO static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); static DWORD (WINAPI *pGetIfTable2)(PMIB_IF_TABLE2*); static DWORD (WINAPI *pGetIfTable2Ex)(MIB_IF_TABLE_LEVEL,PMIB_IF_TABLE2*); +static DWORD (WINAPI *pGetTcp6Table)(PMIB_TCP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdp6Table)(PMIB_UDP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); static DWORD (WINAPI *pGetUnicastIpAddressTable)(ADDRESS_FAMILY,MIB_UNICASTIPADDRESS_TABLE**); @@ -86,6 +87,7 @@ static void loadIPHlpApi(void) pGetIfEntry2 = (void *)GetProcAddress(hLibrary, "GetIfEntry2"); pGetIfTable2 = (void *)GetProcAddress(hLibrary, "GetIfTable2"); pGetIfTable2Ex = (void *)GetProcAddress(hLibrary, "GetIfTable2Ex"); + pGetTcp6Table = (void *)GetProcAddress(hLibrary, "GetTcp6Table"); pGetUdp6Table = (void *)GetProcAddress(hLibrary, "GetUdp6Table"); pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); pGetUnicastIpAddressTable = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressTable"); @@ -2095,6 +2097,51 @@ static void test_ConvertLengthToIpv4Mask(void) ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE ); } +static void test_GetTcp6Table(void) +{ + DWORD ret; + ULONG size = 0; + PMIB_TCP6TABLE buf; + + if (!pGetTcp6Table) + { + win_skip("GetTcp6Table not available\n"); + return; + } + + ret = pGetTcp6Table(NULL, &size, FALSE); + if (ret == ERROR_NOT_SUPPORTED) + { + skip("GetTcp6Table is not supported\n"); + return; + } + ok(ret == ERROR_INSUFFICIENT_BUFFER, + "GetTcp6Table(NULL, &size, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", ret); + if (ret != ERROR_INSUFFICIENT_BUFFER) return; + + buf = HeapAlloc(GetProcessHeap(), 0, size); + + ret = pGetTcp6Table(buf, &size, FALSE); + ok(ret == NO_ERROR, + "GetTcp6Table(buf, &size, FALSE) returned %d, expected NO_ERROR\n", ret); + + if (ret == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace("TCP6 table: %u entries\n", buf->dwNumEntries); + for (i = 0; i < buf->dwNumEntries; i++) + { + trace("%u: local %s%%%u:%u remote %s%%%u:%u state %u\n", i, + ntoa6(&buf->table[i].LocalAddr), ntohs(buf->table[i].dwLocalScopeId), + ntohs(buf->table[i].dwLocalPort), ntoa6(&buf->table[i].RemoteAddr), + ntohs(buf->table[i].dwRemoteScopeId), ntohs(buf->table[i].dwRemotePort), + buf->table[i].State); + } + } + + HeapFree(GetProcessHeap(), 0, buf); +} + static void test_GetUdp6Table(void) { DWORD apiReturn; @@ -2268,6 +2315,7 @@ START_TEST(iphlpapi) test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); test_ConvertLengthToIpv4Mask(); + test_GetTcp6Table(); test_GetUdp6Table(); test_ParseNetworkString(); freeIPHlpApi();

1 0

Alex Henrie : iphlpapi: Implement GetTcp6Table on Linux.
by Alexandre Julliard 17 Feb '20

17 Feb '20

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 17 Feb '20

17 Feb '20

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

Hans Leidekker : bcrypt: Support retrieving the PaddingSchemes property for RSA.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 2bd5a8d57278c31fa35a9ebbe2eaacf9b542aedd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd5a8d57278c31fa35a9ebb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 17 13:35:42 2020 +0100 bcrypt: Support retrieving the PaddingSchemes property for RSA. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 17 +++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 8 +++++++- include/bcrypt.h | 6 ++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 298bfb4007..c2939ea815 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -528,6 +528,20 @@ static NTSTATUS get_aes_property( enum mode_id mode, const WCHAR *prop, UCHAR *b return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_rsa_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!strcmpW( prop, BCRYPT_PADDING_SCHEMES )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BCRYPT_SUPPORTED_PAD_PKCS1_SIG; + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -541,6 +555,9 @@ NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR case ALG_ID_AES: return get_aes_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_RSA: + return get_rsa_property( alg->mode, prop, buf, size, ret_size ); + default: break; } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 0dc2085111..f7404057fa 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1786,7 +1786,7 @@ static void test_RSA(void) BCRYPT_KEY_HANDLE key; BCRYPT_RSAKEY_BLOB *rsablob; UCHAR sig[64]; - ULONG len, size; + ULONG len, size, schemes; NTSTATUS ret; BYTE *buf; @@ -1797,6 +1797,12 @@ static void test_RSA(void) return; } + schemes = size = 0; + ret = pBCryptGetProperty(alg, L"PaddingSchemes", (UCHAR *)&schemes, sizeof(schemes), &size, 0); + ok(!ret, "got %08x\n", ret); + ok(schemes, "schemes not set\n"); + ok(size == sizeof(schemes), "got %u\n", size); + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); ok(!ret, "pBCryptImportKeyPair failed: %08x\n", ret); diff --git a/include/bcrypt.h b/include/bcrypt.h index 0bc4dea910..3dcab5f75a 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -189,6 +189,12 @@ static const WCHAR BCRYPT_KDF_RAW_SECRET[] = {'T','R','U','N','C','A','T','E',0} #define BCRYPT_RNG_INTERFACE 0x00000006 #define BCRYPT_KEY_DERIVATION_INTERFACE 0x00000007 +#define BCRYPT_SUPPORTED_PAD_ROUTER 0x00000001 +#define BCRYPT_SUPPORTED_PAD_PKCS1_ENC 0x00000002 +#define BCRYPT_SUPPORTED_PAD_PKCS1_SIG 0x00000004 +#define BCRYPT_SUPPORTED_PAD_OAEP 0x00000008 +#define BCRYPT_SUPPORTED_PAD_PSS 0x00000010 + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName;

1 0

Zebediah Figura : d3d9: Make shader validator traces less verbose.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 23187cbda3ef2393e69fcd1b0b2b3a2898d12f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23187cbda3ef2393e69fcd1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 13 18:51:00 2020 -0600 d3d9: Make shader validator traces less verbose. Suggested by Paul Gofman. 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/d3d9_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 75e627dd76..137da370e0 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -151,7 +151,7 @@ static ULONG WINAPI shader_validator_Release(IDirect3DShaderValidator9 *iface) static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface, shader_validator_cb callback, void *context, DWORD_PTR arg3) { - FIXME("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3); + WARN("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3); return S_OK; } @@ -163,7 +163,7 @@ static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface, static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *iface, const char *file, int line, const DWORD *tokens, DWORD token_count) { - FIXME("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n", + WARN("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n", iface, debugstr_a(file), line, tokens, token_count); return S_OK; @@ -171,7 +171,7 @@ static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *if static HRESULT WINAPI shader_validator_End(IDirect3DShaderValidator9 *iface) { - FIXME("iface %p, stub!\n", iface); + WARN("iface %p, stub!\n", iface); return S_OK; } @@ -190,7 +190,7 @@ static IDirect3DShaderValidator9 shader_validator = {&shader_validator_vtbl}; IDirect3DShaderValidator9 * WINAPI Direct3DShaderValidatorCreate9(void) { - TRACE("Returning validator %p.\n", &shader_validator); + FIXME("Returning stub validator %p.\n", &shader_validator); return &shader_validator; }

1 0

Zebediah Figura : d3d9: Retrieve transform states from the primary stateblock.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 85b6cfb8260fec4e75a7168559177e93615de73e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b6cfb8260fec4e75a71685… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 13 18:51:01 2020 -0600 d3d9: Retrieve transform states from the primary stateblock. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5bf0d6484c..fafdec10d8 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2123,7 +2123,7 @@ static HRESULT WINAPI d3d9_device_GetTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_get_transform(device->wined3d_device, state, (struct wined3d_matrix *)matrix); + memcpy(matrix, &wined3d_stateblock_get_state(device->state)->transforms[state], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK;

1 0

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

17 Feb '20

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

Nikolay Sivov : mfplat/tests: Use wide string literals.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: ed79ce484ac02dd42d50d26189ab4a9a0d8b8320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed79ce484ac02dd42d50d261… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 17 09:49:33 2020 +0300 mfplat/tests: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ec84c6c261..6800441ba2 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -90,8 +90,7 @@ static HRESULT (WINAPI *pMFTUnregisterLocal)(IClassFactory *factory); static HRESULT (WINAPI *pMFTUnregisterLocalByCLSID)(CLSID clsid); static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); -static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; -static const WCHAR fileschemeW[] = {'f','i','l','e',':','/','/',0}; +static const WCHAR fileschemeW[] = L"file://"; static WCHAR *load_resource(const WCHAR *name) { @@ -177,7 +176,7 @@ static BOOL check_clsid(CLSID *clsids, UINT32 count) static void test_register(void) { - static WCHAR name[] = {'W','i','n','e',' ','t','e','s','t',0}; + WCHAR name[] = L"Wine test"; MFT_REGISTER_TYPE_INFO input[] = { { DUMMY_CLSID, DUMMY_GUID1 } @@ -433,7 +432,7 @@ static void test_source_resolver(void) IMFSourceResolver_Release(resolver2); - filename = load_resource(mp4file); + filename = load_resource(L"test.mp4"); hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -862,7 +861,7 @@ static void check_attr_type(IMFAttributes *obj, const GUID *key, MF_ATTRIBUTE_TY static void test_attributes(void) { - static const WCHAR stringW[] = {'W','i','n','e',0}; + static const WCHAR stringW[] = L"Wine"; static const UINT8 blob[] = {0,1,2,3,4,5}; IMFAttributes *attributes, *attributes1; UINT8 blob_value[256], *blob_buf = NULL; @@ -1473,6 +1472,7 @@ static void test_MFCreateMFByteStreamOnStream(void) static void test_file_stream(void) { + static const WCHAR newfilename[] = L"new.mp4"; IMFByteStream *bytestream, *bytestream2; QWORD bytestream_length, position; IMFAttributes *attributes = NULL; @@ -1485,9 +1485,7 @@ static void test_file_stream(void) WCHAR *str; BOOL eos; - static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; - - filename = load_resource(mp4file); + filename = load_resource(L"test.mp4"); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3231,7 +3229,6 @@ static void test_MFCompareFullToPartialMediaType(void) static void test_attributes_serialization(void) { - static const WCHAR textW[] = {'T','e','x','t',0}; static const UINT8 blob[] = {1,2,3}; IMFAttributes *attributes, *dest; UINT32 size, count, value32; @@ -3283,7 +3280,7 @@ static void test_attributes_serialization(void) IMFAttributes_SetDouble(attributes, &IID_IUnknown, 0.5); IMFAttributes_SetUnknown(attributes, &IID_IMFAttributes, (IUnknown *)attributes); IMFAttributes_SetGUID(attributes, &GUID_NULL, &IID_IUnknown); - IMFAttributes_SetString(attributes, &DUMMY_CLSID, textW); + IMFAttributes_SetString(attributes, &DUMMY_CLSID, L"Text"); IMFAttributes_SetBlob(attributes, &DUMMY_GUID1, blob, sizeof(blob)); hr = MFGetAttributesAsBlobSize(attributes, &size); @@ -3313,7 +3310,7 @@ static void test_attributes_serialization(void) ok(IsEqualGUID(&guid, &IID_IUnknown), "Unexpected guid.\n"); hr = IMFAttributes_GetAllocatedString(dest, &DUMMY_CLSID, &str, &size); ok(hr == S_OK, "Failed to get string value, hr %#x.\n", hr); - ok(!lstrcmpW(str, textW), "Unexpected string.\n"); + ok(!lstrcmpW(str, L"Text"), "Unexpected string.\n"); CoTaskMemFree(str); hr = IMFAttributes_GetAllocatedBlob(dest, &DUMMY_GUID1, &buffer, &size); ok(hr == S_OK, "Failed to get blob value, hr %#x.\n", hr); @@ -3755,7 +3752,7 @@ static const IMFActivateVtbl activate_object_vtbl = static void test_local_handlers(void) { IMFActivate local_activate = { &activate_object_vtbl }; - static const WCHAR localW[] = {'l','o','c','a','l',0}; + static const WCHAR localW[] = L"local"; HRESULT hr; if (!pMFRegisterLocalSchemeHandler)

1 0

Nikolay Sivov : scrrun/tests: Use wide string literals.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 8ccafc5841d011eae144876d1ab660ba5b4eee14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ccafc5841d011eae144876d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 17 09:49:51 2020 +0300 scrrun/tests: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/dictionary.c | 25 +++--- dlls/scrrun/tests/filesystem.c | 190 ++++++++++++++++------------------------- 2 files changed, 86 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ccafc5841d011eae144…

1 0