December 2017 - Wine-Commits

Alexandre Julliard : wine_release: Remove the winapi_stats page generation , it's not meaningful information.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: tools Branch: master Commit: 7498191d2b7b9f3e01856601d57bea131da37c9d URL: http://source.winehq.org/git/tools.git/?a=commit;h=7498191d2b7b9f3e01856601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 12:45:17 2017 +0100 wine_release: Remove the winapi_stats page generation, it's not meaningful information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winapi_stats | 62 ------------------------------------------------------------ wine_release | 9 +-------- 2 files changed, 1 insertion(+), 70 deletions(-) diff --git a/winapi_stats b/winapi_stats deleted file mode 100755 index 786017f..0000000 --- a/winapi_stats +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/perl -# -# Filter to generate the winapi stats table using winapi_extract. -# Must be run from the Wine top-level source directory. -# - -my %stats; - -open STATS, "-|" or exec "./tools/winapi/winapi_extract", "--pseudo-stub-statistics", "--no-verbose", "--no-progress" or die "cannot run winapi_extract"; -while (<STATS>) -{ - chomp; - if (/\*\.c: (.*): (\d+) of (\d+) functions are stubs $(\d+) real, (\d+) pseudo$ and (\d+) are forwards/) - { - my ($dll, $stubs, $total, $real, $pseudo, $forwards) = ($1, $2, $3, $4, $5, $6); - next if $dll =~ /^(wine.*\.drv|wine.*\.acm|wined3d|winedos|wprocs)$/; - $stats{$dll} = [ $stubs, $total, $real, $pseudo, $forwards ]; - ${$stats{" Total"}}[0] += $stubs; - ${$stats{" Total"}}[1] += $total; - ${$stats{" Total"}}[2] += $real; - ${$stats{" Total"}}[3] += $pseudo; - ${$stats{" Total"}}[4] += $forwards; - } -} -close STATS or die "winapi_extract failed"; - -my $bg = 0; - -print "\n\n"; -print "<h3>Win API Stats</h3>\n\n"; -print "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"3\">\n\n"; -print "<tr class=\"hdr\">\n"; -print "<th>Library</th>\n"; -print "<th>API count</th>\n"; -print "<th>% implemented</th>\n"; -print "<th>Total stubs</th>\n"; -print "<th>Real stubs</th>\n"; -print "<th>Pseudo stubs</th>\n"; -print "<th>Forwards</th>\n"; -print "</tr>\n"; - -foreach my $dll (sort keys %stats) -{ - my ($stubs, $total, $real, $pseudo, $forwards) = @{$stats{$dll}}; - my $color = $bg ? "white" : "grey"; - my $pct = $total ? ($total - $stubs) / $total * 100 : 0; - printf "<tr>\n"; - printf "<td class=\"%s\">%s</td>\n", $color, $dll; - printf "<td class=\"%s\">%u</td>\n", $color, $total; - printf "<td class=\"pct%u\">%u%%</td>\n", int(($pct + 2.5) / 5) * 5, $pct; - printf "<td class=\"%s\">%u</td>\n", $color, $stubs; - printf "<td class=\"%s\">%u</td>\n", $color, $real; - printf "<td class=\"%s\">%u</td>\n", $color, $pseudo; - printf "<td class=\"%s\">%u</td>\n", $color, $forwards; - printf "</tr>\n"; - $bg = !$bg; -} - -my $now = `date`; -chomp $now; -print "\n</table>\n"; -print "<p>last modified: $now</p>\n"; diff --git a/wine_release b/wine_release index aed1545..7b8def1 100755 --- a/wine_release +++ b/wine_release @@ -32,14 +32,11 @@ if [ "$branch" = "master" ] then # nuke old attempt (if any) rm -rf wine-$version - git clone -l -s -n git/wine.git wine-$version + git clone -b wine-$version git/wine.git wine-$version cd wine-$version - git checkout wine-$version # update man page and documentation - echo "==== UPDATING DOCUMENTATION ====" ./configure --quiet --without-x --without-freetype - make -s depend manpages="\ loader/wine.man \ @@ -74,10 +71,6 @@ then make -s htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI - # Wine API Stats - echo "==== UPDATING WINE API STATS PAGE ====" - $tools_dir/winapi_stats > winapi_stats.template && mv -f winapi_stats.template $templates_dir/en/winapi_stats.template - cd .. rm -rf wine-$version fi

1 0

Francois Gouget : testbot/Engine: Fix handling of --kill-vms.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: tools Branch: master Commit: b679f7fb2daf0d9e011c0dee2ce8ed33fd5e5031 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b679f7fb2daf0d9e011c0dee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 07:58:45 2017 +0100 testbot/Engine: Fix handling of --kill-vms. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index dfe266f..7dab98e 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -207,6 +207,12 @@ sub Cleanup($;$$) $VM->RunPowerOff(); } } + # $KillVMs is normally used on shutdown so don't start a process that + # will get stuck 'forever' waiting for an offline VM. + elsif ($KillVMs and $VM->Status !~ /^(?:off|offline)$/) + { + $VM->RunPowerOff(); + } } }

1 0

Francois Gouget : testbot/web: Remove an unnecessary WineTestBot:: Config prefix.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: tools Branch: master Commit: b0277542085dc35746b313817a14818629c66a31 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b0277542085dc35746b31381… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 08:00:40 2017 +0100 testbot/web: Remove an unnecessary WineTestBot::Config prefix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b0c2d45..deacf90 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -277,7 +277,7 @@ sub GenerateBody($) my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); $JobsCollectionBlock->GenerateList(); - if ($WineTestBot::Config::JobArchiveDays != 0) + if ($JobArchiveDays != 0) { my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName('Id'); my $MaxIdLength = $PropertyDescriptor->GetMaxLength();

1 0

Francois Gouget : testbot/Engine: Don't override $MaxVMsWhenIdle == 0.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: tools Branch: master Commit: 679645d2fa162cb9f3637d2c9d09a80e464e99b7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=679645d2fa162cb9f3637d2c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 07:56:10 2017 +0100 testbot/Engine: Don't override $MaxVMsWhenIdle == 0. It should only be set to the default if left undefined. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ad492f6..dfe266f 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -714,7 +714,7 @@ sub main() $MaxRevertsWhileRunningVMs = $MaxRevertingVMs; LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } - $MaxVMsWhenIdle ||= $MaxActiveVMs; + $MaxVMsWhenIdle = $MaxActiveVMs if (!defined $MaxVMsWhenIdle); Cleanup(1); # Check for patches that arrived while the server was off.

1 0

Alexandre Julliard : ntdll: Set all registers in set_cpu_context() on ARM.
by Alexandre Julliard Dec. 14, 2017

Dec. 14, 2017

Module: wine Branch: master Commit: 8a07ee48fa96e12474cb6f7c1d365858aaebcdff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a07ee48fa96e12474cb6f7c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 18:34:19 2017 +0100 ntdll: Set all registers in set_cpu_context() on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 51 ++++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index dcb4564..fc65c87 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -262,24 +262,10 @@ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" /* FIXME: Use the Stack instead of the actual register values */ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, ".arm\n\t" - "stmfd SP!, {r1}\n\t" - "mov r1, #0x0200000\n\t"/* CONTEXT_ARM */ - "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ - "str r1, [r0]\n\t" /* context->ContextFlags */ - "ldmfd SP!, {r1}\n\t" - "str r0, [r0, #0x4]\n\t" /* context->R0 */ - "str r1, [r0, #0x8]\n\t" /* context->R1 */ - "str r2, [r0, #0xc]\n\t" /* context->R2 */ - "str r3, [r0, #0x10]\n\t" /* context->R3 */ - "str r4, [r0, #0x14]\n\t" /* context->R4 */ - "str r5, [r0, #0x18]\n\t" /* context->R5 */ - "str r6, [r0, #0x1c]\n\t" /* context->R6 */ - "str r7, [r0, #0x20]\n\t" /* context->R7 */ - "str r8, [r0, #0x24]\n\t" /* context->R8 */ - "str r9, [r0, #0x28]\n\t" /* context->R9 */ - "str r10, [r0, #0x2c]\n\t" /* context->R10 */ - "str r11, [r0, #0x30]\n\t" /* context->R11 */ - "str IP, [r0, #0x34]\n\t" /* context->R12 */ + "stmib r0, {r0-r12}\n\t" /* context->R0..R12 */ + "mov r1, #0x0200000\n\t" /* CONTEXT_ARM */ + "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ + "str r1, [r0]\n\t" /* context->ContextFlags */ "str SP, [r0, #0x38]\n\t" /* context->Sp */ "str LR, [r0, #0x3c]\n\t" /* context->Lr */ "str PC, [r0, #0x40]\n\t" /* context->Pc */ @@ -294,26 +280,17 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, * * Set the new CPU context. */ -/* FIXME: What about the CPSR? */ -void set_cpu_context( const CONTEXT *context ); +void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_cpu_context, - "mov IP, r0\n\t" - "ldr r0, [IP, #0x4]\n\t" /* context->R0 */ - "ldr r1, [IP, #0x8]\n\t" /* context->R1 */ - "ldr r2, [IP, #0xc]\n\t" /* context->R2 */ - "ldr r3, [IP, #0x10]\n\t" /* context->R3 */ - "ldr r4, [IP, #0x14]\n\t" /* context->R4 */ - "ldr r5, [IP, #0x18]\n\t" /* context->R5 */ - "ldr r6, [IP, #0x1c]\n\t" /* context->R6 */ - "ldr r7, [IP, #0x20]\n\t" /* context->R7 */ - "ldr r8, [IP, #0x24]\n\t" /* context->R8 */ - "ldr r9, [IP, #0x28]\n\t" /* context->R9 */ - "ldr r10, [IP, #0x2c]\n\t" /* context->R10 */ - "ldr r11, [IP, #0x30]\n\t" /* context->R11 */ - "ldr SP, [IP, #0x38]\n\t" /* context->R12 */ - "ldr LR, [IP, #0x3c]\n\t" /* context->Lr */ - "ldr PC, [IP, #0x40]\n\t" /* context->Pc */ - ) + ".arm\n\t" + "ldr r1, [r0, #0x44]\n\t" /* context->Cpsr */ + "msr CPSR_f, r1\n\t" + "ldr r1, [r0, #0x40]\n\t" /* context->Pc */ + "ldr lr, [r0, #0x3c]\n\t" /* context->Lr */ + "ldr sp, [r0, #0x38]\n\t" /* context->Sp */ + "push {r1}\n\t" + "ldmib r0, {r0-r12}\n\t" /* context->R0..R12 */ + "pop {pc}" ) /***********************************************************************

1 0

Joel Holdsworth : urlmon: Support [Add.Code] sections in ActiveX INF files.
by Alexandre Julliard Dec. 14, 2017

Dec. 14, 2017

Module: wine Branch: master Commit: 185bcc4523c5827a78a56c63735f1a5f502e999b URL: http://source.winehq.org/git/wine.git/?a=commit;h=185bcc4523c5827a78a56c637… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Dec 13 13:32:22 2017 -0700 urlmon: Support [Add.Code] sections in ActiveX INF files. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/axinstall.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 7ee7d94..d2cf7e6 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -251,12 +251,25 @@ static HRESULT install_inf_file(install_ctx_t *ctx) len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); if(len) { - FIXME("[Add.Code] section not supported\n"); + default_install = FALSE; - /* Don't throw an error if we successfully ran setup hooks; - installation is likely to be complete enough */ - if(default_install) - return E_NOTIMPL; + for(key = buf; *key; key += strlenW(key)+1) { + TRACE("[Add.Code] key: %s\n", debugstr_w(key)); + + len = GetPrivateProfileStringW(add_codeW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + ctx->install_file); + if(!len) { + WARN("Could not get key value\n"); + return E_FAIL; + } + + hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, sect_name, + ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); + if(FAILED(hres)) { + WARN("RunSetupCommandW failed: %08x\n", hres); + return hres; + } + } } if(default_install) {

1 0

Dmitry Timoshkov : bcrypt: Add some crypto-provider related stubs.
by Alexandre Julliard Dec. 14, 2017

Dec. 14, 2017

Module: wine Branch: master Commit: 76bc8d01c0461d12cc6f7ee96ad632145d1a64bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bc8d01c0461d12cc6f7ee96… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 13 12:45:42 2017 +0800 bcrypt: Add some crypto-provider related stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 12 ++++++------ dlls/bcrypt/bcrypt_main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 12 ++++++------ include/bcrypt.h | 23 +++++++++++++++++++++++ 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 9ecd21d..f00f55c 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -1,5 +1,5 @@ -@ stub BCryptAddContextFunction -@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptAddContextFunction(long wstr long wstr long) +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) @ stdcall BCryptCloseAlgorithmProvider(ptr long) @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @@ -39,9 +39,9 @@ @ stub BCryptQueryContextFunctionProperty @ stub BCryptQueryProviderRegistration @ stub BCryptRegisterConfigChangeNotify -@ stub BCryptRegisterProvider -@ stub BCryptRemoveContextFunction -@ stub BCryptRemoveContextFunctionProvider +@ stdcall BCryptRegisterProvider(wstr long ptr) +@ stdcall BCryptRemoveContextFunction(long wstr long wstr) +@ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) @ stub BCryptResolveProviders @ stub BCryptSecretAgreement @ stub BCryptSetAuditingInterface @@ -49,7 +49,7 @@ @ stdcall BCryptSetProperty(ptr wstr ptr long long) @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify -@ stub BCryptUnregisterProvider +@ stdcall BCryptUnregisterProvider(wstr) @ stub BCryptVerifySignature @ stub GetAsymmetricEncryptionInterface @ stub GetCipherInterface diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 765f758..3bdc463 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -122,6 +122,42 @@ static void gnutls_uninitialize(void) } #endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONCRYPTOR_H */ +NTSTATUS WINAPI BCryptAddContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, ULONG pos) +{ + FIXME("%08x, %s, %08x, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), pos); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptAddContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider, ULONG pos) +{ + FIXME("%08x, %s, %08x, %s, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider), pos); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptRemoveContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function) +{ + FIXME("%08x, %s, %08x, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function)); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptRemoveContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider) +{ + FIXME("%08x, %s, %08x, %s, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider)); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptRegisterProvider(LPCWSTR provider, ULONG flags, PCRYPT_PROVIDER_REG reg) +{ + FIXME("%s, %08x, %p: stub\n", debugstr_w(provider), flags, reg); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptUnregisterProvider(LPCWSTR provider) +{ + FIXME("%s: stub\n", debugstr_w(provider)); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 1a78853..5d37121 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -1,5 +1,5 @@ -@ stub BCryptAddContextFunction -@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptAddContextFunction(long wstr long wstr long) bcrypt.BCryptAddContextFunction +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) bcrypt.BCryptAddContextFunctionProvider @ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @@ -42,9 +42,9 @@ @ stub BCryptQueryContextFunctionProperty @ stub BCryptQueryProviderRegistration @ stub BCryptRegisterConfigChangeNotify -@ stub BCryptRegisterProvider -@ stub BCryptRemoveContextFunction -@ stub BCryptRemoveContextFunctionProvider +@ stdcall BCryptRegisterProvider(wstr long ptr) bcrypt.BCryptRegisterProvider +@ stdcall BCryptRemoveContextFunction(long wstr long wstr) bcrypt.BCryptRemoveContextFunction +@ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) bcrypt.BCryptRemoveContextFunctionProvider @ stub BCryptResolveProviders @ stub BCryptSecretAgreement @ stub BCryptSetAuditingInterface @@ -52,7 +52,7 @@ @ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify -@ stub BCryptUnregisterProvider +@ stdcall BCryptUnregisterProvider(wstr) bcrypt.BCryptUnregisterProvider @ stub BCryptVerifySignature @ stub GetIsolationServerInterface @ stub GetKeyStorageInterface diff --git a/include/bcrypt.h b/include/bcrypt.h index 7c3c8d0..1f7093c 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -94,6 +94,29 @@ typedef struct __BCRYPT_KEY_LENGTHS_STRUCT ULONG dwIncrement; } BCRYPT_KEY_LENGTHS_STRUCT; +typedef struct _CRYPT_INTERFACE_REG +{ + ULONG dwInterface; + ULONG dwFlags; + ULONG cFunctions; + PWSTR *rgpszFunctions; +} CRYPT_INTERFACE_REG, *PCRYPT_INTERFACE_REG; + +typedef struct _CRYPT_IMAGE_REG +{ + PWSTR pszImage; + ULONG cInterfaces; + PCRYPT_INTERFACE_REG *rgpInterfaces; +} CRYPT_IMAGE_REG, *PCRYPT_IMAGE_REG; + +typedef struct _CRYPT_PROVIDER_REG +{ + ULONG cAliases; + PWSTR *rgpszAliases; + PCRYPT_IMAGE_REG pUM; + PCRYPT_IMAGE_REG pKM; +} CRYPT_PROVIDER_REG, *PCRYPT_PROVIDER_REG; + typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE;

1 0

Alexandre Julliard : ntdll: Define PTHREAD_STACK_MIN if it's missing.
by Alexandre Julliard Dec. 14, 2017

Dec. 14, 2017

Module: wine Branch: master Commit: 6eab1e93f34075477df323ad6f5f0f97815fbc50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eab1e93f34075477df323ad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 20:28:32 2017 +0100 ntdll: Define PTHREAD_STACK_MIN if it's missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6abfd85..479b8d6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -48,6 +48,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); +#ifndef PTHREAD_STACK_MIN +#define PTHREAD_STACK_MIN 16384 +#endif + struct _KUSER_SHARED_DATA *user_shared_data = NULL; PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL;

1 0

Alexandre Julliard : ntdll: Switch back to the initial stack for thread exit on ARM.
by Alexandre Julliard Dec. 14, 2017

Dec. 14, 2017

Module: wine Branch: master Commit: d147c4c3239a367381ac5dbccbc1cab40699fedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d147c4c3239a367381ac5dbcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 20:28:16 2017 +0100 ntdll: Switch back to the initial stack for thread exit on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 23f494d..272fc7b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1225,8 +1225,10 @@ extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void * __ASM_GLOBAL_FUNC( start_thread, ".arm\n\t" "push {r4-r12,lr}\n\t" - /* build initial context on thread stack */ + /* store exit frame */ "ldr r4, [sp, #40]\n\t" /* teb */ + "str sp, [r4, #0x1d4]\n\t" /* teb->SystemReserved2 */ + /* build initial context on thread stack */ "ldr r4, [r4, #4]\n\t" /* teb->Tib.StackBase */ "sub r5, r4, #0x1a0\n\t" /* sizeof(CONTEXT) */ "mov ip, #0x0200000\n\t" /* CONTEXT_ARM */ @@ -1246,6 +1248,16 @@ __ASM_GLOBAL_FUNC( start_thread, "mov r0, r5\n\t" "b " __ASM_NAME("set_cpu_context") ) +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); +__ASM_GLOBAL_FUNC( call_thread_exit_func, + ".arm\n\t" + "ldr r3, [r2, #0x1d4]\n\t" /* teb->SystemReserved2 */ + "mov ip, #0\n\t" + "str ip, [r2, #0x1d4]\n\t" + "cmp r3, ip\n\t" + "movne sp, r3\n\t" + "blx r1" ) + /*********************************************************************** * signal_start_thread * @@ -1277,7 +1289,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) */ void signal_exit_thread( int status ) { - exit_thread( status ); + call_thread_exit_func( status, exit_thread, NtCurrentTeb() ); } /*********************************************************************** @@ -1285,7 +1297,7 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { - exit( status ); + call_thread_exit_func( status, exit, NtCurrentTeb() ); } /**********************************************************************

1 0

Dmitry Timoshkov : wine.inf: Add "Security Packages" key.
by Alexandre Julliard Dec. 14, 2017

Dec. 14, 2017

Module: wine Branch: master Commit: e5e556bf8505de7cf0a25b47111739b249deeb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e556bf8505de7cf0a25b471… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 13 12:45:04 2017 +0800 wine.inf: Add "Security Packages" key. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d88e4ff..a991319 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -683,6 +683,7 @@ HKLM,Software\Microsoft\Windows Messaging Subsystem,"MAPI",2,"1" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16 +HKLM,System\CurrentControlSet\Control\Lsa,"Security Packages",0x10002,kerberos,schannel HKLM,System\CurrentControlSet\Control\Lsa\Kerberos,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI"

1 0