November 2017 - Wine-Commits

Julian Rüger : German translation for release 2.19
by Jeremy Newman Nov. 20, 2017

Nov. 20, 2017

Module: website Branch: master Commit: a225308853c2e8cb71ae1739ba7cda8cf1ce9b19 URL: http://source.winehq.org/git/website.git/?a=commit;h=a225308853c2e8cb71ae17… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 17 13:47:42 2017 +0100 German translation for release 2.19 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017101401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017101401.xml b/news/de/2017101401.xml new file mode 100644 index 0000000..05846e4 --- /dev/null +++ b/news/de/2017101401.xml @@ -0,0 +1,17 @@ +<news> +<date>14. Oktober 2017</date> +<title>Wine 2.19 freigegeben</title> +<body> + Die Entwicklungsversion 2.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von 32-Bit float Audio unter Android.</li> + <li>Named-Pipes werden nun vollständig vom Wine-Server verarbeitet.</li> + <li>Unterstützung eines neuen Microsoft-Stammzertifikats.</li> + <li>Weitere Transformationskorrekturen in GdiPlus.</li> + <li>Optimierung der Heap-Allokationen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.20
by Jeremy Newman Nov. 20, 2017

Nov. 20, 2017

Module: website Branch: master Commit: 4a367a6bcd8378d717b30839e97b815339a76b62 URL: http://source.winehq.org/git/website.git/?a=commit;h=4a367a6bcd8378d717b308… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 17 13:55:09 2017 +0100 German translation for release 2.20 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017103101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2017103101.xml b/news/de/2017103101.xml new file mode 100644 index 0000000..5d30080 --- /dev/null +++ b/news/de/2017103101.xml @@ -0,0 +1,18 @@ +<news> +<date>31. Oktober 2017</date> +<title>Wine 2.20 freigegeben</title> +<body> + Die Entwicklungsversion 2.20 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.20">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Event-Unterstützung in MSHTML.</li> + <li>Preloader-Unterstützung unter ARM64.</li> + <li>Interpolations-Modi in Direct3D.</li> + <li>Bessere Metafile-Unterstützung in GdiPlus.</li> + <li>Erste Version eines Kerberos5-Authentifizierungspakets.</li> + <li>Verbesserter Cache der OLE-Zwischenablage.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.0.3
by Jeremy Newman Nov. 20, 2017

Nov. 20, 2017

Module: website Branch: master Commit: 98091c48097758f2f3e90df4bd16f84a3e08a1d5 URL: http://source.winehq.org/git/website.git/?a=commit;h=98091c48097758f2f3e90d… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 17 13:50:39 2017 +0100 German translation for release 2.0.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017102001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2017102001.xml b/news/de/2017102001.xml new file mode 100644 index 0000000..2538a95 --- /dev/null +++ b/news/de/2017102001.xml @@ -0,0 +1,13 @@ +<news> +<date>20. Oktober 2017</date> +<title>Wine 2.0.3 freigegeben</title> +<body> + Die Wartungsversion 2.0.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> + <li>Kompatibilität mit FreeType 2.8.1</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : testbot/web: Remove an unneeded import directive.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: tools Branch: master Commit: a6248ca540b55f59287e4cde4d5591c03f712e00 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a6248ca540b55f59287e4cde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 20 12:39:59 2017 +0100 testbot/web: Remove an unneeded import directive. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a9bb231..41a0fe3 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -28,7 +28,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; -use WineTestBot::Log; @JobDetailsPage::ISA = qw(ObjectModel::CGI::CollectionPage);

1 0

Francois Gouget : testbot: Document the issues with composite keys and Collections.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: tools Branch: master Commit: 130eb4474fa4e970fddeaa00141c0e85352e6978 URL: http://source.winehq.org/git/tools.git/?a=commit;h=130eb4474fa4e970fddeaa00… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 20 13:09:16 2017 +0100 testbot: Document the issues with composite keys and Collections. Namely Collection->Add() uses the initial Item's primary key. If that key changes then KeyChanged() must be called. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 13 +++++++++++ testbot/lib/ObjectModel/Item.pm | 43 +++++++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Steps.pm | 5 +++- testbot/lib/WineTestBot/Tasks.pm | 5 +++- 4 files changed, 64 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 47d2b9b..9d3d3ae 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -161,6 +161,19 @@ sub Load($) $self->{Loaded} = 1; } +=pod +=over 12 + +=item C<Add()> + +Instantiates a new Item and adds it to the Collection. + +See Item->new() for details on the Item's default column values and for +important information regarding its primary key. + +=back +=cut + sub Add($) { my ($self) = @_; diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index fe74f35..170f44c 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -36,6 +36,29 @@ require Exporter; @ISA = qw(Exporter); @EXPORT_OK = qw(&new); + +=pod +=over 12 + +=item C<new()> + +Instantiates a new Item and calls _initialize() to set up default values for +its columns, including the primary key. + +Note that it is strongly recommended that _initialize() set up the primary key +such that the new Item can be inserted into a Collection without colliding with +existing items. + +Ideally repeated calls to new() should also each generate unique initial keys +so it is possible to add multiple new Items to a Collection before knowing +their final key value. + +In all cases, it is the responsibility of the caller to adjust the initial +primary key if needed and to call KeyChanged(). See PutColValue() for details. + +=back +=cut + sub new($$@) { my $class = shift; @@ -138,6 +161,26 @@ sub GetColValue($$) return $self->{ColValues}{$ColName}; } +=pod +=over 12 + +=item C<PutColValue()> + +Sets the specified column value. + +Note that if the column is part of the primary key it is up to the caller to +then invoke KeyChanged() so the object can be retrieved from the Collection +using the new key value. + +Further note that KeyChanged() should only be called once all of the +primary key??s columns have reached their final values: in a two column +primary key, calling KeyChanged() with the (new1, old2) values may collide with +another Item which would cause a spurious error even though the final +(new1, new2) key is unique. + +=back +=cut + sub PutColValue($$$) { my ($self, $ColName, $Value) = @_; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 6f2b399..4161f0b 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -47,9 +47,12 @@ sub InitializeNew($$) { my ($self, $Collection) = @_; - $self->Status("queued"); + # Make up an initial, likely unique, key so the Step can be added to the + # Collection my $Keys = $Collection->GetKeys(); $self->No(scalar @$Keys + 1); + + $self->Status("queued"); $self->Type("single"); $self->InStaging(1); $self->DebugLevel(1); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 62eff5d..efe1b21 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -50,10 +50,13 @@ sub InitializeNew($$) { my ($self, $Collection) = @_; - $self->Status("queued"); + # Make up an initial, likely unique, key so the Task can be added to the + # Collection my $Keys = $Collection->GetKeys(); $self->No(scalar @$Keys + 1); + $self->Status("queued"); + $self->SUPER::InitializeNew($Collection); }

1 0

Francois Gouget : testbot: Add the MessageId field to the database diagram.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: tools Branch: master Commit: 34736b24fc165dcb1507d33a7def6d03ec65be6a URL: http://source.winehq.org/git/tools.git/?a=commit;h=34736b24fc165dcb1507d33a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 20 12:49:14 2017 +0100 testbot: Add the MessageId field to the database diagram. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/winetestbot-schema.dia | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 326b3c8..056412c 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1120,6 +1120,32 @@ <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>#MessageId#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(256)#</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="true"/> + </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:attribute> </dia:object>

1 0

Francois Gouget : testbot: Centralize handling of the Job, Step and Task directories.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: tools Branch: master Commit: 6d09e6c9461ef101131a8a5e0570369fbcaf8bc1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6d09e6c9461ef101131a8a5e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 20 12:40:22 2017 +0100 testbot: Centralize handling of the Job, Step and Task directories. Also avoid invoking external tools to delete directories. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- testbot/bin/Janitor.pl | 5 ++--- testbot/bin/WineRunBuild.pl | 16 ++++++---------- testbot/bin/WineRunReconfig.pl | 6 +----- testbot/bin/WineRunTask.pl | 13 +++++-------- testbot/bin/WineSendLog.pl | 15 ++++----------- testbot/lib/WineTestBot/Jobs.pm | 31 ++++++++++++++++++++++++++---- testbot/lib/WineTestBot/Steps.pm | 32 ++++++++++++++++++++++++++----- testbot/lib/WineTestBot/StepsTasks.pm | 13 +++++++++++++ testbot/lib/WineTestBot/Tasks.pm | 36 +++++++++++++++++++++++++++-------- testbot/web/GetFile.pl | 4 ++-- testbot/web/JobDetails.pl | 6 ++---- 12 files changed, 118 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=6d09e6c9461ef101131a…

1 0

Alexandre Julliard : patches: Try harder to find a parent for replies.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: tools Branch: master Commit: e44253139548dfaf238e7eb6e11a5f99d9ed793b URL: http://source.winehq.org/git/tools.git/?a=commit;h=e44253139548dfaf238e7eb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 16:37:49 2017 +0100 patches: Try harder to find a parent for replies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/update b/patches/update index 95e7841..8db8077 100755 --- a/patches/update +++ b/patches/update @@ -255,7 +255,7 @@ sub assign_parent($) } return $parent; } - return undef; + return $patch; } foreach my $file (sort keys %patches) @@ -274,7 +274,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { next if $patch->{"status"} eq "reply"; next if $patch->{"from_marvin"}; - next unless $patch->{"subject"} =~ /\[.*PATCH.*\]/; + next unless $patch->{"subject"} =~ /^\[.*PATCH.*\]/; } printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td>",

1 0

Alex Henrie : combase: Add RoGetParameterizedTypeInstanceIID stub.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: bd70d8c951422e32f247b268cd72670382ff54a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd70d8c951422e32f247b268c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 17 10:43:24 2017 -0700 combase: Add RoGetParameterizedTypeInstanceIID stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec | 2 +- dlls/combase/Makefile.in | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec index 9fb16ab..68db3e9 100644 --- a/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec @@ -1,3 +1,3 @@ @ stub RoFreeParameterizedTypeExtra -@ stub RoGetParameterizedTypeInstanceIID +@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) combase.RoGetParameterizedTypeInstanceIID @ stub RoParameterizedTypeExtraGetTypeSignature diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index c5ab8d2..b1d759e 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,5 +1,5 @@ MODULE = combase.dll -IMPORTS = ole32 +IMPORTS = ole32 uuid C_SRCS = \ roapi.c \ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 493e796..c238eb8 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -253,7 +253,7 @@ @ stub RoGetApartmentIdentifier @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo -@ stub RoGetParameterizedTypeInstanceIID +@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) @ stub RoGetServerActivatableClasses @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index a2dfd54..a2d62520 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -18,6 +18,7 @@ #include "objbase.h" #include "roapi.h" +#include "roparameterizediid.h" #include "hstring.h" #include "wine/debug.h" @@ -55,3 +56,16 @@ HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **factor FIXME("stub: %p %p %p\n", classid, iid, factory); return E_NOTIMPL; } + +/*********************************************************************** + * RoGetParameterizedTypeInstanceIID (combase.@) + */ +HRESULT WINAPI RoGetParameterizedTypeInstanceIID(UINT32 name_element_count, const WCHAR **name_elements, + const IRoMetaDataLocator *meta_data_locator, GUID *iid, + ROPARAMIIDHANDLE *hiid) +{ + FIXME("stub: %d %p %p %p %p\n", name_element_count, name_elements, meta_data_locator, iid, hiid); + if (iid) *iid = GUID_NULL; + if (hiid) *hiid = INVALID_HANDLE_VALUE; + return E_NOTIMPL; +}

1 0

Alex Henrie : include: Add roparameterizediid.idl.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: b678636b86e8ee2ad8ae7afbd4c526633e9fbdc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b678636b86e8ee2ad8ae7afbd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 16 19:44:33 2017 -0700 include: Add roparameterizediid.idl. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/roparameterizediid.idl | 95 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66..d453dc8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000..85ee57d --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,95 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt +#endif + +import "wtypes.idl"; + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder +{ + HRESULT SetWinRtInterface( + GUID iid + ); + + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetRuntimeClassParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *base_type + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); +} + +[ + object +] +interface IRoMetaDataLocator +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +}

1 0

Alexandre Julliard : make_makefiles: Ignore files that have been deleted in the index.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: bfc863474791af182ea7162e22ff52ec1ae30699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc863474791af182ea7162e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 19:39:59 2017 +0100 make_makefiles: Ignore files that have been deleted in the index. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/make_makefiles b/tools/make_makefiles index 8411ecb..f57a7e2 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -542,6 +542,7 @@ my $git_dir = $ENV{GIT_DIR} || ".git"; die "needs to be run from a git checkout" unless -d $git_dir; my @all_files = split /\0/, `git ls-files -c -z`; +map { $ignored_source_files{$_} = 1; } split /\0/, `git ls-files -d -z`; @makefiles = map { (my $ret = $_) =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; foreach my $file (sort @makefiles)

1 0

Rafał Harabień : winex11.drv: Preserve last error in x11drv_thread_data().
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 5c2526a08681c8992d60e7eb462d7aac12a25784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2526a08681c8992d60e7eb4… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Thu Nov 16 22:30:17 2017 +0100 winex11.drv: Preserve last error in x11drv_thread_data(). Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 1 + dlls/user32/menu.c | 1 + dlls/user32/tests/input.c | 11 ++++++++++- dlls/user32/tests/win.c | 8 ++++++++ dlls/winex11.drv/x11drv.h | 5 ++++- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c2aad8d..46220b0 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -283,6 +283,7 @@ static BOOL DIALOG_CreateControls32( HWND hwnd, LPCSTR template, const DLG_TEMPL WARN("control %s %s creation failed\n", debugstr_w(info.className), debugstr_w(info.windowName)); if (dlgTemplate->style & DS_NOFAILCREATE) continue; + SetLastError(0); return FALSE; } diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index a5f2317..38deaef 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3518,6 +3518,7 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, SendMessageW( hWnd, WM_UNINITMENUPOPUP, (WPARAM)hMenu, MAKELPARAM(0, IS_SYSTEM_MENU(menu)) ); } + SetLastError(0); } return ret; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..793590e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,17 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_NOACCESS, "error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %u\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b529284..6e72cbc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6261,6 +6261,14 @@ static void test_CreateWindow(void) ok( rc.bottom <= expected_cy, "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); + /* invalid class */ + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, "INVALID_CLASS", NULL, WS_CHILD, 10, 10, 100, 100, parent, 0, 0, NULL); + ok(hwnd == 0, "CreateWindowEx succeeded\n"); + ok(GetLastError() == ERROR_CLASS_DOES_NOT_EXIST || GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, + "invalid error %u\n", GetLastError()); + DestroyWindow(hwnd); + if (pGetLayout && pSetLayout) { HDC hdc = GetDC( parent ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..938ff22 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,10 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + DWORD err = GetLastError(); /* TlsGetValue always resets last error */ + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + SetLastError( err ); + return data; } /* retrieve the thread display, or NULL if not created yet */

1 0

Hans Leidekker : advapi32; Remove unused foward declarations.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: cd8165a488bf334bf0f77796c2eb8c49852e0c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8165a488bf334bf0f77796c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 17 15:56:56 2017 +0100 advapi32; Remove unused foward declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ae9d6bd..bd15a02 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -48,16 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); -static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, - PACL pAcl, LPDWORD cBytes); -static BYTE ParseAceStringFlags(LPCWSTR* StringAcl); -static BYTE ParseAceStringType(LPCWSTR* StringAcl); -static DWORD ParseAceStringRights(LPCWSTR* StringAcl); -static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( - LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, - LPDWORD cBytes); -static DWORD ParseAclStringFlags(LPCWSTR* StringAcl); typedef struct _ACEFLAG {

1 0

Martin Storsjo : ucrtbase: Always return the full string length in __stdio_common_vs[w] printf for a NULL buffer.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: ee32799d61c03266f327ec3af9dc3309de7163ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee32799d61c03266f327ec3af… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Nov 17 12:39:39 2017 +0200 ucrtbase: Always return the full string length in __stdio_common_vs[w]printf for a NULL buffer. If the target is a NULL buffer (with a zero length), we should always return the full size the format would have needed, even if UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR isn't specified. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 4 ++++ dlls/ucrtbase/tests/printf.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 88f52e0..0c54800 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -764,6 +764,8 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); puts_clbk_str_a(&ctx, 1, &nullbyte); + if(!str) + return ret; if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { @@ -1282,6 +1284,8 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); puts_clbk_str_w(&ctx, 1, &nullbyte); + if(!str) + return ret; if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 77fb560..0e38003 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -215,6 +215,10 @@ static void test_snprintf (void) ok (vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); + ok (vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); + ok (vsprintf_wrapper (0, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); } static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str, @@ -289,6 +293,13 @@ static void test_swprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); } + + ok (vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); + ok (vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); + ok (vswprintf_wrapper (0, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); } static int WINAPIV vfprintf_wrapper(FILE *file,

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 29a0537d91c2a0a042a686cb62c967350958f755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a0537d91c2a0a042a686cb6… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 17 14:30:43 2017 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 68 ++++++++++++++++------------------------------------------------ 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/po/de.po b/po/de.po index 48497f4..8e8fe3d 100644 --- a/po/de.po +++ b/po/de.po @@ -1,20 +1,18 @@ # German translations for Wine # -# Marcus Meissner <marcus(a)jet.franken.de>, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-10-28 15:22+0100\n" -"Last-Translator: Marcus Meissner <marcus(a)jet.franken.de>\n" -"Language-Team: German <kde-i18n-de(a)kde.org>\n" +"PO-Revision-Date: 2017-11-17 14:31+0100\n" +"Last-Translator: Julian Rüger\n" +"Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -10667,6 +10665,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"MKLINK legt einen symbolischen Link an.\n" +"\n" +"Syntax: MKLINK [Optionen] Linkname Ziel\n" +"\n" +"Optionen:\n" +"/d Symlink auf ein Verzeichnis anlegen.\n" +"/h Einen Hardlink anlegen.\n" +"/j Einen Verzeichnisknoten anlegen.\n" +"'Linkname' entspricht dem Dateinamen des neuen Symlinks.\n" +"'Ziel' ist der Pfad, auf den 'Linkname' verweisen wird.\n" #: cmd.rc:312 msgid "" @@ -10677,47 +10685,6 @@ msgstr "" "der Shell zurück, von der CMD gestartet wurde.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10776,6 +10743,7 @@ msgstr "" "FTYPE\t\tZeigt oder ändert den Öffnen-Befehl für eine Dateierweiterung\n" "HELP\t\tZeigt detaillierte Informationen zu einen Thema\n" "MD (MKDIR)\tErzeugt ein Unterverzeichnis\n" +"MKLINK\t\tLegt einen symbolischen Link an\n" "MORE\t\tZeigt die Ausgabe seitenweise an\n" "MOVE\t\tBewegt eine oder mehrere Dateien oder einen Verzeichnisbaum\n" "PATH\t\tSetzt oder zeigt den Suchpfad an\n" @@ -12267,7 +12235,7 @@ msgstr "(Wert nicht gesetzt)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "REG IMPORT file.reg\n" +msgstr "REG IMPORT datei.reg\n" #: reg.rc:67 msgid "reg: The file '%1' was not found.\n" @@ -15069,10 +15037,8 @@ msgid "Expert" msgstr "Experten" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Ergebnis" +msgstr "Ergebnisse zurücksetzen" #: winemine.rc:80 msgid "Congratulations!" @@ -15100,7 +15066,7 @@ msgstr "Minen" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Sämtliche Ergebnisse werden entfernt. Sind Sie sicher?" #: winemine.rc:30 msgid "WineMine"

1 0

Alexandre Julliard : ntdll: Fall back to read() on noexec filesystems also for non-image mappings.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 2e364d25cc51656cfc9c512905cc12fee41bcd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e364d25cc51656cfc9c51290… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 11:54:51 2017 +0100 ntdll: Fall back to read() on noexec filesystems also for non-image mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1c62e57..9cec872 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1164,18 +1164,29 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; - if ((errno == EPERM) && (prot & PROT_EXEC)) - ERR( "failed to set %08x protection on file map, noexec filesystem?\n", prot ); - - /* mmap() failed; if this is because the file offset is not */ - /* page-aligned (EINVAL), or because the underlying filesystem */ - /* does not support mmap() (ENOEXEC,ENODEV), we do it by hand. */ - if ((errno != ENOEXEC) && (errno != EINVAL) && (errno != ENODEV)) return FILE_GetNtStatus(); - if (flags & MAP_SHARED) /* we cannot fake shared mappings */ - { - if (errno == EINVAL) return STATUS_INVALID_PARAMETER; - ERR( "shared writable mmap not supported, broken filesystem?\n" ); - return STATUS_NOT_SUPPORTED; + switch (errno) + { + case EINVAL: /* file offset is not page-aligned, fall back to read() */ + if (flags & MAP_SHARED) return STATUS_INVALID_PARAMETER; + break; + case ENOEXEC: + case ENODEV: /* filesystem doesn't support mmap(), fall back to read() */ + if (flags & MAP_SHARED) + { + ERR( "shared writable mmap not supported, broken filesystem?\n" ); + return STATUS_NOT_SUPPORTED; + } + break; + case EPERM: /* noexec filesystem, fall back to read() */ + if (flags & MAP_SHARED) + { + if (prot & PROT_EXEC) ERR( "failed to set PROT_EXEC on file map, noexec filesystem?\n" ); + return STATUS_ACCESS_DENIED; + } + if (prot & PROT_EXEC) WARN( "failed to set PROT_EXEC on file map, noexec filesystem?\n" ); + break; + default: + return FILE_GetNtStatus(); } }

1 0

Jacek Caban : mshtml: Merge olewnd.c into oleobj.c.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: e1c211eaee7450e240b937d3c95307b374b1ea9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c211eaee7450e240b937d3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 17:46:20 2017 +0100 mshtml: Merge olewnd.c into oleobj.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/oleobj.c | 246 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/olewnd.c | 286 ------------------------------------------- 5 files changed, 246 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1c211eaee7450e240b93…

1 0

Hans Leidekker : advapi32: Add traces to ConvertStringSecurityDescriptorToSecurityDescriptorA/W.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: f947546927ecb053905471d7ad1d5cb5ae3c41c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f947546927ecb053905471d7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 17 15:56:57 2017 +0100 advapi32: Add traces to ConvertStringSecurityDescriptorToSecurityDescriptorA/W. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index bd15a02..a762d5a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4793,6 +4793,9 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( BOOL ret; LPWSTR StringSecurityDescriptorW; + TRACE("%s, %u, %p, %p\n", debugstr_a(StringSecurityDescriptor), StringSDRevision, + SecurityDescriptor, SecurityDescriptorSize); + if(!StringSecurityDescriptor) return FALSE; @@ -4818,7 +4821,8 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( SECURITY_DESCRIPTOR* psd; BOOL bret = FALSE; - TRACE("%s\n", debugstr_w(StringSecurityDescriptor)); + TRACE("%s, %u, %p, %p\n", debugstr_w(StringSecurityDescriptor), StringSDRevision, + SecurityDescriptor, SecurityDescriptorSize); if (GetVersion() & 0x80000000) {

1 0

Hans Leidekker : advapi32: Fix parsing empty DACL/ SACL security descriptor strings.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 1d03ba7611644807af38be40af46e1b22d1dd9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d03ba7611644807af38be40a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 17 15:56:58 2017 +0100 advapi32: Fix parsing empty DACL/SACL security descriptor strings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 4 ++-- dlls/advapi32/tests/security.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a762d5a..7281e01 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4314,7 +4314,7 @@ static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) DWORD flags = 0; LPCWSTR szAcl = *StringAcl; - while (*szAcl != '(') + while (*szAcl && *szAcl != '(') { if (*szAcl == 'P') { @@ -4625,7 +4625,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, pAcl->AclRevision = ACL_REVISION; pAcl->Sbz1 = 0; pAcl->AclSize = length; - pAcl->AceCount = acecount++; + pAcl->AceCount = acecount; pAcl->Sbz2 = 0; } return TRUE; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 08d3705..e86fe21 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4101,6 +4101,8 @@ static void test_ConvertStringSecurityDescriptor(void) PSECURITY_DESCRIPTOR pSD; static const WCHAR Blank[] = { 0 }; unsigned int i; + ULONG size; + ACL *acl; static const struct { const char *sidstring; @@ -4211,6 +4213,33 @@ static void test_ConvertStringSecurityDescriptor(void) ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_DATATYPE) /* win2k */, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %u\n", GetLastError()); if (ret) LocalFree(pSD); + + /* empty DACL */ + size = 0; + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA("D:", SDDL_REVISION_1, &pSD, &size); + ok(ret, "unexpected error %u\n", GetLastError()); + ok(size == sizeof(SECURITY_DESCRIPTOR_RELATIVE) + sizeof(ACL), "got %u\n", size); + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(acl->AclRevision == ACL_REVISION, "got %u\n", acl->AclRevision); + ok(!acl->Sbz1, "got %u\n", acl->Sbz1); + ok(acl->AclSize == sizeof(*acl), "got %u\n", acl->AclSize); + ok(!acl->AceCount, "got %u\n", acl->AceCount); + ok(!acl->Sbz2, "got %u\n", acl->Sbz2); + LocalFree(pSD); + + /* empty SACL */ + size = 0; + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA("S:", SDDL_REVISION_1, &pSD, &size); + ok(ret, "unexpected error %u\n", GetLastError()); + ok(size == sizeof(SECURITY_DESCRIPTOR_RELATIVE) + sizeof(ACL), "got %u\n", size); + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(!acl->Sbz1, "got %u\n", acl->Sbz1); + ok(acl->AclSize == sizeof(*acl), "got %u\n", acl->AclSize); + ok(!acl->AceCount, "got %u\n", acl->AceCount); + ok(!acl->Sbz2, "got %u\n", acl->Sbz2); + LocalFree(pSD); } static void test_ConvertSecurityDescriptorToString(void)

1 0

Alexandre Julliard : ntdll: Also check for EACCES to detect noexec failures.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 03993b456c386cf2f26afe267da83d04302ac984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03993b456c386cf2f26afe267… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 11:54:57 2017 +0100 ntdll: Also check for EACCES to detect noexec failures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9cec872..ab27077 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1177,6 +1177,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start return STATUS_NOT_SUPPORTED; } break; + case EACCES: case EPERM: /* noexec filesystem, fall back to read() */ if (flags & MAP_SHARED) { @@ -1334,6 +1335,7 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) switch (errno) { case EPERM: + case EACCES: WARN( "noexec file system, falling back to read\n" ); break; case ENOEXEC:

1 0

Vincent Povirk : twain_32: Implement source selection dialog.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

1 0

André Hentschel : loader: We now have a preloader on ARM64.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: c459357b0d5881038d0c9efe9761eaabdb90bc8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c459357b0d5881038d0c9efe9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 16 23:20:36 2017 +0100 loader: We now have a preloader on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/main.c b/loader/main.c index a560ec3..0a25272 100644 --- a/loader/main.c +++ b/loader/main.c @@ -195,11 +195,11 @@ static int pre_exec(void) #endif } -#elif defined(__linux__) && defined(__x86_64__) +#elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) static int pre_exec(void) { - return 1; /* we have a preloader on x86-64 */ + return 1; /* we have a preloader on x86-64/arm64 */ } #elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__))

1 0

Zebediah Figura : webservices: Stub WsAbortChannel().
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 48b581befd9288ff942a2ab3f8f23fe20cad4458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b581befd9288ff942a2ab3f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 16 13:18:19 2017 -0600 webservices: Stub WsAbortChannel(). Powerpoint 2016 calls this while loading some themes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 9 +++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 92569fd..9093a6c 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2138,3 +2138,12 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE LeaveCriticalSection( &channel->cs ); return hr; } + +/************************************************************************** + * WsAbortChannel [webservices.@] + */ +HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) +{ + FIXME( "%p %p: stub!\n", handle, error ); + return E_NOTIMPL; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 53fe547..55f3e2e 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -1,6 +1,6 @@ @ stub WsAbandonCall @ stub WsAbandonMessage -@ stub WsAbortChannel +@ stdcall WsAbortChannel(ptr ptr) @ stub WsAbortListener @ stub WsAbortServiceHost @ stdcall WsAbortServiceProxy(ptr ptr)

1 0

Zebediah Figura : kernel32/tests: Trace thread IDs in hexadecimal.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 7ecf84c42193495a687ffc9328a67a489ba5a152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ecf84c42193495a687ffc932… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 16 22:21:32 2017 -0600 kernel32/tests: Trace thread IDs in hexadecimal. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1f6f317..6d532eb 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1523,7 +1523,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; - trace("%04u: mutex_thread_proc: starting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) { ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); @@ -1531,7 +1531,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) else if (ret == WAIT_OBJECT_0 + 1) { ULONG_PTR loader_lock_magic; - trace("%04u: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); ret = pLdrLockLoaderLock(0, NULL, &loader_lock_magic); ok(!ret, "LdrLockLoaderLock error %#x\n", ret); inside_loader_lock++; @@ -1539,21 +1539,21 @@ static DWORD WINAPI mutex_thread_proc(void *param) } else if (ret == WAIT_OBJECT_0 + 2) { - trace("%04u: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); pRtlAcquirePebLock(); inside_peb_lock++; SetEvent(ack_event); } else if (ret == WAIT_OBJECT_0 + 3) { - trace("%04u: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); HeapLock(GetProcessHeap()); inside_heap_lock++; SetEvent(ack_event); } } - trace("%04u: mutex_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1569,11 +1569,11 @@ static DWORD WINAPI semaphore_thread_proc(void *param) while (1) { if (winetest_debug > 1) - trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); if (WaitForSingleObject(stop_event, 50) != WAIT_TIMEOUT) break; } - trace("%04u: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1585,7 +1585,7 @@ static DWORD WINAPI noop_thread_proc(void *param) InterlockedIncrement(noop_thread_started); } - trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: noop_thread_proc: exiting\n", GetCurrentThreadId()); return 195; }

1 0

André Hentschel : libwine: Reserve memory areas for ARM64 in case we don't have a preloader.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: b0fc60d2794c870e33d9d22fd1369986520fcb83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fc60d2794c870e33d9d22fd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 16 23:20:45 2017 +0100 libwine: Reserve memory areas for ARM64 in case we don't have a preloader. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 1a3ca59..458cc13 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -398,7 +398,7 @@ void mmap_init(void) } reserve_dos_area(); -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) if (!list_head( &reserved_areas )) {

1 0