September 2019 - Wine-Commits

Alexandre Julliard : ntdll: Send first chance debug event while on signal stack on i386.
by Alexandre Julliard Sept. 18, 2019

Sept. 18, 2019

Module: wine Branch: master Commit: 7ee66b29cb52fd3fc18fe2314c720b3a0e348e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee66b29cb52fd3fc18fe231… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 18 18:09:11 2019 +0200 ntdll: Send first chance debug event while on signal stack on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f15b327624..534b05c717 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -724,18 +724,14 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f context->Ebp, context->Esp, context->SegCs, context->SegDs, context->SegEs, context->SegFs, context->SegGs, context->EFlags ); } - status = send_debug_event( rec, TRUE, context ); - if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) - return STATUS_SUCCESS; /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; - if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - return STATUS_SUCCESS; + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) goto done; - if ((status = call_stack_handlers( rec, context )) != STATUS_UNHANDLED_EXCEPTION) - return status; + if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) goto done; + if (status != STATUS_UNHANDLED_EXCEPTION) return status; } /* last chance exception */ @@ -752,7 +748,8 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); } - return STATUS_SUCCESS; +done: + return NtSetContextThread( GetCurrentThread(), context ); } @@ -1860,7 +1857,7 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont { NTSTATUS status; - status = NtRaiseException( rec, context, TRUE ); + status = raise_exception( rec, context, TRUE ); raise_status( status, rec ); } @@ -1872,6 +1869,13 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont */ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack ) { + NTSTATUS status = send_debug_event( &stack->rec, TRUE, &stack->context ); + + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) + { + restore_context( &stack->context, sigcontext ); + return; + } ESP_sig(sigcontext) = (DWORD)stack; EIP_sig(sigcontext) = (DWORD)raise_generic_exception; /* clear single-step, direction, and align check flag */ @@ -2499,9 +2503,13 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16, */ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { - NTSTATUS status = raise_exception( rec, context, first_chance ); - if (status == STATUS_SUCCESS) NtSetContextThread( GetCurrentThread(), context ); - return status; + if (first_chance) + { + NTSTATUS status = send_debug_event( rec, TRUE, context ); + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) + NtSetContextThread( GetCurrentThread(), context ); + } + return raise_exception( rec, context, first_chance ); } @@ -2510,7 +2518,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL * * Raise an exception with the full CPU context. */ -void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context ) { save_fpu( context ); save_fpux( context ); @@ -2523,7 +2531,7 @@ void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL context->Dr7 = x86_thread_data()->dr7; context->ContextFlags |= CONTEXT_DEBUG_REGISTERS; - RtlRaiseStatus( NtRaiseException( rec, context, first_chance )); + RtlRaiseStatus( NtRaiseException( rec, context, TRUE )); } @@ -2545,7 +2553,6 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "leal 12(%ebp),%eax\n\t" "movl %eax,0xc4(%esp)\n\t" /* context->Esp */ "movl %esp,%eax\n\t" - "pushl $1\n\t" "pushl %eax\n\t" "pushl %ecx\n\t" "call " __ASM_NAME("raise_exception_full_context") "\n\t"

1 0

Zebediah Figura : user32: Return -1 from peek_message() on error.
by Alexandre Julliard Sept. 18, 2019

Sept. 18, 2019

Module: wine Branch: master Commit: 7c768d905229e3a48cd7d7533a82e1d27bab6597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c768d905229e3a48cd7d753… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 14 12:35:40 2019 -0500 user32: Return -1 from peek_message() on error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 43ce77c2dd..1336865112 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2743,10 +2743,11 @@ static inline void call_sendmsg_callback( SENDASYNCPROC callback, HWND hwnd, UIN /*********************************************************************** * peek_message * - * Peek for a message matching the given parameters. Return FALSE if none available. + * Peek for a message matching the given parameters. Return 0 if none are + * available; -1 on error. * All pending sent messages are processed before returning. */ -static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, UINT changed_mask ) +static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, UINT changed_mask ) { LRESULT result; struct user_thread_info *thread_info = get_user_thread_info(); @@ -2756,7 +2757,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags void *buffer; size_t buffer_size = 256; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return FALSE; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return -1; if (!first && !last) last = ~0; if (hwnd == HWND_BROADCAST) hwnd = HWND_TOPMOST; @@ -2804,9 +2805,14 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags { thread_info->wake_mask = changed_mask & (QS_SENDMESSAGE | QS_SMRESULT); thread_info->changed_mask = changed_mask; + return 0; } - if (res != STATUS_BUFFER_OVERFLOW) return FALSE; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return FALSE; + if (res != STATUS_BUFFER_OVERFLOW) + { + SetLastError( RtlNtStatusToDosError(res) ); + return -1; + } + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return -1; continue; } @@ -2927,7 +2933,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags thread_info->GetMessageExtraInfoVal = msg_data->hardware.info; HeapFree( GetProcessHeap(), 0, buffer ); HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, flags & PM_REMOVE, (LPARAM)msg, TRUE ); - return TRUE; + return 1; } continue; case MSG_POSTED: @@ -2941,7 +2947,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (first == info.msg.message && last == info.msg.message) { HeapFree( GetProcessHeap(), 0, buffer ); - return FALSE; + return 0; } } else @@ -2963,7 +2969,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags thread_info->msg_source = msg_source_unavailable; HeapFree( GetProcessHeap(), 0, buffer ); HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, flags & PM_REMOVE, (LPARAM)msg, TRUE ); - return TRUE; + return 1; } /* if we get here, we have a sent message; call the window procedure */ @@ -3786,18 +3792,20 @@ static inline void check_for_driver_events( UINT msg ) BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT flags ) { MSG msg; + int ret; USER_CheckNotLock(); check_for_driver_events( 0 ); - if (!peek_message( &msg, hwnd, first, last, flags, 0 )) - { - DWORD ret; + ret = peek_message( &msg, hwnd, first, last, flags, 0 ); + if (ret < 0) return FALSE; + if (!ret) + { flush_window_surfaces( TRUE ); ret = wow_handlers.wait_message( 0, NULL, 0, QS_ALLINPUT, 0 ); /* if we received driver events, check again for a pending message */ - if (ret == WAIT_TIMEOUT || !peek_message( &msg, hwnd, first, last, flags, 0 )) return FALSE; + if (ret == WAIT_TIMEOUT || peek_message( &msg, hwnd, first, last, flags, 0 ) <= 0) return FALSE; } check_for_driver_events( msg.message ); @@ -3835,6 +3843,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT { HANDLE server_queue = get_server_queue_handle(); unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ + int ret; USER_CheckNotLock(); check_for_driver_events( 0 ); @@ -3850,10 +3859,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT } else mask = QS_ALLINPUT; - while (!peek_message( msg, hwnd, first, last, PM_REMOVE | (mask << 16), mask )) + while (!(ret = peek_message( msg, hwnd, first, last, PM_REMOVE | (mask << 16), mask ))) { wait_objects( 1, &server_queue, INFINITE, mask & (QS_SENDMESSAGE | QS_SMRESULT), mask, 0 ); } + if (ret < 0) return -1; + check_for_driver_events( msg->message ); return (msg->message != WM_QUIT); @@ -3866,7 +3877,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT BOOL WINAPI DECLSPEC_HOTPATCH GetMessageA( MSG *msg, HWND hwnd, UINT first, UINT last ) { if (get_pending_wmchar( msg, first, last, TRUE )) return TRUE; - GetMessageW( msg, hwnd, first, last ); + if (GetMessageW( msg, hwnd, first, last ) < 0) return -1; map_wparam_WtoA( msg, TRUE ); return (msg->message != WM_QUIT); }

1 0

Jacek Caban : scrobj/tests: Add scriptlet tests.
by Alexandre Julliard Sept. 18, 2019

Sept. 18, 2019

Module: wine Branch: master Commit: e40d857f1c605836a404267b24b1697e33eb0f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e40d857f1c605836a404267b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 15:25:15 2019 +0200 scrobj/tests: Add scriptlet tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/scrobj/tests/Makefile.in | 8 + dlls/scrobj/tests/rsrc.rc | 20 + dlls/scrobj/tests/scrobj.c | 1012 +++++++++++++++++++++++++++++++++++++++++ dlls/scrobj/tests/scrobj.wsc | 28 ++ 6 files changed, 1070 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e40d857f1c605836a404…

1 0

Alexandre Julliard : kernelbase: Don't round thread stack guaranteed size when it is zero.
by Alexandre Julliard Sept. 18, 2019

Sept. 18, 2019

Module: wine Branch: master Commit: b1bb4f84e244d141f7f17cdb6497ce645fd56015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1bb4f84e244d141f7f17cdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 18 17:52:07 2019 +0200 kernelbase: Don't round thread stack guaranteed size when it is zero. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index e16062016a..30e9a2e09b 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -505,7 +505,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadStackGuarantee( ULONG *size ) ULONG new_size = (*size + 4095) & ~4095; /* at least 2 pages on 64-bit */ - if (sizeof(void *) > sizeof(int)) new_size = max( new_size, 8192 ); + if (sizeof(void *) > sizeof(int) && new_size) new_size = max( new_size, 8192 ); *size = prev_size; if (new_size >= (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack)

1 0

Zhiyi Zhang : kernelbase: Comment out DECLSPEC_HOTPATCH for GetThreadLocale.
by Alexandre Julliard Sept. 18, 2019

Sept. 18, 2019

Module: wine Branch: master Commit: de6554a312a731db7d85440ce4eab44eeb53962a URL: https://source.winehq.org/git/wine.git/?a=commit;h=de6554a312a731db7d85440c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 18 23:22:29 2019 +0800 kernelbase: Comment out DECLSPEC_HOTPATCH for GetThreadLocale. Triggered by i686-w64-mingw32-gcc 8.3 with -Og. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 30e9a2e09b..f633dfa3de 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -253,7 +253,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetThreadId( HANDLE thread ) /*********************************************************************** * GetThreadLocale (kernelbase.@) */ -LCID WINAPI DECLSPEC_HOTPATCH GetThreadLocale(void) +LCID WINAPI /* DECLSPEC_HOTPATCH */ GetThreadLocale(void) { LCID ret = NtCurrentTeb()->CurrentLocale; if (!ret) NtCurrentTeb()->CurrentLocale = ret = GetUserDefaultLCID();

1 0

Francois Gouget : testbot: Add a GetMTime() helper function.
by Alexandre Julliard Sept. 18, 2019

Sept. 18, 2019

Module: tools Branch: master Commit: 3660dda79a906164501d0c25edb0455ee5e40773 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3660dda79a906164501d0c2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 18 10:07:58 2019 +0200 testbot: Add a GetMTime() helper function. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 3 ++- testbot/lib/WineTestBot/Utils.pm | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index b4672a7..6576e30 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -118,7 +118,7 @@ sub UpdateWineTest($$) my $Request = HTTP::Request->new(GET => $WineTestUrls{$Build}); if (-r $LatestFileName) { - my $Since = gmtime((stat $LatestFileName)[9]); + my $Since = gmtime(GetMTime($LatestFileName)); $Request->header("If-Modified-Since" => "$Since GMT"); } Debug("Checking $WineTestUrls{$Build}\n"); diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index d96b14a..71be9cf 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -37,6 +37,7 @@ our @EXPORT = qw(GetPatchImpacts LastPartSeparator UpdateWineData use List::Util qw(min max); use WineTestBot::Config; +use WineTestBot::Utils; # @@ -83,7 +84,7 @@ files and a hashtable of all the Wine files. sub _LoadWineFiles() { my $FileName = "$DataDir/latest/winefiles.txt"; - my $MTime = (stat($FileName))[9] || 0; + my $MTime = GetMTime($FileName); if ($_TestList and $_TimeStamp == $MTime) { diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 711917c..309fb19 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -28,7 +28,7 @@ WineTestBot::Utils - Utility functions use Exporter 'import'; our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString - OpenNewFile CreateNewFile CreateNewLink CreateNewDir + OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator BatchQuote ShQuote ShArgv2Cmd); @@ -255,6 +255,12 @@ sub CreateNewDir($$) } } +sub GetMTime($) +{ + my ($Filename) = @_; + return (stat($Filename))[9] || 0; +} + # # WineTest helpers

1 0

Francois Gouget : testbot/TestAgent: Modify and document the connection timeout handling.
by Alexandre Julliard Sept. 18, 2019

Sept. 18, 2019

Module: tools Branch: master Commit: e030ebb110efa063be565cd50f26e4c937ee6caa URL: https://source.winehq.org/git/tools.git/?a=commit;h=e030ebb110efa063be565cd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 18 10:08:57 2019 +0200 testbot/TestAgent: Modify and document the connection timeout handling. The new model better handles the case where we need to wait for the VM to boot before we can connect to the testagentd server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 9 +- testbot/lib/WineTestBot/Config.pm | 15 ++-- testbot/lib/WineTestBot/TestAgent.pm | 169 +++++++++++++++++++++++++++++++---- testbot/lib/WineTestBot/VMs.pm | 8 +- testbot/scripts/SetWinLocale | 2 +- testbot/scripts/TestAgent | 30 +++---- 6 files changed, 181 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=e030ebb110efa063be5…

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Allow restricting the jobs to a single VM.
by Alexandre Julliard Sept. 18, 2019

Sept. 18, 2019

Module: tools Branch: master Commit: b2688e53ac3b5092a469f7daa84c4d7d8fcd8a14 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b2688e53ac3b5092a469f7d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 18 10:08:39 2019 +0200 testbot/CheckForWinetestUpdate: Allow restricting the jobs to a single VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 103 +++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 20 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 6576e30..c677af2 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -6,7 +6,7 @@ # runs the full test suite on the standard Windows test VMs. # # Copyright 2009 Ge van Geldorp -# Copyright 2018 Francois Gouget +# Copyright 2018-2019 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -167,32 +167,40 @@ sub UpdateWineTest($$) return (1, $LatestBaseName); } -sub AddJob($$$) +sub AddJob($$$$) { - my ($BaseJob, $LatestBaseName, $Build) = @_; + my ($VMKey, $BaseJob, $LatestBaseName, $Build) = @_; - my $Remarks = $Build eq "exe64" ? "64-bit" : $BaseJob; - $Remarks = "WineTest: $Remarks VMs"; + my $Remarks = defined $VMKey ? "$VMKey VM" : + $Build eq "exe64" ? "64 bit VMs" : + "$BaseJob VMs"; + $Remarks = "WineTest: $Remarks"; Debug("Creating the '$Remarks' job\n"); my $VMs = CreateVMs(); + $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); if ($Build eq "exe64") { $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); + $VMs->AddFilter("Role", ["base", "winetest"]) if (!defined $VMKey); } elsif ($BaseJob eq "base") { $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); + $VMs->AddFilter("Role", ["base"]) if (!defined $VMKey); } else { $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); + $VMs->AddFilter("Role", ["winetest"]) if (!defined $VMKey); } if ($VMs->GetItemsCount() == 0) { + if (defined $VMKey) + { + Error "The $VMKey VM is not suitable for $Build WineTest jobs\n"; + return 0; + } # There is nothing to do Debug(" Found no VM\n"); return 1; @@ -267,18 +275,25 @@ sub AddJob($$$) return 1; } -sub AddReconfigJob($) +sub AddReconfigJob($$) { - my ($VMType) = @_; + my ($VMKey, $VMType) = @_; - my $Remarks = "Update the $VMType VMs"; + my $Remarks = defined $VMKey ? "$VMKey $VMType VM" : "$VMType VMs"; + $Remarks = "Update the $Remarks"; Debug("Creating the '$Remarks' job\n"); my $VMs = CreateVMs(); + $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); $VMs->AddFilter("Type", [$VMType]); $VMs->FilterEnabledRole(); if ($VMs->GetItemsCount() == 0) { + if (defined $VMKey) + { + Error "The $VMKey VM is not a $VMType VM\n"; + return 0; + } # There is nothing to do Debug(" Found no VM\n"); return 1; @@ -396,7 +411,26 @@ sub AddReconfigJob($) # Command line processing # -my ($OptCreate, %OptTypes, $Usage); +my $Usage; +sub CheckValue($$) +{ + my ($Option, $Value)=@_; + + if (defined $Value) + { + Error "$Option can only be specified once\n"; + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + Error "missing value for $Option\n"; + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +my ($OptCreate, %OptTypes, $OptVMKey); while (@ARGV) { my $Arg = shift @ARGV; @@ -404,6 +438,10 @@ while (@ARGV) { $OptCreate = 1; } + elsif ($Arg eq "--vm") + { + $OptVMKey = CheckValue($Arg, $OptVMKey); + } elsif ($TaskTypes{$Arg}) { $OptTypes{$Arg} = 1; @@ -435,14 +473,39 @@ while (@ARGV) } } -# Check parameters +# Check and untaint parameters if (!defined $Usage) { - %OptTypes = %TaskTypes if (!%OptTypes); + if (!defined $OptVMKey) + { + %OptTypes = %TaskTypes if (!%OptTypes); + } + elsif ($OptVMKey =~ /^([a-zA-Z0-9_]+)$/) + { + $OptVMKey = $1; # untaint + my $VM = CreateVMs()->GetItem($OptVMKey); + if (!defined $VM) + { + Error "The $OptVMKey VM does not exist\n"; + $Usage = 2; + } + elsif (!%OptTypes) + { + %OptTypes = $VM->Type eq "build" ? ("build" => 1) : + $VM->Type eq "wine" ? ("wine" => 1) : + $VM->Type eq "win32" ? ("base32" => 1) : + ("base32" => 1, "all64" => 1); + } + } + else + { + Error "'$OptVMKey' is not a valid VM name\n"; + $Usage = 2; + } } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [TASKTYPE] ...\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [--vm VM] [TASKTYPE] ...\n"; print "\n"; print "Where TASKTYPE is one of:\n"; foreach my $TaskType (sort keys %TaskTypes) @@ -471,11 +534,11 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{other32} or # A new executable means there have been commits so update Wine. Create # this job first purely to make the WineTestBot job queue look nice, and # arbitrarily do it only for 32-bit executables to avoid redundant updates. - $Rc = 1 if ($OptTypes{build} and !AddReconfigJob("build")); - $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, "exe32")); - $Rc = 1 if ($OptTypes{other32} and !AddJob("other", $LatestBaseName, "exe32")); + $Rc = 1 if ($OptTypes{build} and !AddReconfigJob($OptVMKey, "build")); + $Rc = 1 if ($OptTypes{base32} and !AddJob($OptVMKey, "base", $LatestBaseName, "exe32")); + $Rc = 1 if ($OptTypes{other32} and !AddJob($OptVMKey, "other", $LatestBaseName, "exe32")); - $Rc = 1 if ($OptTypes{wine} and !AddReconfigJob("wine")); + $Rc = 1 if ($OptTypes{wine} and !AddReconfigJob($OptVMKey, "wine")); } } @@ -493,7 +556,7 @@ if ($OptTypes{all64}) } elsif ($Create == 1) { - $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, "exe64")); + $Rc = 1 if ($OptTypes{all64} and !AddJob($OptVMKey, "", $LatestBaseName, "exe64")); } }

1 0

Francois Gouget : testbot/TestAgent: Return the server command line in the properties.
by Alexandre Julliard Sept. 18, 2019

Sept. 18, 2019

Module: tools Branch: master Commit: 70a7e9feb00458b5b59c5b0c8a69eeb89635447b URL: https://source.winehq.org/git/tools.git/?a=commit;h=70a7e9feb00458b5b59c5b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 18 10:08:14 2019 +0200 testbot/TestAgent: Return the server command line in the properties. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- testbot/src/testagentd/testagentd.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index d3d7137..d31fea3 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1261,7 +1261,7 @@ sub GetProperties($;$) my $Property = $self->_RecvRawString("Prop$i.s", $Size); return undef if (!defined $Property); debug(" RecvProperty() -> '$Property'\n"); - if ($Property =~ s/^([a-zA-Z0-9.]+)=//) + if ($Property =~ s/^([a-zA-Z0-9.]+(?:\[[0-9]+\])?)=//) { $Properties->{$1} = $Property; } diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index fbc26ab..5fd1367 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -44,6 +44,7 @@ #define BLOCK_SIZE 65536 +static int server_argc; static char** server_argv; static const char *name0; static int opt_debug = 0; @@ -1006,18 +1007,26 @@ static void do_getproperties(SOCKET client) { const char* arch; char* buf = NULL; - int size = 0; + int i, size = 0; if (!expect_list_size(client, 0)) { send_error(client); return; } - send_list_size(client, 3); + send_list_size(client, server_argc + 4); format_msg(&buf, &size, "protocol.version=%s", PROTOCOL_VERSION); send_string(client, buf); + format_msg(&buf, &size, "server.argc=%d", server_argc); + send_string(client, buf); + for (i = 0; i < server_argc; i++) + { + format_msg(&buf, &size, "server.argv[%d]=%s", i, server_argv[i]); + send_string(client, buf); + } + #ifdef WIN32 arch = "win32"; #else @@ -1342,6 +1351,7 @@ int main(int argc, char** argv) SOCKET master; int on = 1; + server_argc = argc; server_argv = argv; name0 = p = argv[0]; while (*p != '\0')

1 0

Alistair Leslie-Hughes : wininet: Update session username/password when cached credentials are used.
by Alexandre Julliard Sept. 17, 2019

Sept. 17, 2019

Module: wine Branch: master Commit: 03d19f4be2d8598546b5ce13b5aa32ed1ecdf986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03d19f4be2d8598546b5ce13… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 15 23:23:26 2019 +0000 wininet: Update session username/password when cached credentials are used. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 20 +++++++++++++++++--- dlls/wininet/tests/http.c | 8 ++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ad01420d45..5844a7c7d6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -853,7 +853,7 @@ static void destroy_authinfo( struct HttpAuthInfo *authinfo ) heap_free(authinfo); } -static UINT retrieve_cached_basic_authorization(const WCHAR *host, const WCHAR *realm, char **auth_data) +static UINT retrieve_cached_basic_authorization(http_request_t *req, const WCHAR *host, const WCHAR *realm, char **auth_data) { basicAuthorizationData *ad; UINT rc = 0; @@ -865,10 +865,24 @@ static UINT retrieve_cached_basic_authorization(const WCHAR *host, const WCHAR * { if (!strcmpiW(host, ad->host) && (!realm || !strcmpW(realm, ad->realm))) { + char *colon; + DWORD length; + TRACE("Authorization found in cache\n"); *auth_data = heap_alloc(ad->authorizationLen); memcpy(*auth_data,ad->authorization,ad->authorizationLen); rc = ad->authorizationLen; + + /* update session username and password to reflect current credentials */ + colon = strchr(ad->authorization, ':'); + length = colon - ad->authorization; + + heap_free(req->session->userName); + heap_free(req->session->password); + + req->session->userName = heap_strndupAtoW(ad->authorization, length, &length); + length++; + req->session->password = heap_strndupAtoW(&ad->authorization[length], ad->authorizationLen - length, &length); break; } } @@ -1144,7 +1158,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, if (!domain_and_username) { if (host && szRealm) - auth_data_len = retrieve_cached_basic_authorization(host, szRealm,&auth_data); + auth_data_len = retrieve_cached_basic_authorization(request, host, szRealm,&auth_data); if (auth_data_len == 0) { heap_free(szRealm); @@ -1660,7 +1674,7 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn UINT data_len; char *data; - if ((data_len = retrieve_cached_basic_authorization(host, NULL, &data))) + if ((data_len = retrieve_cached_basic_authorization(request, host, NULL, &data))) { TRACE("Found cached basic authorization for %s\n", debugstr_w(host)); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 80d2aad9f4..b61d5c7030 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4481,15 +4481,15 @@ static void test_basic_auth_credentials_reuse(int port) SetLastError(0xdeadbeef); ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); ok(ret, "unexpected failure %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "user"), "got %s\n", buffer); - todo_wine ok(size == 4, "got %u\n", size); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); size = sizeof(buffer); SetLastError(0xdeadbeef); ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); ok(ret, "unexpected failure %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); - todo_wine ok(size == 3, "got %u\n", size); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); status = 0xdeadbeef; size = sizeof(status);

1 0