November 2022 - Wine-Commits

Francois Gouget : testbot: Add a message category for warnings.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: tools Branch: master Commit: 28c6e0ade18f90b5d42b9ee15edf62b939167684 URL: https://gitlab.winehq.org/winehq/tools/-/commit/28c6e0ade18f90b5d42b9ee15ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 19 17:41:11 2022 +0200 testbot: Add a message category for warnings. This adds support for identifying warnings (e.g. build warnings), and highlighting or reporting them. --- testbot/bin/WineSendLog.pl | 1 + testbot/lib/WineTestBot/LogUtils.pm | 17 +++++++++++++++-- testbot/web/JobDetails.pl | 2 ++ testbot/web/WineTestBot.css | 2 ++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ab7b90c0..c4024243 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -406,6 +406,7 @@ EOF my $Bugs = $LogInfo->{Bugs}->{$LineNo}; my $Prefix = $Bugs ? join(" ", sort { $a <=> $b } @$Bugs) : $Group->{Types}->[$MsgIndex] eq "k" ? "flk" : + $Group->{Types}->[$MsgIndex] eq "w" ? "wrn" : $Group->{IsNew}->[$MsgIndex] ? "new" : "old"; print $Sendmail "[$Prefix] $Group->{Messages}->[$MsgIndex]\n"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index da35d8d3..e60dec8a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -97,6 +97,12 @@ sub GetLogLineCategory($) { return "info"; } + if (# Build messages + $Line =~ /^warning:/ or + $Line =~ /: warning:/) + { + return "warning"; + } if (# Git errors $Line =~ /^CONFLICT / or $Line =~ /^error: patch failed:/ or @@ -292,11 +298,17 @@ sub ParseTaskLog($) chomp $Line; $Line =~ s/\r+$//; - if (GetLogLineCategory($Line) eq "error") + my $Category = GetLogLineCategory($Line); + if ($Category eq "error") { $CurGroup = _AddLogGroup($LogInfo, "", $LineNo) if (!$CurGroup); _AddLogMsg($LogInfo, $CurGroup, $Line, $LineNo, "e"); } + elsif ($Category eq "warning") + { + $CurGroup = _AddLogGroup($LogInfo, "", $LineNo) if (!$CurGroup); + _AddLogMsg($LogInfo, $CurGroup, $Line, $LineNo, "w"); + } if ($Line eq "Task: tests") { @@ -1014,7 +1026,8 @@ sub LoadLogErrorsFromFh($$) $LogInfo->{BadLog} = "$LogInfo->{LineNo}: Got a $Type line with no group"; return $Line; } - elsif ($Type eq "e" or $Type eq "E" or $Type eq "k" or $Type eq "K") + elsif ($Type eq "e" or $Type eq "E" or $Type eq "k" or $Type eq "K" or + $Type eq "w" or $Type eq "W") { _AddLogMsg($LogInfo, $LogInfo->{CurGroup}, $Value, $Property, $Type); } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index eed9eb30..0b42aea5 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -427,6 +427,7 @@ sub GenerateFullLog($$$$$) { $ErrCategory{$LineNo} = ($Group->{IsNew}->[$MsgIndex] ? "new" : ""). ($Group->{Types}->[$MsgIndex] eq "k" ? "flaky" : + $Group->{Types}->[$MsgIndex] eq "w" ? "warn" : "error"); $ErrFailures{$LineNo} = $Group->{Failures}->{$MsgIndex}; @@ -699,6 +700,7 @@ EOF my $Html = $self->escapeHTML($Line); my $Category = ($Group->{IsNew}->[$MsgIndex] ? "new" : ""). ($Group->{Types}->[$MsgIndex] eq "k" ? "flaky" : + $Group->{Types}->[$MsgIndex] eq "w" ? "warn" : "error"); $Html = "<span class='log-$Category'>$Html</span>"; my $FailureIds = $Group->{Failures}->{$MsgIndex}; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index e686e6f5..cff299a7 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -400,6 +400,8 @@ pre .log-note { font-style: italic; color: blue; } .log-info { background-color: #d9ffcc; } +.log-warn { color: green; } +.log-newwarn { color: green; font-weight: bold; } .log-skip { color: blue; } .log-todo { color: #d08000; } .log-flaky { color: magenta; }

1 0

Francois Gouget : testbot/TestAgent: Don't override a 0 second SetTime() leeway.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: tools Branch: master Commit: fbb1d9fcea0dff71e4846dc8fb0e91b9021e8eec URL: https://gitlab.winehq.org/winehq/tools/-/commit/fbb1d9fcea0dff71e4846dc8fb0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 18 18:52:39 2022 +0100 testbot/TestAgent: Don't override a 0 second SetTime() leeway. It is typically used to detect whether the TestAgent server has high enough privileges. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2d600210..2842cd95 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1403,7 +1403,7 @@ sub Rm($@) sub SetTime($;$) { my ($self, $Leeway) = @_; - $Leeway ||= 30; + $Leeway = 30 if (!defined $Leeway); debug("SetTime $Leeway\n"); # Send the command

1 0

Francois Gouget : testbot/LogUtils: Include the full test unit name in task timeout errors.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: tools Branch: master Commit: 471a416ba8568df41173a8af221aebcb04da39c6 URL: https://gitlab.winehq.org/winehq/tools/-/commit/471a416ba8568df41173a8af221… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 18:05:51 2022 +0100 testbot/LogUtils: Include the full test unit name in task timeout errors. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 06751e78..da35d8d3 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -491,7 +491,7 @@ sub _CloseTestUnit($$$) } elsif ($Last and $LogInfo->{TaskTimedOut}) { - _AddExtra($LogInfo, "$Cur->{Unit}: Timeout"); + _AddExtra($LogInfo, "timeout", $Cur); } } }

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 Nov. 21, 2022

Nov. 21, 2022

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

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

Nov. 21, 2022

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

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

Nov. 21, 2022

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 Nov. 21, 2022

Nov. 21, 2022

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 Nov. 18, 2022

Nov. 18, 2022

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 Nov. 18, 2022

Nov. 18, 2022

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

Alex Henrie : jscript: Use standard C functions for memory allocation in dispex.c.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 7c26da1ae93716718382e276b3b55c6495b071db URL: https://gitlab.winehq.org/wine/wine/-/commit/7c26da1ae93716718382e276b3b55c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 19:17:18 2022 -0700 jscript: Use standard C functions for memory allocation in dispex.c. --- dlls/jscript/dispex.c | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 42f41771ef2..699e4c87b52 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -189,7 +189,7 @@ static inline HRESULT resize_props(jsdisp_t *This) if(This->buf_size != This->prop_cnt) return S_FALSE; - props = heap_realloc(This->props, sizeof(dispex_prop_t)*This->buf_size*2); + props = realloc(This->props, sizeof(dispex_prop_t) * This->buf_size * 2); if(!props) return E_OUTOFMEMORY; This->buf_size *= 2; @@ -220,7 +220,7 @@ static inline dispex_prop_t* alloc_prop(jsdisp_t *This, const WCHAR *name, prop_ return NULL; prop = &This->props[This->prop_cnt]; - prop->name = heap_strdupW(name); + prop->name = wcsdup(name); if(!prop->name) return NULL; prop->type = type; @@ -420,7 +420,7 @@ static HRESULT convert_params(script_ctx_t *ctx, const DISPPARAMS *dp, jsval_t * cnt = dp->cArgs - dp->cNamedArgs; if(cnt > 6) { - argv = heap_alloc(cnt * sizeof(*argv)); + argv = malloc(cnt * sizeof(*argv)); if(!argv) return E_OUTOFMEMORY; }else { @@ -433,7 +433,7 @@ static HRESULT convert_params(script_ctx_t *ctx, const DISPPARAMS *dp, jsval_t * while(i--) jsval_release(argv[i]); if(argv != buf) - heap_free(argv); + free(argv); return hres; } } @@ -775,9 +775,9 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) for (i = This->num_funcs; i--;) release_bytecode(This->funcs[i].code->bytecode); IDispatchEx_Release(&This->jsdisp->IDispatchEx_iface); - heap_free(This->funcs); - heap_free(This->vars); - heap_free(This); + free(This->funcs); + free(This->vars); + free(This); } return ref; } @@ -791,7 +791,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetTypeAttr(ITypeInfo *iface, TYPEATTR **pp if (!ppTypeAttr) return E_INVALIDARG; - attr = heap_alloc_zero(sizeof(*attr)); + attr = calloc(1, sizeof(*attr)); if (!attr) return E_OUTOFMEMORY; attr->guid = GUID_JScriptTypeInfo; @@ -840,7 +840,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, F func = &This->funcs[index]; /* Store the parameter array after the FUNCDESC structure */ - desc = heap_alloc_zero(sizeof(*desc) + sizeof(ELEMDESC) * func->code->param_cnt); + desc = calloc(1, sizeof(*desc) + sizeof(ELEMDESC) * func->code->param_cnt); if (!desc) return E_OUTOFMEMORY; desc->memid = prop_to_id(This->jsdisp, func->prop); @@ -868,7 +868,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VA if (!ppVarDesc) return E_INVALIDARG; if (index >= This->num_vars) return TYPE_E_ELEMENTNOTFOUND; - desc = heap_alloc_zero(sizeof(*desc)); + desc = calloc(1, sizeof(*desc)); if (!desc) return E_OUTOFMEMORY; desc->memid = prop_to_id(This->jsdisp, This->vars[index]); @@ -1213,7 +1213,7 @@ static void WINAPI ScriptTypeInfo_ReleaseTypeAttr(ITypeInfo *iface, TYPEATTR *pT TRACE("(%p)->(%p)\n", This, pTypeAttr); - heap_free(pTypeAttr); + free(pTypeAttr); } static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pFuncDesc) @@ -1222,7 +1222,7 @@ static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pF TRACE("(%p)->(%p)\n", This, pFuncDesc); - heap_free(pFuncDesc); + free(pFuncDesc); } static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVarDesc) @@ -1231,7 +1231,7 @@ static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVar TRACE("(%p)->(%p)\n", This, pVarDesc); - heap_free(pVarDesc); + free(pVarDesc); } static const ITypeInfoVtbl ScriptTypeInfoVtbl = { @@ -1464,7 +1464,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC else num_vars++; } - if (!(typeinfo = heap_alloc(sizeof(*typeinfo)))) + if (!(typeinfo = malloc(sizeof(*typeinfo)))) return E_OUTOFMEMORY; typeinfo->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; @@ -1474,18 +1474,18 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC typeinfo->num_funcs = num_funcs; typeinfo->jsdisp = This; - typeinfo->funcs = heap_alloc(sizeof(*typeinfo->funcs) * num_funcs); + typeinfo->funcs = malloc(sizeof(*typeinfo->funcs) * num_funcs); if (!typeinfo->funcs) { - heap_free(typeinfo); + free(typeinfo); return E_OUTOFMEMORY; } - typeinfo->vars = heap_alloc(sizeof(*typeinfo->vars) * num_vars); + typeinfo->vars = malloc(sizeof(*typeinfo->vars) * num_vars); if (!typeinfo->vars) { - heap_free(typeinfo->funcs); - heap_free(typeinfo); + free(typeinfo->funcs); + free(typeinfo); return E_OUTOFMEMORY; } @@ -1614,7 +1614,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc hres = jsdisp_call_value(This, get_this(pdp), wFlags, argc, argv, pvarRes ? &r : NULL); if(argv != buf) - heap_free(argv); + free(argv); if(SUCCEEDED(hres) && pvarRes) { hres = jsval_to_variant(r, pvarRes); jsval_release(r); @@ -1830,7 +1830,7 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b dispex->extensible = TRUE; dispex->prop_cnt = 0; - dispex->props = heap_alloc_zero(sizeof(dispex_prop_t)*(dispex->buf_size=4)); + dispex->props = calloc(1, sizeof(dispex_prop_t)*(dispex->buf_size=4)); if(!dispex->props) return E_OUTOFMEMORY; @@ -1862,13 +1862,13 @@ HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, jsd jsdisp_t *ret; HRESULT hres; - ret = heap_alloc_zero(sizeof(jsdisp_t)); + ret = calloc(1, sizeof(jsdisp_t)); if(!ret) return E_OUTOFMEMORY; hres = init_dispex(ret, ctx, builtin_info ? builtin_info : &dispex_info, prototype); if(FAILED(hres)) { - heap_free(ret); + free(ret); return hres; } @@ -1896,9 +1896,9 @@ void jsdisp_free(jsdisp_t *obj) default: break; }; - heap_free(prop->name); + free(prop->name); } - heap_free(obj->props); + free(obj->props); script_release(obj->ctx); if(obj->prototype) jsdisp_release(obj->prototype); @@ -1906,7 +1906,7 @@ void jsdisp_free(jsdisp_t *obj) if(obj->builtin_info->destructor) obj->builtin_info->destructor(obj); else - heap_free(obj); + free(obj); } #ifdef TRACE_REFCNT @@ -2128,7 +2128,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns } if(dp.cArgs > ARRAY_SIZE(buf)) { - dp.rgvarg = heap_alloc(argc*sizeof(VARIANT)); + dp.rgvarg = malloc(argc * sizeof(VARIANT)); if(!dp.rgvarg) return E_OUTOFMEMORY; }else { @@ -2141,7 +2141,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns while(i--) VariantClear(dp.rgvarg+argc-i-1); if(dp.rgvarg != buf) - heap_free(dp.rgvarg); + free(dp.rgvarg); return hres; } } @@ -2152,7 +2152,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns for(i=0; i<argc; i++) VariantClear(dp.rgvarg+argc-i-1); if(dp.rgvarg != buf) - heap_free(dp.rgvarg); + free(dp.rgvarg); if(SUCCEEDED(hres) && ret) hres = variant_to_jsval(ctx, &retv, ret); @@ -2223,7 +2223,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W dp.rgdispidNamedArgs = NULL; } - if(dp.cArgs > ARRAY_SIZE(buf) && !(args = heap_alloc(dp.cArgs * sizeof(VARIANT)))) + if(dp.cArgs > ARRAY_SIZE(buf) && !(args = malloc(dp.cArgs * sizeof(VARIANT)))) return E_OUTOFMEMORY; dp.rgvarg = args; @@ -2243,7 +2243,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W for(i = 0; i < argc; i++) VariantClear(dp.rgvarg + dp.cArgs - i - 1); if(args != buf) - heap_free(args); + free(args); if(FAILED(hres)) return hres;

1 0