September 2019 - Wine-commits

Jacek Caban : scrobj: Add partial DllInstall implementation.
by Alexandre Julliard 18 Sep '19

18 Sep '19

Module: wine Branch: master Commit: 30bbed5d1ae8f2f785e67e223f9de48f7c950cc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30bbed5d1ae8f2f785e67e22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 15:25:04 2019 +0200 scrobj: Add partial DllInstall implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 19 +++++++++++++++++++ dlls/scrobj/scrobj.spec | 1 + 2 files changed, 20 insertions(+) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 69d0e75c9e..c27def2b0f 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -444,6 +444,25 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources(scrobj_instance); } +/*********************************************************************** + * DllInstall (scrobj.@) + */ +HRESULT WINAPI DllInstall(BOOL install, const WCHAR *arg) +{ + HRESULT hres; + + if (install) + { + hres = DllRegisterServer(); + if (!arg || FAILED(hres)) return hres; + } + else if (!arg) + return DllUnregisterServer(); + + FIXME("argument %s not supported\n", debugstr_w(arg)); + return E_NOTIMPL; +} + static HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown *outer, REFIID riid, void **obj) { struct scriptlet_typelib *This; diff --git a/dlls/scrobj/scrobj.spec b/dlls/scrobj/scrobj.spec index b16365d0c9..8ebc2efd5b 100644 --- a/dlls/scrobj/scrobj.spec +++ b/dlls/scrobj/scrobj.spec @@ -1,4 +1,5 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Jacek Caban : scrobj/tests: Add scriptlet tests.
by Alexandre Julliard 18 Sep '19

18 Sep '19

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

Zebediah Figura : user32: Return -1 from peek_message() on error.
by Alexandre Julliard 18 Sep '19

18 Sep '19

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

Zebediah Figura : server: Validate the filter window handle in get_message.
by Alexandre Julliard 18 Sep '19

18 Sep '19

Module: wine Branch: master Commit: f5f633e712672d0f467605b0a90df9e5401be080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5f633e712672d0f467605b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 14 12:35:41 2019 -0500 server: Validate the filter window handle in get_message. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 42 ++++++++++++++++++++++++++++++++++++++++++ server/queue.c | 6 ++++++ 2 files changed, 48 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 73beb4d771..2766e7f5fb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12173,6 +12173,31 @@ todo_wine { qstatus = GetQueueStatus(qs_all_input); ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); } + + PostThreadMessageA(GetCurrentThreadId(), WM_USER, 0, 0); + ret = PeekMessageA(&msg, (HWND)-1, 0, 0, PM_NOREMOVE); + ok(ret == TRUE, "wrong ret %d\n", ret); + ok(msg.message == WM_USER, "wrong message %u\n", msg.message); + ret = GetMessageA(&msg, (HWND)-1, 0, 0); + ok(ret == TRUE, "wrong ret %d\n", ret); + ok(msg.message == WM_USER, "wrong message %u\n", msg.message); + + PostThreadMessageA(GetCurrentThreadId(), WM_USER, 0, 0); + ret = PeekMessageA(&msg, (HWND)1, 0, 0, PM_NOREMOVE); + ok(ret == TRUE, "wrong ret %d\n", ret); + ok(msg.message == WM_USER, "wrong message %u\n", msg.message); + ret = GetMessageA(&msg, (HWND)1, 0, 0); + ok(ret == TRUE, "wrong ret %d\n", ret); + ok(msg.message == WM_USER, "wrong message %u\n", msg.message); + + PostThreadMessageA(GetCurrentThreadId(), WM_USER, 0, 0); + ret = PeekMessageA(&msg, (HWND)0xffff, 0, 0, PM_NOREMOVE); + ok(ret == TRUE, "wrong ret %d\n", ret); + ok(msg.message == WM_USER, "wrong message %u\n", msg.message); + ret = GetMessageA(&msg, (HWND)0xffff, 0, 0); + ok(ret == TRUE, "wrong ret %d\n", ret); + ok(msg.message == WM_USER, "wrong message %u\n", msg.message); + done: trace("signalling to exit\n"); SetEvent(info.hevent[EV_STOP]); @@ -17666,6 +17691,22 @@ done: DestroyWindow(hwnd); } +static void test_invalid_window(void) +{ + MSG msg; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetMessageA(&msg, (HWND)0xdeadbeef, 0, 0); + ok(ret == -1, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = PeekMessageA(&msg, (HWND)0xdeadbeef, 0, 0, PM_REMOVE); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError()); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -17791,6 +17832,7 @@ START_TEST(msg) test_notify_message(); test_SetActiveWindow(); test_restore_messages(); + test_invalid_window(); if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); diff --git a/server/queue.c b/server/queue.c index 96587d11d1..b5e17be18f 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2394,6 +2394,12 @@ DECL_HANDLER(get_message) reply->active_hooks = get_active_hooks(); + if (get_win && get_win != 1 && get_win != -1 && !get_user_object( get_win, USER_WINDOW )) + { + set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); + return; + } + if (!queue) return; queue->last_get_msg = current_time; if (!filter) filter = QS_ALLINPUT;

1 0

Andrew Eikum : winebus.sys: Fix build without Linux event support.
by Alexandre Julliard 18 Sep '19

18 Sep '19

Module: wine Branch: master Commit: e83f427a65726bfdefd2712a96f228e720c8b274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e83f427a65726bfdefd2712a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 18 15:06:56 2019 -0500 winebus.sys: Fix build without Linux event support. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 926c755a85..b72e6bf47d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1495,7 +1495,9 @@ void udev_driver_unload( void ) CloseHandle(deviceloop_handle); bus_enumerate_hid_devices(&hidraw_vtbl, device_unload, NULL); +#ifdef HAS_PROPER_INPUT_HEADER bus_enumerate_hid_devices(&lnxev_vtbl, device_unload, NULL); +#endif } NTSTATUS udev_driver_init(void)

1 0

Francois Gouget : testbot: Add a GetMTime() helper function.
by Alexandre Julliard 18 Sep '19

18 Sep '19

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: Return the server command line in the properties.
by Alexandre Julliard 18 Sep '19

18 Sep '19

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

Francois Gouget : testbot/CheckForWinetestUpdate: Allow restricting the jobs to a single VM.
by Alexandre Julliard 18 Sep '19

18 Sep '19

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: Modify and document the connection timeout handling.
by Alexandre Julliard 18 Sep '19

18 Sep '19

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

Alistair Leslie-Hughes : wininet: Pass correct server name when retrieving username information.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: 7d8d703d9b41801b03bd92fcfe78f899b3291d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8d703d9b41801b03bd92fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 17 00:14:04 2019 +0000 wininet: Pass correct server name when retrieving username information. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/dialogs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index b4aa49c0eb..5e26c8b7b4 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -216,7 +216,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( { HWND hitem; struct WININET_ErrorDlgParams *params; - WCHAR szRealm[0x80], szServer[0x80]; + WCHAR szRealm[0x80]; if( uMsg == WM_INITDIALOG ) { @@ -237,7 +237,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( hitem = GetDlgItem( hdlg, IDC_PROXY ); SetWindowTextW( hitem, params->req->session->appInfo->proxy ); - WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); + WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, FALSE ); return TRUE; } @@ -291,7 +291,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( { HWND hitem; struct WININET_ErrorDlgParams *params; - WCHAR szRealm[0x80], szServer[0x80]; + WCHAR szRealm[0x80]; if( uMsg == WM_INITDIALOG ) { @@ -312,7 +312,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( hitem = GetDlgItem( hdlg, IDC_SERVER ); SetWindowTextW( hitem, params->req->session->hostName ); - WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); + WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, FALSE ); return TRUE; }

1 0