September 2019 - Wine-devel

[PATCH] testbot: Add BatchQuote() to quote and escape batch parameters.
by Francois Gouget 12 Sep '19

12 Sep '19

This also fixes percent and caret escaping and documents some batch file parameter escaping quirks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 9 +-------- testbot/lib/WineTestBot/Utils.pm | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 53e9e5001..432bf51d8 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -479,14 +479,7 @@ elsif ($Step->Type eq "suite") $Info .= $VM->Details; } # Escape the arguments for cmd's command interpreter - my $EMail = $AdminEMail; - $EMail =~ s/"/\\"/g; - $EMail =~ s/%/%%/g; - $EMail =~ s/%/%%/g; - $Info =~ s/"/\\"/g; - $Info =~ s/%/%%/g; - $Info =~ s/%/%%/g; - $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n"; + $Script .= "-q -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; $Script .= "$FileName -q -s $RptFileName\r\n" if (!$Mission->{nosubmit}); } Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 83f60fa07..97fb1292a 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -333,6 +333,31 @@ sub IsValidFileName($) =pod =over 12 +=item C<BatchQuote()> + +Quotes strings so they can be used in Windows batch files. + +Note that escaping is subtly different between the command line, batch files +and inside for loops in batch files! This function ignores the latter case. + +=back +=cut +sub BatchQuote($) +{ + my ($Str)=@_; + + $Str =~ s/"/\\"/g; + # Backslashes don't need to be doubled, they only take on a special meaning + # when followed by a double quote. Single quotes and backquotes don't have + # a special meaning either. + $Str =~ s/%/%%/g; + $Str =~ s/\^/^^/g; + return "\"$Str\""; +} + +=pod +=over 12 + =item C<ShQuote()> Quotes strings so they can be used in shell commands. -- 2.20.1

1 0

[PATCH] testbot/LibvirtTool: Provide a more complete domain state description.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 110 ++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 0ae7aaed3..d6c07408c 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -44,6 +44,110 @@ my $HackVirtURI = 1; my %_Hypervisors; my %_Domains; + +# +# Domain state description +# + +my %_StateNameReasons = ( + Sys::Virt::Domain::STATE_NOSTATE => ["no state", + { + Sys::Virt::Domain::STATE_NOSTATE_UNKNOWN => "unknown", + }], + Sys::Virt::Domain::STATE_RUNNING => ["running", + { + Sys::Virt::Domain::STATE_RUNNING_BOOTED => "booted", + Sys::Virt::Domain::STATE_RUNNING_FROM_SNAPSHOT => "snapshot", + Sys::Virt::Domain::STATE_RUNNING_MIGRATED => "migrated", + Sys::Virt::Domain::STATE_RUNNING_MIGRATION_CANCELED => "migration canceled", + Sys::Virt::Domain::STATE_RUNNING_RESTORED => "restored", + Sys::Virt::Domain::STATE_RUNNING_SAVE_CANCELED => "save canceled", + Sys::Virt::Domain::STATE_RUNNING_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_RUNNING_UNPAUSED => "unpaused", + Sys::Virt::Domain::STATE_RUNNING_WAKEUP => "wakeup", + Sys::Virt::Domain::STATE_RUNNING_CRASHED => "crashed", + Sys::Virt::Domain::STATE_RUNNING_POSTCOPY => "postcopy", + }], + Sys::Virt::Domain::STATE_BLOCKED => ["blocked", + { + Sys::Virt::Domain::STATE_BLOCKED_UNKNOWN => "unknown", + }], + Sys::Virt::Domain::STATE_PAUSED => ["paused", + { + Sys::Virt::Domain::STATE_PAUSED_DUMP => "dump", + Sys::Virt::Domain::STATE_PAUSED_FROM_SNAPSHOT => "from snapshot", + Sys::Virt::Domain::STATE_PAUSED_IOERROR => "ioerror", + Sys::Virt::Domain::STATE_PAUSED_MIGRATION => "migration", + Sys::Virt::Domain::STATE_PAUSED_SAVE => "save", + Sys::Virt::Domain::STATE_PAUSED_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_PAUSED_USER => "user", + Sys::Virt::Domain::STATE_PAUSED_WATCHDOG => "watchdog", + Sys::Virt::Domain::STATE_PAUSED_SHUTTING_DOWN => "shutting down", + Sys::Virt::Domain::STATE_PAUSED_SNAPSHOT => "snapshot", + Sys::Virt::Domain::STATE_PAUSED_CRASHED => "crashed", + Sys::Virt::Domain::STATE_PAUSED_STARTING_UP => "starting up", + Sys::Virt::Domain::STATE_PAUSED_POSTCOPY => "postcopy", + Sys::Virt::Domain::STATE_PAUSED_POSTCOPY_FAILED => "postcopy failed", + }], + Sys::Virt::Domain::STATE_SHUTDOWN => ["shutdown", + { + Sys::Virt::Domain::STATE_SHUTDOWN_UNKNOWN => "unknown", + }], + Sys::Virt::Domain::STATE_SHUTOFF => ["shutoff", + { + Sys::Virt::Domain::STATE_SHUTOFF_CRASHED => "crashed", + Sys::Virt::Domain::STATE_SHUTOFF_DESTROYED => "destroyed", + Sys::Virt::Domain::STATE_SHUTOFF_FAILED => "failed", + Sys::Virt::Domain::STATE_SHUTOFF_FROM_SNAPSHOT => "from snapshot", + Sys::Virt::Domain::STATE_SHUTOFF_MIGRATED => "migrated", + Sys::Virt::Domain::STATE_SHUTOFF_SAVED => "saved", + Sys::Virt::Domain::STATE_SHUTOFF_SHUTDOWN => "shutdown", + Sys::Virt::Domain::STATE_SHUTOFF_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_SHUTOFF_DAEMON => "daemon", + }], + Sys::Virt::Domain::STATE_CRASHED => ["crashed", + { + Sys::Virt::Domain::STATE_CRASHED_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_CRASHED_PANICKED => "panicked", + }], + Sys::Virt::Domain::STATE_PMSUSPENDED => ["pmsuspended", + { + Sys::Virt::Domain::STATE_PMSUSPENDED_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_PMSUSPENDED_DISK_UNKNOWN => "disk unknown", + }], +); + +=pod +=over 12 + +=item C<_GetStateDescription()> + +Provides a description of the domain state for diagnostics. + +=back +=cut + +sub _GetStateDescription($$) +{ + my ($State, $Reason) = @_; + + my $StateInfo = $_StateNameReasons{$State}; + my ($StateName, $ReasonName); + if ($StateInfo) + { + $StateName = $StateInfo->[0]; + $ReasonName = $StateInfo->[1]->{$Reason}; + } + + return join(":", $StateName || sprintf("%d", $State), + $ReasonName || sprintf("%d", $Reason)); +} + + +# +# LibvirtDomain class +# + sub new($$) { my ($class, $VM) = @_; @@ -292,8 +396,8 @@ sub PowerOff($) # destroy() sets $@->code to Sys::Virt::Error::ERR_OPERATION_INVALID (55) # if the domain was already off. But this could happen for other reasons so # just check the domain state. - my ($State, $_Reason); - eval { ($State, $_Reason) = $Domain->get_state() }; + my ($State, $Reason); + eval { ($State, $Reason) = $Domain->get_state() }; if ($@) { # Only return the initial error @@ -304,7 +408,7 @@ sub PowerOff($) # This is what we wanted so ignore past errors return undef; } - return $self->_Reset($self->{VM}->Name ." is not off (". _GetStateName($State) ."): $ErrMessage"); + return $self->_Reset($self->{VM}->Name ." is not off (". _GetStateDescription($State, $Reason) ."): $ErrMessage"); } my %_StreamData; -- 2.20.1

1 0

[PATCH] testbot/CheckForWinetestUpdate: Document the task types.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 95cb13d8e..590226cde 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,8 +65,11 @@ my %WineTestUrls = ( "exe64" => "http://test.winehq.org/builds/winetest64-latest.exe" ); -my %TaskTypes = (build => 1, base32 => 1, winetest32 => 1, all64 => 1, - wine => 1); +my %TaskTypes = (build => "Update and rebuild Wine on the build VMs.", + base32 => "Run WineTest on the 32 bit Windows VMs with the 'base' role.", + winetest32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", + all64 => "Run WineTest on the all the 64 bit Windows VMs.", + wine => "Update, rebuild and run WineTest on the Wine VMs."); my $Debug; @@ -441,7 +444,11 @@ if (defined $Usage) { print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [TASKTYPE] ...\n"; print "\n"; - print "Where TASKTYPE is one of: ", join(" ", sort keys %TaskTypes), "\n"; + print "Where TASKTYPE is one of:\n"; + foreach my $TaskType (sort keys %TaskTypes) + { + printf(" %-15s %s\n", $TaskType, $TaskTypes{$TaskType}); + } exit $Usage; } -- 2.20.1

1 0

[PATCH 2/2] advpack/tests: Increase length of 'path' by 13.
by Isira Seneviratne 12 Sep '19

12 Sep '19

4 8

[PATCH v3 2/2] ntdll: Implement RtlUnicodeToUTF8N.
by Dmitry Timoshkov 12 Sep '19

12 Sep '19

v2: replace a macro-driven test block by a more manageble test loop. v3: add special case for dstlen == 0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtlstr.c | 33 +++++++++++++++++++++++++++ dlls/ntdll/tests/rtlstr.c | 48 ++++++++++++++++++++++++++------------- include/winternl.h | 1 + 4 files changed, 67 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 98a423adfb..5a6f4e4ed4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -980,6 +980,7 @@ @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) +@ stdcall RtlUnicodeToUTF8N(ptr long ptr ptr long) @ stdcall RtlUniform(ptr) # @ stub RtlUnlockBootStatusData @ stdcall RtlUnlockHeap(long) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 6b60d36a1c..977f57a907 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -908,6 +908,39 @@ NTSTATUS WINAPI RtlUnicodeToOemN( LPSTR dst, DWORD dstlen, LPDWORD reslen, } +/************************************************************************** + * RtlUnicodeToUTF8N (NTDLL.@) + * + * Converts a Unicode string to a UTF-8 string. + * + * RETURNS + * NTSTATUS code + */ +NTSTATUS WINAPI RtlUnicodeToUTF8N( LPSTR dst, DWORD dstlen, LPDWORD reslen, + LPCWSTR src, DWORD srclen) +{ + int ret; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + if (dst && (srclen & 1)) return STATUS_INVALID_PARAMETER_5; + + if (!dstlen && dst) + { + char c; + dst = &c; + ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, 1 ); + if (ret > 0) ret--; + } + else + ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, dstlen ); + if (reslen) + *reslen = (ret >= 0) ? ret : dstlen; /* overflow -> we filled up to dstlen */ + if (ret < 0) return STATUS_BUFFER_TOO_SMALL; + return STATUS_SUCCESS; +} + + /* CASE CONVERSIONS */ diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index c2c82516cc..4583ddeb4b 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -2055,8 +2055,8 @@ static void utf8_expect_(const unsigned char *out_string, ULONG buflen, ULONG ou status = pRtlUnicodeToUTF8N( out_string ? buffer : NULL, buflen, &bytes_out, in_string, in_bytes); - ok_(__FILE__, line)(status == expect_status, "status = 0x%x\n", status); - ok_(__FILE__, line)(bytes_out == out_bytes, "bytes_out = %u\n", bytes_out); + ok_(__FILE__, line)(status == expect_status, "status 0x%x, expected 0x%x\n", status, expect_status); + ok_(__FILE__, line)(bytes_out == out_bytes, "bytes_out = %u, expected %u\n", bytes_out, out_bytes); if (out_string) { for (i = 0; i < bytes_out; i++) @@ -2082,6 +2082,7 @@ static void test_RtlUnicodeToUTF8N(void) const WCHAR empty_string[] = { 0 }; const WCHAR test_string[] = { 'A',0,'a','b','c','d','e','f','g',0 }; const WCHAR special_string[] = { 'X',0x80,0xd800,0 }; + const ULONG special_string_len[] = { 0, 1, 1, 3, 3, 3, 6, 7 }; const unsigned char special_expected[] = { 'X',0xc2,0x80,0xef,0xbf,0xbd,0 }; unsigned int input_len; const unsigned int test_count = ARRAY_SIZE(unicode_to_utf8); @@ -2151,25 +2152,33 @@ static void test_RtlUnicodeToUTF8N(void) length_expect(0, 0, STATUS_SUCCESS); length_expect(1, 1, STATUS_SUCCESS); length_expect(2, 3, STATUS_SUCCESS); +todo_wine +{ length_expect(3, 6, STATUS_SOME_NOT_MAPPED); length_expect(4, 7, STATUS_SOME_NOT_MAPPED); +} #undef length_expect - /* output truncation */ -#define truncate_expect(buflen, out_bytes, expect_status) \ - utf8_expect_(special_expected, buflen, out_bytes, \ - special_string, sizeof(special_string), \ - expect_status, __LINE__) + for (i = 0; i <= 6; i++) + { + memset(buffer, 0x55, sizeof(buffer)); + bytes_out = 0xdeadbeef; + status = pRtlUnicodeToUTF8N(buffer, i, &bytes_out, special_string, sizeof(special_string)); +todo_wine_if (i == 4 || i == 5 || i == 6) + ok(status == STATUS_BUFFER_TOO_SMALL, "%d: status = 0x%x\n", i, status); +todo_wine_if (bytes_out != special_string_len[i]) + ok(bytes_out == special_string_len[i], "%d: expected %u, got %u\n", i, special_string_len[i], bytes_out); +todo_wine_if (i == 6) + ok(memcmp(buffer, special_expected, special_string_len[i]) == 0, "%d: bad conversion\n", i); + } - truncate_expect(0, 0, STATUS_BUFFER_TOO_SMALL); - truncate_expect(1, 1, STATUS_BUFFER_TOO_SMALL); - truncate_expect(2, 1, STATUS_BUFFER_TOO_SMALL); - truncate_expect(3, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(4, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(5, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(6, 6, STATUS_BUFFER_TOO_SMALL); - truncate_expect(7, 7, STATUS_SOME_NOT_MAPPED); -#undef truncate_expect + status = pRtlUnicodeToUTF8N(buffer, 7, &bytes_out, special_string, sizeof(special_string)); +todo_wine + ok(status == STATUS_SOME_NOT_MAPPED, "status = 0x%x\n", status); +todo_wine + ok(bytes_out == special_string_len[7], "expected %u, got %u\n", special_string_len[7], bytes_out); +todo_wine + ok(memcmp(buffer, special_expected, 7) == 0, "bad conversion\n"); /* conversion behavior with varying input length */ for (input_len = 0; input_len <= sizeof(test_string); input_len++) { @@ -2216,15 +2225,19 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, lstrlenW(unicode_to_utf8[i].unicode) * sizeof(WCHAR)); +todo_wine_if(unicode_to_utf8[i].status == STATUS_SOME_NOT_MAPPED) ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(bytes_out == strlen(unicode_to_utf8[i].expected), "(test %d): bytes_out is %u, expected %u\n", i, bytes_out, lstrlenA(unicode_to_utf8[i].expected)); ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); @@ -2234,6 +2247,8 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, (lstrlenW(unicode_to_utf8[i].unicode) + 1) * sizeof(WCHAR)); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); @@ -2243,6 +2258,7 @@ static void test_RtlUnicodeToUTF8N(void) ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); } diff --git a/include/winternl.h b/include/winternl.h index 3f2e07b7e2..4d58aebe21 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2863,6 +2863,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToOemString(POEM_STRING,PCUNICODE_STRI NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteSize(PULONG,PCWSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); +NTSYSAPI NTSTATUS WINAPI RtlUnicodeToUTF8N(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI ULONG WINAPI RtlUniform(PULONG); NTSYSAPI BOOLEAN WINAPI RtlUnlockHeap(HANDLE); NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); -- 2.20.1

1 0

[PATCH v3 1/2] ntdll/tests: Fix compilation with PSDK compiler.
by Dmitry Timoshkov 12 Sep '19

12 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/rtlstr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 8b948fa82a..c2c82516cc 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1970,7 +1970,7 @@ static void test_RtlHashUnicodeString(void) status = pRtlHashUnicodeString(NULL, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); - RtlInitUnicodeString(&str, strW); + pRtlInitUnicodeString(&str, strW); status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, NULL); ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); @@ -1988,7 +1988,7 @@ static void test_RtlHashUnicodeString(void) ptr = hash_test; while (*ptr->str) { - RtlInitUnicodeString(&str, ptr->str); + pRtlInitUnicodeString(&str, ptr->str); hash = 0; status = pRtlHashUnicodeString(&str, ptr->case_insensitive, HASH_STRING_ALGORITHM_X65599, &hash); ok(status == STATUS_SUCCESS, "got status 0x%08x for %s\n", status, wine_dbgstr_w(ptr->str)); -- 2.20.1

1 0

[PATCH] wininet/tests: InternetQueryOption should return a valid value for username/password when using cached credentials
by Alistair Leslie-Hughes 12 Sep '19

12 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/tests/http.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a4521a94a4..80d2aad9f4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4425,6 +4425,7 @@ static void test_basic_auth_credentials_reuse(int port) HINTERNET ses, con, req; DWORD status, size; BOOL ret; + char buffer[0x40]; ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -4439,6 +4440,20 @@ static void test_basic_auth_credentials_reuse(int port) ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); + status = 0xdeadbeef; size = sizeof(status); ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); @@ -4462,6 +4477,20 @@ static void test_basic_auth_credentials_reuse(int port) ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "user"), "got %s\n", buffer); + todo_wine ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + todo_wine ok(size == 3, "got %u\n", size); + status = 0xdeadbeef; size = sizeof(status); ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); -- 2.17.1

2 2

[PATCH] winetest: Add support for WineTest's subtests.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index e5b2815fb..1bbd78ef2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -2,6 +2,7 @@ # # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard +# Copyright (C) 2017, 2019 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -442,8 +443,9 @@ while ($line = <IN> || "") # Parse the tests output # -my ($dll, $unit, $source, $rev, $result) = ("", "", ""); +my ($dll, $unit, $units_re, $source, $rev, $result) = ("", "", "", ""); my $unitsize = 0; +my %units; my ($failures, $todo, $skipped) = (0, 0, 0); my ($s_failures, $s_todo, $s_skipped, $s_total) = (0, 0, 0, 0); my (%pids, $rc, $summary, $broken); @@ -455,9 +457,9 @@ sub get_source_link($$) my $source_link = defined $_unit ? "$_unit.c" : $source ne "-" ? $source : "$dll:$unit"; $source_link .= ":$_lnum" if (defined $_lnum); - if (defined $_unit and $_unit ne $unit) + if (defined $_unit and !$units{$_unit}) { - # If the line is not for the current test unit we'll let its + # If the line is not for a current test unit we'll let its # developer hash it out with the polluter ;-) $broken = 1; } @@ -481,7 +483,7 @@ sub add_test_line($$) sub check_unit($$) { my ($l_unit, $l_type) = @_; - if ($l_unit ne $unit) + if (!$units{$l_unit}) { add_test_line("end", "Misplaced $l_type message\n"); $extra_failures++; @@ -576,7 +578,8 @@ sub close_test_unit($) mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } - $dll = $unit = ""; + $dll = $unit = $units_re = ""; + %units = (); $unitsize = 0; $failures = $todo = $skipped = 0; $s_failures = $s_todo = $s_skipped = $s_total = 0; @@ -599,6 +602,8 @@ while ($line = <IN>) { close_test_unit(0) if ($dll ne ""); ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev); + %units = ($unit => 1); + $units_re = join("|", keys %units); $testbox = create_test_unit_box(); if ($l_type eq "skipped") @@ -609,40 +614,56 @@ while ($line = <IN>) { $rc = 0; } } + elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + { + my ($l_unit, $l_subunit) = ($1, $2); + if ($units{$l_unit}) + { + $units{$l_subunit} = 1; + $units_re = join("|", keys %units); + } + else + { + add_test_line("end", "Misplaced $l_subunit subtest\n"); + $extra_failures++; + } + } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("failed", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "failure"); $failures++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Test marked todo: .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test marked todo: .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("todo", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "todo"); $todo++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Tests skipped: .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Tests skipped: .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("skipped", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); # Don't complain and don't count misplaced skips - $skipped++ if ($l_unit eq $unit); + $skipped++ if ($units{$l_unit}); } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (.*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("trace", escapeHTML($pollution) . @@ -651,10 +672,10 @@ while ($line = <IN>) { } elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) + $line =~ /(?:([0-9a-f]+):)?($units_re): unhandled exception [0-9a-fA-F]{8} at /)) { my ($l_pid, $l_unit) = ($1, $2); - if ($l_unit eq $unit) + if ($units{$l_unit}) { # This also replaces a test summary line. $pids{$l_pid || 0} = 1; @@ -706,6 +727,9 @@ while ($line = <IN>) { # Then switch to the new one, warning it's missing a start line, # and that its results may be inconsistent. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); + %units = ($unit => 1); + $units_re = join("|", keys %units); + $testbox = create_test_unit_box(); add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; -- 2.20.1

1 0

[PATCH] testbot: Add support for WineTest's subtests.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3dca2e442..21f7dd054 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -183,6 +183,8 @@ sub _NewCurrentUnit($$) # complain about misplaced skips. Dll => $Dll, Unit => $Unit, + Units => {$Unit => 1}, + UnitsRE => $Unit, UnitSize => 0, LineFailures => 0, LineTodos => 0, @@ -209,7 +211,7 @@ sub _CheckUnit($$$$) { my ($Parser, $Cur, $Unit, $Type) = @_; - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") + if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") { $Parser->{IsWineTest} = 1; } @@ -337,28 +339,41 @@ sub ParseWineTestReport($$$) # Recognize skipped messages in case we need to skip tests in the VMs $Cur->{Rc} = 0 if ($Type eq "skipped"); } + elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + { + my ($Unit, $SubUnit) = ($1, $2); + if ($Cur->{Units}->{$Unit}) + { + $Cur->{Units}->{$SubUnit} = 1; + $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); + } + else + { + _AddError($Parser, "Misplaced $SubUnit subtest\n"); + } + } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})\.c:\d+: Test (?:failed|succeeded inside todo block): /)) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /)) { _CheckUnit($Parser, $Cur, $1, "failure"); $Cur->{LineFailures}++; } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})\.c:\d+: Test marked todo: /)) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test marked todo: /)) { _CheckUnit($Parser, $Cur, $1, "todo"); $Cur->{LineTodos}++; } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})\.c:\d+: Tests skipped: /)) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Tests skipped: /)) { my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they # are misreported (see _CloseTestUnit). - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") + if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") { $Cur->{LineSkips}++; } @@ -374,11 +389,11 @@ sub ParseWineTestReport($$$) } elsif ($Line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($Cur->{Unit} ne "" and - $Line =~ /(?:([0-9a-f]+):)?($Cur->{Unit}): unhandled exception [0-9a-fA-F]{8} at /)) + $Line =~ /(?:([0-9a-f]+):)?($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /)) { my ($Pid, $Unit) = ($1, $2); - if ($Unit eq $Cur->{Unit}) + if ($Cur->{Units}->{$Unit}) { # This also replaces a test summary line. $Cur->{Pids}->{$Pid || 0} = 1; -- 2.20.1

1 0

[PATCH] testbot/reporttest: Add coverage for subtests.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 2d074f9ae..00b6c2b35 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -557,7 +557,17 @@ comctl32:tooltips start dlls/comctl32/tests/toolbar.c - ----- Expected assessement: crashed comctl32:tooltips done (3221225477) in 0s -stub comctl32:trackbar +comctl32:trackbar start dlls/comctl32/tests/trackbar.c - +----- A unit test with a subtest +trackbar.c:496: Subtest driver +driver.c:40: Test failed: Something wrong +driver.c:41: Test succeeded inside todo block: Something right! +driver.c:42: Test marked todo: Hello Wine! +driver.c:43: Tests skipped: Another time +----- Expected assessement: 2 failures, 1 todo, 1 skip +07b1:trackbar: 3 tests executed (1 marked as todo, 2 failures), 1 skipped. +comctl32:trackbar:07b1 done (2) in 0s + stub comctl32:treeview stub comctl32:updown stub comdlg32:filedlg -- 2.20.1

1 0