January 2021 - wine-commits

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

Nikolay Sivov : dwrite/shape: Fix iterator skipping logic on ignorable characters.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 23a2213e27058c36c8b015bd353012e0699c3ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a2213e27058c36c8b015bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 22 15:25:23 2021 +0300 dwrite/shape: Fix iterator skipping logic on ignorable characters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 82 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7d89851bbaa..ae9a88a876c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -483,6 +483,8 @@ enum glyph_prop_flags GLYPH_PROP_MARK = LOOKUP_FLAG_IGNORE_MARKS, GLYPH_PROP_ZWNJ = 0x10, GLYPH_PROP_ZWJ = 0x20, + GLYPH_PROP_IGNORABLE = 0x40, + GLYPH_PROP_HIDDEN = 0x80, }; enum gpos_lookup_type @@ -3691,12 +3693,17 @@ static BOOL lookup_is_glyph_match(const struct scriptshaping_context *context, u static enum iterator_match glyph_iterator_may_skip(const struct glyph_iterator *iter) { + unsigned int glyph_props = iter->context->glyph_infos[iter->pos].props & (GLYPH_PROP_IGNORABLE | GLYPH_PROP_HIDDEN); + if (!lookup_is_glyph_match(iter->context, iter->pos, iter->flags)) return ITER_YES; - if ((iter->ignore_zwnj || !(iter->context->glyph_infos[iter->pos].props & GLYPH_PROP_ZWNJ)) && + if (glyph_props == GLYPH_PROP_IGNORABLE && !iter->context->u.buffer.glyph_props[iter->pos].components && + (iter->ignore_zwnj || !(iter->context->glyph_infos[iter->pos].props & GLYPH_PROP_ZWNJ)) && (iter->ignore_zwj || !(iter->context->glyph_infos[iter->pos].props & GLYPH_PROP_ZWJ))) + { return ITER_MAYBE; + } return ITER_NO; } @@ -5687,17 +5694,63 @@ static unsigned int unicode_get_mirrored_char(unsigned int codepoint) } /* + * 034F # Mn COMBINING GRAPHEME JOINER + * 061C # Cf ARABIC LETTER MARK + * 180B..180D # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE + * 180E # Cf MONGOLIAN VOWEL SEPARATOR + * 200B..200F # Cf [5] ZERO WIDTH SPACE..RIGHT-TO-LEFT MARK + * FEFF # Cf ZERO WIDTH NO-BREAK SPACE +*/ +static unsigned int opentype_is_zero_width(unsigned int codepoint) +{ + return codepoint == 0x34f || codepoint == 0x61c || codepoint == 0xfeff || + (codepoint >= 0x180b && codepoint <= 0x180e) || (codepoint >= 0x200b && codepoint <= 0x200f); +} + +/* + * 00AD # Cf SOFT HYPHEN * 034F # Mn COMBINING GRAPHEME JOINER * 061C # Cf ARABIC LETTER MARK + * 115F..1160 # Lo [2] HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG FILLER + * 17B4..17B5 # Mn [2] KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA * 180B..180D # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE * 180E # Cf MONGOLIAN VOWEL SEPARATOR * 200B..200F # Cf [5] ZERO WIDTH SPACE..RIGHT-TO-LEFT MARK + * 202A..202E # Cf [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE + * 2060..2064 # Cf [5] WORD JOINER..INVISIBLE PLUS + * 2065 # Cn <reserved-2065> + * 2066..206F # Cf [10] LEFT-TO-RIGHT ISOLATE..NOMINAL DIGIT SHAPES + * 3164 # Lo HANGUL FILLER + * FE00..FE0F # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 * FEFF # Cf ZERO WIDTH NO-BREAK SPACE + * FFA0 # Lo HALFWIDTH HANGUL FILLER + * FFF0..FFF8 # Cn [9] <reserved-FFF0>..<reserved-FFF8> + * 1BCA0..1BCA3 # Cf [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP + * 1D173..1D17A # Cf [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE + * E0000 # Cn <reserved-E0000> + * E0001 # Cf LANGUAGE TAG + * E0002..E001F # Cn [30] <reserved-E0002>..<reserved-E001F> + * E0020..E007F # Cf [96] TAG SPACE..CANCEL TAG + * E0080..E00FF # Cn [128] <reserved-E0080>..<reserved-E00FF> + * E0100..E01EF # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 + * E01F0..E0FFF # Cn [3600] <reserved-E01F0>..<reserved-E0FFF> */ static unsigned int opentype_is_default_ignorable(unsigned int codepoint) { - return codepoint == 0x34f || codepoint == 0x61c || codepoint == 0xfeff || - (codepoint >= 0x180b && codepoint <= 0x180e) || (codepoint >= 0x200b && codepoint <= 0x200f); + if (codepoint < 0x80) return 0; + return codepoint == 0xad || + codepoint == 0x34f || + codepoint == 0x61c || + (codepoint >= 0x17b4 && codepoint <= 0x17b5) || + (codepoint >= 0x180b && codepoint <= 0x180e) || + (codepoint >= 0x200b && codepoint <= 0x200f) || + (codepoint >= 0x202a && codepoint <= 0x202e) || + (codepoint >= 0x2060 && codepoint <= 0x206f) || + (codepoint >= 0xfe00 && codepoint <= 0xfe0f) || + codepoint == 0xfeff || + (codepoint >= 0xfff0 && codepoint <= 0xfff8) || + (codepoint >= 0x1d173 && codepoint <= 0x1d17a) || + (codepoint >= 0xe0000 && codepoint <= 0xe0fff); } static unsigned int opentype_is_diacritic(unsigned int codepoint) @@ -5751,10 +5804,21 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->u.buffer.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.buffer.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; opentype_set_subst_glyph_props(context, g); - if (codepoint == 0x200d) - context->glyph_infos[g].props |= GLYPH_PROP_ZWJ; - else if (codepoint == 0x200c) - context->glyph_infos[g].props |= GLYPH_PROP_ZWNJ; + if (opentype_is_default_ignorable(codepoint)) + { + context->glyph_infos[g].props |= GLYPH_PROP_IGNORABLE; + if (codepoint == 0x200d) + context->glyph_infos[g].props |= GLYPH_PROP_ZWJ; + else if (codepoint == 0x200c) + context->glyph_infos[g].props |= GLYPH_PROP_ZWNJ; + /* Mongolian FVSs, TAGs, COMBINING GRAPHEME JOINER */ + else if ((codepoint >= 0x180b && codepoint <= 0x180d) || + (codepoint >= 0xe0020 && codepoint <= 0xe007f) || + codepoint == 0x34f) + { + context->glyph_infos[g].props |= GLYPH_PROP_HIDDEN; + } + } /* Group diacritics with preceding base. Glyph class is ignored here. */ if (!g || !opentype_is_diacritic(codepoint)) @@ -5763,9 +5827,9 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->glyph_infos[g].start_text_idx = i; cluster_start_idx = g; } - - if (opentype_is_default_ignorable(codepoint)) + if (opentype_is_zero_width(codepoint)) context->u.buffer.glyph_props[g].isZeroWidthSpace = 1; + context->u.buffer.glyph_props[g].components = 1; context->glyph_count++;

1 0

Nikolay Sivov : dwrite/arabic: Set per-glyph mask.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 4ae8191ee9755c0bda1d2ac3341a08e3c2b0d9fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae8191ee9755c0bda1d2ac3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 22 15:25:22 2021 +0300 dwrite/arabic: Set per-glyph mask. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/opentype.c | 6 ++++++ dlls/dwrite/shapers/arabic.c | 15 +++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3f48c189a13..ac870fd215c 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -590,6 +590,8 @@ extern void shape_enable_feature(struct shaping_features *features, unsigned int unsigned int flags) DECLSPEC_HIDDEN; extern void shape_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, unsigned int value) DECLSPEC_HIDDEN; +extern unsigned int shape_get_feature_1_mask(const struct shaping_features *features, + unsigned int tag) DECLSPEC_HIDDEN; extern void shape_start_next_stage(struct shaping_features *features, stage_func func) DECLSPEC_HIDDEN; struct scriptshaping_context diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 6fe85dd4991..7d89851bbaa 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4632,6 +4632,12 @@ static unsigned int shaping_features_get_mask(const struct shaping_features *fea return feature->mask; } +unsigned int shape_get_feature_1_mask(const struct shaping_features *features, unsigned int tag) +{ + unsigned int shift, mask = shaping_features_get_mask(features, tag, &shift); + return (1 << shift) & mask; +} + static void opentype_layout_get_glyph_range_for_text(struct scriptshaping_context *context, unsigned int start_char, unsigned int end_char, unsigned int *start_glyph, unsigned int *end_glyph) { diff --git a/dlls/dwrite/shapers/arabic.c b/dlls/dwrite/shapers/arabic.c index aaf57da42e4..cc701150a56 100644 --- a/dlls/dwrite/shapers/arabic.c +++ b/dlls/dwrite/shapers/arabic.c @@ -41,6 +41,7 @@ enum arabic_shaping_action MED2, INIT, NONE, + NUM_FEATURES = NONE, }; static BOOL feature_is_syriac(unsigned int tag) @@ -134,10 +135,17 @@ static void arabic_set_shaping_action(struct scriptshaping_context *context, context->glyph_infos[idx].props |= (action & 0xf) << 16; } +static enum arabic_shaping_action arabic_get_shaping_action(const struct scriptshaping_context *context, + unsigned int idx) +{ + return (context->glyph_infos[idx].props >> 16) & 0xf; +} + static void arabic_setup_masks(struct scriptshaping_context *context, const struct shaping_features *features) { unsigned int i, prev = ~0u, state = 0; + unsigned int masks[NUM_FEATURES]; for (i = 0; i < context->length; ++i) { @@ -160,6 +168,13 @@ static void arabic_setup_masks(struct scriptshaping_context *context, prev = i; state = entry->next_state; } + + for (i = 0; i < ARRAY_SIZE(masks); ++i) + masks[i] = shape_get_feature_1_mask(features, arabic_features[i]); + + /* Unaffected glyphs get action NONE with zero mask. */ + for (i = 0; i < context->length; ++i) + context->glyph_infos[i].mask |= masks[arabic_get_shaping_action(context, i)]; } const struct shaper arabic_shaper =

1 0

Nikolay Sivov : dwrite/arabic: Set per-glyph action.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: bea9c706eb6e818b1d8666b619e10f62a0cb1a96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bea9c706eb6e818b1d8666b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 22 15:25:21 2021 +0300 dwrite/arabic: Set per-glyph action. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/shapers/arabic.c | 82 +++++++++++ dlls/dwrite/shapers/arabic_table.c | 275 +++++++++++++++++++++++++++++++++++++ tools/make_unicode | 54 +++++++- 4 files changed, 410 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bea9c706eb6e818b1d86…

1 0

Nikolay Sivov : dwrite: Call stage function for substitution loop.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 864745e7bb0e9648e0157c74457faaf6c47deb09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=864745e7bb0e9648e0157c74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 22 15:25:20 2021 +0300 dwrite: Call stage function for substitution loop. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 66 +++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b446e7450b7..6fe85dd4991 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5795,7 +5795,7 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int language_index, struct shaping_features *features) { struct lookups lookups = { 0 }; - unsigned int i, j, start_idx; + unsigned int i = 0, j, start_idx; BOOL ret; context->nesting_level_left = SHAPE_MAX_NESTING_LEVEL; @@ -5805,47 +5805,53 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, opentype_get_nominal_glyphs(context, features); opentype_layout_set_glyph_masks(context, features); - for (i = 0; i < lookups.count; ++i) + for (j = 0; j <= features->stage; ++j) { - const struct lookup *lookup = &lookups.lookups[i]; + for (; i < features->stages[j].last_lookup; ++i) + { + const struct lookup *lookup = &lookups.lookups[i]; - context->lookup_mask = lookup->mask; - context->auto_zwnj = lookup->auto_zwnj; - context->auto_zwj = lookup->auto_zwj; + context->lookup_mask = lookup->mask; + context->auto_zwnj = lookup->auto_zwnj; + context->auto_zwj = lookup->auto_zwj; - if (!opentype_is_gsub_lookup_reversed(context, lookup)) - { - context->cur = 0; - while (context->cur < context->glyph_count) + if (!opentype_is_gsub_lookup_reversed(context, lookup)) { - ret = FALSE; - - if ((context->glyph_infos[context->cur].mask & lookup->mask) && - lookup_is_glyph_match(context, context->cur, lookup->flags)) + context->cur = 0; + while (context->cur < context->glyph_count) { - ret = opentype_layout_apply_gsub_lookup(context, lookup); - } + ret = FALSE; - if (!ret) - context->cur++; - } - } - else - { - context->cur = context->glyph_count - 1; + if ((context->glyph_infos[context->cur].mask & lookup->mask) && + lookup_is_glyph_match(context, context->cur, lookup->flags)) + { + ret = opentype_layout_apply_gsub_lookup(context, lookup); + } - for (;;) + if (!ret) + context->cur++; + } + } + else { - if ((context->glyph_infos[context->cur].mask & lookup->mask) && - lookup_is_glyph_match(context, context->cur, lookup->flags)) + context->cur = context->glyph_count - 1; + + for (;;) { - opentype_layout_apply_gsub_lookup(context, lookup); - } + if ((context->glyph_infos[context->cur].mask & lookup->mask) && + lookup_is_glyph_match(context, context->cur, lookup->flags)) + { + opentype_layout_apply_gsub_lookup(context, lookup); + } - if (context->cur == 0) break; - --context->cur; + if (context->cur == 0) break; + --context->cur; + } } } + + if (features->stages[j].func) + features->stages[j].func(context); } /* For every glyph range of [<last>.isClusterStart, <next>.isClusterStart) set corresponding

1 0

Nikolay Sivov : dwrite: Add per shaping stage functions.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: dfb94e6f8ee630bd514a7c16beefcba3daaf0bcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb94e6f8ee630bd514a7c16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 22 15:25:19 2021 +0300 dwrite: Add per shaping stage functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 21 ++++++++++++++++----- dlls/dwrite/opentype.c | 7 ++++--- dlls/dwrite/shape.c | 3 ++- dlls/dwrite/shapers/arabic.c | 6 +++--- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 57641680db5..3f48c189a13 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -559,12 +559,23 @@ struct shaping_feature unsigned int stage; }; +#define MAX_SHAPING_STAGE 16 + +typedef void (*stage_func)(struct scriptshaping_context *context); + +struct shaping_stage +{ + stage_func func; + unsigned int last_lookup; +}; + struct shaping_features { struct shaping_feature *features; size_t count; size_t capacity; unsigned int stage; + struct shaping_stage stages[MAX_SHAPING_STAGE]; }; struct shaper @@ -577,9 +588,9 @@ extern const struct shaper arabic_shaper DECLSPEC_HIDDEN; extern void shape_enable_feature(struct shaping_features *features, unsigned int tag, unsigned int flags) DECLSPEC_HIDDEN; -extern void shape_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, - unsigned int value) DECLSPEC_HIDDEN; -extern void shape_start_next_stage(struct shaping_features *features) DECLSPEC_HIDDEN; +extern void shape_add_feature_full(struct shaping_features *features, unsigned int tag, + unsigned int flags, unsigned int value) DECLSPEC_HIDDEN; +extern void shape_start_next_stage(struct shaping_features *features, stage_func func) DECLSPEC_HIDDEN; struct scriptshaping_context { @@ -667,9 +678,9 @@ extern DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache extern DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWORD kind, DWORD tag, unsigned int script_index, unsigned int *language_index) DECLSPEC_HIDDEN; extern void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, - unsigned int language_index, const struct shaping_features *features) DECLSPEC_HIDDEN; + unsigned int language_index, struct shaping_features *features) DECLSPEC_HIDDEN; extern void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, - unsigned int language_index, const struct shaping_features *features) DECLSPEC_HIDDEN; + unsigned int language_index, struct shaping_features *features) DECLSPEC_HIDDEN; extern BOOL opentype_layout_check_feature(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, struct shaping_feature *feature, unsigned int glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 03b74eae591..b446e7450b7 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4442,7 +4442,7 @@ static void opentype_layout_add_lookups(const struct ot_feature_list *feature_li } static void opentype_layout_collect_lookups(struct scriptshaping_context *context, unsigned int script_index, - unsigned int language_index, const struct shaping_features *features, const struct ot_gsubgpos_table *table, + unsigned int language_index, struct shaping_features *features, const struct ot_gsubgpos_table *table, struct lookups *lookups) { unsigned int last_num_lookups = 0, stage, script_feature_count = 0; @@ -4607,6 +4607,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex } last_num_lookups = lookups->count; + features->stages[stage].last_lookup = last_num_lookups; } } @@ -4688,7 +4689,7 @@ static void opentype_layout_apply_gpos_context_lookup(struct scriptshaping_conte } void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, - unsigned int language_index, const struct shaping_features *features) + unsigned int language_index, struct shaping_features *features) { struct lookups lookups = { 0 }; unsigned int i; @@ -5791,7 +5792,7 @@ static void opentype_layout_apply_gsub_context_lookup(struct scriptshaping_conte } void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, - unsigned int language_index, const struct shaping_features *features) + unsigned int language_index, struct shaping_features *features) { struct lookups lookups = { 0 }; unsigned int i, j, start_idx; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 2dbea825216..6428bf6ceb0 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -142,8 +142,9 @@ void shape_enable_feature(struct shaping_features *features, unsigned int tag, shape_add_feature_full(features, tag, FEATURE_GLOBAL | flags, 1); } -void shape_start_next_stage(struct shaping_features *features) +void shape_start_next_stage(struct shaping_features *features, stage_func func) { + features->stages[features->stage].func = func; features->stage++; } diff --git a/dlls/dwrite/shapers/arabic.c b/dlls/dwrite/shapers/arabic.c index 32588b9c796..0b456dadc11 100644 --- a/dlls/dwrite/shapers/arabic.c +++ b/dlls/dwrite/shapers/arabic.c @@ -56,21 +56,21 @@ static void arabic_collect_features(struct scriptshaping_context *context, shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('c','c','m','p'), 0); shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('l','o','c','l'), 0); - shape_start_next_stage(features); + shape_start_next_stage(features, NULL); for (i = 0; i < ARRAY_SIZE(arabic_features); ++i) { unsigned int flags = context->script == Script_Arabic && !feature_is_syriac(arabic_features[i]) ? FEATURE_HAS_FALLBACK : 0; shape_add_feature_full(features, arabic_features[i], flags, 1); - shape_start_next_stage(features); + shape_start_next_stage(features, NULL); } shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('r','l','i','g'), FEATURE_MANUAL_ZWJ | FEATURE_HAS_FALLBACK); shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('r','c','l','t'), FEATURE_MANUAL_ZWJ); shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('c','a','l','t'), FEATURE_MANUAL_ZWJ); - shape_start_next_stage(features); + shape_start_next_stage(features, NULL); shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('m','s','e','t'), 0); }

1 0

Nikolay Sivov : dwrite: Mark features that were not found.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 3c0836bfa3360b8696d08c0c08ed37ab3368bf5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c0836bfa3360b8696d08c0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 22 15:25:18 2021 +0300 dwrite: Mark features that were not found. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4a4229e1dc0..57641680db5 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -544,6 +544,7 @@ enum shaping_feature_flags FEATURE_MANUAL_ZWJ = 0x8, FEATURE_MANUAL_JOINERS = FEATURE_MANUAL_ZWNJ | FEATURE_MANUAL_ZWJ, FEATURE_HAS_FALLBACK = 0x10, + FEATURE_NEEDS_FALLBACK = 0x20, }; struct shaping_feature diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 256218663fb..03b74eae591 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4568,6 +4568,8 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex next_bit += bits_needed; context->global_mask |= (feature->default_value << feature->shift) & feature->mask; } + if (!found) + feature->flags |= FEATURE_NEEDS_FALLBACK; } for (stage = 0; stage <= features->stage; ++stage)

1 0

Nikolay Sivov : dwrite/arabic: Mark some features for fallback.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: f064acbdd9fac8a417067a244d008e4177e265f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f064acbdd9fac8a417067a24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 22 15:25:17 2021 +0300 dwrite/arabic: Mark some features for fallback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +++ dlls/dwrite/opentype.c | 2 +- dlls/dwrite/shape.c | 3 ++- dlls/dwrite/shapers/arabic.c | 25 +++++++++++++++++++++++-- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 76d49ae5104..4a4229e1dc0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -543,6 +543,7 @@ enum shaping_feature_flags FEATURE_MANUAL_ZWNJ = 0x4, FEATURE_MANUAL_ZWJ = 0x8, FEATURE_MANUAL_JOINERS = FEATURE_MANUAL_ZWNJ | FEATURE_MANUAL_ZWJ, + FEATURE_HAS_FALLBACK = 0x10, }; struct shaping_feature @@ -575,6 +576,8 @@ extern const struct shaper arabic_shaper DECLSPEC_HIDDEN; extern void shape_enable_feature(struct shaping_features *features, unsigned int tag, unsigned int flags) DECLSPEC_HIDDEN; +extern void shape_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, + unsigned int value) DECLSPEC_HIDDEN; extern void shape_start_next_stage(struct shaping_features *features) DECLSPEC_HIDDEN; struct scriptshaping_context diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 20534460d09..256218663fb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4553,7 +4553,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex } } - if (!found) + if (!found && !(features->features[i].flags & FEATURE_HAS_FALLBACK)) continue; if (feature->flags & FEATURE_GLOBAL && feature->max_value == 1) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 53b392c88e2..2dbea825216 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -115,7 +115,7 @@ static DWORD shape_select_language(const struct scriptshaping_cache *cache, DWOR return 0; } -static void shape_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, unsigned int value) +void shape_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, unsigned int value) { unsigned int i = features->count; @@ -193,6 +193,7 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s features->features[j].flags ^= FEATURE_GLOBAL; features->features[j].max_value = max(features->features[j].max_value, features->features[i].max_value); } + features->features[j].flags |= features->features[i].flags & FEATURE_HAS_FALLBACK; features->features[j].stage = min(features->features[j].stage, features->features[i].stage); } } diff --git a/dlls/dwrite/shapers/arabic.c b/dlls/dwrite/shapers/arabic.c index d8c6c9495c0..32588b9c796 100644 --- a/dlls/dwrite/shapers/arabic.c +++ b/dlls/dwrite/shapers/arabic.c @@ -18,6 +18,7 @@ */ #include "dwrite_private.h" +#include "scripts.h" static const unsigned int arabic_features[] = { @@ -30,6 +31,24 @@ static const unsigned int arabic_features[] = DWRITE_MAKE_OPENTYPE_TAG('i','n','i','t'), }; +enum arabic_shaping_action +{ + ISOL, + FINA, + FIN2, + FIN3, + MEDI, + MED2, + INIT, + NONE, +}; + +static BOOL feature_is_syriac(unsigned int tag) +{ + return tag == arabic_features[FIN2] || tag == arabic_features[FIN3] || + tag == arabic_features[MED2]; +} + static void arabic_collect_features(struct scriptshaping_context *context, struct shaping_features *features) { @@ -41,11 +60,13 @@ static void arabic_collect_features(struct scriptshaping_context *context, for (i = 0; i < ARRAY_SIZE(arabic_features); ++i) { - shape_enable_feature(features, arabic_features[i], 0); + unsigned int flags = context->script == Script_Arabic && !feature_is_syriac(arabic_features[i]) ? + FEATURE_HAS_FALLBACK : 0; + shape_add_feature_full(features, arabic_features[i], flags, 1); shape_start_next_stage(features); } - shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('r','l','i','g'), FEATURE_MANUAL_ZWJ); + shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('r','l','i','g'), FEATURE_MANUAL_ZWJ | FEATURE_HAS_FALLBACK); shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('r','c','l','t'), FEATURE_MANUAL_ZWJ); shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('c','a','l','t'), FEATURE_MANUAL_ZWJ);

1 0

Jacek Caban : winnt.h: Fix MSVC variants of InterlockedIncrement16 and InterlockedDecrement16.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 1495ccd152a68cc799b4d2de7244e9ee8cc60ae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1495ccd152a68cc799b4d2de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 22 15:11:05 2021 +0100 winnt.h: Fix MSVC variants of InterlockedIncrement16 and InterlockedDecrement16. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index f5ef0c7bd52..5b3efe61385 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6966,7 +6966,7 @@ static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) static FORCEINLINE short WINAPI InterlockedIncrement16( short volatile *dest ) { - return _InterlockedIncrement16( (long volatile *)dest ); + return _InterlockedIncrement16( dest ); } static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) @@ -6976,7 +6976,7 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) static FORCEINLINE short WINAPI InterlockedDecrement16( short volatile *dest ) { - return _InterlockedDecrement16( (long volatile *)dest ); + return _InterlockedDecrement16( dest ); } static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val )

1 0

Henri Verbeet : d3d12: Request VKD3D_API_VERSION_1_2.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: bc29521db57ceaf8698a8e40ddb4852aa0fc77b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc29521db57ceaf8698a8e40… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:25 2021 +0100 d3d12: Request VKD3D_API_VERSION_1_2. The practical effect of this is that vkd3d will start advertising support for version 1.1 root signatures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index b8810848cd3..3dd4ec796b0 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -337,6 +337,11 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe { VK_KHR_SWAPCHAIN_EXTENSION_NAME, }; + static const struct vkd3d_application_info application_info = + { + .type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, + .api_version = VKD3D_API_VERSION_1_2, + }; TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p.\n", adapter, minimum_feature_level, debugstr_guid(iid), device); @@ -357,7 +362,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe } optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; - optional_extensions_info.next = NULL; + optional_extensions_info.next = &application_info; optional_extensions_info.extensions = optional_instance_extensions; optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions);

1 0

Henri Verbeet : d3d12: Implement D3D12CreateVersionedRootSignatureDeserializer().
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 8c412417de4c9a4625ad43d506f9904b76063f38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c412417de4c9a4625ad43d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:24 2021 +0100 d3d12: Implement D3D12CreateVersionedRootSignatureDeserializer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12.spec | 2 +- dlls/d3d12/d3d12_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 7c2ae988067..21231d39558 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -5,7 +5,7 @@ @ stub D3D12CoreGetLayeredDeviceSize @ stub D3D12CoreRegisterLayers @ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) -#@ stub D3D12CreateVersionedRootSignatureDeserializer +@ stdcall D3D12CreateVersionedRootSignatureDeserializer(ptr long ptr ptr) @ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) @ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) @ stdcall D3D12SerializeVersionedRootSignature(ptr ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 9f0fa12ee82..b8810848cd3 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -406,6 +406,15 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); } +HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer) +{ + TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + data, data_size, debugstr_guid(iid), deserializer); + + return vkd3d_create_versioned_root_signature_deserializer(data, data_size, iid, deserializer); +} + HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) {

1 0

Henri Verbeet : d3d12: Implement D3D12SerializeVersionedRootSignature() on top of vkd3d_serialize_versioned_root_signature().
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 681105fd482cb790568576c1d0a360288904ec82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=681105fd482cb790568576c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:23 2021 +0100 d3d12: Implement D3D12SerializeVersionedRootSignature() on top of vkd3d_serialize_versioned_root_signature(). This raises the required version of vkd3d to 1.2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- dlls/d3d12/d3d12_main.c | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configure b/configure index ef09f65f11e..4cb23101f4c 100755 --- a/configure +++ b/configure @@ -16642,11 +16642,11 @@ LIBS="-lvkd3d $VKD3D_LIBS $LIBS" #ifdef __cplusplus extern "C" #endif -char vkd3d_get_dxgi_format (); +char vkd3d_serialize_versioned_root_signature (); int main () { -return vkd3d_get_dxgi_format (); +return vkd3d_serialize_versioned_root_signature (); ; return 0; } diff --git a/configure.ac b/configure.ac index 1921307da31..0f8b9f6c080 100644 --- a/configure.ac +++ b/configure.ac @@ -1971,7 +1971,7 @@ dnl **** Check for vkd3d **** if test "x$with_vkd3d" != "xno" then WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,, - [WINE_CHECK_SONAME(vkd3d,vkd3d_get_dxgi_format,,,[$VKD3D_LIBS])]) + [WINE_CHECK_SONAME(vkd3d,vkd3d_serialize_versioned_root_signature,,,[$VKD3D_LIBS])]) WINE_PACKAGE_FLAGS(VKD3D_SHADER,[libvkd3d-shader],,,, [WINE_CHECK_SONAME(vkd3d-shader,vkd3d_shader_compile,,,[$VKD3D_SHADER_LIBS])]) fi diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index bd680d8254d..9f0fa12ee82 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -420,9 +420,5 @@ HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_S { TRACE("desc %p, blob %p, error_blob %p.\n", desc, blob, error_blob); - if (desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0) - return vkd3d_serialize_root_signature(&desc->Desc_1_0, desc->Version, blob, error_blob); - - FIXME("Unsupported version %#x.\n", desc->Version); - return E_NOTIMPL; + return vkd3d_serialize_versioned_root_signature(desc, blob, error_blob); }

1 0

Henri Verbeet : wined3d: Implement NULL constant buffer views for the Vulkan backend.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 50a90dcb3230b65fefdbb8d9c5fff0d7968172e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50a90dcb3230b65fefdbb8d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:22 2021 +0100 wined3d: Implement NULL constant buffer views for the Vulkan backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 7 +++++-- dlls/wined3d/device.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index b8414155dc0..841b3d742c6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2527,8 +2527,11 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: if (!(buffer = state->cb[binding->shader_type][binding->resource_idx])) { - FIXME("NULL constant buffer views not implemented.\n"); - return false; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, + &device_vk->null_resources_vk.buffer_info, NULL, NULL)) + return false; + break; } buffer_vk = wined3d_buffer_vk(buffer); buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cc40125ac95..3c16a3c691e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -717,11 +717,15 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk vk_info = context_vk->vk_info; - usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT + | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); + r->buffer_info.buffer = r->bo.vk_buffer; + r->buffer_info.offset = r->bo.buffer_offset; + r->buffer_info.range = r->bo.size; if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1, 1)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07ddb57333c..b3934f0d8e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3875,6 +3875,8 @@ struct wined3d_null_image_vk struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; + VkDescriptorBufferInfo buffer_info; + struct wined3d_null_image_vk image_1d; struct wined3d_null_image_vk image_2d; struct wined3d_null_image_vk image_2dms;

1 0

Henri Verbeet : wined3d: Require VK_KHR_sampler_mirror_clamp_to_edge for WINED3D_TADDRESS_MIRROR_ONCE.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: ff19c3e6fa154e4388cfc83d9a7b0603a5714533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff19c3e6fa154e4388cfc83d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:21 2021 +0100 wined3d: Require VK_KHR_sampler_mirror_clamp_to_edge for WINED3D_TADDRESS_MIRROR_ONCE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++------ dlls/wined3d/wined3d_vk.h | 3 +++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 09180e7fdb6..9a226edc65a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -560,7 +560,8 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); const VkPhysicalDeviceLimits *limits = &adapter_vk->device_limits; - BOOL sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; + bool sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER | WINEDDSCAPS_COMPLEX @@ -615,8 +616,9 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPTADDRESSCAPS_CLAMP | WINED3DPTADDRESSCAPS_WRAP; caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER - | WINED3DPTADDRESSCAPS_MIRROR - | WINED3DPTADDRESSCAPS_MIRRORONCE; + | WINED3DPTADDRESSCAPS_MIRROR; + if (vk_info->supported[WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE]) + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; caps->MaxVolumeExtent = limits->maxImageDimension3D; @@ -643,8 +645,9 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s } caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER - | WINED3DPTADDRESSCAPS_MIRROR - | WINED3DPTADDRESSCAPS_MIRRORONCE; + | WINED3DPTADDRESSCAPS_MIRROR; + if (vk_info->supported[WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE]) + caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; caps->StencilCaps |= WINED3DSTENCILCAPS_DECR | WINED3DSTENCILCAPS_INCR @@ -2170,6 +2173,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, ~0u}, {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u, true}, {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1, true}, + {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,VK_API_VERSION_1_2}, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1, true}, {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u, true}, }; @@ -2181,7 +2185,8 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk } map[] = { - {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, + {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, + {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE}, }; if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 0b6748ed0cf..a417a795901 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -207,7 +207,10 @@ struct vulkan_ops enum wined3d_vk_extension { WINED3D_VK_EXT_NONE, + WINED3D_VK_EXT_TRANSFORM_FEEDBACK, + WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, + WINED3D_VK_EXT_COUNT, };

1 0

Alexandre Julliard : ntdll: Add some more section information data.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 7250f9a95b864cd2cda5dda6ce19e370e93b82d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7250f9a95b864cd2cda5dda6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 17:21:13 2021 +0100 ntdll: Add some more section information data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 30 +++++++++++----- dlls/kernelbase/process.c | 2 +- dlls/ntdll/tests/info.c | 16 ++++++--- dlls/ntdll/unix/virtual.c | 33 +++++++++--------- include/wine/server_protocol.h | 10 +++--- include/winternl.h | 13 ++++--- server/mapping.c | 79 +++++++++++++++++++++++------------------- server/protocol.def | 8 +++-- server/trace.c | 12 ++++--- 9 files changed, 121 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7250f9a95b864cd2cda5…

1 0

Alexandre Julliard : winegcc: Pass the same winebuild args to all winebuild invocations.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 7c909489b4a0404d7a0f386bc11c7399ae59a84a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c909489b4a0404d7a0f386b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 13:59:48 2021 +0100 winegcc: Pass the same winebuild args to all winebuild invocations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0a45cb7a0d5..e72f234d94b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -986,8 +986,7 @@ static strarray *get_winebuild_args(struct options *opts) for (i = 0; i < opts->prefix->size; i++) strarray_add( spec_args, strmake( "-B%s", opts->prefix->base[i] )); } - if (opts->use_msvcrt) strarray_add( spec_args, "-mno-cygwin" ); - if (opts->unix_lib) strarray_add( spec_args, "-munix" ); + strarray_addall( spec_args, opts->winebuild_args ); if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args; @@ -1266,8 +1265,6 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); - if(opts->unicode_app) - strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); @@ -1287,7 +1284,6 @@ static void build(struct options* opts) strarray_add(spec_args, "-E"); strarray_add(spec_args, spec_file); } - if (opts->win16_app) strarray_add(spec_args, "-m16"); if (!opts->shared) { @@ -1315,9 +1311,6 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(spec_args, strmake("-L%s", lib_dirs->base[j])); - for ( j = 0 ; j < opts->winebuild_args->size ; j++ ) - strarray_add(spec_args, opts->winebuild_args->base[j]); - if (!is_pe) { for (j = 0; j < opts->delayimports->size; j++) @@ -1485,7 +1478,6 @@ static void build(struct options* opts) strarray_add(implib_args, opts->out_implib); strarray_add(implib_args, "--export"); strarray_add(implib_args, spec_file); - strarray_addall(implib_args, opts->winebuild_args); spawn(opts->prefix, implib_args, 0); strarray_free (implib_args); @@ -1636,7 +1628,7 @@ static int is_option( struct options *opts, int i, const char *option, const cha int main(int argc, char **argv) { int i, c, next_is_arg = 0, linking = 1; - int raw_compiler_arg, raw_linker_arg; + int raw_compiler_arg, raw_linker_arg, raw_winebuild_arg; const char* option_arg; struct options opts; char* lang = 0; @@ -1782,6 +1774,7 @@ int main(int argc, char **argv) /* determine what options go 'as is' to the linker & the compiler */ raw_linker_arg = is_linker_arg(opts.args->base[i]); raw_compiler_arg = !raw_linker_arg; + raw_winebuild_arg = 0; /* do a bit of semantic analysis */ switch (opts.args->base[i][1]) @@ -1840,7 +1833,7 @@ int main(int argc, char **argv) { opts.use_msvcrt = 1; raw_compiler_arg = 0; - strarray_add( opts.winebuild_args, opts.args->base[i] ); + raw_winebuild_arg = 1; } else if (strcmp("-mwindows", opts.args->base[i]) == 0) { @@ -1856,6 +1849,7 @@ int main(int argc, char **argv) { opts.unicode_app = 1; raw_compiler_arg = 0; + raw_winebuild_arg = 1; } else if (strcmp("-mthreads", opts.args->base[i]) == 0) { @@ -1865,11 +1859,13 @@ int main(int argc, char **argv) { opts.unix_lib = 1; raw_compiler_arg = 0; + raw_winebuild_arg = 1; } else if (strcmp("-m16", opts.args->base[i]) == 0) { opts.win16_app = 1; raw_compiler_arg = 0; + raw_winebuild_arg = 1; } else if (strcmp("-m32", opts.args->base[i]) == 0) { @@ -1891,14 +1887,14 @@ int main(int argc, char **argv) } else if (!strcmp("-marm", opts.args->base[i] ) || !strcmp("-mthumb", opts.args->base[i] )) { - strarray_add(opts.winebuild_args, opts.args->base[i]); raw_linker_arg = 1; + raw_winebuild_arg = 1; } else if (!strncmp("-mcpu=", opts.args->base[i], 6) || !strncmp("-mfpu=", opts.args->base[i], 6) || !strncmp("-march=", opts.args->base[i], 7) || !strncmp("-mfloat-abi=", opts.args->base[i], 12)) - strarray_add(opts.winebuild_args, opts.args->base[i]); + raw_winebuild_arg = 1; break; case 'n': if (strcmp("-nostdinc", opts.args->base[i]) == 0) @@ -2073,6 +2069,12 @@ int main(int argc, char **argv) if (next_is_arg && (i + 1 < opts.args->size)) strarray_add( opts.compiler_args, opts.args->base[i + 1] ); } + if (raw_winebuild_arg) + { + strarray_add( opts.winebuild_args, opts.args->base[i] ); + if (next_is_arg && (i + 1 < opts.args->size)) + strarray_add( opts.winebuild_args, opts.args->base[i + 1] ); + } /* skip the next token if it's an argument */ if (next_is_arg) i++;

1 0

Alexandre Julliard : d3dx9: Fix some spec file discrepancies.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 16c03e479774aa211beb35e4a2cb5a336490b688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c03e479774aa211beb35e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 11:47:43 2021 +0100 d3dx9: Fix some spec file discrepancies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index fe8140d1b49..d617d766f85 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -26,7 +26,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index cb40277ea04..f13923dcb3a 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -26,7 +26,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index bfad690a15a..286a9a094a0 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index bfad690a15a..286a9a094a0 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index 60228541015..06ced20df61 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index 60228541015..06ced20df61 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr)

1 0

Alexandre Julliard : msvcp: Fix some spec file discrepancies.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 2012d7ab6a67f909d3970a8880b5487820f3972d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2012d7ab6a67f909d3970a88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 11:46:46 2021 +0100 msvcp: Fix some spec file discrepancies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 20 +++++---- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp140/msvcp140.spec | 84 ++++++++++++++++++------------------- 5 files changed, 60 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2012d7ab6a67f909d397…

1 0

Alexandre Julliard : gdi32: Merge rectangles horizontally when possible in CreatePolyPolygonRgn.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: b67f39ccc6ea4b366e4a839f64d72d5200518a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67f39ccc6ea4b366e4a839f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 11:02:45 2021 +0100 gdi32: Merge rectangles horizontally when possible in CreatePolyPolygonRgn. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50539 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index fba2e125731..b3764b31442 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2613,12 +2613,15 @@ static void scan_convert( WINEREGION *obj, EdgeTable *ET, INT mode, const RECT * { obj->rects[obj->numRects].left = active->bres.minor_axis; obj->rects[obj->numRects].top = y; + obj->rects[obj->numRects].bottom = y + 1; } else if (obj->rects[obj->numRects].left != active->bres.minor_axis) { - obj->rects[obj->numRects].right = active->bres.minor_axis; - obj->rects[obj->numRects].bottom = y + 1; - obj->numRects++; + /* create new rect only if we can't merge with the previous one */ + if (!obj->numRects || obj->rects[obj->numRects-1].top != y || + obj->rects[obj->numRects-1].right < obj->rects[obj->numRects].left) + obj->numRects++; + obj->rects[obj->numRects-1].right = active->bres.minor_axis; } first = !first; }

1 0

Zebediah Figura : server: Use default_fd_get_poll_events() for file objects.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 70d12630716f1edf28f555abdd2ea306711140d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d12630716f1edf28f555ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 18:16:41 2021 -0600 server: Use default_fd_get_poll_events() for file objects. This avoids sending the server into a busy-loop when trying to perform an asynchronous read from a non-regular file (say, a FIFO). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/server/file.c b/server/file.c index 2cc4a9d978c..fd8e3f96033 100644 --- a/server/file.c +++ b/server/file.c @@ -75,7 +75,6 @@ static struct object *file_open_file( struct object *obj, unsigned int access, static struct list *file_get_kernel_obj_list( struct object *obj ); static void file_destroy( struct object *obj ); -static int file_get_poll_events( struct fd *fd ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -104,7 +103,7 @@ static const struct object_ops file_ops = static const struct fd_ops file_fd_ops = { - file_get_poll_events, /* get_poll_events */ + default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ file_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ @@ -287,16 +286,6 @@ struct object_type *file_get_type( struct object *obj ) return get_object_type( &str ); } -static int file_get_poll_events( struct fd *fd ) -{ - struct file *file = get_fd_user( fd ); - int events = 0; - assert( file->obj.ops == &file_ops ); - if (file->access & FILE_UNIX_READ_ACCESS) events |= POLLIN; - if (file->access & FILE_UNIX_WRITE_ACCESS) events |= POLLOUT; - return events; -} - static enum server_fd_type file_get_fd_type( struct fd *fd ) { struct file *file = get_fd_user( fd );

1 0

Zebediah Figura : server: Avoid leaking "acceptsock" on allocation failure.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: fe11ff87ac8918f5e5104cccccb5544d9c6c30c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe11ff87ac8918f5e5104ccc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 18:16:42 2021 -0600 server: Avoid leaking "acceptsock" on allocation failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 5f207e7f180..8c146a0a8f8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1473,7 +1473,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - if (!(req = alloc_accept_req( acceptsock, async, params ))) return 0; + if (!(req = alloc_accept_req( acceptsock, async, params ))) + { + release_object( acceptsock ); + return 0; + } list_add_tail( &sock->accept_list, &req->entry ); acceptsock->accept_recv_req = req; release_object( acceptsock );

1 0

Zebediah Figura : winegstreamer: Don't force watch_bus() onto a Wine thread.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 4782f67bca6f4e6aed585701a517c5b17598f8f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4782f67bca6f4e6aed585701… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:55 2021 -0600 winegstreamer: Don't force watch_bus() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index cb07cafb7bc..b9effe73a5b 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -136,19 +136,6 @@ static void call_cb(struct cb_data *cbdata) pthread_mutex_destroy(&cbdata->lock); } -GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) -{ - struct cb_data cbdata = { WATCH_BUS }; - - cbdata.u.watch_bus_data.bus = bus; - cbdata.u.watch_bus_data.msg = msg; - cbdata.u.watch_bus_data.user = user; - - call_cb(&cbdata); - - return cbdata.u.watch_bus_data.ret; -} - void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) { struct cb_data cbdata = { EXISTING_NEW_PAD }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 9bb3572c5db..0e262c12db8 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -30,7 +30,6 @@ typedef enum { } GstAutoplugSelectResult; enum CB_TYPE { - WATCH_BUS, EXISTING_NEW_PAD, QUERY_FUNCTION, ACTIVATE_MODE, @@ -133,7 +132,6 @@ void mark_wine_thread(void) DECLSPEC_HIDDEN; void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; -GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4653536afcc..e85e54c2e34 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1503,7 +1503,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) if (!This->bus) { This->bus = gst_bus_new(); - gst_bus_set_sync_handler(This->bus, watch_bus_wrapper, This, NULL); + gst_bus_set_sync_handler(This->bus, watch_bus, This, NULL); } This->container = gst_bin_new(NULL); @@ -2424,12 +2424,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) { switch(cbdata->type) { - case WATCH_BUS: - { - struct watch_bus_data *data = &cbdata->u.watch_bus_data; - cbdata->u.watch_bus_data.ret = watch_bus(data->bus, data->msg, data->user); - break; - } case EXISTING_NEW_PAD: { struct pad_added_data *data = &cbdata->u.pad_added_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in watch_bus().
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 871c5673d95ebf685f6a4f34e16e3abf2eb98d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=871c5673d95ebf685f6a4f34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:54 2021 -0600 winegstreamer: Avoid using Wine debug functions in watch_bus(). They depend on a valid TEB and can't be called from non-Wine threads. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index bab9804bdbd..4653536afcc 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1431,14 +1431,14 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) GError *err = NULL; gchar *dbg_info = NULL; - TRACE("filter %p, message type %s.\n", filter, GST_MESSAGE_TYPE_NAME(msg)); + GST_DEBUG("filter %p, message type %s.", filter, GST_MESSAGE_TYPE_NAME(msg)); switch (msg->type) { case GST_MESSAGE_ERROR: gst_message_parse_error(msg, &err, &dbg_info); - ERR("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); - ERR("%s\n", dbg_info); + fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); pthread_mutex_lock(&filter->mutex); @@ -1449,8 +1449,8 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) case GST_MESSAGE_WARNING: gst_message_parse_warning(msg, &err, &dbg_info); - WARN("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); - WARN("%s\n", dbg_info); + fprintf(stderr, "winegstreamer: warning: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + fprintf(stderr, "winegstreamer: warning: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); break;

1 0

Zebediah Figura : winegstreamer: Use a pthread condition variable to wait for filter initialization.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 1f7ab818d8f0778b6c7c80f650f7f5558cffb399 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f7ab818d8f0778b6c7c80f6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:53 2021 -0600 winegstreamer: Use a pthread condition variable to wait for filter initialization. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 120 +++++++++++++++++++++++++++--------------- 1 file changed, 79 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f7ab818d8f0778b6c7c…

1 0

Zebediah Figura : winegstreamer: Store the segment parameters in the parser_event structure.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 2546ad81158946c98d6fcf63e3f15d84909421d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2546ad81158946c98d6fcf63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:52 2021 -0600 winegstreamer: Store the segment parameters in the parser_event structure. Instead of the segment event. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 49 ++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9cd3c8adff5..b6942e5ae77 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdbool.h> +#include <stdint.h> #include <stdio.h> #include <gst/gst.h> #include <gst/video/video.h> diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 903305724a4..d79622094f6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -94,7 +94,11 @@ struct parser_event union { GstBuffer *buffer; - GstEvent *segment; + struct + { + uint64_t position, stop; + double rate; + } segment; } u; }; @@ -709,14 +713,23 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (pin->pin.pin.peer) { struct parser_event stream_event; + const GstSegment *segment; - stream_event.type = PARSER_EVENT_SEGMENT; - stream_event.u.segment = event; - if (queue_stream_event(pin, &stream_event) == GST_FLOW_OK) + gst_event_parse_segment(event, &segment); + + if (segment->format != GST_FORMAT_TIME) { - /* Transfer our reference to the event to the thread. */ - return TRUE; + FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); + break; } + + gst_segment_copy_into(segment, pin->segment); + + stream_event.type = PARSER_EVENT_SEGMENT; + stream_event.u.segment.position = segment->position / 100; + stream_event.u.segment.stop = segment->stop / 100; + stream_event.u.segment.rate = segment->rate * segment->applied_rate; + queue_stream_event(pin, &stream_event); } break; @@ -744,15 +757,12 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { case PARSER_EVENT_NONE: case PARSER_EVENT_EOS: + case PARSER_EVENT_SEGMENT: break; case PARSER_EVENT_BUFFER: gst_buffer_unref(pin->event.u.buffer); break; - - case PARSER_EVENT_SEGMENT: - gst_event_unref(pin->event.u.segment); - break; } pin->event.type = PARSER_EVENT_NONE; @@ -1057,24 +1067,9 @@ static DWORD CALLBACK stream_thread(void *arg) break; case PARSER_EVENT_SEGMENT: - { - const GstSegment *segment; - - gst_event_parse_segment(event.u.segment, &segment); - - if (segment->format != GST_FORMAT_TIME) - { - FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); - break; - } - - gst_segment_copy_into(segment, pin->segment); - - IPin_NewSegment(pin->pin.pin.peer, segment->position / 100, - segment->stop / 100, segment->rate * segment->applied_rate); - gst_event_unref(event.u.segment); + IPin_NewSegment(pin->pin.pin.peer, event.u.segment.position, + event.u.segment.stop, event.u.segment.rate); break; - } case PARSER_EVENT_NONE: assert(0);

1 0

Zebediah Figura : winegstreamer: Move pin duration and caps retrieval to GST_Connect().
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 911bc74a1e494eeffe5e1a21922c58f913bd5ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=911bc74a1e494eeffe5e1a21… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:51 2021 -0600 winegstreamer: Move pin duration and caps retrieval to GST_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 99 +++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 66 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index da53556eb0c..903305724a4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1452,8 +1452,29 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) return GST_BUS_DROP; } +static LONGLONG query_duration(GstPad *pad) +{ + gint64 duration, byte_length; + + if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) + return duration / 100; + + WARN("Failed to query time duration; trying to convert from byte length.\n"); + + /* To accurately get a duration for the stream, we want to only consider the + * length of that stream. Hence, query for the pad duration, instead of + * using the file duration. */ + if (gst_pad_query_duration(pad, GST_FORMAT_BYTES, &byte_length) + && gst_pad_query_convert(pad, GST_FORMAT_BYTES, byte_length, GST_FORMAT_TIME, &duration)) + return duration / 100; + + ERR("Failed to query duration.\n"); + return 0; +} + static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) { + unsigned int i; LONGLONG avail; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( "quartz_src", @@ -1483,28 +1504,19 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) if (!This->init_gst(This)) return E_FAIL; - This->nextofs = This->nextpullofs = 0; - return S_OK; -} - -static LONGLONG query_duration(GstPad *pad) -{ - gint64 duration, byte_length; - - if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) - return duration / 100; - - WARN("Failed to query time duration; trying to convert from byte length.\n"); + for (i = 0; i < This->source_count; ++i) + { + struct parser_source *pin = This->sources[i]; + const HANDLE events[2] = {pin->caps_event, This->error_event}; - /* To accurately get a duration for the stream, we want to only consider the - * length of that stream. Hence, query for the pad duration, instead of - * using the file duration. */ - if (gst_pad_query_duration(pad, GST_FORMAT_BYTES, &byte_length) - && gst_pad_query_convert(pad, GST_FORMAT_BYTES, byte_length, GST_FORMAT_TIME, &duration)) - return duration / 100; + pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); + pin->seek.llCurrent = 0; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return E_FAIL; + } - ERR("Failed to query duration.\n"); - return 0; + This->nextofs = This->nextpullofs = 0; + return S_OK; } static inline struct parser_source *impl_from_IMediaSeeking(IMediaSeeking *iface) @@ -1714,7 +1726,6 @@ static const struct strmbase_sink_ops sink_ops = static BOOL decodebin_parser_init_gst(struct parser *filter) { GstElement *element = gst_element_factory_make("decodebin", NULL); - unsigned int i; HANDLE events[2]; int ret; @@ -1754,18 +1765,6 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; - for (i = 0; i < filter->source_count; ++i) - { - struct parser_source *pin = filter->sources[i]; - - pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); - pin->seek.llCurrent = 0; - events[0] = pin->caps_event; - events[1] = filter->error_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) - return FALSE; - } - return TRUE; } @@ -2506,7 +2505,6 @@ static BOOL wave_parser_init_gst(struct parser *filter) static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; struct parser_source *pin; GstElement *element; - HANDLE events[2]; int ret; if (!(element = gst_element_factory_make("wavparse", NULL))) @@ -2544,14 +2542,6 @@ static BOOL wave_parser_init_gst(struct parser *filter) return FALSE; } - pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); - pin->seek.llCurrent = 0; - - events[0] = pin->caps_event; - events[1] = filter->error_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) - return FALSE; - return TRUE; } @@ -2621,7 +2611,6 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = static BOOL avi_splitter_init_gst(struct parser *filter) { GstElement *element = gst_element_factory_make("avidemux", NULL); - unsigned int i; HANDLE events[2]; int ret; @@ -2660,18 +2649,6 @@ static BOOL avi_splitter_init_gst(struct parser *filter) if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; - for (i = 0; i < filter->source_count; ++i) - { - struct parser_source *pin = filter->sources[i]; - - pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); - pin->seek.llCurrent = 0; - events[0] = pin->caps_event; - events[1] = filter->error_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) - return FALSE; - } - return TRUE; } @@ -2791,17 +2768,7 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) events[1] = filter->error_event; events[2] = pin->eos_event; res = WaitForMultipleObjects(3, events, FALSE, INFINITE); - if (res == 1) - return FALSE; - - pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); - pin->seek.llCurrent = 0; - - events[0] = pin->caps_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) - return FALSE; - - return TRUE; + return (res != 1); } static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt)

1 0

Rémi Bernon : windowscodecs: Use IWICComponentFactory_CreateStream in GetReaderByIndex.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 3c6cf6ef2c3c919ef82de28a634a22f70ce8312a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c6cf6ef2c3c919ef82de28a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 20 10:30:06 2021 +0100 windowscodecs: Use IWICComponentFactory_CreateStream in GetReaderByIndex. Instead of StreamImpl_Create. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index 5970a44cd53..b05d50dfea9 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -595,7 +595,7 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc { CommonDecoderFrame *This = impl_from_IWICMetadataBlockReader(iface); HRESULT hr; - IWICComponentFactory* factory; + IWICComponentFactory* factory = NULL; IWICStream* stream; TRACE("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); @@ -609,7 +609,10 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc hr = E_INVALIDARG; if (SUCCEEDED(hr)) - hr = StreamImpl_Create(&stream); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + hr = IWICComponentFactory_CreateStream(factory, &stream); if (SUCCEEDED(hr)) { @@ -664,23 +667,17 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc } else { - if (SUCCEEDED(hr)) - hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory); - - if (SUCCEEDED(hr)) - { - hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, - &This->parent->decoder_info.block_format, NULL, - This->metadata_blocks[nIndex].options & DECODER_BLOCK_OPTION_MASK, - (IStream*)stream, ppIMetadataReader); - - IWICComponentFactory_Release(factory); - } + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &This->parent->decoder_info.block_format, NULL, + This->metadata_blocks[nIndex].options & DECODER_BLOCK_OPTION_MASK, + (IStream*)stream, ppIMetadataReader); } IWICStream_Release(stream); } + if (factory) IWICComponentFactory_Release(factory); + if (FAILED(hr)) *ppIMetadataReader = NULL;

1 0

Rémi Bernon : windowscodecs: Use create_instance instead of ImagingFactory_CreateInstance.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: f6c7f150ec33d6ab53e18cdf4cef37470cc2cda0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6c7f150ec33d6ab53e18cdf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 20 10:30:05 2021 +0100 windowscodecs: Use create_instance instead of ImagingFactory_CreateInstance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/clsfactory.c | 2 +- dlls/windowscodecs/decoder.c | 2 +- dlls/windowscodecs/palette.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 914e8ad52cd..b2914a7fd5b 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -206,7 +206,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return ret; } -HRESULT create_instance(CLSID *clsid, const IID *iid, void **ppv) +HRESULT create_instance(const CLSID *clsid, const IID *iid, void **ppv) { int i; diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index 3e43fa91114..5970a44cd53 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -665,7 +665,7 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc else { if (SUCCEEDED(hr)) - hr = ImagingFactory_CreateInstance(&IID_IWICComponentFactory, (void**)&factory); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory); if (SUCCEEDED(hr)) { diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 34329717201..051a5944eb2 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -679,7 +679,7 @@ static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *palette, else rgb24_source = source; - hr = ImagingFactory_CreateInstance(&IID_IWICImagingFactory, (void **)&factory); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICImagingFactory, (void **)&factory); if (hr != S_OK) goto fail; hr = IWICImagingFactory_CreateBitmapFromSource(factory, rgb24_source, WICBitmapCacheOnLoad, &rgb24_bitmap); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 3b20f7d6c24..85d057cc278 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -133,7 +133,7 @@ DECLARE_INTERFACE_(IMILUnknown2,IUnknown) }; #undef INTERFACE -HRESULT create_instance(CLSID *clsid, const IID *iid, void **ppv) DECLSPEC_HIDDEN; +HRESULT create_instance(const CLSID *clsid, const IID *iid, void **ppv) DECLSPEC_HIDDEN; typedef HRESULT(*class_constructor)(REFIID,void**); extern HRESULT FormatConverter_CreateInstance(REFIID riid, void** ppv) DECLSPEC_HIDDEN;

1 0

Ziqing Hui : gdiplus: Record logical DPI in metafile.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 3549097c9e393bca3d2b2c86dd04a0d971a1c138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3549097c9e393bca3d2b2c86… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jan 20 10:26:46 2021 +0800 gdiplus: Record logical DPI in metafile. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/metafile.c | 20 ++++++++++++++------ dlls/gdiplus/tests/metafile.c | 2 -- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f0143743caf..4bca5b13be9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -415,6 +415,8 @@ struct GpMetafile{ DWORD next_object_id; UINT limit_dpi; BOOL printer_display; + REAL logical_dpix; + REAL logical_dpiy; /* playback */ GpGraphics *playback_graphics; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 12b7cba75dc..3c2e8eb3aa2 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -838,6 +838,8 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->limit_dpi = 96; (*metafile)->hemf = NULL; (*metafile)->printer_display = (GetDeviceCaps(record_dc, TECHNOLOGY) == DT_RASPRINTER); + (*metafile)->logical_dpix = (REAL)GetDeviceCaps(record_dc, LOGPIXELSX); + (*metafile)->logical_dpiy = (REAL)GetDeviceCaps(record_dc, LOGPIXELSY); list_init(&(*metafile)->containers); if (!frameRect) @@ -964,8 +966,8 @@ GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) if (stat == Ok) { *result = metafile->record_graphics; - metafile->record_graphics->xres = 96.0; - metafile->record_graphics->yres = 96.0; + metafile->record_graphics->xres = metafile->logical_dpix; + metafile->record_graphics->yres = metafile->logical_dpiy; metafile->record_graphics->printer_display = metafile->printer_display; } @@ -1792,12 +1794,16 @@ static GpStatus METAFILE_PlaybackUpdateWorldTransform(GpMetafile *metafile) if (stat == Ok) { - REAL scale = units_to_pixels(1.0, metafile->page_unit, 96.0, metafile->printer_display); + REAL scale_x = units_to_pixels(1.0, metafile->page_unit, metafile->logical_dpix, metafile->printer_display); + REAL scale_y = units_to_pixels(1.0, metafile->page_unit, metafile->logical_dpiy, metafile->printer_display); if (metafile->page_unit != UnitDisplay) - scale *= metafile->page_scale; + { + scale_x *= metafile->page_scale; + scale_y *= metafile->page_scale; + } - stat = GdipScaleMatrix(real_transform, scale, scale, MatrixOrderPrepend); + stat = GdipScaleMatrix(real_transform, scale_x, scale_y, MatrixOrderPrepend); if (stat == Ok) stat = GdipMultiplyMatrix(real_transform, metafile->world_transform, MatrixOrderPrepend); @@ -4070,7 +4076,9 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, (*metafile)->preserve_hemf = !delete; /* If the 31th bit of EmfPlusFlags was set, metafile was recorded with a DC for a video display. * If clear, metafile was recorded with a DC for a printer */ - (*metafile)->printer_display = !(header.EmfPlusFlags & (1 << 31)); + (*metafile)->printer_display = !(header.EmfPlusFlags & (1u << 31)); + (*metafile)->logical_dpix = header.LogicalDpiX; + (*metafile)->logical_dpix = header.LogicalDpiY; list_init(&(*metafile)->containers); TRACE("<-- %p\n", *metafile); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index e919884120f..60659bf3119 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3529,10 +3529,8 @@ static void test_printer_dc(void) GdipGetDpiX(graphics, &dpix); GdipGetDpiX(graphics, &dpiy); - todo_wine { expectf((REAL)(GetDeviceCaps(hdc, LOGPIXELSX)), dpix); expectf((REAL)(GetDeviceCaps(hdc, LOGPIXELSY)), dpiy); - } GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage *)metafile);

1 0

Ziqing Hui : gdiplus/tests: Add initial tests for metafile created from printer DC.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: c32be58b478377cdba5a70e4ecd40d9bf27225be URL: https://source.winehq.org/git/wine.git/?a=commit;h=c32be58b478377cdba5a70e4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jan 20 10:24:25 2021 +0800 gdiplus/tests: Add initial tests for metafile created from printer DC. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 3ce7a16d61a..e919884120f 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -22,6 +22,7 @@ #include "objbase.h" #include "gdiplus.h" +#include "winspool.h" #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) @@ -3457,6 +3458,86 @@ static void test_lineargradient(void) GdipDisposeImage((GpImage*)metafile); } +static HDC create_printer_dc(void) +{ + char buffer[260]; + DWORD len; + PRINTER_INFO_2A *pbuf = NULL; + DRIVER_INFO_3A *dbuf = NULL; + HANDLE hprn = 0; + HDC hdc = 0; + HMODULE winspool = LoadLibraryA("winspool.drv"); + BOOL (WINAPI *pOpenPrinterA)(LPSTR, HANDLE *, LPPRINTER_DEFAULTSA); + BOOL (WINAPI *pGetDefaultPrinterA)(LPSTR, LPDWORD); + BOOL (WINAPI *pGetPrinterA)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); + BOOL (WINAPI *pGetPrinterDriverA)(HANDLE, LPSTR, DWORD, LPBYTE, DWORD, LPDWORD); + BOOL (WINAPI *pClosePrinter)(HANDLE); + + pGetDefaultPrinterA = (void *)GetProcAddress(winspool, "GetDefaultPrinterA"); + pOpenPrinterA = (void *)GetProcAddress(winspool, "OpenPrinterA"); + pGetPrinterA = (void *)GetProcAddress(winspool, "GetPrinterA"); + pGetPrinterDriverA = (void *)GetProcAddress(winspool, "GetPrinterDriverA"); + pClosePrinter = (void *)GetProcAddress(winspool, "ClosePrinter"); + + if (!pGetDefaultPrinterA || !pOpenPrinterA || !pGetPrinterA || !pGetPrinterDriverA || !pClosePrinter) + goto done; + + len = sizeof(buffer); + if (!pGetDefaultPrinterA(buffer, &len)) goto done; + if (!pOpenPrinterA(buffer, &hprn, NULL)) goto done; + + pGetPrinterA(hprn, 2, NULL, 0, &len); + pbuf = HeapAlloc(GetProcessHeap(), 0, len); + if (!pGetPrinterA(hprn, 2, (LPBYTE)pbuf, len, &len)) goto done; + + pGetPrinterDriverA(hprn, NULL, 3, NULL, 0, &len); + dbuf = HeapAlloc(GetProcessHeap(), 0, len); + if (!pGetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, len, &len)) goto done; + + hdc = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode); + trace("hdc %p for driver '%s' printer '%s' port '%s'\n", hdc, + dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); +done: + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); + if (hprn) pClosePrinter(hprn); + if (winspool) FreeLibrary(winspool); + return hdc; +} + +static void test_printer_dc(void) +{ + HDC hdc; + Status status; + RectF frame = { 0.0, 0.0, 1.0, 1.0 }; + GpMetafile *metafile; + GpGraphics *graphics; + REAL dpix, dpiy; + + hdc = create_printer_dc(); + if (!hdc) + { + skip("could not create a DC for the default printer\n"); + return; + } + + status = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitInch, L"winetest", &metafile); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage *)metafile, &graphics); + expect(Ok, status); + + GdipGetDpiX(graphics, &dpix); + GdipGetDpiX(graphics, &dpiy); + todo_wine { + expectf((REAL)(GetDeviceCaps(hdc, LOGPIXELSX)), dpix); + expectf((REAL)(GetDeviceCaps(hdc, LOGPIXELSY)), dpiy); + } + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage *)metafile); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3510,6 +3591,7 @@ START_TEST(metafile) test_unknownfontdecode(); test_fillregion(); test_lineargradient(); + test_printer_dc(); GdiplusShutdown(gdiplusToken); }

1 0

Ziqing Hui : gdiplus: Correctly handle UnitDisplay for printer DC.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: f40f379f050c97bf615adcff07e6b1f554dff3cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40f379f050c97bf615adcff… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jan 20 10:24:10 2021 +0800 gdiplus: Correctly handle UnitDisplay for printer DC. For printer DC, UnitDisplay specifies that a unit is 1/100 inch, which is different from display DC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17848 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 12 ++++++------ dlls/gdiplus/gdiplus.c | 22 +++++++++++++++------- dlls/gdiplus/gdiplus_private.h | 8 +++++--- dlls/gdiplus/graphics.c | 38 ++++++++++++++++++++------------------ dlls/gdiplus/image.c | 12 ++++++++---- dlls/gdiplus/metafile.c | 25 ++++++++++++++++--------- dlls/gdiplus/tests/graphics.c | 2 -- 7 files changed, 70 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f40f379f050c97bf615a…

1 0

Zebediah Figura : vkd3d-shader: Implement the parenthetical operator in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: 6520fb153e6e49c0e9b7b0eef6e711d9c1efa8b6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6520fb153e6e49c0e9b7b0e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:47 2021 -0600 vkd3d-shader: Implement the parenthetical operator in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 -- libs/vkd3d-shader/preproc.y | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 76a2f31..27d933c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,8 +243,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/preproc-if-expr.shader_test \ - tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index aa381e8..7a99543 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -693,6 +693,10 @@ primary_expr $$ = !!preproc_find_macro(ctx, $3); vkd3d_free($3); } + | '(' expr ')' + { + $$ = $2; + } unary_expr : primary_expr

1 0

Zebediah Figura : vkd3d-shader: Implement the ternary operator in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: e15b884e1a9f149ee0c07abdb83f0d287d4bd5af URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e15b884e1a9f149ee0c07ab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:46 2021 -0600 vkd3d-shader: Implement the ternary operator in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 +- libs/vkd3d-shader/preproc.y | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 37acc5e..1bf14ff 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -162,7 +162,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[-()\[\]{},+!*/<>&|^] {return yytext[0];} +<INITIAL>[-()\[\]{},+!*/<>&|^?:] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 051f94b..aa381e8 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -351,6 +351,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> bitor_expr %type <integer> logicand_expr %type <integer> logicor_expr +%type <integer> expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -483,6 +484,14 @@ body_token_const { $$ = "^"; } + | '?' + { + $$ = "?"; + } + | ':' + { + $$ = ":"; + } | T_CONCAT { $$ = "##"; @@ -548,7 +557,7 @@ directive } vkd3d_free($2); } - | T_IF logicor_expr T_NEWLINE + | T_IF expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -563,7 +572,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF logicor_expr T_NEWLINE + | T_ELIF expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -791,3 +800,10 @@ logicor_expr { $$ = $1 || $3; } + +expr + : logicor_expr + | expr '?' logicor_expr ':' logicor_expr + { + $$ = $1 ? $3 : $5; + }

1 0

Zebediah Figura : vkd3d-shader: Implement logical operators in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: 338399d5636ae3c2e6204c815821413292902bc6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=338399d5636ae3c2e6204c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:45 2021 -0600 vkd3d-shader: Implement logical operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 4 ++-- libs/vkd3d-shader/preproc.y | 30 ++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 4c82bab..37acc5e 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -82,6 +82,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>">=" {return T_GE;} <INITIAL>"==" {return T_EQ;} <INITIAL>"!=" {return T_NE;} +<INITIAL>"&&" {return T_AND;} +<INITIAL>"||" {return T_OR;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -95,8 +97,6 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>## {return T_CONCAT;} -<INITIAL>"&&" {return T_TEXT;} -<INITIAL>"||" {return T_TEXT;} <INITIAL>"++" {return T_TEXT;} <INITIAL>"--" {return T_TEXT;} <INITIAL>"<<"=? {return T_TEXT;} diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index fa5e5cc..051f94b 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -336,6 +336,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_GE ">=" %token T_EQ "==" %token T_NE "!=" +%token T_AND "&&" +%token T_OR "||" %token T_DEFINED "defined" %type <integer> primary_expr @@ -347,6 +349,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> bitand_expr %type <integer> bitxor_expr %type <integer> bitor_expr +%type <integer> logicand_expr +%type <integer> logicor_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -499,6 +503,14 @@ body_token_const { $$ = "!="; } + | T_AND + { + $$ = "&&"; + } + | T_OR + { + $$ = "||"; + } | T_DEFINED { $$ = "defined"; @@ -536,7 +548,7 @@ directive } vkd3d_free($2); } - | T_IF bitor_expr T_NEWLINE + | T_IF logicor_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -551,7 +563,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF bitor_expr T_NEWLINE + | T_ELIF logicor_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -765,3 +777,17 @@ bitor_expr { $$ = $1 | $3; } + +logicand_expr + : bitor_expr + | logicand_expr T_AND bitor_expr + { + $$ = $1 && $3; + } + +logicor_expr + : logicand_expr + | logicor_expr T_OR logicand_expr + { + $$ = $1 || $3; + }

1 0

Zebediah Figura : vkd3d-shader: Implement bitwise operators in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: c1d2edc9d57d8c584b90b487f9f301bdf3b55b15 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c1d2edc9d57d8c584b90b48… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:44 2021 -0600 vkd3d-shader: Implement bitwise operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 +- libs/vkd3d-shader/preproc.y | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index d21ddd1..4c82bab 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -162,7 +162,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[-()\[\]{},+!*/<>] {return yytext[0];} +<INITIAL>[-()\[\]{},+!*/<>&|^] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 089fd76..fa5e5cc 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -344,6 +344,9 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> add_expr %type <integer> ineq_expr %type <integer> eq_expr +%type <integer> bitand_expr +%type <integer> bitxor_expr +%type <integer> bitor_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -464,6 +467,18 @@ body_token_const { $$ = ">"; } + | '&' + { + $$ = "&"; + } + | '|' + { + $$ = "|"; + } + | '^' + { + $$ = "^"; + } | T_CONCAT { $$ = "##"; @@ -521,7 +536,7 @@ directive } vkd3d_free($2); } - | T_IF eq_expr T_NEWLINE + | T_IF bitor_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -536,7 +551,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF eq_expr T_NEWLINE + | T_ELIF bitor_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -729,3 +744,24 @@ eq_expr { $$ = $1 != $3; } + +bitand_expr + : eq_expr + | bitand_expr '&' eq_expr + { + $$ = $1 & $3; + } + +bitxor_expr + : bitand_expr + | bitxor_expr '^' bitand_expr + { + $$ = $1 ^ $3; + } + +bitor_expr + : bitxor_expr + | bitor_expr '|' bitxor_expr + { + $$ = $1 | $3; + }

1 0

Zebediah Figura : vkd3d-shader: Implement equality operators in #if directives.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: vkd3d Branch: master Commit: 15bbaed9602cc0b9e87b98edda286fa28552fa6b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=15bbaed9602cc0b9e87b98e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 21 16:10:43 2021 -0600 vkd3d-shader: Implement equality operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.l | 4 +++- libs/vkd3d-shader/preproc.y | 26 ++++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 30bea62..76a2f31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,7 +243,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 6779a39..d21ddd1 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -80,6 +80,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"<=" {return T_LE;} <INITIAL>">=" {return T_GE;} +<INITIAL>"==" {return T_EQ;} +<INITIAL>"!=" {return T_NE;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -99,7 +101,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"--" {return T_TEXT;} <INITIAL>"<<"=? {return T_TEXT;} <INITIAL>">>"=? {return T_TEXT;} -<INITIAL>[-+*/%&|^=!]= {return T_TEXT;} +<INITIAL>[-+*/%&|^]= {return T_TEXT;} <INCLUDE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;} diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 6d88419..089fd76 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -334,6 +334,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_LE "<=" %token T_GE ">=" +%token T_EQ "==" +%token T_NE "!=" %token T_DEFINED "defined" %type <integer> primary_expr @@ -341,6 +343,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> mul_expr %type <integer> add_expr %type <integer> ineq_expr +%type <integer> eq_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -473,6 +476,14 @@ body_token_const { $$ = ">="; } + | T_EQ + { + $$ = "=="; + } + | T_NE + { + $$ = "!="; + } | T_DEFINED { $$ = "defined"; @@ -510,7 +521,7 @@ directive } vkd3d_free($2); } - | T_IF ineq_expr T_NEWLINE + | T_IF eq_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -525,7 +536,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF ineq_expr T_NEWLINE + | T_ELIF eq_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -707,3 +718,14 @@ ineq_expr { $$ = $1 >= $3; } + +eq_expr + : ineq_expr + | eq_expr T_EQ ineq_expr + { + $$ = $1 == $3; + } + | eq_expr T_NE ineq_expr + { + $$ = $1 != $3; + }

1 0

Francois Gouget : testbot/TestWTBS: Fix the TestUnits check in case of build errors.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: b47c3dd0180168c53c267972a32821c16cca4a30 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b47c3dd0180168c53c26797… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:47 2021 +0100 testbot/TestWTBS: Fix the TestUnits check in case of build errors. In case of a build error the TestUnits check must be skipped on Wine VMs since the test units list is built from the test reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index cc3037f..01f46bf 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -514,6 +514,12 @@ sub CheckTask($$$$) { is($Task->Status, $TaskInfo->{Status}, "Check Status of task ". TaskKeyStr($Task)); } + if ($Task->Status =~ /^bad/) + { + # It makes no sense to check which test units were run in case of a build + # error. + $TestUnits->{$TaskType}->{"*skipped*"} = 1; + } my $ReportCount = 0; foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) @@ -670,6 +676,8 @@ sub CheckJobTree($) $HasTask->{$Type} ||= 0; is($HasTask->{$Type}, $TypeInfo->{HasTask}, "Check the presence of $Type tasks for job ". $Job->Id); } + + next if ($TestUnits->{$Type}->{"*skipped*"}); if (CheckValue($TypeInfo->{TestUnits})) { foreach my $TestUnit (split / +/, $TypeInfo->{TestUnits})

1 0

Francois Gouget : testbot/TestWTBS: Also check the build tasks.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: 79c546194f92d83da849d56a02d133681f7d5e30 URL: https://source.winehq.org/git/tools.git/?a=commit;h=79c546194f92d83da849d56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:45 2021 +0100 testbot/TestWTBS: Also check the build tasks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e3909a2..cc3037f 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -660,7 +660,7 @@ sub CheckJobTree($) # which VMs to run the test on. if (IsMailingListJob($Job)) { - foreach my $Type ("win32", "win64", "wine") + foreach my $Type ("build", "win32", "win64", "wine") { next if (!$HasBaseVM->{$Type});

1 0

Francois Gouget : testbot/TestWTBS: Allow matching errors in testbot.log.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: 9b028fed31426847eb847bb0e3e22873bfdeca49 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9b028fed31426847eb847bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:38 2021 +0100 testbot/TestWTBS: Allow matching errors in testbot.log. Tasks have three types of logs: - *.report files that collect the test output. - task.log which collects the messages from the VM-side process that starts the Wine test / build. - testbot.log which collects the server-side messages when some inconsistency is detected or the connection to the VM is lost. Each get their own .errors file but so far only errors in the first two types of logs could be matched. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 5cadc5d..e3909a2 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -300,7 +300,7 @@ sub LoadTestInfo($) foreach my $RawGroupName (@{$RawInfo->{ErrGroupNames}}) { my $GroupName = lcfirst($RawGroupName); - if ($GroupName =~ s/^(tasks|build|tests|win|win32|win64|wine)\.(log|report)\.//) + if ($GroupName =~ s/^(tasks|build|tests|win|win32|win64|wine)\.(report|log|testbot)\.//) { my $ErrInfo = ($TestInfo->{$1}->{"$2.errors"} ||= {}); push @{$ErrInfo->{ErrGroupNames}}, $GroupName; @@ -395,12 +395,13 @@ sub IsMailingListJob($) } =pod -=item <tasks.(log|report).groupname> +=item <tasks.(report|log|testbot).groupname> Verifies the presence of new errors in the specified error log or report of the tasks in the specified category. For this, list the group and errors that are expected to appear; where the group name is prefixed by the task -category and either 'log' or 'report'. +category and either 'report' for the test reports, 'log' for 'task.log', or +'testbot' for 'testbot.log'. For instance: g 0 tests.report.kernel32 @@ -531,6 +532,11 @@ sub CheckTask($$$$) map { $TestUnits->{wine}->{$_} = 1 } (keys %$ReportTestUnits); } } + elsif ($LogName =~ /^testbot\./) + { + $LogType = "testbot"; + } + if ($TaskInfo->{"$LogType.errors"}) { CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"},

1 0

Francois Gouget : testbot/TestWTBS: Tweak the properties propagation.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: 451bccebf110702a789a202652b4954ec85bd563 URL: https://source.winehq.org/git/tools.git/?a=commit;h=451bccebf110702a789a202… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:30 2021 +0100 testbot/TestWTBS: Tweak the properties propagation. Cascade the properties down 1 level at a time rather than straight to the base level. This reduces duplication about which base categories belong in the top-level ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index c5ac9e1..5cadc5d 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -323,9 +323,9 @@ sub LoadTestInfo($) SetDefault($TestInfo, "tasks", "HasTask", 1); # Then propagate the defaults - foreach my $Pair (["win", ["win32", "win64"]], - ["tests", ["win32", "win64", "wine"]], - ["tasks", ["build", "win32", "win64", "wine"]]) + foreach my $Pair (["tasks", ["build", "tests"]], + ["tests", ["win", "wine"]], + ["win", ["win32", "win64"]]) { my ($Src, $TaskTypes) = @$Pair; foreach my $Field (keys %{$TestInfo->{$Src}})

1 0

Francois Gouget : testbot/TestWTBS: Skip the base Windows VMs if there is no base build VM.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: tools Branch: master Commit: 0d988959e645b52d4c22213132e7343e88171d24 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d988959e645b52d4c22213… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 22 17:02:27 2021 +0100 testbot/TestWTBS: Skip the base Windows VMs if there is no base build VM. Do not report errors about missing Windows tasks if the TestBot only has Wine VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 5f62d63..c5ac9e1 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -696,6 +696,12 @@ foreach my $VM (@{$VMs->GetItems()}) { $HasBaseVM->{$VM->Type} = 1 if ($VM->Role eq "base"); } +if (!$HasBaseVM->{build}) +{ + # Cannot run the tests on Windows if there is no build VM + delete $HasBaseVM->{win32}; + delete $HasBaseVM->{win64}; +} CheckJobs();

1 0

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