January 2018 - Wine-Devel - list.winehq.org

[PATCH 2/9] kerberos: Add SpUserModeInitialize implementation.
by Dmitry Timoshkov Jan. 25, 2018

Jan. 25, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/kerberos.spec | 2 +- dlls/kerberos/krb5_ap.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/kerberos.spec b/dlls/kerberos/kerberos.spec index c41b830e46..7f765b1206 100644 --- a/dlls/kerberos/kerberos.spec +++ b/dlls/kerberos/kerberos.spec @@ -1,7 +1,7 @@ 1 stub SpInitialize 2 stub KerbDomainChangeCallback 3 stdcall SpLsaModeInitialize(long ptr ptr ptr) -4 stub SpUserModeInitialize +4 stdcall SpUserModeInitialize(long ptr ptr ptr) 32 stub SpInstanceInit @ stdcall -private DllMain(long long ptr) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ca4bf0a236..4667205b61 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -728,3 +728,33 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } + +static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = +{ + NULL, /* SpInstanceInit */ + NULL, /* SpInitUserModeContext */ + NULL, /* SpMakeSignature */ + NULL, /* SpVerifySignature */ + NULL, /* SpSealMessage */ + NULL, /* SpUnsealMessage */ + NULL, /* SpGetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpCompleteAuthToken */ + NULL, /* SpDeleteContext */ + NULL, /* SpFormatCredentialsFn */ + NULL, /* SpMarshallSupplementalCreds */ + NULL, /* SpExportSecurityContext */ + NULL /* SpImportSecurityContext */ +}; + +NTSTATUS NTAPI SpUserModeInitialize(ULONG lsa_version, PULONG package_version, + PSECPKG_USER_FUNCTION_TABLE *table, PULONG table_count) +{ + TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &kerberos_user_table; + *table_count = 1; + + return STATUS_SUCCESS; +} -- 2.15.1

2 1

[PATCH 1/9] kerberos: Implement SpQueryContextAttributes.
by Dmitry Timoshkov Jan. 25, 2018

Jan. 25, 2018

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index b467119363..ca4bf0a236 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -67,6 +67,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(kerberos); | SECPKG_FLAG_RESTRICTED_TOKENS \ | SECPKG_FLAG_APPCONTAINER_CHECKS) +static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; +static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; +static const SecPkgInfoW infoW = +{ + KERBEROS_CAPS, + 1, + RPC_C_AUTHN_GSS_KERBEROS, + KERBEROS_MAX_BUF, + kerberos_name_W, + kerberos_comment_W +}; + static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; @@ -158,18 +170,6 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { - static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; - static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; - static const SecPkgInfoW infoW = - { - KERBEROS_CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W - }; - TRACE("%p\n", info); /* LSA will make a copy before forwarding the structure, so @@ -608,6 +608,52 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) #endif } +static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, ULONG attribute, void *buffer ) +{ + TRACE( "(%lx %u %p)\n", context, attribute, buffer ); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + case SECPKG_ATTR_SIZES: + { + SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buffer; + sizes->cbMaxToken = KERBEROS_MAX_BUF; + sizes->cbMaxSignature = 37; + sizes->cbBlockSize = 1; + sizes->cbSecurityTrailer = 49; + return SEC_E_OK; + } + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)buffer; + info->PackageInfo = (SecPkgInfoW *)&infoW; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -657,7 +703,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */ - NULL, /* SpQueryContextAttributes */ + kerberos_SpQueryContextAttributes, NULL, /* SpAddCredentials */ NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */ -- 2.15.1

2 1

[PATCH] ole32: Allow caching of icon aspects for static class caches.
by Huw Davies Jan. 25, 2018

Jan. 25, 2018

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/ole2.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index c07633d960..325a98b33b 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2398,7 +2398,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - if (This->clsid_static) return DV_E_FORMATETC; + if (This->clsid_static && fmt_cpy.dwAspect != DVASPECT_ICON) return DV_E_FORMATETC; hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 1a4fce5b06..3bd4acce92 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2441,13 +2441,24 @@ static void test_data_cache_cache(void) hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( FAILED(hr), "got %08x\n", hr ); + fmt.dwAspect = DVASPECT_DOCPRINT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + /* try caching another clip format */ - fmt.dwAspect = DVASPECT_CONTENT; fmt.cfFormat = CF_METAFILEPICT; + fmt.dwAspect = DVASPECT_CONTENT; fmt.tymed = TYMED_MFPICT; hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( FAILED(hr), "got %08x\n", hr ); + /* As an exception, it's possible to add an icon aspect */ + fmt.cfFormat = CF_METAFILEPICT; + fmt.dwAspect = DVASPECT_ICON; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + IOleCache2_Release( cache ); } -- 2.12.0

1 0

[PATCH 1/2] ntdll: Add RtlAddGrowableFunctionTable stub
by Alex Henrie Jan. 25, 2018

Jan. 25, 2018

From: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Copied from https://bugs.winehq.org/show_bug.cgi?id=42255 with minor changes. Xenia needs this function to return S_OK. However, if I understand correctly, faking success is fine because Xenia only needs these function tables for debug backtraces, which are not produced during the normal operation of the program. Fixes https://bugs.winehq.org/show_bug.cgi?id=42255 dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 035fad2058..3813e43707 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -428,6 +428,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index d60c2a9dc2..1bd9b766d4 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1043,6 +1043,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index abd3174f22..872452eb35 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3201,6 +3201,18 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ -- 2.16.1

2 2

[PATCH] testbot/Janitor: Use filters to get old Jobs, Patches and RecordGroups.
by Francois Gouget Jan. 25, 2018

Jan. 25, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 0f126e87..382408d1 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -57,19 +57,16 @@ delete $ENV{ENV}; # Delete obsolete Jobs if ($JobPurgeDays != 0) { - my $DeleteBefore = time() - $JobPurgeDays * 86400; my $Jobs = CreateJobs(); + $Jobs->AddFilter("Submitted", [time() - $JobPurgeDays * 86400], "<"); foreach my $Job (@{$Jobs->GetItems()}) { - if ($Job->Submitted < $DeleteBefore) + LogMsg "Deleting job ", $Job->Id, "\n"; + $Job->RmTree(); + my $ErrMessage = $Jobs->DeleteItem($Job); + if (defined($ErrMessage)) { - LogMsg "Deleting job ", $Job->Id, "\n"; - $Job->RmTree(); - my $ErrMessage = $Jobs->DeleteItem($Job); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + LogMsg $ErrMessage, "\n"; } } } @@ -102,23 +99,20 @@ foreach my $Set (@{$Sets->GetItems()}) # Delete obsolete Patches now that no Job references them if ($JobPurgeDays != 0) { - $DeleteBefore = time() - $JobPurgeDays * 86400; my $Patches = CreatePatches(); + $Patches->AddFilter("Received", [time() - $JobPurgeDays * 86400], "<"); foreach my $Patch (@{$Patches->GetItems()}) { - if ($Patch->Received < $DeleteBefore) + my $Jobs = CreateJobs(); + $Jobs->AddFilter("Patch", [$Patch]); + if ($Jobs->IsEmpty()) { - my $Jobs = CreateJobs(); - $Jobs->AddFilter("Patch", [$Patch]); - if ($Jobs->IsEmpty()) + LogMsg "Deleting patch ", $Patch->Id, "\n"; + unlink("$DataDir/patches/" . $Patch->Id); + my $ErrMessage = $Patches->DeleteItem($Patch); + if (defined($ErrMessage)) { - LogMsg "Deleting patch ", $Patch->Id, "\n"; - unlink("$DataDir/patches/" . $Patch->Id); - my $ErrMessage = $Patches->DeleteItem($Patch); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + LogMsg $ErrMessage, "\n"; } } } @@ -270,17 +264,14 @@ else # Delete obsolete record groups if ($JobPurgeDays != 0) { - $DeleteBefore = time() - $JobPurgeDays * 86400; my $RecordGroups = CreateRecordGroups(); + $RecordGroups->AddFilter("Timestamp", [time() - $JobPurgeDays * 86400], "<"); foreach my $RecordGroup (@{$RecordGroups->GetItems()}) { - if ($RecordGroup->Timestamp < $DeleteBefore) + my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); + if (defined($ErrMessage)) { - my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + LogMsg $ErrMessage, "\n"; } } } -- 2.15.1

1 0

[PATCH] testbot: Link statistics to the corresponding activity page row.
by Francois Gouget Jan. 25, 2018

Jan. 25, 2018

More specifically, this makes it possible to see where the maximum revert times and others come from, and what else was happening at that time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 25 ++++++++++++++----------- testbot/web/Activity.pl | 3 ++- testbot/web/Stats.pl | 19 +++++++++++++------ 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index fb2cee52..2c21d9fd 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -51,6 +51,7 @@ Each entry contains a structure grouping all the state and event information for the specified timestamp. Entries have the following structure: { + id => <RecordGroupId>, start => <StartTimestamp>, end => <EndTimestamp>, runnable => <RunnableTasksCount>, @@ -105,7 +106,8 @@ sub GetActivity($;$) $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) { - my $Group = { start => $RecordGroup->Timestamp }; + my $Group = { id => $RecordGroup->Id, + start => $RecordGroup->Timestamp }; $ActivityHash->{$RecordGroup->Id} = $Group; push @$Activity, $Group; $MinId = $RecordGroup->Id if (!defined $MinId or $RecordGroup->Id < $MinId); @@ -305,9 +307,9 @@ sub GetActivity($;$) return ($Activity, $Counters); } -sub _AddFullStat($$$;$) +sub _AddFullStat($$$$;$) { - my ($Stats, $StatKey, $Value, $Source) = @_; + my ($Stats, $StatKey, $Value, $GroupId, $Source) = @_; $Stats->{"$StatKey.count"}++; $Stats->{$StatKey} += $Value; @@ -315,6 +317,7 @@ sub _AddFullStat($$$;$) if (!exists $Stats->{$MaxKey} or $Stats->{$MaxKey} < $Value) { $Stats->{$MaxKey} = $Value; + $Stats->{"$MaxKey.groupid"} = $GroupId if (defined $GroupId); $Stats->{"$MaxKey.source"} = $Source if ($Source); } } @@ -346,7 +349,7 @@ sub GetStatistics($) $Task->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Task->Ended - $Task->Started; - _AddFullStat($GlobalStats, "$StepType.time", $Time, $Task); + _AddFullStat($GlobalStats, "$StepType.time", $Time, undef, $Task); } if ($IsSpecialJob) { @@ -354,11 +357,11 @@ sub GetStatistics($) if (-f $ReportFileName) { my $ReportSize = -s $ReportFileName; - _AddFullStat($GlobalStats, "$StepType.size", $ReportSize, $Task); + _AddFullStat($GlobalStats, "$StepType.size", $ReportSize, undef, $Task); if ($VMs->ItemExists($Task->VM->GetKey())) { my $VMStats = ($VMsStats->{items}->{$Task->VM->Name} ||= {}); - _AddFullStat($VMStats, "report.size", $ReportSize, $Task); + _AddFullStat($VMStats, "report.size", $ReportSize, undef, $Task); } } } @@ -369,7 +372,7 @@ sub GetStatistics($) $Job->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Job->Ended - $Job->Submitted; - _AddFullStat($GlobalStats, "jobs.time", $Time, $Job); + _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; if (!exists $GlobalStats->{start} or $GlobalStats->{start} > $Job->Submitted) @@ -421,8 +424,8 @@ sub GetStatistics($) my $Status = $VMStatus->{status}; my $Time = $VMStatus->{end} - $VMStatus->{start}; - _AddFullStat($VMStats, "$Status.time", $Time); - _AddFullStat($HostStats, "$Status.time", $Time); + _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id}); + _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id}); if ($Status =~ /^(?:reverting|sleeping|running|dirty)$/) { $VMStats->{"busy.elapsed"} += $Time; @@ -439,8 +442,8 @@ sub GetStatistics($) $VMStatus->{result} eq "failed")) { my $StepType = $VMStatus->{step}->Type; - _AddFullStat($VMStats, "$StepType.time", $Time, $VMStatus->{task}); - _AddFullStat($HostStats, "$StepType.time", $Time, $VMStatus->{task}); + _AddFullStat($VMStats, "$StepType.time", $Time, $Group->{id}, $VMStatus->{task}); + _AddFullStat($HostStats, "$StepType.time", $Time, $Group->{id}, $VMStatus->{task}); } } diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 0b92299a..6ca3199a 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -153,7 +153,8 @@ EOF my $Group = $Activity->[$Index]; next if (!$Group->{statusvms}); - print "<tr><td>", _GetHtmlTime($Group->{start}), "</td>"; + my $GroupId = $Group->{id}; + print "<tr><td id='g$GroupId'>", _GetHtmlTime($Group->{start}), "</td>"; if ($Group->{engine}) { print "<td class='Record RecordEngine'>$Group->{engine}</td>\n"; diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index d9f43814..d9a3ce50 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -140,16 +140,23 @@ sub _GetStatHtml($$;$$) my ($Stats, $StatKey, $AllStats, $Flags) = @_; my $Value = _GetStatStr($Stats, $StatKey, $AllStats, $Flags); - return $Value if (!$Stats->{"$StatKey.source"}); my $SrcObj = $Stats->{"$StatKey.source"}; - my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); - if (defined $TaskNo) + if ($SrcObj) { - my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo); - return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>"; + my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); + if (defined $TaskNo) + { + my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo); + return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>"; + } + return "<a href='/index.pl#job$JobId'>$Value</a>"; } - return "<a href='/index.pl#job$JobId'>$Value</a>"; + + my $GroupId = $Stats->{"$StatKey.groupid"}; + return "<a href='/Activity.pl?Hours=0#g$GroupId'>$Value</a>" if ($GroupId); + + return $Value; } sub _GenGlobalLine($$$;$$) -- 2.15.1

1 0

[PATCH v2 1/4] shcore: Add DLL and GetProcessDpiAwareness stub
by Alex Henrie Jan. 24, 2018

Jan. 24, 2018

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Patch adapted from Wine Staging. I couldn't figure out why you're getting test failures on your machine (`make test` works as well as can be expected here), but hopefully adding a stub for GetProcessDpiAwareness at the same time (also copied from Wine Staging) will fix the problem. configure.ac | 1 + dlls/shcore/Makefile.in | 4 +++ dlls/shcore/main.c | 50 +++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 7 ++++- 5 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 dlls/shcore/Makefile.in create mode 100644 dlls/shcore/main.c create mode 100644 dlls/shcore/shcore.spec diff --git a/configure.ac b/configure.ac index 3942e15e9a..b09a0babf7 100644 --- a/configure.ac +++ b/configure.ac @@ -3530,6 +3530,7 @@ WINE_CONFIG_TEST(dlls/setupapi/tests) WINE_CONFIG_DLL(setupx.dll16,enable_win16) WINE_CONFIG_DLL(sfc,,[implib]) WINE_CONFIG_DLL(sfc_os,,[implib]) +WINE_CONFIG_DLL(shcore) WINE_CONFIG_DLL(shdoclc,,[clean]) WINE_CONFIG_DLL(shdocvw,,[clean,implib]) WINE_CONFIG_TEST(dlls/shdocvw/tests) diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in new file mode 100644 index 0000000000..ec2e95f526 --- /dev/null +++ b/dlls/shcore/Makefile.in @@ -0,0 +1,4 @@ +MODULE = shcore.dll + +C_SRCS = \ + main.c diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c new file mode 100644 index 0000000000..9075a38e1b --- /dev/null +++ b/dlls/shcore/main.c @@ -0,0 +1,50 @@ +/* + * Copyright 2016 Sebastian Lackner + * + * 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 "shellscalingapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shcore); + +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; +} + +HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *value) +{ + FIXME("(%p, %p): stub\n", process, value); + if (value) *value = PROCESS_DPI_UNAWARE; + return S_OK; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec new file mode 100644 index 0000000000..ae647a5598 --- /dev/null +++ b/dlls/shcore/shcore.spec @@ -0,0 +1,83 @@ +@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW +@ stub CreateRandomAccessStreamOnFile +@ stub CreateRandomAccessStreamOverStream +@ stub CreateStreamOverRandomAccessStream +@ stdcall -private DllCanUnloadNow() shell32.DllCanUnloadNow +@ stub DllGetActivationFactory +@ stdcall -private DllGetClassObject(ptr ptr ptr) shell32.DllGetClassObject +@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID +@ stub GetDpiForMonitor +@ stub GetDpiForShellUIComponent +@ stdcall GetProcessDpiAwareness(long ptr) +@ stub GetProcessReference +@ stub GetScaleFactorForDevice +@ stub GetScaleFactorForMonitor +@ stub IStream_Copy +@ stdcall IStream_Read(ptr ptr long) shlwapi.IStream_Read +@ stub IStream_ReadStr +@ stdcall IStream_Reset(ptr) shlwapi.IStream_Reset +@ stdcall IStream_Size(ptr ptr) shlwapi.IStream_Size +@ stdcall IStream_Write(ptr ptr long) shlwapi.IStream_Write +@ stub IStream_WriteStr +@ stdcall IUnknown_AtomicRelease(long) shlwapi.IUnknown_AtomicRelease +@ stdcall IUnknown_GetSite(ptr ptr ptr) shlwapi.IUnknown_GetSite +@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shlwapi.IUnknown_QueryService +@ stdcall IUnknown_Set(ptr ptr) shlwapi.IUnknown_Set +@ stdcall IUnknown_SetSite(ptr ptr) shlwapi.IUnknown_SetSite +@ stdcall IsOS(long) shlwapi.IsOS +@ stub RegisterScaleChangeEvent +@ stub RegisterScaleChangeNotifications +@ stub RevokeScaleChangeNotifications +@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi +@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode +@ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA +@ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW +@ stdcall SHCreateMemStream(ptr long) shlwapi.SHCreateMemStream +@ stdcall SHCreateStreamOnFileA(str long ptr) shlwapi.SHCreateStreamOnFileA +@ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx +@ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW +@ stdcall SHCreateThread(ptr ptr long ptr) shlwapi.SHCreateThread +@ stdcall SHCreateThreadRef(ptr ptr) shlwapi.SHCreateThreadRef +@ stub SHCreateThreadWithHandle +@ stdcall SHDeleteEmptyKeyA(long ptr) shlwapi.SHDeleteEmptyKeyA +@ stdcall SHDeleteEmptyKeyW(long ptr) shlwapi.SHDeleteEmptyKeyW +@ stdcall SHDeleteKeyA(long str) shlwapi.SHDeleteKeyA +@ stdcall SHDeleteKeyW(long wstr) shlwapi.SHDeleteKeyW +@ stdcall SHDeleteValueA(long str str) shlwapi.SHDeleteValueA +@ stdcall SHDeleteValueW(long wstr wstr) shlwapi.SHDeleteValueW +@ stdcall SHEnumKeyExA(long long str ptr) shlwapi.SHEnumKeyExA +@ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW +@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA +@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW +@ stdcall SHGetThreadRef(ptr) shlwapi.SHGetThreadRef +@ stdcall SHGetValueA( long str str ptr ptr ptr ) shlwapi.SHGetValueA +@ stdcall SHGetValueW( long wstr wstr ptr ptr ptr ) shlwapi.SHGetValueW +@ stdcall SHOpenRegStream2A(long str str long) shlwapi.SHOpenRegStream2A +@ stdcall SHOpenRegStream2W(long wstr wstr long) shlwapi.SHOpenRegStream2W +@ stdcall SHOpenRegStreamA(long str str long) shlwapi.SHOpenRegStreamA +@ stdcall SHOpenRegStreamW(long wstr wstr long) shlwapi.SHOpenRegStreamW +@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyA +@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyW +@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shlwapi.SHQueryValueExA +@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shlwapi.SHQueryValueExW +@ stdcall SHRegDuplicateHKey(long) shlwapi.SHRegDuplicateHKey +@ stdcall SHRegGetIntW(ptr wstr long) shlwapi.SHRegGetIntW +@ stdcall SHRegGetPathA(long str str ptr long) shlwapi.SHRegGetPathA +@ stdcall SHRegGetPathW(long wstr wstr ptr long) shlwapi.SHRegGetPathW +@ stdcall SHRegGetValueA( long str str long ptr ptr ptr ) shlwapi.SHRegGetValueA +@ stub SHRegGetValueFromHKCUHKLM +@ stdcall SHRegGetValueW( long wstr wstr long ptr ptr ptr ) shlwapi.SHRegGetValueW +@ stdcall SHRegSetPathA(long str str str long) shlwapi.SHRegSetPathA +@ stdcall SHRegSetPathW(long wstr wstr wstr long) shlwapi.SHRegSetPathW +@ stdcall SHReleaseThreadRef() shlwapi.SHReleaseThreadRef +@ stdcall SHSetThreadRef(ptr) shlwapi.SHSetThreadRef +@ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA +@ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW +@ stdcall SHStrDupA(str ptr) shlwapi.SHStrDupA +@ stdcall SHStrDupW(wstr ptr) shlwapi.SHStrDupW +@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi +@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode +@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID +@ stub SetProcessDpiAwareness +@ stub SetProcessReference +@ stub UnregisterScaleChangeEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index 1833cb6d1b..417cf50ac3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -322,9 +322,14 @@ my @dll_groups = "api-ms-win-core-shlwapi-legacy-l1-1-0", "api-ms-win-core-shlwapi-obsolete-l1-1-0", "api-ms-win-core-shlwapi-obsolete-l1-2-0", - "api-ms-win-shcore-scaling-l1-1-1", "api-ms-win-core-url-l1-1-0", ], + [ + "shell32", + "shlwapi", + "shcore", + "api-ms-win-shcore-scaling-l1-1-1", + ], [ "user32", "api-ms-win-core-stringansi-l1-1-0", -- 2.16.1

2 4

[PATCH] kernel32: Add stub for ReOpenFile
by Fabian Maurer Jan. 24, 2018

Jan. 24, 2018

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- .../api-ms-win-core-file-l2-1-0.spec | 2 +- .../api-ms-win-core-file-l2-1-1.spec | 2 +- .../api-ms-win-core-file-l2-1-2.spec | 2 +- dlls/kernel32/file.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec index 3c1e59ca95..5272d4c3bd 100644 --- a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec +++ b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec @@ -6,6 +6,6 @@ @ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec index 6bfcb0895e..9cd8689e94 100644 --- a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec +++ b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec @@ -7,6 +7,6 @@ @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW @ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec index bee3c053a6..ab6f303a2d 100644 --- a/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec +++ b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec @@ -10,5 +10,5 @@ @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW @ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 7196aff670..e114440296 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2820,6 +2820,16 @@ HANDLE WINAPI OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTOR id, DWORD access return result; } +/*********************************************************************** + * ReOpenFile (KERNEL32.@) + */ +HANDLE WINAPI ReOpenFile(HANDLE handle_original, DWORD access, DWORD sharing, DWORD flags) +{ + FIXME("(%p, %d, %d, %d): stub\n", handle_original, access, sharing, flags); + + return NULL; +} + /*********************************************************************** * K32EnumDeviceDrivers (KERNEL32.@) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d437e..6e4d75a546 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1267,7 +1267,7 @@ # @ stub RemoveLocalAlternateComputerNameW @ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler @ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler -# @ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) ReOpenFile @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b9eb4fcf87..c1e4eab3a7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1233,7 +1233,7 @@ # @ stub QuirkIsEnabledForProcess @ stdcall RaiseException(long long long ptr) kernel32.RaiseException # @ stub RaiseFailFastException -# @ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadConsoleA(long ptr long ptr ptr) kernel32.ReadConsoleA @ stdcall ReadConsoleInputA(long ptr long ptr) kernel32.ReadConsoleInputA @ stub ReadConsoleInputExA -- 2.16.0

2 2

[PATCH] mshtml: Added IDOMEvent::get_srcElement implementation.
by Jacek Caban Jan. 24, 2018

Jan. 24, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 20 ++++++++++++++------ dlls/mshtml/tests/events.js | 3 +++ 2 files changed, 17 insertions(+), 6 deletions(-)

1 0

[PATCH] winex11: Implement WGL_ARB_create_context_no_error.
by Henri Verbeet Jan. 24, 2018

Jan. 24, 2018

Mostly because it's easy, and we'd like to use this from wined3d at some point. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Note that this requires an update of the OpenGL extension list to build. --- dlls/opengl32/make_opengl | 1 + dlls/winex11.drv/opengl.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index d5d614b6138..ebdca671757 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -369,6 +369,7 @@ my %remapped_wgl_functions = my %supported_wgl_extensions = ( "WGL_ARB_create_context" => 1, + "WGL_ARB_create_context_no_error" => 1, "WGL_ARB_create_context_profile" => 1, "WGL_ARB_extensions_string" => 1, "WGL_ARB_make_current_read" => 1, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e6652867800..e976ad7067b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -163,6 +163,8 @@ typedef XID GLXPbuffer; #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 #define GLX_CONTEXT_FLAGS_ARB 0x2094 +/** GLX_ARB_create_context_no_error */ +#define GLX_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3 /** GLX_ARB_create_context_profile */ #define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 /** GLX_ATI_pixel_format_float */ @@ -2118,6 +2120,12 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg pContextAttribList += 2; ret->numAttribs++; break; + case WGL_CONTEXT_OPENGL_NO_ERROR_ARB: + pContextAttribList[0] = GLX_CONTEXT_OPENGL_NO_ERROR_ARB; + pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; + ret->numAttribs++; + break; case WGL_CONTEXT_PROFILE_MASK_ARB: pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; pContextAttribList[1] = attribList[1]; @@ -3179,6 +3187,8 @@ static void X11DRV_WineGL_LoadExtensions(void) register_extension( "WGL_ARB_create_context" ); opengl_funcs.ext.p_wglCreateContextAttribsARB = X11DRV_wglCreateContextAttribsARB; + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_no_error" )) + register_extension( "WGL_ARB_create_context_no_error" ); if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_profile")) register_extension("WGL_ARB_create_context_profile"); } -- 2.11.0

1 0