May 2018 - Wine-devel - list.winehq.org

[PATCH 3/6] winmm: Add playing status to MIDI stream structure and use it.
by Akihiro Sagawa 24 May '18

24 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)

2 1

[PATCH 2/6] winmm: Protect MIDI stream info with critical section.
by Akihiro Sagawa 24 May '18

24 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)

2 1

[PATCH 1/6] winmm/tests: Add tests regarding MIDI stream player clocks and positions.
by Akihiro Sagawa 24 May '18

24 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+)

2 1

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 24 May '18

24 May '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 4bc100e7fc..60bc6510fe 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3684,18 +3684,19 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"Attribuutti 'writable' ei voi olla 'true' tämän objektin ominaisuuksissa" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Ei-konfiguroitavaa ominaisuutta '|' ei voi määritellä uudestaan" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Ominaisuudella ei voi olla sekä hakufunktiota että arvoa" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -8502,10 +8503,8 @@ msgid "&Browse..." msgstr "&Selaa..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Tiedostotyyppi" +msgstr "Tiedostotyyppi:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8516,16 +8515,12 @@ msgid "Size:" msgstr "Koko:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Luotu" +msgstr "Luotu:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Ominaisuudet:" +msgstr "Ominaisuudet:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8536,28 +8531,20 @@ msgid "&Archive" msgstr "&Arkisto" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Avaa:" +msgstr "Avaa ohjelmalla:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "&Vaihda kuvaketta..." +msgstr "&Vaihda..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Muokattu" +msgstr "Muokattu:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Viimeisin muutos:" +msgstr "Käytetty:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" -- 2.17.0

1 0

[PATCH] testbot/build: Better detect when a native rebuild is needed.
by Francois Gouget 24 May '18

24 May '18

The builds need more than just winebuild and wrc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 19f220b64..ce27baab1 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -122,7 +122,7 @@ sub ApplyPatch($$$) { $NeedBuildNative = $NeedMakeMakefiles = $NeedConfigure = 1; } - elsif ($Line =~ m=^diff.*tools/(?:winebuild|wrc)=) + elsif ($Line =~ m=^diff.*tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)=) { $NeedBuildNative = 1; } -- 2.17.0

1 0

[PATCH] testbot: Sort the modules and test units alphabetically when creating jobs.
by Francois Gouget 24 May '18

24 May '18

This makes it easier to find the results for a specific module or test unit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 26127e93a..b15668732 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -241,7 +241,7 @@ sub Submit($$$) my $Disposition = "Submitted job "; my $First = 1; - foreach my $Module (keys %Modules) + foreach my $Module (sort keys %Modules) { my $Jobs = CreateJobs(); @@ -287,7 +287,7 @@ sub Submit($$$) return $ErrMessage; } - foreach my $Unit (keys %{$Modules{$Module}}) + foreach my $Unit (sort keys %{$Modules{$Module}}) { # Add 32 and 64-bit tasks foreach my $Bits ("32", "64") -- 2.17.0

1 0

[PATCH] testbot: Remove support for archiving jobs.
by Francois Gouget 24 May '18

24 May '18

We don't use it and there does not seem to be any forseable need for it anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: This patch requires updating the database. testbot/bin/Janitor.pl | 26 +-------- testbot/ddl/update34.sql | 4 ++ testbot/ddl/winetestbot.sql | 2 - testbot/doc/winetestbot-schema.dia | 85 +++++++++++------------------- testbot/lib/WineTestBot/Config.pm | 5 +- testbot/lib/WineTestBot/Jobs.pm | 9 ---- testbot/web/index.pl | 20 +------ 7 files changed, 39 insertions(+), 112 deletions(-) create mode 100644 testbot/ddl/update34.sql diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 7c4168ca8..f7a6e33b6 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -2,7 +2,7 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # # This script performs janitorial tasks. It removes incomplete patch series, -# archives old jobs and purges older jobs and patches. +# purges older jobs and patches, etc. # # Copyright 2009 Ge van Geldorp # Copyright 2017 Francois Gouget @@ -172,30 +172,6 @@ if ($JobPurgeDays != 0) } } -# Archive old Jobs, that is remove all their associated files -if ($JobArchiveDays != 0) -{ - my $ArchiveBefore = time() - $JobArchiveDays * 86400; - my $Jobs = CreateJobs(); - $Jobs->FilterNotArchived(); - foreach my $Job (@{$Jobs->GetItems()}) - { - if (defined($Job->Ended) && $Job->Ended < $ArchiveBefore) - { - Trace "Archiving job ", $Job->Id, "\n"; - next if ($DryRun); - - foreach my $Step (@{$Job->Steps->GetItems()}) - { - unlink $Step->GetDir() . "/" . $Step->FileName; - } - - $Job->Archived(1); - $Job->Save(); - } - } -} - # Purge the deleted VMs if they are not referenced anymore my $VMs = CreateVMs(); $VMs->AddFilter("Role", ["deleted"]); diff --git a/testbot/ddl/update34.sql b/testbot/ddl/update34.sql new file mode 100644 index 000000000..28dc4e92e --- /dev/null +++ b/testbot/ddl/update34.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Jobs + DROP Archived; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 32eab4e3e..9ec428c04 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -110,7 +110,6 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Jobs ( Id INT(5) NOT NULL AUTO_INCREMENT, - Archived ENUM('Y', 'N') NOT NULL, BranchName VARCHAR(20) NOT NULL, UserName VARCHAR(40) NOT NULL, Priority INT(1) NOT NULL, @@ -123,7 +122,6 @@ CREATE TABLE Jobs FOREIGN KEY (UserName) REFERENCES Users(Name), FOREIGN KEY (PatchId) REFERENCES Patches(Id), PRIMARY KEY (Id), - INDEX JobsArchived (Archived) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 2c720f2d2..0dbc7f985 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -846,16 +846,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="-16.8208,-13.2667"/> + <dia:point val="-16.8208,-13.3167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-16.8208,-13.2667;-7.8208,-10.2667"/> + <dia:rectangle val="-16.8208,-13.3167;-7.8208,-10.3167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-16.8208,-13.2667"/> + <dia:point val="-16.8208,-13.3167"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="9"/> @@ -1239,22 +1239,22 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="-4.57083,-14.8667"/> + <dia:point val="-4.57083,-14.9167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-4.57083,-14.8667;4.81417,-5.4667"/> + <dia:rectangle val="-4.57083,-14.9167;4.81417,-6.3167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-4.57083,-14.8667"/> + <dia:point val="-4.57083,-14.9167"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="9.3850000000000016"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="9.3999999999999986"/> + <dia:real val="8.5999999999999996"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#Jobs#</dia:string> @@ -1298,29 +1298,6 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> - <dia:string>#Archived#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#BOOL#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#BranchName#</dia:string> @@ -2004,7 +1981,7 @@ <dia:point val="25.4792,-14.8834"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.4792,-14.8834;36.0192,-4.6834"/> + <dia:rectangle val="25.4792,-14.8834;36.0192,-5.4834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2016,7 +1993,7 @@ <dia:real val="10.539999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="10.199999999999999"/> + <dia:real val="9.3999999999999986"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#Tasks#</dia:string> @@ -2304,7 +2281,7 @@ <dia:point val="25.6708,-2.02919"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.6708,-2.02919;36.2108,8.97081"/> + <dia:rectangle val="25.6708,-2.02919;36.5958,10.5708"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2313,10 +2290,10 @@ <dia:point val="25.6708,-2.02919"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="10.539999999999999"/> + <dia:real val="10.925000000000001"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="11"/> + <dia:real val="12.600000000000001"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#VMs#</dia:string> @@ -2693,19 +2670,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O14"> <dia:attribute name="obj_pos"> - <dia:point val="-7.82083,-11.5667"/> + <dia:point val="-7.8208,-11.6167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-7.87083,-12.2167;-4.52083,-11.5167"/> + <dia:rectangle val="-7.8708,-12.2667;-4.52083,-11.5667"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="-7.82083,-11.5667"/> - <dia:point val="-5.92083,-11.5667"/> - <dia:point val="-5.92083,-11.5667"/> - <dia:point val="-4.57083,-11.5667"/> + <dia:point val="-7.8208,-11.6167"/> + <dia:point val="-5.92083,-11.6167"/> + <dia:point val="-5.92083,-11.6167"/> + <dia:point val="-4.57083,-11.6167"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -2753,17 +2730,17 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O15"> <dia:attribute name="obj_pos"> - <dia:point val="4.81417,-13.1667"/> + <dia:point val="4.81417,-13.2167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.76417,-13.8334;8.29583,-13.1167"/> + <dia:rectangle val="4.76417,-13.8667;8.29583,-13.1334"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="4.81417,-13.1667"/> - <dia:point val="6.4625,-13.1667"/> + <dia:point val="4.81417,-13.2167"/> + <dia:point val="6.4625,-13.2167"/> <dia:point val="6.4625,-13.1834"/> <dia:point val="8.24583,-13.1834"/> </dia:attribute> @@ -2885,7 +2862,7 @@ <dia:point val="36.0192,-9.98336"/> <dia:point val="37.6193,-9.98336"/> <dia:point val="37.6193,-0.32919"/> - <dia:point val="36.2108,-0.32919"/> + <dia:point val="36.5958,-0.32919"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -2936,7 +2913,7 @@ <dia:point val="0.1125,-17.85"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.0625,-17.9;1.48167,-14.8167"/> + <dia:rectangle val="0.0625,-17.9;1.48167,-14.8667"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2944,8 +2921,8 @@ <dia:attribute name="orth_points"> <dia:point val="0.1125,-17.85"/> <dia:point val="0.1125,-15.3584"/> - <dia:point val="0.121667,-15.3584"/> - <dia:point val="0.121667,-14.8667"/> + <dia:point val="0.12167,-15.3584"/> + <dia:point val="0.12167,-14.9167"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="1"/> @@ -2993,17 +2970,17 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O19"> <dia:attribute name="obj_pos"> - <dia:point val="-4.57083,-5.96669"/> + <dia:point val="-4.57083,-6.8167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-18.2807,-6.61669;-4.52083,-0.80002"/> + <dia:rectangle val="-18.2807,-7.4667;-4.52083,-0.80002"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="-4.57083,-5.96669"/> - <dia:point val="-18.2307,-5.96669"/> + <dia:point val="-4.57083,-6.8167"/> + <dia:point val="-18.2307,-6.8167"/> <dia:point val="-18.2307,-0.85002"/> <dia:point val="-16.4708,-0.85002"/> </dia:attribute> @@ -3047,7 +3024,7 @@ <dia:real val="0.59999999999999998"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O9" connection="30"/> + <dia:connection handle="0" to="O9" connection="28"/> <dia:connection handle="1" to="O8" connection="12"/> </dia:connections> </dia:object> diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 4f4c8d82a..b7d633db6 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -35,7 +35,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $PrettyHostNames $JobPurgeDays $JobArchiveDays + $TunnelDefaults $PrettyHostNames $JobPurgeDays $WebHostName $RegistrationQ $RegistrationARE $MuninAPIKey); require Exporter; @@ -49,7 +49,7 @@ require Exporter; $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $PrettyHostNames $JobPurgeDays $JobArchiveDays + $TunnelDefaults $PrettyHostNames $JobPurgeDays $WebHostName $RegistrationQ $RegistrationARE $MuninAPIKey); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); @@ -116,7 +116,6 @@ $LDAPRealNameAttribute = undef; $LDAPEMailAttribute = undef; $JobPurgeDays = 7; -$JobArchiveDays = 0; if (!$::BuildEnv) { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 1dbee9b37..6be271ba3 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -74,7 +74,6 @@ sub InitializeNew($$) { my ($self, $Collection) = @_; - $self->Archived(!1); $self->Branch(CreateBranches()->GetDefaultBranch()); $self->Status("queued"); $self->Submitted(time()); @@ -421,7 +420,6 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Job id", 1, 1, "S", 5), - CreateBasicPropertyDescriptor("Archived", "Job is archived", !1, 1, "B", 1), CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), @@ -451,11 +449,4 @@ sub CreateJobs(;$) $ScopeObject); } -sub FilterNotArchived($) -{ - my ($self) = @_; - - $self->AddFilter("Archived", [!1]); -} - 1; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 3e5a48106..37b41eae8 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -56,8 +56,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Archived" || - $PropertyName eq "Patch" || + if ($PropertyName eq "Patch" || ($PropertyName eq "Branch" && ! CreateBranches()->MultipleBranchesPresent)) { @@ -278,26 +277,9 @@ sub GenerateBody($) print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs(); - $Jobs->FilterNotArchived(); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); $JobsCollectionBlock->GenerateList(); - if ($JobArchiveDays != 0) - { - my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName('Id'); - my $MaxIdLength = $PropertyDescriptor->GetMaxLength(); - print <<EOF -<br> -<form action='/JobDetails.pl' method='post' enctype='multipart/form-data'> -<div class='ItemProperty'> -<label>Archived job id</label><div class='ItemValue'><input type='text' name='Key' maxlength='$MaxIdLength' size='$MaxIdLength'/></div> -  -<input type='submit' name='Action' value='Show details'/> -</div> -</form> -EOF - } - print "<h2><a name='vms'></a>VMs</h2>\n"; my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); $VMsCollectionBlock->GenerateList(); -- 2.17.0

1 0

[PATCH 1/2] gdiplus: Pass the correct GUID to encode_image_wic for GIF images
by Alistair Leslie-Hughes 24 May '18

24 May '18

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9841857..5affe03 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4567,7 +4567,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, static GpStatus encode_image_gif(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) { - return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatGif, params); } /***************************************************************************** -- 1.9.1

2 1

[PATCH 2/2] gdiplus: Display the GUID of the image type in GdipSaveImageToStream
by Alistair Leslie-Hughes 24 May '18

24 May '18

Based of patch by Dmitry Timoshkov Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5affe03..e9b0b08 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4580,7 +4580,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, encode_image_func encode_image; int i; - TRACE("%p %p %p %p\n", image, stream, clsid, params); + TRACE("%p, %p, %s, %p\n", image, stream, wine_dbgstr_guid(clsid), params); if(!image || !stream) return InvalidParameter; -- 1.9.1

2 1

[PATCH 1/5] msi/tests: Test deferral of MoveFiles.
by Zebediah Figura 24 May '18

24 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 26 +++++++++++++++++++++++++- dlls/msi/tests/custom.c | 16 ++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 943c939..1600fe3 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -526,6 +526,29 @@ static const char mov_move_file_dat[] = "wildcardnodest\taugustus\tbudd*\t\tSourceDir\tMSITESTDIR\t1\n" "singlenodest\taugustus\tb?r\t\tSourceDir\tMSITESTDIR\t1\n"; +static const char mov_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t100\n" + "FileCost\t\t200\n" + "ResolveSource\t\t300\n" + "CostFinalize\t\t400\n" + "InstallValidate\t\t500\n" + "InstallInitialize\t\t600\n" + "MoveFiles\t\t700\n" + "mov_immediate\t\t701\n" + "mov_deferred\t\t702\n" + "InstallFiles\t\t800\n" + "InstallFinalize\t\t900\n"; + +static const char mov_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "mov_immediate\t1\tcustom.dll\tmov_absent\n" + "mov_deferred\t1025\tcustom.dll\tmov_present\n"; + static const char df_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -1843,7 +1866,8 @@ static const msi_table mov_tables[] = ADD_TABLE(rof_feature), ADD_TABLE(ci2_feature_comp), ADD_TABLE(ci2_file), - ADD_TABLE(install_exec_seq), + ADD_TABLE(mov_install_exec_seq), + ADD_TABLE(mov_custom_action), ADD_TABLE(rof_media), ADD_TABLE(property), ADD_TABLE(mov_move_file), diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0f34eb0..0bf62d9 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1363,3 +1363,19 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { } return ERROR_SUCCESS; } + +UINT WINAPI mov_present(MSIHANDLE hinst) +{ + ok(hinst, pf_exists("msitest\\canada"), "file absent\n"); + ok(hinst, pf_exists("msitest\\dominica"), "file absent\n"); + return ERROR_SUCCESS; +} + +UINT WINAPI mov_absent(MSIHANDLE hinst) +{ +todo_wine { + ok(hinst, !pf_exists("msitest\\canada"), "file present\n"); + ok(hinst, !pf_exists("msitest\\dominica"), "file present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 52feffa..4b46dc3 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -9,6 +9,8 @@ @ stdcall crs_absent(long) @ stdcall file_present(long) @ stdcall file_absent(long) +@ stdcall mov_present(long) +@ stdcall mov_absent(long) @ stdcall odbc_present(long) @ stdcall odbc_absent(long) @ stdcall rd_present(long) -- 2.7.4

3 20