September 2019 - Wine-devel

[PATCH] glu32: Fix the spelling of some comments.
by Francois Gouget 16 Sep '19

16 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/glu32/sweep.c | 4 ++-- dlls/glu32/tess.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/glu32/sweep.c b/dlls/glu32/sweep.c index a909e2be33b..0bfc9335cb5 100644 --- a/dlls/glu32/sweep.c +++ b/dlls/glu32/sweep.c @@ -542,7 +542,7 @@ static void CallCombine( GLUtesselator *tess, GLUvertex *isect, static void SpliceMergeVertices( GLUtesselator *tess, GLUhalfEdge *e1, GLUhalfEdge *e2 ) /* - * Two vertices with idential coordinates are combined into one. + * Two vertices with identical coordinates are combined into one. * e1->Org is kept, while e2->Org is discarded. */ { @@ -1045,7 +1045,7 @@ static void ConnectRightVertex( GLUtesselator *tess, ActiveRegion *regUp, static void ConnectLeftDegenerate( GLUtesselator *tess, ActiveRegion *regUp, GLUvertex *vEvent ) /* - * The event vertex lies exacty on an already-processed edge or vertex. + * The event vertex lies exactly on an already-processed edge or vertex. * Adding the new vertex involves splicing it into the already-processed * part of the mesh. */ diff --git a/dlls/glu32/tess.c b/dlls/glu32/tess.c index a1bca2e1582..6e72d1e3ef7 100644 --- a/dlls/glu32/tess.c +++ b/dlls/glu32/tess.c @@ -192,7 +192,7 @@ static void CheckOrientation( GLUtesselator *tess ) /* The "feature merging" is not intended to be complete. There are * special cases where edges are nearly parallel to the sweep line * which are not implemented. The algorithm should still behave - * robustly (ie. produce a reasonable tesselation) in the presence + * robustly (ie. produce a reasonable tessellation) in the presence * of such edges, however it may miss features which could have been * merged. We could minimize this effect by choosing the sweep line * direction to be something unusual (ie. not parallel to one of the -- 2.20.1

1 0

[PATCH] jscript: Use wide-char literals in lexer.
by Jacek Caban 16 Sep '19

16 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This seems to work in all configs I tried. dlls/jscript/lex.c | 137 +++++++++++++++------------------------------ 1 file changed, 46 insertions(+), 91 deletions(-)

1 0

[PATCH] testbot/Reconfig: Clone the Wine source repository if it is missing.
by Francois Gouget 16 Sep '19

16 Sep '19

This simplifies setting up a new build VM. Also trace the git commands. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 14 +++++++++++--- testbot/lib/WineTestBot/Config.pm | 8 ++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 02253922e..57a5f4b1a 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -79,11 +79,19 @@ sub GitPull($) { my ($Dir) = @_; - InfoMsg "\nUpdating the $Dir source\n"; - system("cd '$DataDir/$Dir' && git pull"); + if (!-d "$DataDir/$Dir") + { + InfoMsg "\nRetrieving the $Dir source\n"; + system("set -x && git clone $RepoURLs{$Dir}"); + } + else + { + InfoMsg "\nUpdating the $Dir source\n"; + system("cd '$DataDir/$Dir' && set -x && git pull"); + } if ($? != 0) { - LogMsg "Git pull failed\n"; + LogMsg "Git clone/pull failed\n"; return !1; } diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 7304e1075..3d9214bae 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -26,7 +26,7 @@ WineTestBot::Config - Site-independent configuration settings =cut use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir - $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs + %RepoURLs $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail @@ -42,7 +42,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw($UseSSL $LogDir $DataDir $BinDir +(a)EXPORT = qw($UseSSL $LogDir $DataDir $BinDir %RepoURLs $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail @@ -79,6 +79,10 @@ sub PrependPaths(@) } +%RepoURLs = ( + "wine" => "git://source.winehq.org/git/wine.git", +); + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 0; -- 2.20.1

1 0

[PATCH] testbot/SetWinLocale: Activate tainting.
by Francois Gouget 16 Sep '19

16 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index 7477c5d78..d64f50b54 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # # Sets the locale of the specified Windows machine and, optionally, -- 2.20.1

1 0

[PATCH] testbot/SetWinLocale: Better match the TestBot naming conventions.
by Francois Gouget 16 Sep '19

16 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/SetWinLocale | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index d64f50b54..2690dbb1f 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -251,7 +251,7 @@ my %Keyboards = ( # my $Usage; -sub check_opt_val($$) +sub CheckValue($$) { my ($Option, $Value) = @_; @@ -269,10 +269,10 @@ sub check_opt_val($$) return shift @ARGV; } -sub check_opt_locale($$) +sub CheckLocale($$) { my ($Option, $Value) = @_; - $Value = check_opt_val($Option, $Value); + $Value = CheckValue($Option, $Value); if ($Value !~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/) { Error("'$Value' is not a valid $Option locale\n"); @@ -294,7 +294,7 @@ while (@ARGV) } elsif ($Arg eq "--vm") { - $OptVM = check_opt_val($Arg, $OptVM); + $OptVM = CheckValue($Arg, $OptVM); } elsif ($Arg eq "--refresh") { @@ -310,7 +310,7 @@ while (@ARGV) } elsif ($Arg eq "--add-locales") { - $OptAddLocales = check_opt_val($Arg, $OptAddLocales); + $OptAddLocales = CheckValue($Arg, $OptAddLocales); } elsif ($Arg eq "--reboot") { @@ -332,27 +332,27 @@ while (@ARGV) } elsif ($Arg eq "--default") { - $OptDefault = check_opt_locale($Arg, $OptDefault); + $OptDefault = CheckLocale($Arg, $OptDefault); } elsif ($Arg eq "--locale") { - $OptLocale = check_opt_locale($Arg, $OptLocale); + $OptLocale = CheckLocale($Arg, $OptLocale); } elsif ($Arg eq "--system") { - $OptSystem = check_opt_locale($Arg, $OptSystem); + $OptSystem = CheckLocale($Arg, $OptSystem); } elsif ($Arg eq "--mui") { - $OptMUI = check_opt_locale($Arg, $OptMUI); + $OptMUI = CheckLocale($Arg, $OptMUI); } elsif ($Arg eq "--keyboard") { - $OptKeyboard = check_opt_locale($Arg, $OptKeyboard); + $OptKeyboard = CheckLocale($Arg, $OptKeyboard); } elsif ($Arg eq "--country") { - $OptCountry = check_opt_val($Arg, $OptCountry); + $OptCountry = CheckValue($Arg, $OptCountry); } elsif ($Arg eq "--debug") { -- 2.20.1

1 0

[PATCH] testbot/LibvirtTool: Fix FatalError() when the VM status is not as expected.
by Francois Gouget 16 Sep '19

16 Sep '19

If the VM Status is not in the expected state then it no longer belongs to this process. So don't even try to save it as that could cause interference. Also don't notify the administrator about putting it offline since that will not be happening. However if the VM is merely in maintenance mode that means the tool is being debugged so proceed normally except for the VM Status which must not be modified to avoid inteference from the scheduler. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f031c78c8..5c3906503 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -166,23 +166,31 @@ sub FatalError($) my ($ErrMessage) = @_; Error $ErrMessage; + # Get the up-to-date VM status + $VM = CreateVMs()->GetItem($VMKey); + # Put the VM offline or mark it for maintenance my $Errors = ($VM->Errors || 0) + 1; my $NewStatus = $Errors < $MaxVMErrors ? "offline" : "maintenance"; - $VM = CreateVMs()->GetItem($VMKey); - # Put the VM offline if nobody else modified its status before us - if ($VM->Status eq $CurrentStatus) + if ($VM->Status eq "maintenance") { - $VM->Status($NewStatus); - $VM->ChildDeadline(undef); - $VM->ChildPid(undef); - $VM->Errors($Errors); + # Still proceed with changing the non-Status fields and notifying the + # administrator to allow for error handling debugging. + } + elsif ($VM->Status ne $CurrentStatus) + { + LogMsg "Not updating the VM because its status changed: ". $VM->Status ." != $CurrentStatus\n"; + exit 1; } else { - $NewStatus = ""; + $VM->Status($NewStatus); } + $VM->ChildDeadline(undef); + $VM->ChildPid(undef); + $VM->Errors($Errors); + my ($ErrProperty, $SaveErrMessage) = $VM->Save(); if (defined $SaveErrMessage) { @@ -198,7 +206,7 @@ sub FatalError($) elsif ($NewStatus eq "maintenance") { NotifyAdministrator("The $VMKey VM needs maintenance", - "Got ". $VM->Errors ." consecutive errors working on the $VMKey VM:\n". + "Got $Errors consecutive errors working on the $VMKey VM:\n". "\n$ErrMessage\n". "An administrator needs to look at it and to put it back online."); } -- 2.20.1

1 0

[PATCH] rpcrt4: Implement wait_for_incoming_data() for named pipes transport.
by Dmitry Timoshkov 16 Sep '19

16 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/rpc_transport.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 02fd56ce96..7564b66df1 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -463,10 +463,17 @@ static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) CancelIoEx(connection->pipe, NULL); } -static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection) +static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *conn) { - /* FIXME: implement when named pipe writes use overlapped I/O */ - return -1; + RpcConnection_np *connection = (RpcConnection_np *)conn; + HANDLE event; + + event = get_np_event(connection); + if (!event) return -1; + + WaitForSingleObject(event, INFINITE); + release_np_event(connection, event); + return 0; } static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, -- 2.20.1

3 4

[PATCH v2] rpcrt4: Implement wait_for_incoming_data() for named pipes transport.
by Dmitry Timoshkov 16 Sep '19

16 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/rpc_transport.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 02fd56ce96..961335d191 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -463,10 +463,27 @@ static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) CancelIoEx(connection->pipe, NULL); } -static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection) +static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *conn) { - /* FIXME: implement when named pipe writes use overlapped I/O */ - return -1; + RpcConnection_np *connection = (RpcConnection_np *)conn; + HANDLE event; + NTSTATUS status; + + if (connection->listen_event) + { + WaitForSingleObject(connection->listen_event, INFINITE); + return 0; + } + + event = get_np_event(connection); + if (!event) return -1; + + status = NtFsControlFile(connection->pipe, event, NULL, NULL, &connection->io_status, FSCTL_PIPE_LISTEN, NULL, 0, NULL, 0); + if (status == STATUS_SUCCESS) + WaitForSingleObject(event, INFINITE); + + release_np_event(connection, event); + return 0; } static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, -- 2.20.1

1 0

[PATCH v4 resend] winex11.drv: Destroy old clipping message window if it has been replaced
by Rémi Bernon 16 Sep '19

16 Sep '19

When the same thread repeatedly calls ClipCursor, a message window is created for every call, then stored in x11drv_thread_data->clip_hwnd. The WM_X11DRV_CLIP_CURSOR notification is then sent to the desktop window, then to the previous clipping thread in order for it to destroy its clip_hwnd. But as the clipping thread is the same, and because x11drv_thread_data->clip_hwnd has been overwritten, it does not satisfy the "hwnd == data->clip_hwnd" condition and the window leaked. This was causing exhaustion of user handles, and ultimately, failures to create new clipping message windows, which then in turn makes the pointer grab be lost. This change makes sure that any dangling clipping message window is properly destroyed. Note: Implementing this by avoiding the re-creation of clipping message window leads to a race condition when ClipCursor rect is reset then restored: the desktop process sends reset notification which may be processed after the clipping rect has already been restored. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 12 ++++++++++-- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8d1dc5e35d7..15e5c04a41e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -502,7 +502,7 @@ BOOL CDECL X11DRV_ClipCursor( const RECT *clip ); * * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR. */ -LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) +LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) { struct x11drv_thread_data *data = x11drv_init_thread_data(); @@ -513,7 +513,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) HWND prev = clip_hwnd; clip_hwnd = new_clip_hwnd; if (prev || new_clip_hwnd) TRACE( "clip hwnd changed from %p to %p\n", prev, new_clip_hwnd ); - if (prev) SendNotifyMessageW( prev, WM_X11DRV_CLIP_CURSOR, 0, 0 ); + if (prev) SendNotifyMessageW( prev, WM_X11DRV_CLIP_CURSOR, (WPARAM)prev, 0 ); } else if (hwnd == data->clip_hwnd) /* this is a notification that clipping has been reset */ { @@ -530,6 +530,14 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) GetClipCursor( &clip ); X11DRV_ClipCursor( &clip ); } + else if (prev_clip_hwnd) + { + /* This is a notification send by the desktop window to an old + * dangling clip window. + */ + TRACE( "destroying old clip hwnd %p\n", prev_clip_hwnd ); + DestroyWindow( prev_clip_hwnd ); + } return 0; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fb97ec5a0d4..73aa78a17fc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2727,7 +2727,7 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) set_window_cursor( x11drv_thread_data()->clip_window, (HCURSOR)lp ); return 0; case WM_X11DRV_CLIP_CURSOR: - return clip_cursor_notify( hwnd, (HWND)lp ); + return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d4e476facb2..9ac83e57b1a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -621,7 +621,7 @@ extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN; extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; -extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; +extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH] user32: Avoid dead initialization (scan-build)
by Alex Henrie 16 Sep '19

16 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/user_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 830097570a..31a6168108 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -248,7 +248,7 @@ static void dpiaware_init(void) static const WCHAR permonv2W[] = {'p','e','r','m','o','n','i','t','o','r','v','2',0}; static const WCHAR spacesW[] = {' ','\t','\r','\n',0}; static const WCHAR * const types[] = { unawareW, systemW, permonW, permonv2W }; - WCHAR *p, *start = buffer, *end; + WCHAR *p, *start, *end; ULONG_PTR i; TRACE( "got dpiAwareness=%s\n", debugstr_w(buffer) ); -- 2.23.0

2 1