July 2021 - Wine-Commits - list.winehq.org

Alex Henrie : include: Add TBS_E_* to winerror.h.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 3ffb15eb34564a4d848aeb2a570c94bfafeb31dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ffb15eb34564a4d848aeb2a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 29 21:00:35 2021 -0600 include: Add TBS_E_* to winerror.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 8765e177029..f22b24f267b 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3639,6 +3639,29 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) #define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) +#define TBS_E_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x80284001) +#define TBS_E_BAD_PARAMETER _HRESULT_TYPEDEF_(0x80284002) +#define TBS_E_INVALID_OUTPUT_POINTER _HRESULT_TYPEDEF_(0x80284003) +#define TBS_E_INVALID_CONTEXT _HRESULT_TYPEDEF_(0x80284004) +#define TBS_E_INSUFFICIENT_BUFFER _HRESULT_TYPEDEF_(0x80284005) +#define TBS_E_IOERROR _HRESULT_TYPEDEF_(0x80284006) +#define TBS_E_INVALID_CONTEXT_PARAM _HRESULT_TYPEDEF_(0x80284007) +#define TBS_E_SERVICE_NOT_RUNNING _HRESULT_TYPEDEF_(0x80284008) +#define TBS_E_TOO_MANY_TBS_CONTEXTS _HRESULT_TYPEDEF_(0x80284009) +#define TBS_E_TOO_MANY_RESOURCES _HRESULT_TYPEDEF_(0x8028400a) +#define TBS_E_SERVICE_START_PENDING _HRESULT_TYPEDEF_(0x8028400b) +#define TBS_E_PPI_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8028400c) +#define TBS_E_COMMAND_CANCELED _HRESULT_TYPEDEF_(0x8028400d) +#define TBS_E_BUFFER_TOO_LARGE _HRESULT_TYPEDEF_(0x8028400e) +#define TBS_E_TPM_NOT_FOUND _HRESULT_TYPEDEF_(0x8028400f) +#define TBS_E_SERVICE_DISABLED _HRESULT_TYPEDEF_(0x80284010) +#define TBS_E_NO_EVENT_LOG _HRESULT_TYPEDEF_(0x80284011) +#define TBS_E_ACCESS_DENIED _HRESULT_TYPEDEF_(0x80284012) +#define TBS_E_PROVISIONING_NOT_ALLOWED _HRESULT_TYPEDEF_(0x80284013) +#define TBS_E_PPI_FUNCTION_UNSUPPORTED _HRESULT_TYPEDEF_(0x80284014) +#define TBS_E_OWNERAUTH_NOT_FOUND _HRESULT_TYPEDEF_(0x80284015) +#define TBS_E_PROVISIONING_INCOMPLETE _HRESULT_TYPEDEF_(0x80284016) + #define UI_E_CREATE_FAILED _HRESULT_TYPEDEF_(0x802a0001) #define UI_E_SHUTDOWN_CALLED _HRESULT_TYPEDEF_(0x802a0002) #define UI_E_ILLEGAL_REENTRANCY _HRESULT_TYPEDEF_(0x802a0003)

1 0

Zebediah Figura : ws2_32/tests: Add tests for options which can only be set.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: b9bf00605d4af7d0927a63695b97eb3d8db8bd4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9bf00605d4af7d0927a6369… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:37 2021 -0500 ws2_32/tests: Add tests for options which can only be set. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e579b72ecb5..8617a6fb7e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11011,6 +11011,47 @@ static void test_so_debug(void) closesocket(s); } +static void test_set_only_options(void) +{ + unsigned int i; + int ret, len; + int value; + SOCKET s; + + static const struct + { + int level; + int option; + } + tests[] = + { + {IPPROTO_IP, IP_ADD_MEMBERSHIP}, + {IPPROTO_IP, IP_DROP_MEMBERSHIP}, + {IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP}, + {IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (tests[i].level == IPPROTO_IPV6) + { + s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + if (s == INVALID_SOCKET) continue; + } + else + { + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + } + + len = sizeof(value); + ret = getsockopt(s, tests[i].level, tests[i].option, (char *)&value, &len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOPROTOOPT, "got error %u\n", WSAGetLastError()); + + closesocket(s); + } +} + START_TEST( sock ) { int i; @@ -11027,6 +11068,7 @@ START_TEST( sock ) test_ip_pktinfo(); test_extendedSocketOptions(); test_so_debug(); + test_set_only_options(); for (i = 0; i < ARRAY_SIZE(tests); i++) do_test(&tests[i]);

1 0

Alex Henrie : tbs: Add stub dll.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 91c42ffe46687c611bd9323996a08798633823a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c42ffe46687c611bd93239… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 29 20:33:45 2021 -0600 tbs: Add stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51335 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/tbs/Makefile.in | 3 +++ dlls/tbs/tbs.spec | 21 +++++++++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/configure b/configure index 14c9dd2ff7d..1789634ea84 100755 --- a/configure +++ b/configure @@ -1626,6 +1626,7 @@ enable_sxs enable_t2embed enable_tapi32 enable_taskschd +enable_tbs enable_tdh enable_tdi_sys enable_traffic @@ -20990,6 +20991,7 @@ wine_fn_config_makefile dlls/tapi32 enable_tapi32 wine_fn_config_makefile dlls/tapi32/tests enable_tests wine_fn_config_makefile dlls/taskschd enable_taskschd wine_fn_config_makefile dlls/taskschd/tests enable_tests +wine_fn_config_makefile dlls/tbs enable_tbs wine_fn_config_makefile dlls/tdh enable_tdh wine_fn_config_makefile dlls/tdi.sys enable_tdi_sys wine_fn_config_makefile dlls/toolhelp.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 09c58aaff28..f0a42cf3b0a 100644 --- a/configure.ac +++ b/configure.ac @@ -3665,6 +3665,7 @@ WINE_CONFIG_MAKEFILE(dlls/tapi32) WINE_CONFIG_MAKEFILE(dlls/tapi32/tests) WINE_CONFIG_MAKEFILE(dlls/taskschd) WINE_CONFIG_MAKEFILE(dlls/taskschd/tests) +WINE_CONFIG_MAKEFILE(dlls/tbs) WINE_CONFIG_MAKEFILE(dlls/tdh) WINE_CONFIG_MAKEFILE(dlls/tdi.sys) WINE_CONFIG_MAKEFILE(dlls/toolhelp.dll16,enable_win16) diff --git a/dlls/tbs/Makefile.in b/dlls/tbs/Makefile.in new file mode 100644 index 00000000000..8f23c81e4f9 --- /dev/null +++ b/dlls/tbs/Makefile.in @@ -0,0 +1,3 @@ +MODULE = tbs.dll + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/tbs/tbs.spec b/dlls/tbs/tbs.spec new file mode 100644 index 00000000000..3fa5c04f863 --- /dev/null +++ b/dlls/tbs/tbs.spec @@ -0,0 +1,21 @@ +@ stub Tbsi_Create_Attestation_From_Log +@ stub Tbsi_Get_TCG_Logs +@ stub GetDeviceID +@ stub GetDeviceIDString +@ stub GetDeviceIDWithTimeout +@ stub Tbsi_Context_Create +@ stub Tbsi_Create_Windows_Key +@ stub Tbsi_FilterLog +@ stub Tbsi_GetDeviceInfo +@ stub Tbsi_Get_OwnerAuth +@ stub Tbsi_Get_TCG_Log +@ stub Tbsi_Get_TCG_Log_Ex +@ stub Tbsi_Physical_Presence_Command +@ stub Tbsi_Revoke_Attestation +@ stub Tbsi_ShaHash +@ stub Tbsip_Cancel_Commands +@ stub Tbsip_Context_Close +@ stub Tbsip_Submit_Command +@ stub Tbsip_Submit_Command_NonBlocking +@ stub Tbsip_TestInterruptInformation +@ stub Tbsip_TestMorBit

1 0

Zebediah Figura : ws2_32: Explicitly return WSAENOPROTOOPT for IP membership options in getsockopt().
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 51c19a9d978b3d0e985d00b728a3cc87057da66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c19a9d978b3d0e985d00b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:38 2021 -0500 ws2_32: Explicitly return WSAENOPROTOOPT for IP membership options in getsockopt(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 84f7f06036f..650885a101e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2433,8 +2433,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPPROTO_IP: switch(optname) { - case WS_IP_ADD_MEMBERSHIP: - case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL case WS_IP_HDRINCL: #endif @@ -2462,19 +2460,20 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return ret; case WS_IP_DONTFRAGMENT: return get_dont_fragment(s, IPPROTO_IP, (BOOL *)optval) ? 0 : SOCKET_ERROR; + + default: + FIXME( "unrecognized IP option %u\n", optname ); + /* fall through */ + + case WS_IP_ADD_MEMBERSHIP: + case WS_IP_DROP_MEMBERSHIP: + SetLastError( WSAENOPROTOOPT ); + return -1; } - FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); - return SOCKET_ERROR; case WS_IPPROTO_IPV6: switch(optname) { -#ifdef IPV6_ADD_MEMBERSHIP - case WS_IPV6_ADD_MEMBERSHIP: -#endif -#ifdef IPV6_DROP_MEMBERSHIP - case WS_IPV6_DROP_MEMBERSHIP: -#endif case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: @@ -2495,9 +2494,16 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return ret; case WS_IPV6_DONTFRAG: return get_dont_fragment(s, IPPROTO_IPV6, (BOOL *)optval) ? 0 : SOCKET_ERROR; + + default: + FIXME( "unrecognized IPv6 option %u\n", optname ); + /* fall through */ + + case WS_IPV6_ADD_MEMBERSHIP: + case WS_IPV6_DROP_MEMBERSHIP: + SetLastError( WSAENOPROTOOPT ); + return -1; } - FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); - return SOCKET_ERROR; default: WARN("Unknown level: 0x%08x\n", level);

1 0

Francois Gouget : winetest/build-patterns: Show the list a test pattern is in.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: tools Branch: master Commit: b180989b797979d2874ffa02b6c7a496a745fa42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b180989b797979d2874ffa0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 1 19:25:41 2021 +0200 winetest/build-patterns: Show the list a test pattern is in. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index e3174b2..da7272e 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -382,7 +382,6 @@ foreach my $build (@sortedbuilds) $tests{$testname} = $test = { id => $testname, name => $testname, - title => "<a href='tests/$testname.html'>$testname</a>", source => $source, }; $testsources{$source} = 1; @@ -1236,7 +1235,13 @@ sub write_patterns_list($$$$) my $test = $tests{$testname}; print $html "<div class='testfile' id='$test->{id}'>\n"; - print $html "<div class='updownbar'>$test->{title}"; + my $title = $test->{title}; + if (!$test->{title}) + { + my $tooltip = $list->{title} ? " title='$list->{title}'" : ""; + $title = "<a href='tests/$testname.html'$tooltip>$testname</a>"; + } + print $html "<div class='updownbar'>$title"; print $html "<div class='ralign'>"; if ($mainpage) {

1 0

Francois Gouget : winetest/gather: Link 'test list' failures to the test's version page.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: tools Branch: master Commit: 79b8c4e42f40f7d9983779bff372b7056122ccf7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=79b8c4e42f40f7d9983779b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 1 19:26:08 2021 +0200 winetest/gather: Link 'test list' failures to the test's version page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/winetest/gather b/winetest/gather index e000777..1e9b2da 100755 --- a/winetest/gather +++ b/winetest/gather @@ -693,6 +693,12 @@ sub singletest($$$) { { $href = "$report->{dir}/$testname.html"; } + elsif (-r "$builddir/$report->{dir}/version.html") + { + my $dll = $testname; + $dll =~ s/:.*//; + $href = "$report->{dir}/version.html#$dll"; + } else { $href="";

1 0

Francois Gouget : winetest: Remove the unused td.arrow CSS style.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: tools Branch: master Commit: a58e6db33be949a740baba49d7e232eb8b136435 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a58e6db33be949a740baba4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 1 19:50:30 2021 +0200 winetest: Remove the unused td.arrow CSS style. The up/down arrows are now positioned using the ralign class rather than a table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/report.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/report.css b/winetest/report.css index 80be53d..b558c6f 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -65,10 +65,6 @@ table.output td { text-align: left; } -td.arrow :link { color: #ffffff; text-decoration: none; } -td.arrow :visited { color: #ffffff; text-decoration: none; } -td.arrow :hover { color: #ffffff; text-decoration: underline; } - .ralign { display: inline-block; float: right;

1 0

Francois Gouget : winetest/gather: Truncated files are rejected.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: tools Branch: master Commit: 4fde1079b1e417291e067331542673ae7d922f00 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4fde1079b1e417291e06733… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 1 19:26:33 2021 +0200 winetest/gather: Truncated files are rejected. When a report size exceeds the size limit it is dropped so the corresponding summary.txt file will never contain "failed filelimit". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/winetest/gather b/winetest/gather index 1e9b2da..abb3395 100755 --- a/winetest/gather +++ b/winetest/gather @@ -108,8 +108,6 @@ sub short_date($) # group A reference to the group the report belongs to. # missing A hash of the reason why some test results are missing, # indexed by the test unit name. -# filelimit The name of the last test that was run before the report file -# size limit was reached. # <testname> Maps the test names to a structure containing the individual # unit test's results. Note that there's no name collision # with the other fields because the test names contain a ':'. @@ -349,9 +347,6 @@ foreach my $file (glob "$builddir/*/summary.txt") { if ($count eq "failed") { if ($todos eq "crash") { $report->{$testname} = { status => "crash" }; - } elsif ($todos eq "filelimit") { - $report->{$testname} = { status => "file limit" }; - $report->{filelimit} = $testname; } else { $report->{$testname} = { status => $todos }; } @@ -437,16 +432,12 @@ foreach my $group (@groups) { foreach my $report (@{$group->{reports}}) { if (!exists $report->{$testname}) { my ($dll, $unit) = split(/:/, $testname); - my $filelimit = $report->{filelimit}; if (exists $report->{missing}->{$dll}) { # Record the reason why this test is missing $report->{$testname} = { status => $report->{missing}->{$dll}, count => [ 1, 1 ], skips => [ 1, 1 ] }; - } elsif (defined $filelimit && $testname gt $filelimit) { - # Mark this test as missing because of a partial report file - $report->{$testname}->{status} = "truncated"; } else { # Mark this test as missing for an unknown reason (typically # the start & done lines where unrecognizable) @@ -650,7 +641,6 @@ sub get_result_title($$) if ($result->{status} eq "crash") { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } if ($result->{status} eq "skipped") { return "Skipped by user request"; } - if ($result->{status} eq "truncated") { return "The report was truncated"; } my ($dll, $unit) = split(/:/, $testname); $dll.=".dll" if ($dll !~ /\....?$/); @@ -737,7 +727,6 @@ sub singletest($$$) { crash => "crashed", 258 => "timeout", mixed => "mixed", - truncated => "truncated", ); $msg = $status2label{$status} || "unknown"; }

1 0