wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Alexandre Julliard : ntdll: Check for valid architecture before mapping the module.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 63b62953683fc62e95d5df8cb975009554aff1a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b62953683fc62e95d5df8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 13:41:16 2021 +0100 ntdll: Check for valid architecture before mapping the module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 33 ++++++++++++++++----------------- dlls/ntdll/unix/loader.c | 43 +++++++++++++++++++++++-------------------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fa757fefa90..fec33c8017c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1985,6 +1985,8 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in void *addr = module; ULONG i, old_prot; + if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return TRUE; /* already 64-bit */ + TRACE( "%p\n", module ); if (NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE, &old_prot )) @@ -2304,34 +2306,31 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void SECTION_MAP_READ | SECTION_MAP_EXECUTE, NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); if (!status) + { + NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); + if (!is_valid_binary( handle, image_info )) + { + TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->Machine ); + status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + NtClose( mapping ); + } + } + NtClose( handle ); + if (!status) { if (*module) { NtUnmapViewOfSection( NtCurrentProcess(), *module ); *module = NULL; } - NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, ViewShare, 0, PAGE_EXECUTE_READ ); if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - NtClose( mapping ); - } - if (!status && !is_valid_binary( handle, image_info )) - { - TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->Machine ); - NtUnmapViewOfSection( NtCurrentProcess(), *module ); - *module = NULL; - status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - } #ifdef _WIN64 - if (!status && - image_info->Machine != IMAGE_FILE_MACHINE_AMD64 && - image_info->Machine != IMAGE_FILE_MACHINE_ARM64) - { - if (!convert_to_pe64( *module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; - } + if (!status && !convert_to_pe64( *module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; #endif - NtClose( handle ); + NtClose( mapping ); + } return status; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 43c769f2d2a..972793ac3e9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1077,7 +1077,7 @@ static NTSTATUS CDECL load_so_dll( UNICODE_STRING *nt_name, void **module ) /* check a PE library architecture */ -static BOOL is_valid_binary( HMODULE module, const SECTION_IMAGE_INFORMATION *info ) +static BOOL is_valid_binary( const SECTION_IMAGE_INFORMATION *info ) { #ifdef __i386__ return info->Machine == IMAGE_FILE_MACHINE_I386; @@ -1138,7 +1138,7 @@ static inline char *prepend( char *buffer, const char *str, size_t len ) /*********************************************************************** * open_dll_file * - * Open a file for a new dll. Helper for find_dll_file. + * Open a file for a new dll. Helper for open_builtin_file. */ static NTSTATUS open_dll_file( const char *name, void **module, SECTION_IMAGE_INFORMATION *image_info ) { @@ -1187,37 +1187,40 @@ static NTSTATUS open_dll_file( const char *name, void **module, SECTION_IMAGE_IN NtClose( handle ); if (status) return status; - if (*module) - { - NtUnmapViewOfSection( NtCurrentProcess(), *module ); - *module = NULL; - } NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); - status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, - ViewShare, 0, PAGE_EXECUTE_READ ); - if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - NtClose( mapping ); - if (status) return status; - /* ignore non-builtins */ if (!(image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin)) { WARN( "%s found in WINEDLLPATH but not a builtin, ignoring\n", debugstr_a(name) ); status = STATUS_DLL_NOT_FOUND; } - else if (!is_valid_binary( *module, image_info )) + else if (!is_valid_binary( image_info )) { TRACE( "%s is for arch %x, continuing search\n", debugstr_a(name), image_info->Machine ); status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; } - - if (!status) status = add_builtin_module( *module, NULL, &st ); - - if (status) + else { - NtUnmapViewOfSection( NtCurrentProcess(), *module ); - *module = NULL; + if (*module) + { + NtUnmapViewOfSection( NtCurrentProcess(), *module ); + *module = NULL; + } + status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, + ViewShare, 0, PAGE_EXECUTE_READ ); + if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; + + if (!status) + { + status = add_builtin_module( *module, NULL, &st ); + if (status) + { + NtUnmapViewOfSection( NtCurrentProcess(), *module ); + *module = NULL; + } + } } + NtClose( mapping ); return status; }

1 0

Alexandre Julliard : ntdll: Load the COR header directly from the file handle.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 7203ad0ecd06b451116fcfe3b08e4d620e853bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7203ad0ecd06b451116fcfe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 12:31:34 2021 +0100 ntdll: Load the COR header directly from the file handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 63 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3f43062f9f8..fa757fefa90 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2016,11 +2016,49 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, old_prot, &old_prot ); return TRUE; } + +/* check COM header for ILONLY flag, ignoring runtime version */ +static BOOL get_cor_header( HANDLE file, const SECTION_IMAGE_INFORMATION *info, IMAGE_COR20_HEADER *cor ) +{ + IMAGE_DOS_HEADER mz; + IMAGE_NT_HEADERS32 nt; + IO_STATUS_BLOCK io; + LARGE_INTEGER offset; + IMAGE_SECTION_HEADER sec[96]; + unsigned int i, count; + DWORD va, size; + + offset.QuadPart = 0; + if (NtReadFile( file, 0, NULL, NULL, &io, &mz, sizeof(mz), &offset, NULL )) return FALSE; + if (io.Information != sizeof(mz)) return FALSE; + if (mz.e_magic != IMAGE_DOS_SIGNATURE) return FALSE; + offset.QuadPart = mz.e_lfanew; + if (NtReadFile( file, 0, NULL, NULL, &io, &nt, sizeof(nt), &offset, NULL )) return FALSE; + if (io.Information != sizeof(nt)) return FALSE; + if (nt.Signature != IMAGE_NT_SIGNATURE) return FALSE; + if (nt.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return FALSE; + va = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; + size = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; + if (!va || size < sizeof(*cor)) return FALSE; + offset.QuadPart = offsetof( IMAGE_NT_HEADERS32, OptionalHeader ) + nt.FileHeader.SizeOfOptionalHeader; + count = min( 96, nt.FileHeader.NumberOfSections ); + if (NtReadFile( file, 0, NULL, NULL, &io, &sec, count * sizeof(*sec), &offset, NULL )) return FALSE; + if (io.Information != count * sizeof(*sec)) return FALSE; + for (i = 0; i < count; i++) + { + if (va < sec[i].VirtualAddress) continue; + if (sec[i].Misc.VirtualSize && va - sec[i].VirtualAddress >= sec[i].Misc.VirtualSize) continue; + offset.QuadPart = sec->PointerToRawData + va - sec[i].VirtualAddress; + if (NtReadFile( file, 0, NULL, NULL, &io, cor, sizeof(*cor), &offset, NULL )) return FALSE; + return (io.Information == sizeof(*cor)); + } + return FALSE; +} #endif /* On WoW64 setups, an image mapping can also be created for the other 32/64 CPU */ /* but it cannot necessarily be loaded as a dll, so we need some additional checks */ -static BOOL is_valid_binary( HMODULE module, const SECTION_IMAGE_INFORMATION *info ) +static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info ) { #ifdef __i386__ return info->Machine == IMAGE_FILE_MACHINE_I386; @@ -2037,13 +2075,11 @@ static BOOL is_valid_binary( HMODULE module, const SECTION_IMAGE_INFORMATION *in if (!info->ImageContainsCode) return TRUE; if (!(info->u.ImageFlags & IMAGE_FLAGS_ComPlusNativeReady)) { - /* check COM header directly, ignoring runtime version */ - DWORD size; - const IMAGE_COR20_HEADER *cor_header = RtlImageDirectoryEntryToData( module, TRUE, - IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, &size ); - if (!cor_header || !(cor_header->Flags & COMIMAGE_FLAGS_ILONLY)) return FALSE; + IMAGE_COR20_HEADER cor_header; + if (!get_cor_header( file, info, &cor_header )) return FALSE; + if (!(cor_header.Flags & COMIMAGE_FLAGS_ILONLY)) return FALSE; } - return convert_to_pe64( module, info ); + return TRUE; #else return FALSE; /* no wow64 support on other platforms */ #endif @@ -2267,8 +2303,6 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE, NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); - NtClose( handle ); - if (!status) { if (*module) @@ -2282,13 +2316,22 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); } - if (!status && !is_valid_binary( *module, image_info )) + if (!status && !is_valid_binary( handle, image_info )) { TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->Machine ); NtUnmapViewOfSection( NtCurrentProcess(), *module ); *module = NULL; status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; } +#ifdef _WIN64 + if (!status && + image_info->Machine != IMAGE_FILE_MACHINE_AMD64 && + image_info->Machine != IMAGE_FILE_MACHINE_ARM64) + { + if (!convert_to_pe64( *module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; + } +#endif + NtClose( handle ); return status; }

1 0

Francois Gouget : testbot/TestWTBS: Allow checking the web patches status.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: tools Branch: master Commit: b6f41769733d351c0d8e8bbd2f3c1b79bb55023a URL: https://source.winehq.org/git/tools.git/?a=commit;h=b6f41769733d351c0d8e8bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 25 14:52:37 2021 +0100 testbot/TestWTBS: Allow checking the web patches status. Checks the Failed / OK status on Wine's 'Patch status' page. For instance: ----- TestWTBS ----- p webpatch.Status Failed ----- TestWTBS ----- Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 100 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 5686428..0980081 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -202,7 +202,7 @@ sub DumpTestInfo($) { my ($TestInfo) = @_; - foreach my $Category ("patch", "job", "tasks", "tests", "win", + foreach my $Category ("webpatch", "patch", "job", "tasks", "tests", "win", "build", "win32", "win64", "wine") { WineTestBot::LogUtils::_WriteLogErrorsToFh(*STDERR, $TestInfo->{$Category}); @@ -225,6 +225,12 @@ sub CheckValue($) return (defined $Value and $Value ne "ignore"); } +sub SkipCheck($) +{ + my ($Value) = @_; + return (defined $Value and $Value eq "ignore"); +} + sub LoadTestInfo($) { my ($FileName) = @_; @@ -280,7 +286,7 @@ sub LoadTestInfo($) # Split up the information to jobs, tasks, etc. my $TestInfo = { - patch => {}, job => {}, + webpatch => {}, patch => {}, job => {}, tasks => {}, tests => {}, win => {}, build => {}, win32 => {}, win64 => {}, wine => {}, }; @@ -288,7 +294,7 @@ sub LoadTestInfo($) foreach my $Entry (keys %{$RawInfo}) { my $Field = lcfirst($Entry); - if ($Field =~ s/^(patch|job|tasks|tests|win|build|win32|win64|wine)\.//) + if ($Field =~ s/^(webpatch|patch|job|tasks|tests|win|build|win32|win64|wine)\.//) { my $TaskType = $1; $TestInfo->{$TaskType}->{$Field} = $RawInfo->{$Entry}; @@ -374,6 +380,20 @@ sub LoadTestInfo($) } } + # Automatically check webpatch.Status in simple cases + if (!defined $TestInfo->{patch}->{Disposition} and + CheckValue($TestInfo->{job}->{Status}) and + !SkipCheck($TestInfo->{win32}->{TestFailures}) and + !SkipCheck($TestInfo->{win64}->{TestFailures}) and + !SkipCheck($TestInfo->{wine}->{TestFailures})) + { + my $Status = ($TestInfo->{job}->{Status} ne 'completed' or + $TestInfo->{win32}->{TestFailures} or + $TestInfo->{win64}->{TestFailures} or + $TestInfo->{wine}->{TestFailures}) ? "Failed" : "OK"; + SetDefault($TestInfo, "webpatch", "Status", $Status); + } + return $TestInfo; } @@ -803,6 +823,78 @@ sub CheckJobs() =pod +=item <webpatch.Status> + +Checks the webpatch's status. +This is the 'Failed' or 'OK' status on the Wine 'Patch status' page (outside +the TestBot). +If patch.Disposition is not set the default is to expect the status to be +'Failed' if job.Status is not 'completed' or any of the tests has a non-zero +TestFailures field; and 'OK' otherwise. + +For instance: +p webpatch.Status Failed + +=cut + +sub CheckWebPatch($$$) +{ + my ($Patch, $Job, $TestInfo) = @_; + + # Only patches submitted through WinePatchesWebSubmit.pl get a WebPatchId. + return if (!$Patch->WebPatchId or !-d "$DataDir/webpatches"); + + my $WebFileName = "$DataDir/webpatches/". $Patch->WebPatchId; + ok(-f $WebFileName, "Check presence of the ". $Patch->WebPatchId ." webpatch"); + + my $WebResultFile = "$WebFileName.testbot"; + if (!$Job or $Job->Status !~ /^(completed|badpatch|badbuild|boterror)$/) + { + ok(!-f $WebResultFile, "Check absence of the ". $Patch->WebPatchId ." TestBot result file"); + return; + } + + ok(-f $WebResultFile, "Check presence of the ". $Patch->WebPatchId ." TestBot result file for job ". $Job->Id); + + if (open(my $ResultFh, "<", $WebResultFile)) + { + my ($HasStatus, $HasJobId, $HasURL); + while (my $Line = <$ResultFh>) + { + if ($Line =~ /^Status: (\w+)$/) + { + my $WebStatus = $1; + if (CheckValue($TestInfo->{webpatch}->{Status})) + { + is($WebStatus, $TestInfo->{webpatch}->{Status}, "Check the ". $Patch->WebPatchId ." web patch status (job ". $Job->Id .")"); + } + $HasStatus = 1; + } + elsif ($Line =~ /^Job-ID: (\d+)$/) + { + is($1, $Job->Id, "Check the ". $Patch->WebPatchId ." job id"); + $HasJobId = 1; + } + elsif ($Line =~ /^URL: (.+)$/) + { + my $JobId = $Job->Id; + ok($1 =~ m~\Q/$WebHostName\E/JobDetails\.pl\?Key=$JobId$~, + "Check the ". $Patch->WebPatchId ." URL"); + $HasURL = 1; + } + # Ignore the rest of the file + last if ($HasStatus and $HasJobId and $HasURL); + } + close($ResultFh); + } + else + { + fail("Could not open $WebResultFile for reading: $!"); + } +} + +=pod + =item <patch.Disposition> Checks the patch's disposition. @@ -860,6 +952,8 @@ sub CheckPatch($$$) { fail("Patch ". $Patch->Id ."(". $Patch->Subject .") should have an associated job but Disposition is: ". $Patch->Disposition); } + + CheckWebPatch($Patch, $Job, $TestInfo); } sub CheckPatches()

1 0

Francois Gouget : testbot/TestWTBS: Allow checking the patches disposition.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: tools Branch: master Commit: 18965f76c01c7cb6bb2729fea49ca4a24120b704 URL: https://source.winehq.org/git/tools.git/?a=commit;h=18965f76c01c7cb6bb2729f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 25 14:52:34 2021 +0100 testbot/TestWTBS: Allow checking the patches disposition. This allows verifying that patches that should not result in a TestBot job are indeed ignored for the right reason (aka disposition). For instance: ----- TestWTBS ----- p patch.Disposition Does not impact the Wine build ----- TestWTBS ----- Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 115 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 106 insertions(+), 9 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 58bf8a7..5686428 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -48,6 +48,7 @@ use WineTestBot::Config; # For $PatchesMailingList use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Patches; use WineTestBot::VMs; @@ -161,9 +162,10 @@ if (defined $Usage) print "\n"; print "Where:\n"; print " --jobs RANGES Only check the jobs in one of the specified comma-separated\n"; - print " job id ranges. Each range is either a single job id, or of the\n"; - print " form 'FIRST..LAST' where FIRST and LAST are either the empty\n"; - print " string or a job id.\n"; + print " job id ranges. This also causes patches not related to one of\n"; + print " these jobs to be ignored. Each range is either a single job id,\n"; + print " or of the form 'FIRST..LAST' where FIRST and LAST are either the\n"; + print " empty string or a job id.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -318,9 +320,12 @@ sub LoadTestInfo($) return undef if (!$HasTestInfo); # Fill in some useful defaults - SetDefault($TestInfo, "job", "Status", "completed"); - SetDefault($TestInfo, "tasks", "Status", "completed"); - SetDefault($TestInfo, "tasks", "HasTask", 1); + if (!defined $TestInfo->{patch}->{Disposition}) + { + SetDefault($TestInfo, "job", "Status", "completed"); + SetDefault($TestInfo, "tasks", "Status", "completed"); + SetDefault($TestInfo, "tasks", "HasTask", 1); + } # Then propagate the defaults foreach my $Pair (["tasks", ["build", "tests"]], @@ -666,6 +671,10 @@ sub CheckJob($$) { is($Job->Status, $JobInfo->{Status}, "Check Status for job ". $Job->Id); } + elsif (CheckValue($TestInfo->{patch}->{Disposition})) + { + fail("The '$TestInfo->{patch}->{Disposition}' patch disposition is incompatible with job ". $Job->Id); + } } sub IsJobInRange($) @@ -681,6 +690,8 @@ sub IsJobInRange($) return 0; } +my %CheckedJobs; + =pod =item <tasks.HasTask> @@ -705,12 +716,15 @@ p win.TestUnits cabinet:extract cabinet:fdi =cut -sub CheckJobTree($) +sub CheckJobTree($;$) { - my ($Job) = @_; + my ($Job, $TestInfo) = @_; return if (!IsJobInRange($Job)); - my ($TestInfo, $HasTask); + return if ($CheckedJobs{$Job->Id}); + $CheckedJobs{$Job->Id} = 1; + + my $HasTask; my $TestUnits = { wine => {} }; my $Steps = $Job->Steps; @@ -783,6 +797,85 @@ sub CheckJobs() } +# +# Verify the Patches and the patches site +# + +=pod + +=item <patch.Disposition> + +Checks the patch's disposition. +By default the disposition is supposed to point to the relevant job, in which +case default values are provided for the job.Status, tasks.Status and +tasks.HasTask properties. If a specific disposition is specified, then these +defaults are not provided since no job should be created in that case. + +For instance: +p patch.Disposition Does not impact the Wine build + +=cut + +sub CheckPatch($$$) +{ + my ($Jobs, $Patch, $TestInfo) = @_; + + my $Job; + if ($Patch->Disposition =~ /^Submitted job (\d+)$/) + { + $Job = $Jobs->GetItem($1); + } + # The job range restriction extends to their associated patches... + return if ($Job and !IsJobInRange($Job)); + # ..and to patches with no job + return if (!$Job and @JobRanges); + + my $PatchInfo = $TestInfo->{patch}; + if (CheckValue($PatchInfo->{Disposition})) + { + is($Patch->Disposition, $PatchInfo->{Disposition}, "Check Disposition for patch ". $Patch->Id .": ". $Patch->Subject); + } + elsif ($Patch->Disposition =~ /^Submitted job (.*)$/) + { + isnt($Job, undef, "Check job $1 for patch ". $Patch->Id .": ". $Patch->Subject); + if (!$Job or $Job->Status eq "canceled") + { + ; # Nothing to check + } + elsif ($Job->Status =~ /^(?:queued|running)$/) + { + print "...skipping job ". $Job->Id ." because it is not complete yet (". $Job->Status .")\n"; + } + else + { + # Provide defaults for the job checks + my $Remarks = $Patch->Subject; + $Remarks =~ s~^\[\d+/\d+\]\s~~; # In case submitted as a patch series + $Remarks =~ s~\s+$~~; + SetDefault($TestInfo, "job", "Remarks", $Remarks); + CheckJobTree($Job, $TestInfo); + } + } + else + { + fail("Patch ". $Patch->Id ."(". $Patch->Subject .") should have an associated job but Disposition is: ". $Patch->Disposition); + } +} + +sub CheckPatches() +{ + my $Jobs = CreateJobs(); + my $Patches = CreatePatches(); + foreach my $Patch (sort { $b->Id <=> $a->Id } @{$Patches->GetItems()}) + { + my $PatchFileName = "$DataDir/patches/". $Patch->Id; + next if (!-f $PatchFileName); + my $TestInfo = LoadTestInfo($PatchFileName); + CheckPatch($Jobs, $Patch, $TestInfo) if ($TestInfo); + } +} + + # # Run the tests # @@ -799,6 +892,10 @@ if (!$HasBaseVM->{build}) delete $HasBaseVM->{win64}; } +print "***** Checking Patches *****\n"; +CheckPatches(); + +print "\n***** Checking Jobs *****\n"; CheckJobs(); done_testing();

1 0

Francois Gouget : testbot/TestWTBS: Allow checking for specific strings in logs.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: tools Branch: master Commit: 5ae56250113e8dbe7a4e0abbbb7519e1ed552a64 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5ae56250113e8dbe7a4e0ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 25 14:52:31 2021 +0100 testbot/TestWTBS: Allow checking for specific strings in logs. Either for their presence or their absence. This is particularly useful to check that specific build actions were performed (or skipped) as expected. For instance: ----- TestWTBS ----- a build.log.Grep ^Applying patch a build.log.GrepV ^Running make_requests a build.log.GrepV ^Running make_opengl ----- TestWTBS ----- Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 84 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 01f46bf..58bf8a7 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -3,7 +3,7 @@ # # Automate checking the Wine TestBot test Suite results. # -# Copyright 2020 Francois Gouget +# Copyright 2020-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -353,6 +353,22 @@ sub LoadTestInfo($) } } + # Validate and fix the Grep* fields + foreach my $GrepType ("Grep", "GrepV") + { + foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", "wine") + { + foreach my $LogType ("report", "log", "testbot") + { + my $Array = $TestInfo->{$TaskType}->{"$LogType.$GrepType"}; + next if (!defined $Array); + next if (ref($Array) eq "ARRAY"); + fail("$TaskType.$LogType.$GrepType should be an array (a lines)"); + $TestInfo->{$TaskType}->{"$LogType.$GrepType"} = [ $Array ]; + } + } + } + return $TestInfo; } @@ -488,6 +504,51 @@ sub CheckLogErrors($$$) } } +sub GrepTaskLog($$$$) +{ + my ($Task, $LogName, $TaskInfo, $LogType) = @_; + + my @Grep = @{$TaskInfo->{"$LogType.Grep"} || []}; + my @GrepV = @{$TaskInfo->{"$LogType.GrepV"} || []}; + return if (!@Grep and !@GrepV); + + if (open(my $LogFile, "<", $Task->GetDir() ."/$LogName")) + { + my $LineNo; + foreach my $Line (<$LogFile>) + { + $LineNo++; + my $i = 0; + while ($i < @GrepV) + { + if ($Line =~ /$GrepV[$i]/) + { + fail(TaskKeyStr($Task) ."/$LogName:$LineNo should not match $GrepV[$i]"); + splice @GrepV, $i, 1; + next; + } + $i++; + } + $i = 0; + while ($i < @Grep) + { + if ($Line =~ /$Grep[$i]/) + { + splice @Grep, $i, 1; + next; + } + $i++; + } + last if (!@Grep and !@GrepV); + } + close($LogFile); + } + foreach my $RegExp (@Grep) + { + fail(TaskKeyStr($Task) ."/$LogName should match $RegExp"); + } +} + =pod =item <job.Status> @@ -503,6 +564,26 @@ By default the Status field should be 'completed'. Checks the value of the task's TestFailures field. By default the TestFailures field is not checked. +=item <tasks.(report|log|testbot).Grep> +=item <tasks.(report|log|testbot).GrepV> + +Verifies the presence or absence of specific regular expressions in the +specified error log or reports of the tasks in the specified category. +Multiple regular expressions can be specified so this uses the array type of +line ('a'). + +For instance: +a build.log.Grep ^Applying patch +a build.log.GrepV ^Running make_requests +a build.log.GrepV ^Running make_opengl + +Checks that the TestBot applied the patch and did not find it necessary to +run make_requests and make_opengl. + +Finally, note that while the Grep* directives are inherited by subcategories, +they are not merged. So if if both win and win32 have Grep directives, win32 +will not inherit anything from the win category. + =cut sub CheckTask($$$$) @@ -548,6 +629,7 @@ sub CheckTask($$$$) CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, TaskKeyStr($Task) ."/$LogName"); } + GrepTaskLog($Task, $LogName, $TaskInfo, $LogType); } if ($Task->Status eq "completed" and CheckValue($TaskInfo->{TestFailures})) {

1 0

Francois Gouget : testbot/LogUtils: Add support for arrays in .errors files.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: tools Branch: master Commit: 2f043aaf3b5aff2478343ddc2b7cf4391182e72a URL: https://source.winehq.org/git/tools.git/?a=commit;h=2f043aaf3b5aff2478343dd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 25 14:52:28 2021 +0100 testbot/LogUtils: Add support for arrays in .errors files. Array lines allow providing multiple values for a given 'property' name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3488c7b..7971435 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -848,6 +848,10 @@ Property lines contain (name, value) pairs. Note that properties which can be calculated while reading the errors file are not saved (e.g. ErrCount and NewCount). +=item a <name> <value> +Array lines contain (name, value) pairs and can appear multiple times for a +given name, resulting in a corresponding list of values. + =item g <lineno> <groupname> Group lines contain the group name and the line number of the first line of the group in the log. Note that the first line would typically not be an @@ -897,6 +901,22 @@ sub LoadLogErrorsFromFh($$) return $Line; } } + elsif ($Type eq "a") + { + if (!defined $LogInfo->{$Property}) + { + $LogInfo->{$Property} = [ $Value ]; + } + elsif (ref($LogInfo->{$Property}) eq "ARRAY") + { + push @{$LogInfo->{$Property}}, $Value; + } + else + { + $LogInfo->{BadLog} = "$LogInfo->{LineNo}: $Property is not an array, its value is $LogInfo->{$Property}"; + return $Line; + } + } elsif ($Type eq "g") { $LogInfo->{CurGroup} = _AddLogGroup($LogInfo, $Value, $Property); @@ -1025,7 +1045,15 @@ sub _DumpErrors next; } - print STDERR "+ $Key $LogInfo->{$Key}\n"; + if (ref($LogInfo->{$Key}) eq "ARRAY") + { + print STDERR "+ $Key\n"; + map { print STDERR " | $_\n" } (@{$LogInfo->{$Key}}); + } + else + { + print STDERR "+ $Key $LogInfo->{$Key}\n"; + } } _WriteLogErrorsToFh(*STDERR, $LogInfo); map { _DumpErrors("$Label.$_", $LogInfo->{$_}) } (@SubKeys);

1 0

Georg Lehmann : winevulkan: Unwrap VkSurfaceKHR if required.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 2d4dd4252b0cf6526b3cc8194cce642b16eb12f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d4dd4252b0cf6526b3cc819… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jan 22 18:31:57 2021 +0100 winevulkan: Unwrap VkSurfaceKHR if required. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50422 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 ++++++++++-- dlls/winevulkan/vulkan_thunks.c | 5 ++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6242ddcce0b..40978a8fc7a 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -955,6 +955,8 @@ class VkHandle(object): return "wine_debug_utils_messenger_from_handle({0})->debug_messenger".format(name) if self.name == "VkDebugReportCallbackEXT": return "wine_debug_report_callback_from_handle({0})->debug_callback".format(name) + if self.name == "VkSurfaceKHR": + return "wine_surface_from_handle({0})->base.surface".format(name) native_handle_name = None @@ -979,6 +981,8 @@ class VkHandle(object): def is_wrapped(self): return self.native_handle("test") is not None + def is_unwrapped_by_driver(self): + return self.name == "VkSurfaceKHR" class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, @@ -1601,8 +1605,12 @@ class VkParam(object): else: return "&{0}_host".format(self.name) else: - # We need to pass the native handle to the native Vulkan calls. - native_handle = self.handle.native_handle(self.name) if self.is_handle() else None + # We need to pass the native handle to the native Vulkan calls unless + # the wine driver unwraps the handle for us. + if self.is_handle() and not self.handle.is_unwrapped_by_driver(): + native_handle = self.handle.native_handle(self.name) + else: + native_handle = None return native_handle if native_handle else self.name diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index a0ddace9866..0ea713be6cf 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -7262,7 +7262,8 @@ BOOL wine_vk_is_type_wrapped(VkObjectType type) type == VK_OBJECT_TYPE_DEVICE || type == VK_OBJECT_TYPE_INSTANCE || type == VK_OBJECT_TYPE_PHYSICAL_DEVICE || - type == VK_OBJECT_TYPE_QUEUE; + type == VK_OBJECT_TYPE_QUEUE || + type == VK_OBJECT_TYPE_SURFACE_KHR; } uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) @@ -7285,6 +7286,8 @@ uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) return (uint64_t) (uintptr_t) ((VkPhysicalDevice) (uintptr_t) handle)->phys_dev; case VK_OBJECT_TYPE_QUEUE: return (uint64_t) (uintptr_t) ((VkQueue) (uintptr_t) handle)->queue; + case VK_OBJECT_TYPE_SURFACE_KHR: + return (uint64_t) wine_surface_from_handle(handle)->base.surface; default: return handle; }

1 0

Georg Lehmann : winevulkan: Wrap VkSurfaceKHR in winevulkan.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: d9c9b5ea614780340708cf18423a10704d8587e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9c9b5ea614780340708cf18… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jan 22 18:31:56 2021 +0100 winevulkan: Wrap VkSurfaceKHR in winevulkan. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 4 ++-- dlls/winevulkan/make_vulkan | 32 ++++++++++++++++++++++++--- dlls/winevulkan/vulkan.c | 47 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 17 +++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 12 ---------- dlls/winevulkan/vulkan_thunks.h | 2 ++ dlls/winex11.drv/vulkan.c | 4 ++-- include/wine/vulkan_driver.h | 28 +++++++++++++++++++++++- 8 files changed, 126 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9c9b5ea614780340708…

1 0

Jacek Caban : jscript: Add VT_CY type support.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: d22bafa7630488bd12cb1549ee33bc6d9eb1e45a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d22bafa7630488bd12cb1549… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 22 20:22:09 2021 +0100 jscript: Add VT_CY type support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 6 ++++++ dlls/jscript/tests/lang.js | 28 +++++++++++++++++++++++++ dlls/jscript/tests/run.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index bfecdc75c4a..3c3cd012490 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -315,6 +315,12 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) case VT_R4: *r = jsval_number(V_R4(var)); return S_OK; + case VT_CY: + /* FIXME: Native converts VT_CY to a special kind number type, which is + * never converted to VT_I4 when it's converted back to VARIANT. */ + *r = jsval_number((double)V_CY(var).int64 / 10000.0); + WARN("VT_CY: %lf\n", get_number(*r)); + return S_OK; case VT_UNKNOWN: if(V_UNKNOWN(var)) { IDispatch *disp; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 6b3640bfa0b..753b4ee595e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -215,6 +215,34 @@ ok(tmp === 3, "tmp = " + tmp); ok(d != d, "date d == d"); })(); +(function() { + /* VT_CY handling */ + var d; + todo_wine_ok(getVT(v_cy(0)) === "VT_R8", "vt v_cy(0) = " + getVT(v_cy(0))); + todo_wine_ok(getVT(v_cy(10000)) === "VT_R8", "vt v_cy(10000) = " + getVT(v_cy(0))); + d = v_cy(0); + todo_wine_ok(getVT(d) === "VT_R8", "vt v_cy(0) = " + getVT(d)); + todo_wine_ok(getVT(+d) === "VT_R8", "vt +v_cy(0) = " + getVT(d)); + ok(d == 0, "v_cy(0) != 0\n"); + ok(d === 0, "v_cy(0) !== 0\n"); + ok("" + d === "0", "str(v_cy(0)) = " + d); + ok(d === d, "date d !== d"); + + d = v_cy(1000); + ok(getVT(d) === "VT_R8", "vt v_cy(1000) = " + getVT(d)); + ok(getVT(+d) === "VT_R8", "vt +v_cy(1000) = " + getVT(d)); + ok(d == 0.1, "v_cy(1000) != 0, d = " + d); + ok(d === 0.1, "v_cy(1000) !== 0.1\n"); + ok("" + d === "0.1", "str(v_cy(1000)) = " + d); + ok(d === d, "date d !== d"); + + d = v_cy(25000); + ok(getVT(d) === "VT_R8", "vt v_cy(25000) = " + getVT(d)); + ok(getVT(+d) === "VT_R8", "vt +v_cy(25000) = " + getVT(d)); + ok(d === 2.5, "v_cy(25000) !== 2.5\n"); + ok("" + d === "2.5", "str(v_cy(25000)) = " + d); +})(); + function testRecFunc(x) { ok(testRecFunc.arguments === arguments, "testRecFunc.arguments = " + testRecFunc.arguments); if(x) { diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 7837d5fee4d..281774cb2ba 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -167,6 +167,8 @@ DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_THROWINT 0x1021 #define DISPID_GLOBAL_THROWEI 0x1022 #define DISPID_GLOBAL_VDATE 0x1023 +#define DISPID_GLOBAL_VCY 0x1024 +#define DISPID_GLOBAL_TODOWINE 0x1025 #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -809,6 +811,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TRACE; return S_OK; } + if(!lstrcmpW(bstrName, L"todo_wine_ok")) { + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_TODOWINE; + return S_OK; + } if(!lstrcmpW(bstrName, L"reportSuccess")) { CHECK_EXPECT(global_success_d); test_grfdex(grfdex, fdexNameCaseSensitive); @@ -972,6 +979,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!lstrcmpW(bstrName, L"v_cy")) { + *pid = DISPID_GLOBAL_VCY; + return S_OK; + } + if(!lstrcmpW(bstrName, L"testArgTypes")) { *pid = DISPID_GLOBAL_TESTARGTYPES; return S_OK; @@ -1052,6 +1064,25 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_GLOBAL_TODOWINE: + ok(wFlags == INVOKE_FUNC || wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + if(wFlags & INVOKE_PROPERTYGET) + ok(pvarRes != NULL, "pvarRes == NULL\n"); + else + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(pdp->rgvarg+1) = %d\n", V_VT(pdp->rgvarg+1)); + todo_wine ok(V_BOOL(pdp->rgvarg+1), "%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + + return S_OK; + case DISPID_GLOBAL_TRACE: ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); @@ -1536,6 +1567,26 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, } return S_OK; + case DISPID_GLOBAL_VCY: + ok(wFlags == (DISPATCH_METHOD|DISPATCH_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pvarRes != NULL, "pvarRes != NULL\n"); + V_VT(pvarRes) = VT_CY; + switch(V_VT(pdp->rgvarg)) + { + case VT_I4: + V_CY(pvarRes).int64 = V_I4(pdp->rgvarg); + break; + case VT_R8: + V_CY(pvarRes).int64 = V_R8(pdp->rgvarg); + break; + default: + ok(0, "vt = %u\n", V_VT(pdp->rgvarg)); + return E_INVALIDARG; + } + return S_OK; + case DISPID_GLOBAL_INTPROP: V_VT(pvarRes) = VT_INT; V_INT(pvarRes) = 22;

1 0

Jacek Caban : ntdll/tests: Don't assume 32-bit test module base.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: fadd22ed5a844525ad1c9f3fa99980d732f5098b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fadd22ed5a844525ad1c9f3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 22 15:18:32 2021 +0100 ntdll/tests: Don't assume 32-bit test module base. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 202a939b76f..06d8246a566 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3867,22 +3867,20 @@ static void test_kiuserexceptiondispatcher(void) 0x48, 0x8d, 0x8c, 0x24, 0xf0, 0x04, 0x00, 0x00, /* lea 0x4f0(%rsp),%rcx */ 0x4c, 0x89, 0x22, /* mov %r12,(%rdx) */ - 0xff, 0x14, 0x25, - /* offset: 17 bytes */ - 0x00, 0x00, 0x00, 0x00, /* callq *addr */ /* call hook implementation. */ + 0x48, 0xb8, /* movabs hook_KiUserExceptionDispatcher,%rax */ + 0,0,0,0,0,0,0,0, /* offset 16 */ + 0xff, 0xd0, /* callq *rax */ 0x48, 0x31, 0xc9, /* xor %rcx, %rcx */ 0x48, 0x31, 0xd2, /* xor %rdx, %rdx */ - - 0xff, 0x24, 0x25, - /* offset: 30 bytes */ - 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ + 0x48, 0xb8, /* movabs pKiUserExceptionDispatcher,%rax */ + 0,0,0,0,0,0,0,0, /* offset 34 */ + 0xff, 0xe0, /* jmpq *rax */ }; - void *phook_KiUserExceptionDispatcher = hook_KiUserExceptionDispatcher; BYTE patched_KiUserExceptionDispatcher_bytes[12]; - DWORD old_protect1, old_protect2; + void *bpt_address, *trampoline_ptr; EXCEPTION_RECORD record; - void *bpt_address; + DWORD old_protect; CONTEXT ctx; LONG pass; BYTE *ptr; @@ -3898,19 +3896,14 @@ static void test_kiuserexceptiondispatcher(void) *(ULONG64 *)(except_code + 2) = (ULONG64)&test_kiuserexceptiondispatcher_regs; *(ULONG64 *)(except_code + 0x2a) = (ULONG64)&test_kiuserexceptiondispatcher_regs.new_rax; - ok(((ULONG64)&phook_KiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&phook_KiUserExceptionDispatcher), - "Address is too long.\n"); - ok(((ULONG64)&pKiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&pKiUserExceptionDispatcher), - "Address is too long.\n"); - - *(unsigned int *)(hook_trampoline + 17) = (unsigned int)(ULONG_PTR)&phook_KiUserExceptionDispatcher; - *(unsigned int *)(hook_trampoline + 30) = (unsigned int)(ULONG_PTR)&pKiUserExceptionDispatcher; - - ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); - ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + *(ULONG_PTR *)(hook_trampoline + 16) = (ULONG_PTR)hook_KiUserExceptionDispatcher; + *(ULONG_PTR *)(hook_trampoline + 34) = (ULONG_PTR)pKiUserExceptionDispatcher; + trampoline_ptr = (char *)code_mem + 1024; + memcpy(trampoline_ptr, hook_trampoline, sizeof(hook_trampoline)); + ok(((ULONG64)trampoline_ptr & 0xffffffff) == (ULONG64)trampoline_ptr, "Address is too long.\n"); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), - PAGE_EXECUTE_READWRITE, &old_protect2); + PAGE_EXECUTE_READWRITE, &old_protect); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, @@ -3919,7 +3912,7 @@ static void test_kiuserexceptiondispatcher(void) /* mov hook_trampoline, %rax */ *ptr++ = 0x48; *ptr++ = 0xb8; - *(void **)ptr = hook_trampoline; + *(void **)ptr = trampoline_ptr; ptr += sizeof(ULONG64); /* jmp *rax */ *ptr++ = 0xff; @@ -4042,9 +4035,7 @@ static void test_kiuserexceptiondispatcher(void) RemoveVectoredExceptionHandler(vectored_handler); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), - old_protect2, &old_protect2); - ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); - ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), old_protect1, &old_protect1); + old_protect, &old_protect); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021