April 2021 - Wine-commits - list.winehq.org

Francois Gouget : testbot/PatchUtils: Take into account module subdirectories.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: tools Branch: master Commit: 2377f26807488984a76c702af779a4f58ee23f42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2377f26807488984a76c702… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 11:23:24 2021 +0200 testbot/PatchUtils: Take into account module subdirectories. Patches to files in in a subdirectory of a dll or program should be treated the same as regular dll/program patches. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 0d60fdb..7ae58d3 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -240,7 +240,7 @@ sub _HandleFile($$$) $Impacts->{MakeMakefiles} = 1; } } - elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) + elsif ($FilePath =~ m~^(dlls|programs)/([^/\s]+)/((?:[^\s]+/)?[^/\s]+)$~) { my ($Root, $PatchedDir, $File) = ($1, $2, $3);

1 0

Francois Gouget : testbot/PatchUtils: Document the make_* scripts indirect impacts.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: tools Branch: master Commit: 2ac989fd8548d6546061d0e26cda0e33f8b3c037 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2ac989fd8548d6546061d0e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 11:24:26 2021 +0200 testbot/PatchUtils: Document the make_* scripts indirect impacts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7ae58d3..a7d33f6 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -443,6 +443,8 @@ sub GetPatchImpacts($) $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_requests essentially impacts every test but these + # indirect impacts are ignored (use test=all if it really matters). } elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=) { @@ -461,18 +463,30 @@ sub GetPatchImpacts($) $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeOpenGL} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_opengl impacts other dlls through header changes so + # it could make sense for the TestBot to rerun the corresponding tests + # when test=module. But that would require either hardcoding the list + # of impacted modules, or detecting changed source files (and thus the + # list of tests to run) at build time which is incompatible with the + # current architecture. + # So these indirect impacts are ignored for now. A workaround is to + # use test=all. } elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=) { $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeVulkan} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_vulkan impacts other dlls through header changes. + # See the make_opengl comment. } elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=) { $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeUnicode} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_unicode changes the source for many dlls. + # See the make_opengl comment. } elsif ($Line =~ m=^--- /dev/null$=) {

1 0

Francois Gouget : testbot/TestLauncher: Fix the missing dll error on Windows <= Vista.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: tools Branch: master Commit: ada2dd71f94e137de0a16e466611b40eaf029f4a URL: https://source.winehq.org/git/tools.git/?a=commit;h=ada2dd71f94e137de0a16e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 16:24:02 2021 +0200 testbot/TestLauncher: Fix the missing dll error on Windows <= Vista. On Vista and lower the critical error dialog title is different for missing dlls but that is unrelated to side-by-side dlls. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 5f05aeb..fc67f92 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -183,14 +183,11 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) /* Followed by a reason */ Reason = NULL; - if (strcmp(Buffer + TestFileLen, " - System Error") == 0) + if (/* Windows >= 7 */ + strcmp(Buffer + TestFileLen, " - System Error") == 0 || + /* Windows <= Vista */ + strcmp(Buffer + TestFileLen, " - Unable To Locate Component") == 0) Reason = "missing dll"; - else if (strcmp(Buffer + TestFileLen, " - Unable To Locate Component") == 0) - { - /* Sadly Windows >= 7 reports this as "System Error" */ - Reason = "missing manifest for side-by-side dll"; - IsSkip = FALSE; - } else if (strcmp(Buffer + TestFileLen, " - Entry Point Not Found") == 0) Reason = "missing entry point"; else if (strcmp(Buffer + TestFileLen, " - Ordinal Not Found") == 0)

1 0

Francois Gouget : testbot/LogUtils: Fix handling of failures before the first test unit.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: tools Branch: master Commit: c5d7bace65a2bf27a86f87f727d618f00640dc62 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c5d7bace65a2bf27a86f87f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 16:24:55 2021 +0200 testbot/LogUtils: Fix handling of failures before the first test unit. This is necessary to be able to account for errors found in the "dll versions" block. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 60 ++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5f7046c..dde4104 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -407,7 +407,7 @@ sub _CloseTestUnit($$$) my ($LogInfo, $Cur, $Last) = @_; # Verify the summary lines - if (!$Cur->{IsBroken}) + if ($Cur->{Dll} ne "" and !$Cur->{IsBroken}) { _CheckSummaryCounter($LogInfo, $Cur, "Failures", "failure"); _CheckSummaryCounter($LogInfo, $Cur, "Todos", "todo"); @@ -418,37 +418,41 @@ sub _CloseTestUnit($$$) # so only use them as a fallback. $Cur->{LineFailures} ||= $Cur->{SummaryFailures}; - if ($Cur->{UnitSize} > $MaxUnitSize) + if ($Cur->{Dll} ne "") { - _AddExtra($LogInfo, "prints too much data ($Cur->{UnitSize} bytes)", $Cur); - } - if (!$Cur->{IsBroken} and defined $Cur->{Rc}) - { - # Check the exit code, particularly against failures reported - # after the 'done' line (e.g. by subprocesses). - if ($Cur->{LineFailures} != 0 and $Cur->{Rc} == 0) + if ($Cur->{UnitSize} > $MaxUnitSize) { - _AddExtra($LogInfo, "returned success despite having failures", $Cur); + _AddExtra($LogInfo, "prints too much data ($Cur->{UnitSize} bytes)", $Cur); } - elsif (!$LogInfo->{IsWineTest} and $Cur->{Rc} != 0) + if (!$Cur->{IsBroken} and defined $Cur->{Rc}) { - _AddExtra($LogInfo, "The test returned a non-zero exit code"); - } - elsif ($LogInfo->{IsWineTest} and $Cur->{LineFailures} == 0 and $Cur->{Rc} != 0) - { - _AddExtra($LogInfo, "returned a non-zero exit code despite reporting no failures", $Cur); - } - } - # For executables TestLauncher's done line may not be recognizable. - elsif ($LogInfo->{IsWineTest} and !defined $Cur->{Rc}) - { - if (!$Last) - { - _AddExtra($LogInfo, "has no done line (or it is garbled)", $Cur); + # Check the exit code, particularly against failures reported + # after the 'done' line (e.g. by subprocesses). + if ($Cur->{LineFailures} != 0 and $Cur->{Rc} == 0) + { + _AddExtra($LogInfo, "returned success despite having failures", $Cur); + } + elsif (!$LogInfo->{IsWineTest} and $Cur->{Rc} != 0) + { + _AddExtra($LogInfo, "The test returned a non-zero exit code"); + } + elsif ($LogInfo->{IsWineTest} and $Cur->{LineFailures} == 0 and + $Cur->{Rc} != 0) + { + _AddExtra($LogInfo, "returned a non-zero exit code despite reporting no failures", $Cur); + } } - elsif ($Last and !$LogInfo->{TaskTimedOut}) + # For executables TestLauncher's done line may not be recognizable. + elsif ($LogInfo->{IsWineTest} and !defined $Cur->{Rc}) { - _AddExtra($LogInfo, "The report seems to have been truncated"); + if (!$Last) + { + _AddExtra($LogInfo, "has no done line (or it is garbled)", $Cur); + } + elsif ($Last and !$LogInfo->{TaskTimedOut}) + { + _AddExtra($LogInfo, "The report seems to have been truncated"); + } } } @@ -548,7 +552,7 @@ sub ParseWineTestReport($$$) my ($Dll, $Unit, $Type) = ($1, $2, $3); # Close the previous test unit - _CloseTestUnit($LogInfo, $Cur, 0) if ($Cur->{Dll} ne ""); + _CloseTestUnit($LogInfo, $Cur, 0); $Cur = _NewCurrentUnit($Dll, $Unit); $LogInfo->{TestUnitCount}++; @@ -689,7 +693,7 @@ sub ParseWineTestReport($$$) # First close the current test unit taking into account # it may have been polluted by the new one. $Cur->{IsBroken} = 1; - _CloseTestUnit($LogInfo, $Cur, 0) if ($Cur->{Dll} ne ""); + _CloseTestUnit($LogInfo, $Cur, 0); # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have

1 0

Francois Gouget : testbot/LogUtils: Detect and report the dll version errors.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: tools Branch: master Commit: f3833ecc460d7ab17dd2051b14857faf0c106a0a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f3833ecc460d7ab17dd2051… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 16:24:58 2021 +0200 testbot/LogUtils: Detect and report the dll version errors. There should be no native dll while running the tests in Wine. Also all expected CreateProcess() errors have explanations. So report the others as failures. This also relaxes the GetReportLineCategory() regexps a bit to match the new 'version error' lines. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48062 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index dde4104..e6e89f5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -325,8 +325,8 @@ sub GetReportLineCategory($) { return "skip"; } - if ($Line =~ /^ \w+=dll is (?:missing|native|a stub)/ or - $Line =~ /^ \w+=(?:load error|version error \d+|version not (?:found|present))$/ or + if ($Line =~ /^ \w+=dll is (?:missing|a stub)/ or + $Line =~ /^ \w+=(?:version error \d+|version not (?:found|present))/ or $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or $Line =~ /: this is the last test seen before the exception/) { @@ -538,6 +538,7 @@ sub ParseWineTestReport($$$) } my $LineNo = 0; + my $InDlls = 0; my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { @@ -547,7 +548,21 @@ sub ParseWineTestReport($$$) chomp $Line; $Line =~ s/\r+$//; - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+)%) + if ($InDlls == 0 and $Line =~ /^Dll info:$/) + { + $InDlls = 1; + } + elsif ($InDlls == 1 and + $Line =~ /^\s+\S+=(?:dll is native|load error \d+)$/) + { + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + $Cur->{LineFailures}++; + } + elsif ($Line =~ /^Test output:$/) + { + $InDlls = 2; + } + elsif ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+)%) { my ($Dll, $Unit, $Type) = ($1, $2, $3);

1 0

Zebediah Figura : ntoskrnl/tests: Use a hard-coded file path in test_obj_reference().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: fa928d16c31c37599c15f50f276822323c4e896a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa928d16c31c37599c15f50f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 4 22:36:46 2021 -0500 ntoskrnl/tests: Use a hard-coded file path in test_obj_reference(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d9d712418ee..ec2d8d33900 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1166,7 +1166,7 @@ static void WINAPI thread_proc(void *arg) PsTerminateSystemThread(STATUS_SUCCESS); } -static void test_ob_reference(const WCHAR *test_path) +static void test_ob_reference(void) { POBJECT_TYPE (WINAPI *pObGetObjectType)(void*); OBJECT_ATTRIBUTES attr = { sizeof(attr) }; @@ -1177,8 +1177,6 @@ static void test_ob_reference(const WCHAR *test_path) POBJECT_TYPE obj1_type; UNICODE_STRING pathU; IO_STATUS_BLOCK io; - WCHAR *tmp_path; - SIZE_T len; NTSTATUS status; pObGetObjectType = get_proc_address("ObGetObjectType"); @@ -1189,18 +1187,12 @@ static void test_ob_reference(const WCHAR *test_path) status = ZwCreateEvent(&event_handle, SYNCHRONIZE, &attr, NotificationEvent, TRUE); ok(!status, "ZwCreateEvent failed: %#x\n", status); - len = wcslen(test_path); - tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(L".tmp")); - memcpy(tmp_path, test_path, len * sizeof(WCHAR)); - memcpy(tmp_path + len, L".tmp", sizeof(L".tmp")); - - RtlInitUnicodeString(&pathU, tmp_path); + RtlInitUnicodeString(&pathU, L"\\??\\C:\\windows\\winetest_ntoskrnl_file.tmp"); attr.ObjectName = &pathU; - attr.Attributes = OBJ_KERNEL_HANDLE; + attr.Attributes = OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE; status = ZwCreateFile(&file_handle, DELETE | FILE_WRITE_DATA | SYNCHRONIZE, &attr, &io, NULL, 0, 0, FILE_CREATE, FILE_DELETE_ON_CLOSE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(!status, "ZwCreateFile failed: %#x\n", status); - ExFreePool(tmp_path); status = ZwDuplicateObject(NtCurrentProcess(), file_handle, NtCurrentProcess(), &file_handle2, 0, OBJ_KERNEL_HANDLE, DUPLICATE_SAME_ACCESS); @@ -2164,7 +2156,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_version(); test_stack_callout(); test_lookaside_list(); - test_ob_reference(test_input->path); + test_ob_reference(); test_resource(); test_lookup_thread(); test_IoAttachDeviceToDeviceStack();

1 0

Zebediah Figura : ntoskrnl/tests: Open the test output file using a hardcoded path.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: cf1f8c6718ead3f3dd4d6ff9f4dce5232e596f67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf1f8c6718ead3f3dd4d6ff9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 4 22:36:47 2021 -0500 ntoskrnl/tests: Open the test output file using a hardcoded path. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 7 ++++--- dlls/ntoskrnl.exe/tests/driver.h | 1 - dlls/ntoskrnl.exe/tests/driver4.c | 7 ++++--- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 24 ++++++++---------------- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index ec2d8d33900..179d2d5e02d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2126,13 +2126,14 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st return STATUS_BUFFER_TOO_SMALL; attr.Length = sizeof(attr); - RtlInitUnicodeString(&pathU, test_input->path); + RtlInitUnicodeString(&pathU, L"\\??\\C:\\windows\\winetest_ntoskrnl_okfile"); running_under_wine = test_input->running_under_wine; winetest_debug = test_input->winetest_debug; winetest_report_success = test_input->winetest_report_success; attr.ObjectName = &pathU; - attr.Attributes = OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ - ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ + ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); pExEventObjectType = get_proc_address("ExEventObjectType"); ok(!!pExEventObjectType, "ExEventObjectType not found\n"); diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 58a92d4838e..d55dd95cf20 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -46,7 +46,6 @@ struct test_input DWORD process_id; SIZE_T teststr_offset; ULONG64 *modified_value; - WCHAR path[1]; }; static inline char *drv_strrchr( const char *str, char ch ) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 45ea90260a8..a29ba3b55ab 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -487,13 +487,14 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st return STATUS_BUFFER_TOO_SMALL; attr.Length = sizeof(attr); - RtlInitUnicodeString(&pathU, test_input->path); + RtlInitUnicodeString(&pathU, L"\\??\\C:\\winetest_ntoskrnl_okfile"); running_under_wine = test_input->running_under_wine; winetest_debug = test_input->winetest_debug; winetest_report_success = test_input->winetest_report_success; attr.ObjectName = &pathU; - attr.Attributes = OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ - ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ + ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); netio_init(); test_wsk_get_address_info(); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 73f96789f06..1987019a6c5 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -367,22 +367,20 @@ static ULONG64 modified_value; static void main_test(void) { - WCHAR temppathW[MAX_PATH], pathW[MAX_PATH]; struct test_input *test_input; - DWORD len, written, read; - UNICODE_STRING pathU; + DWORD written, read; LONG new_failures; char buffer[512]; HANDLE okfile; BOOL res; /* Create a temporary file that the driver will write ok/trace output to. */ - GetTempPathW(MAX_PATH, temppathW); - GetTempFileNameW(temppathW, L"dok", 0, pathW); - pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); - len = pathU.Length + sizeof(WCHAR); - test_input = heap_alloc( offsetof( struct test_input, path[len / sizeof(WCHAR)]) ); + okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + + test_input = heap_alloc( sizeof(*test_input) ); test_input->running_under_wine = !strcmp(winetest_platform, "wine"); test_input->winetest_report_success = winetest_report_success; test_input->winetest_debug = winetest_debug; @@ -391,16 +389,11 @@ static void main_test(void) test_input->modified_value = &modified_value; modified_value = 0; - memcpy(test_input->path, pathU.Buffer, len); - res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, - offsetof( struct test_input, path[len / sizeof(WCHAR)]), + res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, sizeof(*test_input), &new_failures, sizeof(new_failures), &written, NULL); ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(written == sizeof(new_failures), "got size %x\n", written); - okfile = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(okfile != INVALID_HANDLE_VALUE, "failed to create %s: %u\n", wine_dbgstr_w(pathW), GetLastError()); - /* Print the ok/trace output and then add to our failure count. */ do { ReadFile(okfile, buffer, sizeof(buffer), &read, NULL); @@ -408,10 +401,9 @@ static void main_test(void) } while (read == sizeof(buffer)); winetest_add_failures(new_failures); - pRtlFreeUnicodeString(&pathU); heap_free(test_input); CloseHandle(okfile); - DeleteFileW(pathW); + DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); } static void test_basic_ioctl(void)

1 0

Zebediah Figura : ntoskrnl/tests: Remove some duplicate tests from the netio driver.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 3d3c411d0567d567579c731c090946e061cc2656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d3c411d0567d567579c731c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 4 22:36:48 2021 -0500 ntoskrnl/tests: Remove some duplicate tests from the netio driver. These are already tested in the main driver; there's no need to test them again. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver4.c | 68 +++----------------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 --- 2 files changed, 4 insertions(+), 68 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index a29ba3b55ab..d2a053e6b7a 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -37,19 +37,10 @@ #include "utils.h" static DRIVER_OBJECT *driver_obj; -static DEVICE_OBJECT *lower_device, *upper_device; - -static unsigned int create_count, close_count; +static DEVICE_OBJECT *device_obj; static const WCHAR driver_link[] = L"\\DosDevices\\WineTestDriver4"; static const WCHAR device_name[] = L"\\Device\\WineTestDriver4"; -static const WCHAR upper_name[] = L"\\Device\\WineTestUpper4"; - -static FILE_OBJECT *last_created_file; -static void *create_caller_thread; -static PETHREAD create_irp_thread; - -static POBJECT_TYPE *pIoDriverObjectType; static WSK_CLIENT_NPI client_npi; static WSK_REGISTRATION registration; @@ -525,10 +516,6 @@ static NTSTATUS WINAPI driver_iocontrol(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MAIN_TEST: status = main_test(device, irp, stack); break; - case IOCTL_WINETEST_DETACH: - IoDetachDevice(lower_device); - status = STATUS_SUCCESS; - break; default: break; } @@ -543,17 +530,6 @@ static NTSTATUS WINAPI driver_iocontrol(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_create(DEVICE_OBJECT *device, IRP *irp) { - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - DWORD *context = ExAllocatePool(PagedPool, sizeof(*context)); - - last_created_file = irpsp->FileObject; - ++create_count; - if (context) - *context = create_count; - irpsp->FileObject->FsContext = context; - create_caller_thread = KeGetCurrentThread(); - create_irp_thread = irp->Tail.Overlay.Thread; - irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -561,13 +537,8 @@ static NTSTATUS WINAPI driver_create(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_close(DEVICE_OBJECT *device, IRP *irp) { - IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); - netio_uninit(); - ++close_count; - if (stack->FileObject->FsContext) - ExFreePool(stack->FileObject->FsContext); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -582,17 +553,13 @@ static VOID WINAPI driver_unload(DRIVER_OBJECT *driver) RtlInitUnicodeString(&linkW, driver_link); IoDeleteSymbolicLink(&linkW); - IoDeleteDevice(upper_device); - IoDeleteDevice(lower_device); + IoDeleteDevice(device_obj); } NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) { - static const WCHAR IoDriverObjectTypeW[] = L"IoDriverObjectType"; - static const WCHAR driver_nameW[] = L"\\Driver\\WineTestDriver4"; UNICODE_STRING nameW, linkW; NTSTATUS status; - void *obj; DbgPrint("Loading driver.\n"); @@ -603,41 +570,14 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_iocontrol; driver->MajorFunction[IRP_MJ_CLOSE] = driver_close; - RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); - pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); - - RtlInitUnicodeString(&nameW, driver_nameW); - if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) - return status; - if (obj != driver) - { - ObDereferenceObject(obj); - return STATUS_UNSUCCESSFUL; - } - ObDereferenceObject(obj); - RtlInitUnicodeString(&nameW, device_name); RtlInitUnicodeString(&linkW, driver_link); if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) + FILE_DEVICE_SECURE_OPEN, FALSE, &device_obj))) { status = IoCreateSymbolicLink(&linkW, &nameW); - lower_device->Flags &= ~DO_DEVICE_INITIALIZING; - } - - if (!status) - { - RtlInitUnicodeString(&nameW, upper_name); - - status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); - } - - if (!status) - { - IoAttachDeviceToDeviceStack(upper_device, lower_device); - upper_device->Flags &= ~DO_DEVICE_INITIALIZING; + device_obj->Flags &= ~DO_DEVICE_INITIALIZING; } return status; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 1987019a6c5..18f5189e382 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -904,7 +904,6 @@ static void test_driver4(struct testsign_context *ctx) WCHAR filename[MAX_PATH]; SC_HANDLE service; HANDLE hthread; - DWORD written; BOOL ret; if (!(service = load_driver(ctx, filename, L"driver4.dll", L"WineTestDriver4"))) @@ -923,9 +922,6 @@ static void test_driver4(struct testsign_context *ctx) main_test(); WaitForSingleObject(hthread, INFINITE); - ret = DeviceIoControl(device, IOCTL_WINETEST_DETACH, NULL, 0, NULL, 0, &written, NULL); - ok(ret, "DeviceIoControl failed: %u\n", GetLastError()); - CloseHandle(device); unload_driver(service);

1 0

Zebediah Figura : ntoskrnl/tests: Use a more descriptive name for the netio test driver.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: b1eba2266a30b3dda239f1de8723074a89e9a974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1eba2266a30b3dda239f1de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 4 22:36:49 2021 -0500 ntoskrnl/tests: Use a more descriptive name for the netio test driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 8 ++++---- dlls/ntoskrnl.exe/tests/{driver4.c => driver_netio.c} | 6 +++--- dlls/ntoskrnl.exe/tests/{driver4.spec => driver_netio.spec} | 0 dlls/ntoskrnl.exe/tests/ntoskrnl.c | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index c799dfcaf77..d911879ff99 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -7,8 +7,8 @@ driver2_IMPORTS = winecrt0 ntoskrnl driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver3_IMPORTS = winecrt0 ntoskrnl driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver4_IMPORTS = winecrt0 ntoskrnl netio -driver4_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver_netio_IMPORTS = winecrt0 ntoskrnl netio +driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native @@ -19,8 +19,8 @@ SOURCES = \ driver2.spec \ driver3.c \ driver3.spec \ - driver4.c \ - driver4.spec \ + driver_netio.c \ + driver_netio.spec \ driver_pnp.c \ driver_pnp.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver_netio.c similarity index 99% rename from dlls/ntoskrnl.exe/tests/driver4.c rename to dlls/ntoskrnl.exe/tests/driver_netio.c index d2a053e6b7a..3d783dbef0d 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -1,5 +1,5 @@ /* - * ntoskrnl.exe testing framework + * Unit tests for netio.sys (kernel sockets) * * Copyright 2020 Paul Gofman for CodeWeavers * @@ -39,8 +39,8 @@ static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *device_obj; -static const WCHAR driver_link[] = L"\\DosDevices\\WineTestDriver4"; -static const WCHAR device_name[] = L"\\Device\\WineTestDriver4"; +static const WCHAR driver_link[] = L"\\DosDevices\\winetest_netio"; +static const WCHAR device_name[] = L"\\Device\\winetest_netio"; static WSK_CLIENT_NPI client_npi; static WSK_REGISTRATION registration; diff --git a/dlls/ntoskrnl.exe/tests/driver4.spec b/dlls/ntoskrnl.exe/tests/driver_netio.spec similarity index 100% rename from dlls/ntoskrnl.exe/tests/driver4.spec rename to dlls/ntoskrnl.exe/tests/driver_netio.spec diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 18f5189e382..4667915f621 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -899,14 +899,14 @@ static DWORD WINAPI wsk_test_thread(void *parameter) return TRUE; } -static void test_driver4(struct testsign_context *ctx) +static void test_driver_netio(struct testsign_context *ctx) { WCHAR filename[MAX_PATH]; SC_HANDLE service; HANDLE hthread; BOOL ret; - if (!(service = load_driver(ctx, filename, L"driver4.dll", L"WineTestDriver4"))) + if (!(service = load_driver(ctx, filename, L"driver_netio.dll", L"winetest_netio"))) return; if (!start_driver(service, TRUE)) @@ -915,7 +915,7 @@ static void test_driver4(struct testsign_context *ctx) return; } - device = CreateFileA("\\\\.\\WineTestDriver4", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + device = CreateFileA("\\\\.\\winetest_netio", 0, 0, NULL, OPEN_EXISTING, 0, NULL); ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); hthread = CreateThread(NULL, 0, wsk_test_thread, NULL, 0, NULL); @@ -1260,8 +1260,8 @@ START_TEST(ntoskrnl) ok(ret, "DeleteFile failed: %u\n", GetLastError()); test_driver3(&ctx); - subtest("driver4"); - test_driver4(&ctx); + subtest("driver_netio"); + test_driver_netio(&ctx); test_pnp_driver(&ctx);

1 0

Hugh McMaster : reg: Only call get_long_key() when operations require it.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 07fdd5036ca40fd4f0475583b6e410192576d804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07fdd5036ca40fd4f0475583… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 5 23:24:11 2021 +1000 reg: Only call get_long_key() when operations require it. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 4 ++-- programs/reg/delete.c | 4 +++- programs/reg/export.c | 8 +++++--- programs/reg/query.c | 4 +++- programs/reg/reg.c | 6 ++---- programs/reg/reg.h | 3 ++- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index f259f0a4100..d94789ad484 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -213,11 +213,11 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, int reg_add(int argc, WCHAR *argvW[]) { HKEY root; - WCHAR *path, *key_name, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; + WCHAR *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; BOOL value_empty = FALSE, force = FALSE; int i; - if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + if (!parse_registry_key(argvW[2], &root, &path)) return 1; for (i = 3; i < argc; i++) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index b23b14e8dab..626fcf3b341 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -113,7 +113,7 @@ int reg_delete(int argc, WCHAR *argvW[]) BOOL value_all = FALSE, value_empty = FALSE, force = FALSE; int i; - if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + if (!parse_registry_key(argvW[2], &root, &path)) return 1; for (i = 3; i < argc; i++) @@ -158,6 +158,8 @@ int reg_delete(int argc, WCHAR *argvW[]) if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) goto invalid; + key_name = get_long_key(root, path); + return run_delete(root, path, key_name, value_name, value_empty, value_all, force); invalid: diff --git a/programs/reg/export.c b/programs/reg/export.c index 5d55eaad407..13d5871d57e 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -347,14 +347,14 @@ static HANDLE get_file_handle(WCHAR *filename, BOOL overwrite_file) int reg_export(int argc, WCHAR *argvW[]) { HKEY root, hkey; - WCHAR *path, *long_key; + WCHAR *path, *key_name; BOOL overwrite_file = FALSE; HANDLE hFile; int i, ret; if (argc < 4) goto invalid; - if (!parse_registry_key(argvW[2], &root, &path, &long_key)) + if (!parse_registry_key(argvW[2], &root, &path)) return 1; for (i = 4; i < argc; i++) @@ -378,9 +378,11 @@ int reg_export(int argc, WCHAR *argvW[]) return 1; } + key_name = get_long_key(root, path); + hFile = get_file_handle(argvW[3], overwrite_file); export_file_header(hFile); - ret = export_registry_data(hFile, hkey, long_key); + ret = export_registry_data(hFile, hkey, key_name); export_newline(hFile); CloseHandle(hFile); diff --git a/programs/reg/query.c b/programs/reg/query.c index cc8f264e780..76f12b4a2d3 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -329,7 +329,7 @@ int reg_query(int argc, WCHAR *argvW[]) BOOL value_empty = FALSE, recurse = FALSE; int i; - if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + if (!parse_registry_key(argvW[2], &root, &path)) return 1; for (i = 3; i < argc; i++) @@ -368,6 +368,8 @@ int reg_query(int argc, WCHAR *argvW[]) if (value_name && value_empty) goto invalid; + key_name = get_long_key(root, path); + return run_query(root, path, key_name, value_name, value_empty, recurse); invalid: diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6b337f5d415..3ffc5fe3d8f 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -203,7 +203,7 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD return subkey_path; } -static WCHAR *get_long_key(HKEY root, WCHAR *path) +WCHAR *get_long_key(HKEY root, WCHAR *path) { DWORD i, array_size = ARRAY_SIZE(root_rels), len; WCHAR *long_key; @@ -229,7 +229,7 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) return long_key; } -BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) { if (!sane_path(key)) return FALSE; @@ -245,8 +245,6 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long return FALSE; } - *long_key = get_long_key(*root, *path); - return TRUE; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index c7719a6e4f0..3fc9e392d45 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -39,7 +39,8 @@ void WINAPIV output_string(const WCHAR *fmt, ...); BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); HKEY path_get_rootkey(const WCHAR *path); WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len); -BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); +WCHAR *get_long_key(HKEY root, WCHAR *path); +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path); BOOL is_char(const WCHAR s, const WCHAR c); BOOL is_switch(const WCHAR *s, const WCHAR c);

1 0