November 2022 - Wine-commits

Francois Gouget : testbot/LibvirtTool: Re-set the locale and country when preparing Windows VMs.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: tools Branch: master Commit: ba9cb31d7418e896a8fc95f4cbc4af312631e197 URL: https://gitlab.winehq.org/winehq/tools/-/commit/ba9cb31d7418e896a8fc95f4cbc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 18 12:56:38 2022 +0100 testbot/LibvirtTool: Re-set the locale and country when preparing Windows VMs. On Windows a call to SetSystemTime() reverts UserDefaultLCID and ThreadLocale to their pre-SetWinLocale values. But only if the time is 24 hours after SetWinLocale was run!!! Setting the locale is normally done when preparing the VM's live snapshot (some of the locale settings require a reboot) so part of the locale settings are lost if the snapshot is used more than 24 hours later. Fortunately the lost settings take don't require a reboot to take effect so re-set without rebooting right before using the VM to work around this issue. --- testbot/bin/LibvirtTool.pl | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 0c070da6..60559ebd 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -588,9 +588,9 @@ sub ResetBootCount($) $TA->SetProperty("start.count", 0); } -sub PrepareVM($) +sub PrepareVM($$) { - my ($TA) = @_; + my ($TA, $Config) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -611,6 +611,22 @@ sub PrepareVM($) { FatalError("Setting the $VMKey system time failed: ". $PTA->GetLastError() ."\n"); } + + if ($VM->Type =~ /^win(?:32|64)$/ and $Config->{locale}) + { + # Moving the time forward by more than 24 hours reverts UserDefaultLCID and + # ThreadLocale to their pre-SetWinLocale values!!! So restore the locale. + my $Country = $Config->{locale}; + $Country =~ s/^.*-//; + my @Cmd = ("$BinDir/SetWinLocale", "--vm", $VMKey, "--locale", $Config->{locale}, "--country", $Country, "--no-reboot"); + $TA->Disconnect(); + + Debug("Running: @Cmd\n"); + if (system(@Cmd)) + { + FatalError("Could not restore the $VMKey locale to $Config->{locale}\n"); + } + } } sub GetSnapshotConfig($$) @@ -885,6 +901,11 @@ sub Revert() $VM->ChildDeadline($Deadline + $ExtraTimeout); $VM->Save(); } + else + { + GetSnapshotConfig($Domain, $Config); + $Config->{base} = $VM->IdleSnapshot; + } # Before reverting, try to perform a clean shutdown if requested. # After a shutdown a small wait is also sometimes required, at least when @@ -924,7 +945,7 @@ sub Revert() my $TA = $VM->GetAgent(); WaitForBoot($TA) if ($Booting); - PrepareVM($TA); + PrepareVM($TA, $Config); if ($Config->{create}) {

1 0

Francois Gouget : testbot: Allow known regular failures to match flaky failures too.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: tools Branch: master Commit: dd8daec9a43e46d4c25a438bd29d76285cf27f13 URL: https://gitlab.winehq.org/winehq/tools/-/commit/dd8daec9a43e46d4c25a438bd29… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 14 11:56:58 2022 +0200 testbot: Allow known regular failures to match flaky failures too. This ensures a smooth transition when a failure is marked as flaky. --- testbot/lib/WineTestBot/LogUtils.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 56129e10..585b1d04 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1491,12 +1491,17 @@ sub MatchLogFailures($$) my $UnitFailures = $FailureTree{$GroupName}->{$TestUnit}; next if (!$UnitFailures); + # Allow regular expressions written for regular failures to still match + # when the test has been marked as flaky to ensure a smooth transition. + my $NonFlakyLine = $Line; + $NonFlakyLine =~ s/Test succeeded inside flaky todo block:/Test succeeded inside todo block:/g; + $NonFlakyLine =~ s/Test marked flaky:/Test failed:/g; foreach my $UnitFailure (@$UnitFailures) { my $RegExp = $UnitFailure->FailureRegExp; my $Match = eval { use warnings FATAL => qw(regexp); - $RegExp and $Line =~ /$RegExp/; + $RegExp and ($Line =~ /$RegExp/ or $NonFlakyLine =~ /$RegExp/); }; next if (!$Match);

1 0

Francois Gouget : testbot: Highlight the "wait timed out in thread" critical section errors.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: tools Branch: master Commit: 86aedb9aae7819f503c919eb4798c629c060cf15 URL: https://gitlab.winehq.org/winehq/tools/-/commit/86aedb9aae7819f503c919eb479… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 19 16:25:47 2019 +0100 testbot: Highlight the "wait timed out in thread" critical section errors. The tests should not be triggering any such errors. --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 585b1d04..241eda46 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -141,6 +141,12 @@ sub GetLogLineCategory($) } return "error"; } + if ($Line =~ /^[0-9a-f]+:err:ntdll:RtlpWaitForCriticalSection/) + { + # The tests should not have "wait timed out in thread" critical section + # errors. + return "error"; + } if (# TestBot script error messages $Line =~ /^[a-zA-Z.]+:error: / or # TestBot error

1 0

Conor McCarthy : tests: Test a typed UAV buffer in test_atomic_instructions().
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: vkd3d Branch: master Commit: fc652d2b27d39f8e63c073682763f51619f5fcb2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fc652d2b27d39f8e63c073682763f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 18 13:43:30 2022 +1000 tests: Test a typed UAV buffer in test_atomic_instructions(). Until vkd3d-shader is patched, an atomic op on a typed buffer where StorageImageReadWithoutFormat is available will cause SPIR-V validation failure, and assertion in Mesa debug builds, because the image will be declared with Unknown format. --- tests/d3d12.c | 129 ++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 44 deletions(-)

1 0

Conor McCarthy : vkd3d-shader: Introduce DESCRIPTOR_INFO_FLAG_UAV_ATOMICS and always declare UAV images with known type for atomic ops.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: vkd3d Branch: master Commit: 1b11b57652b3c2cd785353c8ccd29d5f87b0993a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1b11b57652b3c2cd785353c8ccd29… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 18 13:44:05 2022 +1000 vkd3d-shader: Introduce DESCRIPTOR_INFO_FLAG_UAV_ATOMICS and always declare UAV images with known type for atomic ops. Atomic ops on images with Unknown type will cause SPIR-V validation failure, and assertion failure in Mesa debug builds. D3D12 allows atomics on typed buffers, and this requires a distinction to be made between UAV reads and atomic ops. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53874 --- include/vkd3d_shader.h | 3 +++ libs/vkd3d-shader/spirv.c | 5 +++-- libs/vkd3d-shader/vkd3d_shader_main.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7178ac5f..939ab42d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1263,6 +1263,9 @@ enum vkd3d_shader_descriptor_info_flag VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ = 0x00000002, /** The descriptor is a comparison sampler. */ VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE = 0x00000004, + /** The descriptor is a UAV resource, on which the shader performs + * atomic ops. \since 1.6 */ + VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS = 0x00000008, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_INFO_FLAG), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 734ba315..2d1691c6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5864,9 +5864,9 @@ static uint32_t spirv_compiler_get_image_type_id(struct spirv_compiler *compiler { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_descriptor_info *d; + bool uav_read, uav_atomics; uint32_t sampled_type_id; SpvImageFormat format; - bool uav_read; format = SpvImageFormatUnknown; if (reg->type == VKD3DSPR_UAV) @@ -5874,7 +5874,8 @@ static uint32_t spirv_compiler_get_image_type_id(struct spirv_compiler *compiler d = spirv_compiler_get_descriptor_info(compiler, VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, range); uav_read = !!(d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ); - if (raw_structured || (uav_read && !compiler->uav_read_without_format)) + uav_atomics = !!(d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS); + if (raw_structured || uav_atomics || (uav_read && !compiler->uav_read_without_format)) format = image_format_for_image_read(data_type); else if (uav_read) vkd3d_spirv_enable_capability(builder, SpvCapabilityStorageImageReadWithoutFormat); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5e25dde8..72a6d2d8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -692,6 +692,25 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_contex d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER; } +static bool vkd3d_shader_instruction_is_uav_atomic_op(const struct vkd3d_shader_instruction *instruction) +{ + enum vkd3d_shader_opcode handler_idx = instruction->handler_idx; + return (VKD3DSIH_ATOMIC_AND <= handler_idx && handler_idx <= VKD3DSIH_ATOMIC_XOR) + || (VKD3DSIH_IMM_ATOMIC_ALLOC <= handler_idx && handler_idx <= VKD3DSIH_IMM_ATOMIC_XOR); +} + +static void vkd3d_shader_scan_record_uav_atomic_op(struct vkd3d_shader_scan_context *context, + const struct vkd3d_shader_register *reg) +{ + struct vkd3d_shader_descriptor_info *d; + + if (!context->scan_descriptor_info) + return; + + d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); + d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS; +} + static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, enum vkd3d_shader_descriptor_type type, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type, @@ -1019,6 +1038,15 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte if (vkd3d_shader_instruction_is_uav_counter(instruction)) vkd3d_shader_scan_record_uav_counter(context, &instruction->src[0].reg); + if (vkd3d_shader_instruction_is_uav_atomic_op(instruction)) + { + for (i = 0; i < instruction->dst_count; ++i) + { + if (instruction->dst[i].reg.type == VKD3DSPR_UAV) + vkd3d_shader_scan_record_uav_atomic_op(context, &instruction->dst[i].reg); + } + } + ++context->location.line; return VKD3D_OK; }

1 0

Francois Gouget : testbot/TestWTBS: Issue an error if $OnlyCompletePatchSets is set.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: tools Branch: master Commit: 135c6f146466e56c4ed7821f91e380664598ee97 URL: https://gitlab.winehq.org/winehq/tools/-/commit/135c6f146466e56c4ed7821f91e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 2 16:53:58 2022 +0100 testbot/TestWTBS: Issue an error if $OnlyCompletePatchSets is set. The test suite needs to be able to check the handling of all parts of a patchset and is thus incompatible with this setting. The error is only issued once and the impacted jobs are skipped to avoid duplicate errors. --- testbot/tests/TestWTBS | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index f7d4fcfb..33074a82 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -259,11 +259,12 @@ sub SkipCheck($) return (defined $Value and $Value eq "ignore"); } -sub LoadTestInfo($) +sub LoadRawTestInfo($) { my ($FileName) = @_; my $RawInfo; + my $SectionCount = 0; if (open(my $TestFh, "<", $FileName)) { parser: while (my $Line = <$TestFh>) @@ -275,6 +276,7 @@ sub LoadTestInfo($) { # Patch series may have multiple TestWTBS sections, one per part. # Only the last one counts. + $SectionCount++; $RawInfo = { LogName => basename($FileName), LogPath => $FileName, @@ -297,6 +299,10 @@ sub LoadTestInfo($) delete $RawInfo->{BadLog}; } } + elsif ($Line eq "===== TestBot: Last patchset part =====") + { + $SectionCount = 0; + } } close($TestFh); @@ -312,6 +318,35 @@ sub LoadTestInfo($) return undef; } + $RawInfo->{SectionCount} = $SectionCount; + return $RawInfo; +} + +my $BrokenPatchSets; + +sub WarnBrokenPatchSets() +{ + if (!$BrokenPatchSets) + { + # The WTBS needs to be able to check how the TestBot handles patchset + # parts. + fail("\$OnlyCompletePatchSets=1 is incompatible with the WTBS\n"); + $BrokenPatchSets = 1; + } +} + +sub LoadTestInfo($) +{ + my ($FileName) = @_; + + my $RawInfo = LoadRawTestInfo($FileName); + return undef if (!$RawInfo); + if ($RawInfo->{SectionCount} > 1) + { + WarnBrokenPatchSets(); + return undef; + } + # Split up the information to jobs, tasks, etc. my $TestInfo = { webpatch => {}, patch => {}, job => {}, @@ -329,6 +364,10 @@ sub LoadTestInfo($) $TestInfo->{$TaskType}->{$Field} = $RawInfo->{$Entry}; $HasTestInfo = 1; } + elsif ($Entry eq "SectionCount") + { + # Ignore these + } elsif ($Entry !~ /^(?:CurGroup|eCount|eNew|MsgGroups|MsgGroupNames|LineNo|LogName|LogPath)$/) { fail("$FileName: $Entry is not a valid property name"); @@ -1181,6 +1220,16 @@ sub CheckJobTree($;$) $TestInfo = LoadTestInfo($Step->GetFullFileName()); return if (!$TestInfo); } + elsif ($Step->FileType eq "patch") + { + my $RawInfo = LoadRawTestInfo($Step->GetFullFileName()); + if ($RawInfo->{SectionCount} > 1) + { + WarnBrokenPatchSets(); + print "...skipping job ". $Job->Id ." because \$OnlyCompletePatchSets is set\n"; + return; + } + } my $TaskType = $Step->Type eq "build" ? "build" : $Step->FileType eq "patch" ? "wine" : @@ -1412,7 +1461,11 @@ sub CheckPatch($$$) } my $PatchInfo = $TestInfo->{patch}; - if (CheckValue($PatchInfo->{Disposition})) + if ($Patch->Disposition =~ /^(?:Only test full series|Series is not a Wine patch)/) + { + WarnBrokenPatchSets(); + } + elsif (CheckValue($PatchInfo->{Disposition})) { is($Patch->Disposition, $PatchInfo->{Disposition}, "Check Disposition for patch ". $Patch->Id .": ". $Patch->Subject); }

1 0

Francois Gouget : testbot: Tweak the disposition of patches when $OnlyCompletePatchSets is set.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: tools Branch: master Commit: 88b98f0927a572a5f0f9ebef392bcc1347b0d498 URL: https://gitlab.winehq.org/winehq/tools/-/commit/88b98f0927a572a5f0f9ebef392… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 3 03:13:50 2022 +0100 testbot: Tweak the disposition of patches when $OnlyCompletePatchSets is set. This allows identifying patches which received special treatment due to this setting. --- testbot/lib/WineTestBot/Patches.pm | 5 ++++- testbot/lib/WineTestBot/PendingPatchSets.pm | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index c0768bea..866a9a60 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -230,7 +230,10 @@ sub Submit($$;$) } else { - $self->Disposition(($SubjectInfo->{PartNo} ? "Part is not" : "Not") ." a Wine patch"); + $self->Disposition(($OnlyCompletePatchSets ? "Series is not" : + $SubjectInfo->{PartNo} ? "Part is not" : + "Not") + ." a Wine patch"); } return undef; } diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 070a71df..06ba8886 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -108,7 +108,9 @@ sub SubmitSubset($$$) { # Skip over the intermediate patches to instead # test the full patchset at once it is complete. - return undef; + $FinalPatch->Disposition("Only test full series"); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); + return $ErrMessage; } my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patchset.diff");

1 0

Nikolay Sivov : xmllite/writer: Handle surrogate pairs.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 5d1820c40bd93e6810f072a39745ee739ba99b81 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d1820c40bd93e6810f072a39745ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 17 22:58:16 2022 +0300 xmllite/writer: Handle surrogate pairs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 10 ----- dlls/xmllite/tests/writer.c | 33 +++++++++++++++ dlls/xmllite/writer.c | 94 +++++++++++++++++++++++++++++++++--------- dlls/xmllite/xmllite_private.h | 11 +++++ 4 files changed, 119 insertions(+), 29 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d747e36e623..f238e2af79d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1466,16 +1466,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) return S_OK; } -/* [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] */ -static inline BOOL is_char(WCHAR ch) -{ - return (ch == '\t') || (ch == '\r') || (ch == '\n') || - (ch >= 0x20 && ch <= 0xd7ff) || - (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ - (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ - (ch >= 0xe000 && ch <= 0xfffd); -} - /* [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ BOOL is_pubchar(WCHAR ch) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index c4ab079373c..d15fe8b64df 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1335,6 +1335,8 @@ static void test_WriteCData(void) static void test_WriteRaw(void) { + static const WCHAR surrogates[] = {0xdc00, 0xd800, '\0'}; + static const WCHAR invalid[] = {0x8, '\0'}; static const WCHAR rawW[] = L"a<:"; IXmlWriter *writer; IStream *stream; @@ -1351,6 +1353,15 @@ static void test_WriteRaw(void) stream = writer_set_output(writer); + hr = IXmlWriter_WriteRaw(writer, surrogates); + ok(hr == WR_E_INVALIDSURROGATEPAIR, "Unexpected hr %#lx.\n", hr); + + hr = IXmlWriter_WriteRaw(writer, L"\uffff"); + ok(hr == WC_E_XMLCHARACTER, "Unexpected hr %#lx.\n", hr); + + hr = IXmlWriter_WriteRaw(writer, invalid); + ok(hr == WC_E_XMLCHARACTER, "Unexpected hr %#lx.\n", hr); + hr = IXmlWriter_WriteRaw(writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1885,6 +1896,7 @@ static void test_WriteCharEntity(void) static void test_WriteString(void) { + static const WCHAR surrogates[] = {0xd800, 0xdc00, 'x', 'y', '\0'}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -1905,6 +1917,27 @@ static void test_WriteString(void) stream = writer_set_output(writer); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"sub", NULL); + ok(hr == S_OK, "Unexpected hr #%lx.\n", hr); + + hr = IXmlWriter_WriteString(writer, L"\v"); + ok(hr == WC_E_XMLCHARACTER, "Unexpected hr %#lx.\n", hr); + + hr = IXmlWriter_WriteString(writer, L"\ufffe"); + ok(hr == WC_E_XMLCHARACTER, "Unexpected hr %#lx.\n", hr); + + hr = IXmlWriter_WriteString(writer, surrogates); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + CHECK_OUTPUT(stream, + "<sub>\U00010000xy"); + IStream_Release(stream); + + stream = writer_set_output(writer); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 065716f7e8c..def165656ef 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1684,9 +1684,30 @@ static HRESULT WINAPI xmlwriter_WriteQualifiedName(IXmlWriter *iface, LPCWSTR pw return E_NOTIMPL; } +static HRESULT writer_get_next_write_count(const WCHAR *str, unsigned int length, unsigned int *count) +{ + if (!is_char(*str)) return WC_E_XMLCHARACTER; + + if (IS_HIGH_SURROGATE(*str)) + { + if (length < 2 || !IS_LOW_SURROGATE(*(str + 1))) + return WR_E_INVALIDSURROGATEPAIR; + + *count = 2; + } + else if (IS_LOW_SURROGATE(*str)) + return WR_E_INVALIDSURROGATEPAIR; + else + *count = 1; + + return S_OK; +} + static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR data) { xmlwriter *This = impl_from_IXmlWriter(iface); + unsigned int count; + HRESULT hr = S_OK; TRACE("%p %s\n", This, debugstr_w(data)); @@ -1713,8 +1734,15 @@ static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR data) return WR_E_INVALIDACTION; } - write_output_buffer(This->output, data, -1); - return S_OK; + while (*data) + { + if (FAILED(hr = writer_get_next_write_count(data, ~0u, &count))) return hr; + if (FAILED(hr = write_output_buffer(This->output, data, count))) return hr; + + data += count; + } + + return hr; } static HRESULT WINAPI xmlwriter_WriteRawChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch) @@ -1834,27 +1862,56 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre return S_OK; } -static void write_escaped_string(xmlwriter *writer, const WCHAR *string) +static HRESULT write_escaped_char(xmlwriter *writer, const WCHAR *string, unsigned int count) { - while (*string) + HRESULT hr; + + switch (*string) { - switch (*string) + case '<': + hr = write_output_buffer(writer->output, L"<", 4); + break; + case '&': + hr = write_output_buffer(writer->output, L"&", 5); + break; + case '>': + hr = write_output_buffer(writer->output, L">", 4); + break; + default: + hr = write_output_buffer(writer->output, string, count); + } + + return hr; +} + +static HRESULT write_escaped_string(xmlwriter *writer, const WCHAR *string, unsigned int length) +{ + unsigned int count; + HRESULT hr = S_OK; + + if (length == ~0u) + { + while (*string) { - case '<': - write_output_buffer(writer->output, L"<", 4); - break; - case '&': - write_output_buffer(writer->output, L"&", 5); - break; - case '>': - write_output_buffer(writer->output, L">", 4); - break; - default: - write_output_buffer(writer->output, string, 1); + if (FAILED(hr = writer_get_next_write_count(string, ~0u, &count))) return hr; + if (FAILED(hr = write_escaped_char(writer, string, count))) return hr; + + string += count; } + } + else + { + while (length) + { + if (FAILED(hr = writer_get_next_write_count(string, length, &count))) return hr; + if (FAILED(hr = write_escaped_char(writer, string, count))) return hr; - string++; + string += count; + length -= count; + } } + + return hr; } static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, const WCHAR *string) @@ -1884,8 +1941,7 @@ static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, const WCHAR *stri } This->textnode = 1; - write_escaped_string(This, string); - return S_OK; + return write_escaped_string(This, string, ~0u); } static HRESULT WINAPI xmlwriter_WriteSurrogateCharEntity(IXmlWriter *iface, WCHAR wchLow, WCHAR wchHigh) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index bd53fca575f..f4e2d92fe26 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -63,6 +63,17 @@ BOOL is_pubchar(WCHAR ch) DECLSPEC_HIDDEN; BOOL is_namestartchar(WCHAR ch) DECLSPEC_HIDDEN; BOOL is_namechar(WCHAR ch) DECLSPEC_HIDDEN; +/* [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] */ +static inline BOOL is_char(WCHAR ch) +{ + return (ch == '\t') || (ch == '\r') || (ch == '\n') || + (ch >= 0x20 && ch <= 0xd7ff) || + (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ + (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ + (ch >= 0xe000 && ch <= 0xfffd); +} + +/* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ static inline BOOL is_wchar_space(WCHAR ch) { return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n';

1 0

Alex Henrie : windowscodecs: Use standard C functions for memory allocation in metadataquery.c.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 971548728c96682843a901f060a6cbc389b2ec03 URL: https://gitlab.winehq.org/wine/wine/-/commit/971548728c96682843a901f060a6cb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 22:08:51 2022 -0700 windowscodecs: Use standard C functions for memory allocation in metadataquery.c. --- dlls/windowscodecs/metadataquery.c | 20 ++++++++++---------- dlls/windowscodecs/wincodecs_private.h | 10 ---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index c4df29a2a01..75da054cd38 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -86,8 +86,8 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) if (!ref) { IWICMetadataBlockReader_Release(This->block); - HeapFree(GetProcessHeap(), 0, This->root); - HeapFree(GetProcessHeap(), 0, This); + free(This->root); + free(This); } return ref; } @@ -461,7 +461,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW len = lstrlenW(query) + 1; if (This->root) len += lstrlenW(This->root); - full_query = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + full_query = malloc(len * sizeof(WCHAR)); full_query[0] = 0; if (This->root) lstrcpyW(full_query, This->root); @@ -591,7 +591,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW else PropVariantClear(&new_value); - HeapFree(GetProcessHeap(), 0, full_query); + free(full_query); return hr; } @@ -730,7 +730,7 @@ HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, const W { QueryReader *obj; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + obj = calloc(1, sizeof(*obj)); if (!obj) return E_OUTOFMEMORY; @@ -740,7 +740,7 @@ HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, const W IWICMetadataBlockReader_AddRef(mbr); obj->block = mbr; - obj->root = root ? heap_strdupW(root) : NULL; + obj->root = wcsdup(root); *out = &obj->IWICMetadataQueryReader_iface; @@ -804,8 +804,8 @@ static ULONG WINAPI mqw_Release(IWICMetadataQueryWriter *iface) if (!ref) { IWICMetadataBlockWriter_Release(writer->block); - HeapFree(GetProcessHeap(), 0, writer->root); - HeapFree(GetProcessHeap(), 0, writer); + free(writer->root); + free(writer); } return ref; } @@ -870,7 +870,7 @@ HRESULT MetadataQueryWriter_CreateInstance(IWICMetadataBlockWriter *mbw, const W { QueryWriter *obj; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + obj = calloc(1, sizeof(*obj)); if (!obj) return E_OUTOFMEMORY; @@ -880,7 +880,7 @@ HRESULT MetadataQueryWriter_CreateInstance(IWICMetadataBlockWriter *mbw, const W IWICMetadataBlockWriter_AddRef(mbw); obj->block = mbw; - obj->root = root ? heap_strdupW(root) : NULL; + obj->root = wcsdup(root); *out = &obj->IWICMetadataQueryWriter_iface; diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 72227cf0cd2..6a5c4604cf5 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -229,16 +229,6 @@ extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *, con extern HRESULT MetadataQueryWriter_CreateInstance(IWICMetadataBlockWriter *, const WCHAR *, IWICMetadataQueryWriter **) DECLSPEC_HIDDEN; extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - SIZE_T len; - if (!src) return NULL; - len = (lstrlenW(src) + 1) * sizeof(WCHAR); - if ((dst = HeapAlloc(GetProcessHeap(), 0, len))) memcpy(dst, src, len); - return dst; -} - static inline const char *debug_wic_rect(const WICRect *rect) { if (!rect) return "(null)";

1 0

Gabriel Ivăncescu : mshtml: Implement pageshow event.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: e2bb4c1b88874c4a4d07b3d32ee0b9d43f12d57c URL: https://gitlab.winehq.org/wine/wine/-/commit/e2bb4c1b88874c4a4d07b3d32ee0b9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Implement pageshow event. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 120 +++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mshtml_private_iface.idl | 14 ++++ dlls/mshtml/nsevents.c | 22 +++++++ dlls/mshtml/tests/documentmode.js | 17 +++++ 6 files changed, 175 insertions(+)

1 0