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

[PATCH 1/3] testbot/Engine: Let event handlers add / remove events.
by Francois Gouget 10 May '18

10 May '18

This makes it possible to handle events that happen at irregular intervals: the event is created as non-repeating and the event handler computes when the next event should happen and adds it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Events.pm | 70 ++++++++++++++---------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index 677debfbf..f1ab39ac9 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -37,10 +37,11 @@ sub AddEvent($$$$) { my ($Name, $Timeout, $Repeat, $HandlerFunc) = @_; - $Events{$Name} = {Expires => time() + $Timeout, - Timeout => $Timeout, - Repeat => $Repeat, - HandlerFunc => $HandlerFunc}; + $Events{$Name} = { Name => $Name, + Expires => time() + $Timeout, + Timeout => $Timeout, + Repeat => $Repeat, + HandlerFunc => $HandlerFunc }; } sub DeleteEvent($) @@ -54,42 +55,51 @@ sub EventScheduled($) { my ($Name) = @_; - return defined($Events{$Name}); + return exists $Events{$Name}; } sub RunEvents() { my $Now = time(); - my $Next = undef; - foreach my $Name (keys %Events) + # Run expired events in their expiration order. + # Note that callbacks may add / remove events. + my @SortedEvents = sort { $a->{Expires} <=> $b->{Expires} } values %Events; + foreach my $Event (@SortedEvents) { - my $Event = $Events{$Name}; - if (defined($Event)) + if (!exists $Events{$Event->{Name}}) + { + # This event got removed by a callback + next; + } + + if ($Event->{Expires} > $Now) + { + # Since the events are sorted by expiration order, + # there is no other event to run. + last; + } + + if ($Event->{Repeat}) { - if ($Event->{Expires} <= $Now) - { - if ($Event->{Repeat}) - { - $Event->{Expires} += $Event->{Timeout}; - if (! defined($Next) || $Event->{Expires} - $Now < $Next) - { - $Next = $Event->{Expires} - $Now; - } - } - else - { - delete $Events{$Name}; - } - &{$Event->{HandlerFunc}}(); - } - elsif (! defined($Next) || $Event->{Expires} - $Now < $Next) - { - $Next = $Event->{Expires} - $Now; - } + $Event->{Expires} += $Event->{Timeout}; } + else + { + delete $Events{$Event->{Name}}; + } + &{$Event->{HandlerFunc}}(); } - return $Next; + # Determine when the next event is due + my $Next = undef; + foreach my $Event (values %Events) + { + if (!defined $Next or $Event->{Expires} - $Now < $Next) + { + $Next = $Event->{Expires} - $Now; + } + } + return $Next <= 0 ? 1 : $Next; } 1; -- 2.17.0

1 0

[PATCH] setupapi: set LastError on success in SetupInstallFromInfSectionW
by Austin English 10 May '18

10 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45167 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/setupapi/install.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 0593df892e..5a76e3a581 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1188,6 +1188,7 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, return FALSE; } + SetLastError(ERROR_SUCCESS); return TRUE; } -- 2.16.1

1 0

[PATCH 6/6] jscript: Make RegExp object properties non-writable.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsregexp.c | 40 ++++++++-------------------------------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 12 insertions(+), 32 deletions(-)

1 0

[PATCH 5/6] jscript: Make Function instance object properties non-writable.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 14 ++++---------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 10 deletions(-)

1 0

[PATCH 4/6] jscript: Make String.length non-writable.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/string.c | 10 ++-------- dlls/jscript/tests/api.js | 6 ++++++ dlls/mshtml/tests/es5.js | 1 + 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[PATCH 3/6] jscript: Use jsdisp_get_own_property in Object.propertyIsEnumerable implementation.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 13 ------------- dlls/jscript/jscript.h | 1 - dlls/jscript/object.c | 8 ++++---- 3 files changed, 4 insertions(+), 18 deletions(-)

1 0

[PATCH 2/6] jscript: Use jsdisp_get_own_property in Object.hasOwnProperty implementation.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 13 ------------- dlls/jscript/jscript.h | 1 - dlls/jscript/object.c | 17 +++++++++-------- 3 files changed, 9 insertions(+), 22 deletions(-)

1 0

[PATCH 1/6] jscript: Added Object.getOwnPropertyDescriptor implementation.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 32 +++++++++++++++ dlls/jscript/jscript.h | 7 ++++ dlls/jscript/object.c | 83 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 4 ++ dlls/mshtml/tests/es5.js | 43 +++++++++++++++++--- 5 files changed, 163 insertions(+), 6 deletions(-)

1 0

[PATCH v2] feclient: Add stub dll.
by Gijs Vermeulen 10 May '18

10 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- v2: update .spec to Windows 10 For https://bugs.winehq.org/show_bug.cgi?id=40451 configure.ac | 1 + dlls/feclient/Makefile.in | 4 ++++ dlls/feclient/feclient.spec | 50 +++++++++++++++++++++++++++++++++++++++++++++ dlls/feclient/main.c | 45 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+) create mode 100644 dlls/feclient/Makefile.in create mode 100644 dlls/feclient/feclient.spec create mode 100644 dlls/feclient/main.c diff --git a/configure.ac b/configure.ac index 54c31d86c8..195271ed44 100644 --- a/configure.ac +++ b/configure.ac @@ -3282,6 +3282,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) +WINE_CONFIG_MAKEFILE(dlls/feclient) WINE_CONFIG_MAKEFILE(dlls/fltlib) WINE_CONFIG_MAKEFILE(dlls/fltmgr.sys) WINE_CONFIG_MAKEFILE(dlls/fntcache) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in new file mode 100644 index 0000000000..d3eeefb0cc --- /dev/null +++ b/dlls/feclient/Makefile.in @@ -0,0 +1,4 @@ +MODULE = feclient.dll + +C_SRCS = \ + main.c diff --git a/dlls/feclient/feclient.spec b/dlls/feclient/feclient.spec new file mode 100644 index 0000000000..2cf4a63258 --- /dev/null +++ b/dlls/feclient/feclient.spec @@ -0,0 +1,50 @@ +@ stub EdpAllowFileAccessForProcess +@ stub EdpConsumerCredentialCreate +@ stub EdpConsumerCredentialQuery +@ stub EdpContainerizeFile +@ stub EdpCredentialCreate +@ stub EdpCredentialDelete +@ stub EdpCredentialExists +@ stub EdpCredentialQuery +@ stub EdpDecontainerizeFile +@ stub EdpDplPolicyEnabledForUser +@ stub EdpDplStartCredServiceIfDplEnabledForUser +@ stub EdpDplUpgradePinInfo +@ stub EdpDplUpgradeVerifyUser +@ stub EdpDplUserCredentialsSet +@ stub EdpDplUserUnlockComplete +@ stub EdpDplUserUnlockStart +@ stub EdpFree +@ stub EdpGetContainerIdentity +@ stub EdpGetCredServiceState +@ stub EdpIsConsumerDataProtectionEnforced +@ stub EdpIsConsumerDataProtectionSupported +@ stub EdpPurgeAppLearningEvents +@ stub EdpQueryCredServiceInfo +@ stub EdpQueryDplEnforcedPolicyOwnerIds +@ stub EdpQueryRevokedPolicyOwnerIds +@ stub EdpRmsClearKeys +@ stub EdpSetCredServiceInfo +@ stub EdpUnprotectFile +@ stub EdpWriteLogSiteLearningEvents +@ stub EfsClientCloseFileRaw +@ stub EfsClientCopyFileRaw +@ stub EfsClientDecryptFile +@ stub EfsClientDuplicateEncryptionInfo +@ stub EfsClientEncryptFileEx +@ stub EfsClientFileEncryptionStatus +@ stub EfsClientFreeKeyInfo +@ stub EfsClientFreeProtectorList +@ stub EfsClientGetEncryptedFileVersion +@ stub EfsClientGetKeyInfo +@ stub EfsClientOpenFileRaw +@ stub EfsClientQueryProtectors +@ stub EfsClientReadFileRaw +@ stub EfsClientWriteFileRaw +@ stub EfsClientWriteFileWithHeaderRaw +@ stub EfsReprotectFile +@ stub EfsUtilGetCurrentKey +@ stub FeClientInitialize +@ stub GetLockSessionUnwrappedKey +@ stub GetLockSessionWrappedKey +@ stub OefsCheckSupport diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c new file mode 100644 index 0000000000..91aed70ec8 --- /dev/null +++ b/dlls/feclient/main.c @@ -0,0 +1,45 @@ +/* + * feclient API + * + * Copyright 2016 Michael Müller + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(feclient); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} -- 2.13.6

1 0

[PATCH] hnetcfg/tests: Ignore case when comparing filenames.
by Hans Leidekker 10 May '18

10 May '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/hnetcfg/tests/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 4d70818293..4ee19d8db4 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -141,7 +141,7 @@ static void test_NetFwAuthorizedApplication(void) hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); ok(hr == S_OK, "got: %08x\n", hr); - ok(!lstrcmpW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); + ok(!lstrcmpiW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); SysFreeString( bstr ); SysFreeString( image ); -- 2.11.0

1 0