September 2018 - Wine-Devel

Re: [PATCH v2 1/8] shell32/autocomplete: Fix going up through the suggestion listbox

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Sept. 21, 2018

Re: [PATCH v2] gdi32: Avoid using GCC's typeof extension

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Sept. 21, 2018

[PATCH 4/4] testbot: Rename some GetPatchImpacts() fields.

by Francois Gouget

The new names are less ambiguous and less Wine-specific. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 25 ++++++++++++------------- testbot/lib/WineTestBot/Patches.pm | 6 +++--- testbot/web/Submit.pl | 4 ++-- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 7a268db5c..1287f6db5 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -222,7 +222,7 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - ($Impacts->{WineBuild} and !BuildNative()) or + ($Impacts->{PatchedRoot} and !BuildNative()) or !BuildTestExecutables($Targets, $Impacts, "exe32") or !BuildTestExecutables($Targets, $Impacts, "exe64")) { diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 04aea183b..2bac7be46 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -195,7 +195,7 @@ sub _HandleFile($$$) my ($Root, $Dir, $File) = ($1, $2, $3); my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{TestBuild} = 1; + $Impacts->{PatchedTests} = 1; $Impacts->{Tests}->{$Module}->{Files}->{$File} = $Change; if ($File eq "Makefile.in" and $Change ne "modify") @@ -209,7 +209,7 @@ sub _HandleFile($$$) my ($Root, $Dir, $File) = ($1, $2, $3); my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{ModuleBuild} = 1; + $Impacts->{PatchedModules} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -227,12 +227,11 @@ sub _HandleFile($$$) $Impacts->{IsWinePatch} = 1; } # Else this file exists in Wine but has a very common name so it may just - # as well belong to another repository. Still update WineBuild in case - # this patch really is for Wine. + # as well belong to another repository. if ($FilePath !~ /^(?:$IgnoredPathsRe)/) { - $Impacts->{WineBuild} = 1; + $Impacts->{PatchedRoot} = 1; if ($FilePath =~ m~/Makefile.in$~ and $Change ne "modify") { # This adds / removes a directory @@ -245,7 +244,7 @@ sub _HandleFile($$$) { # This may or may not be a Wine patch but the new Makefile.in will be # added to the build by make_makefiles. - $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; + $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; } } } @@ -274,7 +273,7 @@ sub GetPatchImpacts($;$) # patch. ModuleUnitCount => 0, # Number of patched test units. - UnitCount => 0, + TestUnitCount => 0, # The modules that need a rebuild, even if only for the tests. BuildModules => {}, # Information about 'tests' directories. @@ -284,8 +283,8 @@ sub GetPatchImpacts($;$) if ($PastImpacts) { - if ($PastImpacts->{WineBuild} or $PastImpacts->{ModuleBuild} or - $PastImpacts->{TestBuild}) + if ($PastImpacts->{PatchedRoot} or $PastImpacts->{PatchedModules} or + $PastImpacts->{PatchedTests}) { # Update the list of Wine files so we correctly recognize patchset parts # that modify new Wine files. @@ -318,11 +317,11 @@ sub GetPatchImpacts($;$) { if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=) { - $Impacts->{WineBuild} = $Impacts->{Autoconf} = 1; + $Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1; } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; + $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- /dev/null$=) @@ -401,7 +400,7 @@ sub GetPatchImpacts($;$) } $TestInfo->{UnitCount} = scalar(keys %{$TestInfo->{Units}}); - $Impacts->{UnitCount} += $TestInfo->{UnitCount}; + $Impacts->{TestUnitCount} += $TestInfo->{UnitCount}; } return $Impacts; @@ -420,7 +419,7 @@ sub GetBuildTimeout($$) map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %$Builds; # Set $ModuleCount to 0 if a full rebuild is needed - my $ModuleCount = (!$Impacts or $Impacts->{WineBuild}) ? 0 : + my $ModuleCount = (!$Impacts or $Impacts->{PatchedRoot}) ? 0 : scalar(keys %{$Impacts->{BuildModules}}); my ($ExeTimeout, $WineTimeout) = (0, 0); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 5024ed489..038754365 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -136,8 +136,8 @@ sub Submit($$$) $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, $PastImpacts); - if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and - !$Impacts->{TestBuild}) + if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and + !$Impacts->{PatchedTests}) { if ($Impacts->{IsWinePatch}) { @@ -176,7 +176,7 @@ sub Submit($$$) my $BuildVMs = CreateVMs(); $BuildVMs->AddFilter("Type", ["build"]); $BuildVMs->AddFilter("Role", ["base"]); - if ($Impacts->{UnitCount} and !$BuildVMs->IsEmpty()) + if ($Impacts->{TestUnitCount} and !$BuildVMs->IsEmpty()) { # Create the Build Step my $BuildStep = $NewJob->Steps->Add(); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index fe101042c..ae4aca3dd 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -598,11 +598,11 @@ sub DetermineFileType($$) if ($FileType eq "unknown") { my $Impacts = GetPatchImpacts($FileName); - if ($Impacts->{UnitCount} == 0) + if ($Impacts->{TestUnitCount} == 0) { $ErrMessage = "Patch doesn't affect tests"; } - elsif ($Impacts->{UnitCount} > 1) + elsif ($Impacts->{TestUnitCount} > 1) { $ErrMessage = "Patch contains changes to multiple tests"; } -- 2.18.0

Sept. 21, 2018

[PATCH 3/4] testbot: Add _CreateTestInfo() to reduce code duplication in PatchUtils.

by Francois Gouget

_CreateTestInfo() creates the initial $Impacts->{Tests} structure for GetPachImpacts(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 64 ++++++++++++++------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7c57b2c85..04aea183b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -150,6 +150,31 @@ my $IgnoredPathsRe = join('|', 'tools/winemaker/', ); +sub _CreateTestInfo($$$) +{ + my ($Impacts, $Root, $Dir) = @_; + + my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; + $Impacts->{BuildModules}->{$Module} = 1; + $Impacts->{IsWinePatch} = 1; + + my $Tests = $Impacts->{Tests}; + if (!$Tests->{$Module}) + { + $Tests->{$Module} = { + "Module" => $Module, + "Path" => "$Root/$Dir/tests", + "ExeBase" => "${Module}_test", + }; + foreach my $File (keys %{$_TestList->{$Module}}) + { + $Tests->{$Module}->{Files}->{$File} = 0; # not modified + } + } + + return $Module; +} + sub _HandleFile($$$) { my ($Impacts, $FilePath, $Change) = @_; @@ -168,43 +193,23 @@ sub _HandleFile($$$) if ($FilePath =~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~) { my ($Root, $Dir, $File) = ($1, $2, $3); - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; - $Impacts->{BuildModules}->{$Module} = 1; - $Impacts->{TestBuild} = 1; - $Impacts->{IsWinePatch} = 1; - my $Tests = $Impacts->{Tests}; - if (!$Tests->{$Module}) - { - $Tests->{$Module} = { - "Module" => $Module, - "Path" => "$Root/$Dir/tests", - "ExeBase" => "${Module}_test", - }; - } + my $Module = _CreateTestInfo($Impacts, $Root, $Dir); + $Impacts->{TestBuild} = 1; + $Impacts->{Tests}->{$Module}->{Files}->{$File} = $Change; if ($File eq "Makefile.in" and $Change ne "modify") { # This adds / removes a directory $Impacts->{MakeMakefiles} = 1; } - - if (!$Tests->{$Module}->{Files}) - { - foreach my $File (keys %{$_TestList->{$Module}}) - { - $Tests->{$Module}->{Files}->{$File} = 0; # not modified - } - } - $Tests->{$Module}->{Files}->{$File} = $Change; } elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) { my ($Root, $Dir, $File) = ($1, $2, $3); - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; - $Impacts->{BuildModules}->{$Module} = 1; + + my $Module = _CreateTestInfo($Impacts, $Root, $Dir); $Impacts->{ModuleBuild} = 1; - $Impacts->{IsWinePatch} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -300,13 +305,10 @@ sub GetPatchImpacts($;$) foreach my $PastInfo (values %{$PastImpacts->{Tests}}) { - if ($PastInfo->{Files}) + foreach my $File (keys %{$PastInfo->{Files}}) { - foreach my $File (keys %{$PastInfo->{Files}}) - { - _HandleFile($Impacts, "$PastInfo->{Path}/$File", - $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); - } + _HandleFile($Impacts, "$PastInfo->{Path}/$File", + $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); } } } -- 2.18.0

Sept. 21, 2018

[PATCH 2/4] testbot: Fix Makefile.in additions / removals in GetPatchImpacts().

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 602c80b7d..7c57b2c85 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -183,15 +183,10 @@ sub _HandleFile($$$) }; } - # Assume makefile modifications may break the build but not the tests - if ($File eq "Makefile.in") + if ($File eq "Makefile.in" and $Change ne "modify") { - if ($Change eq "new" or $Change eq "rm") - { - # This adds / removes a directory - $Impacts->{MakeMakefiles} = 1; - } - return; + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; } if (!$Tests->{$Module}->{Files}) @@ -233,6 +228,11 @@ sub _HandleFile($$$) if ($FilePath !~ /^(?:$IgnoredPathsRe)/) { $Impacts->{WineBuild} = 1; + if ($FilePath =~ m~/Makefile.in$~ and $Change ne "modify") + { + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; + } } # Else patches to this file don't impact the Wine build. } @@ -358,6 +358,8 @@ sub GetPatchImpacts($;$) { # Skip unmodified files next if (!$TestInfo->{Files}->{$File}); + # Assume makefile modifications may break the build but not the tests + next if ($File eq "Makefile.in"); my $Base = $File; if ($Base !~ s/(?:\.c|\.spec)$//) -- 2.18.0

Sept. 21, 2018

[PATCH 1/4] testbot: Add a ModuleBuild check in GetPatchImpacts().

by Francois Gouget

Patches that impact a single module can impact the Wine files list too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 9e0e68980..602c80b7d 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -279,7 +279,8 @@ sub GetPatchImpacts($;$) if ($PastImpacts) { - if ($PastImpacts->{WineBuild} or $PastImpacts->{TestBuild}) + if ($PastImpacts->{WineBuild} or $PastImpacts->{ModuleBuild} or + $PastImpacts->{TestBuild}) { # Update the list of Wine files so we correctly recognize patchset parts # that modify new Wine files. -- 2.18.0

Sept. 21, 2018

[PATCH] xmllite/writer: Fix writing prefixed attributes.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/writer.c | 27 +++++++++++++++++++++++++++ dlls/xmllite/writer.c | 8 +++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2cd9cea6cc..5ddb1ef2a7 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1768,6 +1768,33 @@ todo_wine "</p:a>"); IStream_Release(stream); + + /* Define prefix, write attribute with it. */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = write_start_element(writer, NULL, "e", NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri"); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = write_attribute_string(writer, "prefix", "attr", NULL, "value"); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<e xmlns:prefix=\"uri\" prefix:attr=\"value\" />"); + + IStream_Release(stream); + IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index bf2a7514ac..8d1fb3a2da 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -843,8 +843,8 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; static const WCHAR xmlW[] = {'x','m','l',0}; xmlwriter *This = impl_from_IXmlWriter(iface); + BOOL is_xmlns_prefix, is_xmlns_local; int prefix_len, local_len; - BOOL is_xmlns_prefix; struct ns *ns; HRESULT hr; @@ -879,6 +879,8 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR if (FAILED(hr = is_valid_ncname(local, &local_len))) return hr; + is_xmlns_local = !strcmpW(local, xmlnsW); + /* Trivial case, no prefix. */ if (prefix_len == 0 && is_empty_string(uri)) { @@ -918,9 +920,9 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR } /* Ignore prefix is URI wasn't specified. */ - if (is_empty_string(uri)) + if (is_xmlns_local && is_empty_string(uri)) { - write_output_attribute(This, NULL, 0, local, local_len, value); + write_output_attribute(This, NULL, 0, xmlnsW, ARRAY_SIZE(xmlnsW) - 1, value); return S_OK; } -- 2.18.0

Sept. 21, 2018

[PATCH 3/3] opcservices: Update content stream position on Read().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/package.c | 2 ++ dlls/opcservices/tests/opcservices.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index fb07d4db78..5534fe6783 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -560,6 +560,8 @@ static HRESULT WINAPI opc_content_stream_Read(IStream *iface, void *buff, ULONG if (*num_read) memcpy(buff, stream->content->data + stream->pos.QuadPart, *num_read); + stream->pos.QuadPart += *num_read; + return S_OK; } diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 2ef5677174..6bb0c54c62 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -159,6 +159,11 @@ static void test_package(void) ok(hr == S_OK, "Failed to read content, hr %#x.\n", hr); ok(!memcmp(buff, "abc", 3), "Unexpected content.\n"); + move.QuadPart = 0; + hr = IStream_Seek(stream2, move, STREAM_SEEK_CUR, &pos); + ok(SUCCEEDED(hr), "Seek failed, hr %#x.\n", hr); + ok(pos.QuadPart == 3, "Unexpected position.\n"); + IStream_Release(stream); IStream_Release(stream2); -- 2.18.0

Sept. 21, 2018

[PATCH 2/3] opcservices: Write relationship stream for parts.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/package.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index a6f3b9046d..fb07d4db78 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1956,6 +1956,7 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations static HRESULT opc_package_write_part(struct zip_archive *archive, IOpcPart *part, IXmlWriter *writer) { OPC_COMPRESSION_OPTIONS options = OPC_COMPRESSION_NORMAL; + IOpcRelationshipSet *rels = NULL; IStream *content = NULL; IOpcPartUri *name; BSTR uri = NULL; @@ -1974,10 +1975,17 @@ static HRESULT opc_package_write_part(struct zip_archive *archive, IOpcPart *par /* Part names always start with root '/', skip it. */ hr = compress_add_file(archive, uri + 1, content, options); } + if (SUCCEEDED(hr)) + hr = IOpcPart_GetRelationshipSet(part, &rels); + if (SUCCEEDED(hr)) + hr = opc_package_write_rels(archive, rels, (IOpcUri *)name, writer); + IOpcPartUri_Release(name); SysFreeString(uri); if (content) IStream_Release(content); + if (rels) + IOpcRelationshipSet_Release(rels); return hr; } -- 2.18.0

Sept. 21, 2018

[PATCH 1/3] opcservices: Add content type entry for relationship parts.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/package.c | 70 +++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index d7467a5ef8..a6f3b9046d 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1535,6 +1535,7 @@ HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) struct content_types { struct list types; + BOOL has_rels_part; }; enum content_type_element @@ -1653,9 +1654,26 @@ static HRESULT opc_package_add_content_type(struct content_types *types, IOpcPar return hr; } +static BOOL opc_package_has_rels_part(IOpcRelationshipSet *rel_set) +{ + IOpcRelationshipEnumerator *enumerator; + BOOL has_next; + HRESULT hr; + + if (FAILED(hr = IOpcRelationshipSet_GetEnumerator(rel_set, &enumerator))) + return FALSE; + + has_next = FALSE; + IOpcRelationshipEnumerator_MoveNext(enumerator, &has_next); + IOpcRelationshipEnumerator_Release(enumerator); + + return has_next; +} + static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct content_types *types) { IOpcPartEnumerator *enumerator; + IOpcRelationshipSet *rel_set; IOpcPartSet *parts; BOOL has_next; HRESULT hr; @@ -1663,6 +1681,13 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co if (FAILED(hr = IOpcPackage_GetPartSet(package, &parts))) return hr; + hr = IOpcPackage_GetRelationshipSet(package, &rel_set); + if (SUCCEEDED(hr)) + { + types->has_rels_part |= opc_package_has_rels_part(rel_set); + IOpcRelationshipSet_Release(rel_set); + } + hr = IOpcPartSet_GetEnumerator(parts, &enumerator); IOpcPartSet_Release(parts); if (FAILED(hr)) @@ -1681,6 +1706,16 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co if (FAILED(hr = IOpcPartEnumerator_GetCurrent(enumerator, &part))) break; + if (!types->has_rels_part) + { + hr = IOpcPart_GetRelationshipSet(part, &rel_set); + if (SUCCEEDED(hr)) + { + types->has_rels_part |= opc_package_has_rels_part(rel_set); + IOpcRelationshipSet_Release(rel_set); + } + } + hr = opc_package_add_content_type(types, part); IOpcPart_Release(part); if (FAILED(hr)) @@ -1694,23 +1729,40 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co return hr; } +static HRESULT opc_package_write_default_type(const WCHAR *ext, const WCHAR *type, IXmlWriter *writer) +{ + static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; + static const WCHAR extensionW[] = {'E','x','t','e','n','s','i','o','n',0}; + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; + HRESULT hr; + + hr = IXmlWriter_WriteStartElement(writer, NULL, defaultW, NULL); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteAttributeString(writer, NULL, extensionW, NULL, ext); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, type); + return hr; +} + static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_archive *archive, IXmlWriter *writer) { static const WCHAR uriW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','.','o','r','g','/', 'p','a','c','k','a','g','e','/','2','0','0','6','/','c','o','n','t','e','n','t','-','t','y','p','e','s',0}; + static const WCHAR relstypeW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','v','n','d','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','-', + 'p','a','c','k','a','g','e','.','r','e','l','a','t','i','o','n','s','h','i','p','s','+','x','m','l',0}; static const WCHAR contenttypesW[] = {'[','C','o','n','t','e','n','t','_','T','y','p','e','s',']','.','x','m','l',0}; static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; - static const WCHAR extensionW[] = {'E','x','t','e','n','s','i','o','n',0}; static const WCHAR overrideW[] = {'O','v','e','r','r','i','d','e',0}; static const WCHAR partnameW[] = {'P','a','r','t','N','a','m','e',0}; - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; static const WCHAR typesW[] = {'T','y','p','e','s',0}; + static const WCHAR relsW[] = {'r','e','l','s',0}; struct content_type *content_type, *content_type2; struct content_types types; IStream *content = NULL; HRESULT hr; list_init(&types.types); + types.has_rels_part = FALSE; hr = CreateStreamOnHGlobal(NULL, TRUE, &content); if (SUCCEEDED(hr)) @@ -1722,16 +1774,18 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a if (SUCCEEDED(hr)) hr = IXmlWriter_WriteStartElement(writer, NULL, typesW, uriW); + if (SUCCEEDED(hr) && types.has_rels_part) + { + hr = opc_package_write_default_type(relsW, relstypeW, writer); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteEndElement(writer); + } + LIST_FOR_EACH_ENTRY_SAFE(content_type, content_type2, &types.types, struct content_type, entry) { if (content_type->element == CONTENT_TYPE_DEFAULT) { - if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, defaultW, NULL); - if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, extensionW, NULL, content_type->u.def.ext + 1); - if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, content_type->u.def.type); + hr = opc_package_write_default_type(content_type->u.def.ext + 1, content_type->u.def.type, writer); CoTaskMemFree(content_type->u.def.ext); CoTaskMemFree(content_type->u.def.type); -- 2.18.0

Sept. 21, 2018