December 2021 - Wine-devel - list.winehq.org

[PATCH v2] ws2_32: Fix memory leaks on error paths in unix_gethostby* (scan-build)
by Alex Henrie 22 Dec '21

22 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Don't free before the call to hostent_from_unix --- dlls/ws2_32/unixlib.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index e89ebe35248..1f82aee81de 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -866,7 +866,10 @@ static NTSTATUS unix_gethostbyaddr( void *args ) } if (!unix_host) + { + free( unix_buffer ); return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + } ret = hostent_from_unix( unix_host, params->host, params->size ); @@ -916,7 +919,10 @@ static NTSTATUS unix_gethostbyname( void *args ) } if (!unix_host) + { + free( unix_buffer ); return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + } ret = hostent_from_unix( unix_host, params->host, params->size ); -- 2.34.1

1 0

[PATCH] quartz/tests: Test querying connection state inside of IPin::ReceiveConnection().
by Zebediah Figura 22 Dec '21

22 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/tests/avisplit.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 10088c033b7..80ee6607279 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -913,6 +913,25 @@ static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int return VFW_S_NO_MORE_ITEMS; } +static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + AM_MEDIA_TYPE mt2; + IPin *peer2; + HRESULT hr; + + hr = IPin_ConnectedTo(peer, &peer2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer2 == &iface->pin.IPin_iface, "Peer didn't match.\n"); + IPin_Release(peer2); + + hr = IPin_ConnectionMediaType(peer, &mt2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mt, &mt2), "Media types didn't match.\n"); + FreeMediaType(&mt2); + + return S_OK; +} + static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); @@ -976,6 +995,7 @@ static const struct strmbase_sink_ops testsink_ops = .base.pin_query_interface = testsink_query_interface, .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, + .sink_connect = testsink_connect, .pfnReceive = testsink_Receive, .sink_eos = testsink_eos, .sink_new_segment = testsink_new_segment, -- 2.34.1

2 1

[PATCH] server: Avoid using the long double type on non-x86 platforms.
by Zebediah Figura 22 Dec '21

22 Dec '21

We especially may want to support x86 on ARM, where long double is not an 80-bit type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/trace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/trace.c b/server/trace.c index a1a8726ba71..a48f00258fe 100644 --- a/server/trace.c +++ b/server/trace.c @@ -666,9 +666,11 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) ctx.fp.i386_regs.data_off, ctx.fp.i386_regs.data_sel, ctx.fp.i386_regs.cr0npx ); for (i = 0; i < 8; i++) { - long double reg = 0; - memcpy( &reg, &ctx.fp.i386_regs.regs[10 * i], 10 ); - fprintf( stderr, ",fp.reg%u=%Lg", i, reg ); + unsigned __int64 reg[2]; + memset( reg, 0, sizeof(reg) ); + memcpy( reg, &ctx.fp.i386_regs.regs[10 * i], 10 ); + fprintf( stderr, ",fp.reg%u=", i ); + dump_uint128( "", reg ); } } if (ctx.flags & SERVER_CTX_EXTENDED_REGISTERS) -- 2.34.1

1 0

[PATCH] winex11: Fix the build when XInput2 headers are not present.
by Zebediah Figura 22 Dec '21

22 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 155 ++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 76 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 9e56e080bda..51a6828f10c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -275,7 +275,6 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator thread_data->x_valuator.value = 0; thread_data->y_valuator.value = 0; } -#endif /*********************************************************************** @@ -283,7 +282,6 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator */ static void enable_xinput2(void) { -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask; XIDeviceInfo *pointer_info; @@ -330,9 +328,10 @@ static void enable_xinput2(void) data->xi2_current_slave = 0; data->xi2_state = xi_enabled; -#endif } +#endif + /*********************************************************************** * disable_xinput2 */ @@ -371,6 +370,7 @@ static void disable_xinput2(void) */ static BOOL grab_clipping_window( const RECT *clip ) { +#if HAVE_X11_EXTENSIONS_XINPUT2_H static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); Window clip_window; @@ -441,6 +441,10 @@ static BOOL grab_clipping_window( const RECT *clip ) data->clip_hwnd = msg_hwnd; SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, (LPARAM)msg_hwnd ); return TRUE; +#else + WARN( "XInput2 was not available at compile time\n" ); + return FALSE; +#endif } /*********************************************************************** @@ -628,79 +632,6 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x input->u.mi.dy = pt.y; } -static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) -{ - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator; - double x_value = 0, y_value = 0, x_scale, y_scale; - const double *values = event->valuators.values; - RECT virtual_rect; - int i; - - if (x->number < 0 || y->number < 0) return FALSE; - if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; - - /* If there is no slave currently detected, no previous motion nor device - * change events were received. Look it up now on the device list in this - * case. - */ - if (!thread_data->xi2_current_slave) - { - XIDeviceInfo *devices = thread_data->xi2_devices; - - for (i = 0; i < thread_data->xi2_device_count; i++) - { - if (devices[i].use != XISlavePointer) continue; - if (devices[i].deviceid != event->deviceid) continue; - if (devices[i].attachment != thread_data->xi2_core_pointer) continue; - thread_data->xi2_current_slave = event->deviceid; - break; - } - } - if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - - virtual_rect = get_virtual_screen_rect(); - - if (x->max <= x->min) x_scale = 1; - else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min); - if (y->max <= y->min) y_scale = 1; - else y_scale = (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); - - for (i = 0; i <= max( x->number, y->number ); i++) - { - if (!XIMaskIsSet( event->valuators.mask, i )) continue; - if (i == x->number) - { - x_value = *values; - x->value += x_value * x_scale; - } - if (i == y->number) - { - y_value = *values; - y->value += y_value * y_scale; - } - values++; - } - - input->u.mi.dx = round( x->value ); - input->u.mi.dy = round( y->value ); - - TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy ); - - x->value -= input->u.mi.dx; - y->value -= input->u.mi.dy; - - if (!input->u.mi.dx && !input->u.mi.dy) - { - TRACE( "accumulating motion\n" ); - return FALSE; - } - - return TRUE; -} - - /*********************************************************************** * send_mouse_input * @@ -1887,6 +1818,78 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev ) return TRUE; } +static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator; + double x_value = 0, y_value = 0, x_scale, y_scale; + const double *values = event->valuators.values; + RECT virtual_rect; + int i; + + if (x->number < 0 || y->number < 0) return FALSE; + if (!event->valuators.mask_len) return FALSE; + if (thread_data->xi2_state != xi_enabled) return FALSE; + + /* If there is no slave currently detected, no previous motion nor device + * change events were received. Look it up now on the device list in this + * case. + */ + if (!thread_data->xi2_current_slave) + { + XIDeviceInfo *devices = thread_data->xi2_devices; + + for (i = 0; i < thread_data->xi2_device_count; i++) + { + if (devices[i].use != XISlavePointer) continue; + if (devices[i].deviceid != event->deviceid) continue; + if (devices[i].attachment != thread_data->xi2_core_pointer) continue; + thread_data->xi2_current_slave = event->deviceid; + break; + } + } + if (event->deviceid != thread_data->xi2_current_slave) return FALSE; + + virtual_rect = get_virtual_screen_rect(); + + if (x->max <= x->min) x_scale = 1; + else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min); + if (y->max <= y->min) y_scale = 1; + else y_scale = (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); + + for (i = 0; i <= max( x->number, y->number ); i++) + { + if (!XIMaskIsSet( event->valuators.mask, i )) continue; + if (i == x->number) + { + x_value = *values; + x->value += x_value * x_scale; + } + if (i == y->number) + { + y_value = *values; + y->value += y_value * y_scale; + } + values++; + } + + input->u.mi.dx = round( x->value ); + input->u.mi.dy = round( y->value ); + + TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy ); + + x->value -= input->u.mi.dx; + y->value -= input->u.mi.dy; + + if (!input->u.mi.dx && !input->u.mi.dy) + { + TRACE( "accumulating motion\n" ); + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * X11DRV_RawMotion */ -- 2.34.1

1 0

[PATCH] po: Update LIthuanian translation.
by Aurimas Fišeras 21 Dec '21

21 Dec '21

2 1

[RFC PATCH] ntdll: Swallow crashes once pthread_exit() has been called.
by Giovanni Mascellani 21 Dec '21

21 Dec '21

When pthread_exit() is called, it tries to rewind the stack, which includes calling cleanup routines registered with pthread_cleanup_push() or similar procedures. But we also unwind the stack in signal_exit_thread(). This means that if any cleanup routine was registered between the exit frame and where control was when the thread was interrupted, then pthread will try to call functions from frames that do not exist anymore and might have been overwritten, which easily results in segmentation faults or similar accidents. Since until PE separation is finished it is not easy to fix the real problem, this patch logs and swallows crashes occurring after pthread_exit() is called, so that at least damages are minimized and developers are not confused by irrelevant messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52213 --- dlls/ntdll/unix/signal_arm.c | 6 ++++++ dlls/ntdll/unix/signal_arm64.c | 6 ++++++ dlls/ntdll/unix/signal_i386.c | 6 ++++++ dlls/ntdll/unix/signal_x86_64.c | 6 ++++++ dlls/ntdll/unix/thread.c | 2 ++ dlls/ntdll/unix/unix_private.h | 1 + 6 files changed, 27 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index ebc08984adf..b552bdb79f9 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -800,6 +800,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) EXCEPTION_RECORD rec = { 0 }; ucontext_t *context = sigcontext; + if (ntdll_get_thread_data()->exiting_pthread) + { + WARN("Swallowing crash after pthread is exiting\n"); + syscall(__NR_exit, 0); + } + switch (get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index f2612412366..10da9b8a366 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -854,6 +854,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) EXCEPTION_RECORD rec = { 0 }; ucontext_t *context = sigcontext; + if (ntdll_get_thread_data()->exiting_pthread) + { + WARN("Swallowing crash after pthread is exiting\n"); + syscall(__NR_exit, 0); + } + rec.NumberParameters = 2; rec.ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index bf3abc1a587..1d4f8ec9df1 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1774,6 +1774,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ucontext_t *ucontext = sigcontext; void *stack = setup_exception_record( sigcontext, &rec, &xcontext ); + if (ntdll_get_thread_data()->exiting_pthread) + { + WARN("Swallowing crash after pthread is exiting\n"); + syscall(__NR_exit, 0); + } + switch (TRAP_sig(ucontext)) { case TRAP_x86_OFLOW: /* Overflow exception */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d32e38875a4..6454d2e6b26 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2551,6 +2551,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct xcontext context; ucontext_t *ucontext = sigcontext; + if (ntdll_get_thread_data()->exiting_pthread) + { + WARN("Swallowing crash after pthread is exiting\n"); + syscall(__NR_exit, 0); + } + rec.ExceptionAddress = (void *)RIP_sig(ucontext); save_context( &context, sigcontext ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00fe2b6fa1b..8a22b68605a 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1055,6 +1055,7 @@ static void pthread_exit_wrapper( int status ) close( ntdll_get_thread_data()->wait_fd[1] ); close( ntdll_get_thread_data()->reply_fd ); close( ntdll_get_thread_data()->request_fd ); + ntdll_get_thread_data()->exiting_pthread = TRUE; pthread_exit( UIntToPtr(status) ); } @@ -1342,6 +1343,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT thread_data->request_fd = request_pipe[1]; thread_data->start = start; thread_data->param = param; + thread_data->exiting_pthread = FALSE; pthread_attr_init( &pthread_attr ); pthread_attr_setstack( &pthread_attr, teb->DeallocationStack, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 0dcb09ad641..0d1117be2e3 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -61,6 +61,7 @@ struct ntdll_thread_data PRTL_THREAD_START_ROUTINE start; /* thread entry point */ void *param; /* thread entry point parameter */ void *jmp_buf; /* setjmp buffer for exception handling */ + BOOL exiting_pthread; }; C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) ); -- 2.34.1

3 3

[PATCH] msxml3: Fix crashes due to access to invalid context pointer.
by Bernhard Übelacker 21 Dec '21

21 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52073 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> ---- Unchanged to previous [RFC]. In function xslt_doc_default_loader a pointer of the stack based variable "xmlParserInputPtr input" is given to bind_url. Later in function import_loader_onDataAvailable this pointer appears as parameter "void *ctxt" which correctly gets casted to "xmlParserInputPtr *input", but in my opinion incorrectly given to xmlNewIOInputStream as parameter "xmlParserCtxtPtr ctxt". In the next call to xmlNewInputStream this xmlParserCtxtPtr is used to increment the input_id member. By accident this input_id member contains the pointer which causes in xmlXPathNodeCollectAndTest the segfault. --- dlls/msxml3/node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 721ad54e379..272e438e773 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1329,7 +1329,7 @@ static HRESULT import_loader_onDataAvailable(void *ctxt, char *ptr, DWORD len) inputbuffer = xmlParserInputBufferCreateIO(import_loader_io_read, import_loader_io_close, buffer, XML_CHAR_ENCODING_NONE); - *input = xmlNewIOInputStream(ctxt, inputbuffer, XML_CHAR_ENCODING_NONE); + *input = xmlNewIOInputStream(NULL, inputbuffer, XML_CHAR_ENCODING_NONE); if (!*input) xmlFreeParserInputBuffer(inputbuffer); -- 2.34.1

2 1

[PATCH] win32u: Implement NtUserBuildHwndList.
by Jacek Caban 21 Dec '21

21 Dec '21

Fixes Quake Champions, spotted by Paul Gofman. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 82 +++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 31 ++++++++++++ dlls/wow64win/Makefile.in | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 25 ++++++++++ dlls/wow64win/wow64win_private.h | 2 + include/ntuser.h | 2 + 9 files changed, 144 insertions(+), 4 deletions(-)

1 0

[tools] testbot/SetWinLocale: Remove the VM options.
by Francois Gouget 21 Dec '21

21 Dec '21

The TestBot creates the the missing live snapshots itself so these options were unused. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Also they can only be used by running SetWinLocale on the TestBot server which I cannot do. --- testbot/bin/SetWinLocale | 327 +++------------------------------------ 1 file changed, 21 insertions(+), 306 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 1e803c555..d7f795bee 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -1,10 +1,9 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# Sets the locale of the specified Windows machine and, optionally, -# updates or creates a new snapshot of the TestBot VM for it. +# Sets the locale of the specified Windows machine. # -# Copyright 2018 Francois Gouget +# Copyright 2018, 2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -40,7 +39,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Log; use WineTestBot::TestAgent; -use WineTestBot::VMs; use WineTestBot::Utils; @@ -292,7 +290,6 @@ sub CheckLocale($$) } my ($OptHostName, $OptReboot); -my ($OptVM, $OptRefresh, $OptRefreshAll, $OptAddMissing, $OptAddLocales); my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); while (@ARGV) { @@ -301,26 +298,6 @@ while (@ARGV) { $Usage = 0; } - elsif ($Arg eq "--vm") - { - $OptVM = CheckValue($Arg, $OptVM); - } - elsif ($Arg eq "--refresh") - { - $OptRefresh = 1; - } - elsif ($Arg eq "--refresh-all") - { - $OptRefreshAll = 1; - } - elsif ($Arg eq "--add-missing") - { - $OptAddMissing = 1; - } - elsif ($Arg eq "--add-locales") - { - $OptAddLocales = CheckValue($Arg, $OptAddLocales); - } elsif ($Arg eq "--reboot") { if (defined $OptReboot and !$OptReboot) @@ -388,101 +365,22 @@ while (@ARGV) } # Check and untaint parameters -my ($BaseVMName, $VMLocale, %AddLocales, $KeyboardIds, $CountryId); +my ($KeyboardIds, $CountryId); if (!defined $Usage) { - if (defined $OptVM) + if (!defined $OptHostName) { - if ($OptRefresh or $OptRefreshAll or $OptAddMissing or - defined $OptAddLocales) - { - if (defined $OptReboot and !$OptReboot) - { - Error("--no-reboot is incompatible with --refresh, --refresh-all, --add-missing and --add-locales\n"); - $Usage = 2; - } - if (defined $OptDefault or defined $OptLocale or defined $OptMUI or - defined $OptCountry or defined $OptKeyboard) - { - Error("--default, --locale, --mui, --country and --keyboard are incompatible with the VM snapshot options\n"); - $Usage = 2; - } - - # Always reboot Windows before updating a TestBot snapshot - $OptReboot = 1; - } - if ($OptRefresh and - ($OptRefreshAll or $OptAddMissing or defined $OptAddLocales)) - { - Error("--refresh is incompatible with --refresh--all, --add-missing and --add-locales\n"); - $Usage = 2; - } - if ($OptRefreshAll and $OptAddMissing) - { - Error("--refresh-all and --add-missing are mutually incompatible\n"); - $Usage = 2; - } - if (defined $OptAddLocales) - { - foreach my $Locale (split /:/, $OptAddLocales) - { - if ($Locale =~ /^[a-z]{2}_[A-Z]{2}$/) - { - $AddLocales{$Locale} = 1; - } - else - { - Error("'$Locale' is not a valid locale for --add-locales\n"); - $Usage = 2; - last; - } - } - if (!%AddLocales) - { - Error("'$OptAddLocales' does not contain any valid locale\n"); - $Usage = 2; - } - } - - $BaseVMName = $OptVM; - if ($BaseVMName =~ s/_([a-z]{2})_([A-Z]{2})$//) - { - if ($OptRefreshAll) - { - Error("'$OptVM' should not be a locale VM\n"); - $Usage = 2; - } - $VMLocale = "$1_$2"; # untaint - $OptDefault = $VMLocale eq "sr_RS" ? "sr-Latn-CS" : "$1-$2"; - } - elsif ($OptRefresh) - { - Error("'$OptVM' is not a locale VM\n"); - $Usage = 2; - } + Error("you must specify the Windows machine to work on\n"); + $Usage = 2; + } + elsif ($OptHostName =~ /^([a-zA-Z0-9.-]+)$/) + { + $OptHostName = $1; # untaint } else { - if ($OptRefresh or $OptRefreshAll or $OptAddMissing or - defined $OptAddLocales) - { - Error("--refresh, --refresh-all, --add-missing and --add-locales can only be used with --vm\n"); - $Usage = 2; - } - if (!defined $OptHostName) - { - Error("you must specify the Windows machine to work on\n"); - $Usage = 2; - } - elsif ($OptHostName =~ /^([a-zA-Z0-9.-]+)$/) - { - $OptHostName = $1; # untaint - } - else - { - Error("'$OptHostName' is not a valid hostname\n"); - $Usage = 2; - } + Error("'$OptHostName' is not a valid hostname\n"); + $Usage = 2; } $OptLocale ||= $OptDefault; @@ -516,9 +414,7 @@ if (!defined $Usage) } if (!defined $OptLocale and !defined $OptSystem and !defined $OptMUI and - !defined $OptKeyboard and !defined $OptCountry and - !$OptRefresh and !$OptRefreshAll and !$OptAddMissing and - !defined $OptAddLocales) + !defined $OptKeyboard and !defined $OptCountry) { Error("you must specify at least one locale to change\n"); $Usage = 2; @@ -537,21 +433,11 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] --vm NAME --refresh\n"; - print "or $name0 [options] --vm NAME [--refresh-all] [--add-locales LOC1:LOC2:...]\n"; - print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME|--vm NAME\n"; + print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; - print "Sets the locale of the specified Windows machine and, optionally, updates or creates a new snapshot ot the TestBot VM for it.\n"; + print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; - print " --vm NAME Work on the specified TestBot VM.\n"; - print " --refresh Create or update the TestBot VM's snapshot (and VM if needed).\n"; - print " --refresh-all Refresh the locale VMs derived from the specified base VM.\n"; - print " --add-missing Check the locale VMs derived from the specified base VM and\n"; - print " add any missing corresponding snapshots.\n"; - print " --add-locales LOC1:LOC2:... Create new TestBot VMs derived from the specified\n"; - print " base VM for each of the Unix locale in the colon-sperated\n"; - print " list.\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --default LOC Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; @@ -573,160 +459,6 @@ if (defined $Usage) } -# -# Handle the meta options -# - -my $VMs = CreateVMs(); -my $VM = $VMs->GetItem($OptVM); -if ($VM and $VM->Role eq "deleted") -{ - FatalError("'$OptVM' is marked for deletion\n"); -} - -if ($OptRefreshAll or $OptAddMissing) -{ - FatalError("could not find the '$OptVM' virtual machine\n") if (!$VM); - - my $HasLocaleVMs; - foreach my $VM (@{$VMs->GetItems()}) - { - next if ($VM->Role eq "deleted"); - if ($VM->Name =~ /^\Q$OptVM\E_([a-z]{2})_([A-Z]{2})$/) - { - $HasLocaleVMs = 1; - if ($OptRefreshAll or !$VM->GetDomain()->HasSnapshot($VM->IdleSnapshot)) - { - $AddLocales{"$1_$2"} = 1; - } - } - } - FatalError("could not find any locale VM for '$OptVM'\n") if (!$HasLocaleVMs); - if (!%AddLocales) - { - Debug(Elapsed($Start), " Nothing to do!\n"); - exit(0); - } -} - -if (%AddLocales) -{ - my @Failed; - my @Cmd = ("$0", ($Debug ? "--debug" : ()), "--refresh", "--vm"); - foreach my $Locale (sort keys %AddLocales) - { - if (Run(@Cmd, "${OptVM}_$Locale")) - { - push @Failed, $Locale; - } - } - if (@Failed) - { - Error("failed to add/refresh the snapshots for the following locales: @Failed\n"); - exit(1); - } - exit(0); -} - - -# -# Prepare the virtual machine -# - -if ($OptRefresh) -{ - my $BaseVM = $VMs->GetItem($BaseVMName); - if (!$BaseVM) - { - FatalError("could not find the '$BaseVMName' base virtual machine\n"); - } - - if (!$VM) - { - if ($BaseVM->Status ne "maintenance") - { - FatalError("the base VM is not marked for maintenance\n"); - } - if ($DryRun) - { - Warning("'$OptVM' does not exist. Skipping for dry run.\n"); - exit(0); - } - - # Create the localized VM - $VM = $VMs->Add(); - $VM->Name($OptVM); - $VM->SortOrder($BaseVM->SortOrder + 1); - $VM->Type($BaseVM->Type); - $VM->Role("extra"); - $VM->Missions($BaseVM->Missions); - $VM->MissionCaps($BaseVM->MissionCaps); - # All we need is for one VM to be in maintenance mode to prevent the - # TestBot from using this hypervisor domain. The base VM is in maintenance - # mode so that is enough. - $VM->Status("off"); - $VM->VirtURI($BaseVM->VirtURI); - $VM->VirtDomain($BaseVM->VirtDomain); - $VM->IdleSnapshot($BaseVM->IdleSnapshot ."_$VMLocale"); - $VM->Hostname($BaseVM->Hostname); - - my $Description = $BaseVM->Description ." ". LocaleName($VMLocale); - my $PropertyDescriptor = $VMs->GetPropertyDescriptorByName("Description"); - if ($PropertyDescriptor->GetMaxLength() < length($Description)) - { - Warning("the $OptVM description is too long. Truncating it.\n"); - $Description = substr($Description, 0, $PropertyDescriptor->GetMaxLength()); - } - $VM->Description($Description); - $VM->Details($BaseVM->Details); - - my ($_ErrKey, $_ErrProperty, $ErrMessage) = $VMs->Save(); - if (defined $ErrMessage) - { - FatalError("could not create the localized VM: $ErrMessage\n"); - } - } - else - { - if ($VM->Status ne "maintenance" and $BaseVM->Status ne "maintenance") - { - FatalError("neither $OptVM nor its base VM are marked for maintenance\n"); - } - if ($VM->Status !~ /^(?:maintenance|off)$/) - { - FatalError("'$OptVM' is neither off nor marked for maintenance\n"); - } - if ($BaseVM->Status !~ /^(?:maintenance|off)$/) - { - FatalError("'$BaseVMName' is neither off nor marked for maintenance\n"); - } - - } - - my $IdleSnapshot = $VM->IdleSnapshot; - if ($VM->GetDomain()->HasSnapshot($IdleSnapshot)) - { - Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); - my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->RemoveSnapshot(); - if (defined $ErrMessage) - { - FatalError("could not remove the $IdleSnapshot snapshot: $ErrMessage\n"); - } - } - - Debug(Elapsed($Start), " Reverting the base VM\n"); - if (Run("$::RootDir/bin/LibvirtTool.pl", "--debug", "revert", $BaseVMName)) - { - # LibvirtTool.pl will have already printed an error message - exit(1); - } -} -elsif (defined $OptVM and !$VM) -{ - FatalError("could not find the '$OptVM' virtual machine\n"); -} - - # # Generate the intl.cpl configuration # @@ -782,8 +514,7 @@ push @Config, "</gs:GlobalizationServices>"; # Change the Windows locale using intl.cpl # -$OptHostName = $VM->Hostname if ($VM); # For error messages -my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); +my $TA = TestAgent->new($OptHostName, $AgentPort); Debug(Elapsed($Start), " Sending the configuration file\n"); print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); @@ -834,6 +565,11 @@ if (!$DryRun) } } + +# +# Reboot to finalize the changes +# + if ($OptReboot) { Debug(Elapsed($Start), " Rebooting Windows\n"); @@ -847,37 +583,16 @@ if ($OptReboot) $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows } -} - -# -# Update the virtual machine snapshot -# - -if ($OptRefresh) -{ # Wait a bit to make sure we don't reconnect before Windows has rebooted. sleep(30) if (!$DryRun); - # Allow up to 10 minutes for the shutdown plus reboot. Debug(Elapsed($Start), " Waiting for Windows to boot\n"); $TA->SetConnectTimeout(undef, undef, $WaitForBoot); if (!$DryRun and !$TA->Ping()) { FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); } - - # Then wait a good minute after the reboot to make sure all the widgets are - # up and running. - Debug(Elapsed($Start), " Letting Windows warm up\n"); - sleep(60) if (!$DryRun); - - Debug(Elapsed($Start), " Creating the ", $VM->IdleSnapshot, " snapshot\n"); - my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->CreateSnapshot(); - if (defined $ErrMessage) - { - FatalError("could not create the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); - } } Debug(Elapsed($Start), " All done!\n"); -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Show the intl.cpl XML file in --debug mode.
by Francois Gouget 21 Dec '21

21 Dec '21

In addition to the --dry-run mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index d9a9e0340..1e803c555 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -786,11 +786,10 @@ $OptHostName = $VM->Hostname if ($VM); # For error messages my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); Debug(Elapsed($Start), " Sending the configuration file\n"); -if ($DryRun) -{ - print STDERR join("\n", "locales.xml:", @Config, ""); -} -elsif (!$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) +print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); + +if (!$DryRun and + !$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) { FatalError("could not send the configuration file:", $TA->GetLastError(), "\n"); } -- 2.30.2

1 0