October 2017 - Wine-Commits

Alexandre Julliard : opengl32: Remove no longer used support for generating thread-safe thunks.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: 2abeb7634c07892606d7252d673e8a4300b13e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abeb7634c07892606d7252d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 10:10:41 2017 +0200 opengl32: Remove no longer used support for generating thread-safe thunks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 502b9ae..81b7291 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -67,10 +67,6 @@ my $ext_file = "opengl_ext.c"; my $wgl_driver_file = "../../include/wine/wgl_driver.h"; my $wgl_file = "../../include/wine/wgl.h"; -# Set to 0 for removing the ENTER / LEAVE GL calls -my $gen_thread_safe = 0; -# Prefix used for the local variables -my $ext_prefix = "func_"; # If set to 1, generate TRACEs for each OpenGL function my $gen_traces = 1; @@ -299,9 +295,6 @@ sub GenerateThunk($$$) return "$ret) DECLSPEC_HIDDEN;\n" if $name eq "glGetStringi"; $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; - if ($func_ref->[0] ne "void" && $gen_thread_safe) { - $ret .= " " . ConvertType($func_ref->[0]) . " ret_value;\n"; - } if ($gen_traces) { $ret .= " TRACE(\"($trace_arg)\\n\""; if ($trace_arg ne "") { @@ -309,25 +302,11 @@ sub GenerateThunk($$$) } $ret .= ");\n"; } - if ($gen_thread_safe) { - $ret .= " ENTER_GL();\n"; - $ret .= " "; - if ($func_ref->[0] ne "void") { - $ret .= "ret_value = "; - } - $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; - $ret .= " LEAVE_GL();\n"; - if ($func_ref->[0] ne "void") { - $ret .= " return ret_value;\n" - } - } - else { - $ret .= " "; - if ($func_ref->[0] ne "void") { - $ret .= "return "; - } - $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; + $ret .= " "; + if ($func_ref->[0] ne "void") { + $ret .= "return "; } + $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; $ret .= "}\n"; # Return this string....

1 0

Francois Gouget : testbot: Improve LibvirtTool.pl and make it more easily extensible.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: tools Branch: master Commit: f8006d341c4ce1bd05226db613b2b9aeb1b4f769 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f8006d341c4ce1bd05226db6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 9 11:34:26 2017 +0200 testbot: Improve LibvirtTool.pl and make it more easily extensible. Always check the status field before changing it, and always report status change errors. Only notify the administrator that the VM is offline if changing the status to offline succeeded. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 238 +++++++++++++++++++++++++---------------- testbot/lib/WineTestBot/VMs.pm | 2 +- 2 files changed, 149 insertions(+), 91 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 5cbb0bf..aa256f3 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -1,12 +1,12 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# Reverts a VM so that it is ready to run jobs. Note that in addition to the -# hypervisor revert operation this implies letting the VM settle down and -# checking that it responds to our commands. If this fails the administrator -# is notified and the VM is marked as offline. +# Reverts a VM so that it is ready to run jobs. +# This operation can take quite a bit of time, particularly in case of +# network trouble, and thus is best performed in a separate process. # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2017 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -57,45 +57,41 @@ sub Error(@) LogMsg @_; } -sub FatalError($$) +sub NotifyAdministrator($$) { - my ($ErrMessage, $VM) = @_; - Error $ErrMessage; + my ($Subject, $Body) = @_; - # Get the up-to-date VM status and update it if nobody else changed it - my $VMKey = $VM->GetKey(); - $VM = CreateVMs()->GetItem($VMKey); - if ($VM->Status eq "reverting" or $VM->Status eq "sleeping") + if (open(my $fh, "|/usr/sbin/sendmail -oi -t -odq")) { - $VM->Status("offline"); - $VM->ChildPid(undef); - $VM->Save(); - } - - my $VMSnapshot = $VM->IdleSnapshot; - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; + LogMsg "Notifying administrator: $Subject\n"; + print $fh <<"EOF"; From: $RobotEMail To: $AdminEMail -Subject: VM $VMKey offline - -Reverting $VMKey to $VMSnapshot failed: +Subject: $Subject -$ErrMessage - -The VM has been put offline. +$Body EOF - close(SENDMAIL); - - exit 1; + close($fh); + } + else + { + LogMsg "Could not send administrator notification: $!\n"; + LogMsg " Subject: $Subject\n"; + LogMsg " Body: $Body\n"; + } } + +# +# Setup and command line processing +# + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; # Grab the command line options -my ($Usage, $VMKey); +my ($Usage, $Action, $VMKey); while (@ARGV) { my $Arg = shift @ARGV; @@ -103,6 +99,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "revert") + { + $Action = $Arg; + } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -127,8 +127,14 @@ while (@ARGV) } # Check parameters +my $VM; if (!defined $Usage) { + if (!defined $Action) + { + Error "you must specify the action to perform\n"; + $Usage = 2; + } if (!defined $VMKey) { Error "you must specify the VM name\n"; @@ -137,92 +143,144 @@ if (!defined $Usage) elsif ($VMKey =~ /^([a-zA-Z0-9_]+)$/) { $VMKey = $1; + $VM = CreateVMs()->GetItem($VMKey); + if (!defined $VM) + { + Error "VM $VMKey does not exist\n"; + $Usage = 2; + } } else { Error "'$VMKey' is not a valid VM name\n"; $Usage = 2; } - } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] VMName\n"; - exit $Usage; + print "Usage: $Name0 [--debug] [--help] revert VMName\n"; + exit $Usage; } -my $VM = CreateVMs()->GetItem($VMKey); -if (!defined $VM) -{ - Error "VM $VMKey does not exist\n"; - exit 1; -} -if (!$Debug and $VM->Status ne "reverting") -{ - FatalError "The VM is not ready to be reverted (" . $VM->Status . ")\n", $VM; -} + +# +# Main +# + my $Start = Time(); -LogMsg "Reverting $VMKey to ", $VM->IdleSnapshot, "\n"; -# Some QEmu/KVM versions are buggy and cannot revert a running VM -Debug(Elapsed($Start), " Powering off the VM\n"); -my $Domain = $VM->GetDomain(); -my $ErrMessage = $Domain->PowerOff(1); -if (defined $ErrMessage) -{ - Error "$ErrMessage\n"; - LogMsg "Trying the revert anyway\n"; -} +my $CurrentStatus; -Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); -$ErrMessage = $Domain->RevertToSnapshot(); -if (defined($ErrMessage)) +sub FatalError($) { - FatalError "Could not revert $VMKey to " . $VM->IdleSnapshot . ": $ErrMessage\n", - $VM; + my ($ErrMessage) = @_; + Error $ErrMessage; + + # Put the VM offline if nobody else modified its status before us + $VM = CreateVMs()->GetItem($VMKey); + $VM->Status("offline") if ($VM->Status eq $CurrentStatus); + $VM->ChildPid(undef); + my ($ErrProperty, $SaveErrMessage) = $VM->Save(); + if (defined $SaveErrMessage) + { + LogMsg "Could not put the $VMKey VM offline: $SaveErrMessage ($ErrProperty)\n"; + } + elsif ($VM->Status eq "offline") + { + NotifyAdministrator("Putting the $VMKey VM offline", + "Could not perform the $Action operation on the $VMKey VM:\n". + "\n$ErrMessage\n". + "The VM has been put offline."); + } + exit 1; } -# Get the up-to-date VM status and exit if someone else changed it -$VM = CreateVMs()->GetItem($VMKey); -exit 1 if ($VM->Status ne "reverting"); -$VM->Status("sleeping"); -(my $ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +sub ChangeStatus($$;$) { - FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM; + my ($From, $To, $Done) = @_; + + # Get the up-to-date VM status + $VM = CreateVMs()->GetItem($VMKey); + if (!$VM or (defined $From and $VM->Status ne $From)) + { + LogMsg "Not changing status\n"; + return undef; + } + + $VM->Status($To); + $VM->ChildPid(undef) if ($Done); + my ($ErrProperty, $ErrMessage) = $VM->Save(); + if (defined $ErrMessage) + { + FatalError("Could not change the $VMKey VM status: $ErrMessage\n"); + } + $CurrentStatus = $To; + return 1; } -Debug(Elapsed($Start), " Trying the TestAgent connection\n"); -LogMsg "Waiting for ", $VM->Name, " (up to ${WaitForToolsInVM}s per attempt)\n"; -my $TA = $VM->GetAgent(); -$TA->SetConnectTimeout($WaitForToolsInVM); -my $Success = $TA->Ping(); -$TA->Disconnect(); -if (!$Success) +sub Revert() { - $ErrMessage = $TA->GetLastError(); - FatalError "Tools in $VMKey not responding: $ErrMessage\n", $VM; + my $VM = CreateVMs()->GetItem($VMKey); + if (!$Debug and $VM->Status ne "reverting") + { + Error("The VM is not ready to be reverted (". $VM->Status .")\n"); + return 1; + } + $CurrentStatus = "reverting"; + + # Some QEmu/KVM versions are buggy and cannot revert a running VM + Debug(Elapsed($Start), " Powering off the VM\n"); + my $Domain = $VM->GetDomain(); + my $ErrMessage = $Domain->PowerOff(1); + if (defined $ErrMessage) + { + LogMsg "Could not power off $VMKey: $ErrMessage\n"; + LogMsg "Trying the revert anyway...\n"; + } + + Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); + $ErrMessage = $Domain->RevertToSnapshot(); + if (defined $ErrMessage) + { + FatalError("Could not revert $VMKey to ". $VM->IdleSnapshot .": $ErrMessage\n"); + } + + # The VM is now sleeping which may allow some tasks to run + return 1 if (!ChangeStatus("reverting", "sleeping")); + + Debug(Elapsed($Start), " Trying the TestAgent connection\n"); + LogMsg "Waiting for ". $VM->Name ." (up to ${WaitForToolsInVM}s per attempt)\n"; + my $TA = $VM->GetAgent(); + $TA->SetConnectTimeout($WaitForToolsInVM); + my $Success = $TA->Ping(); + $TA->Disconnect(); + if (!$Success) + { + $ErrMessage = $TA->GetLastError(); + FatalError("Cannot connect to the $VMKey TestAgent: $ErrMessage\n"); + } + + if ($SleepAfterRevert != 0) + { + Debug(Elapsed($Start), " Sleeping\n"); + LogMsg "Letting ". $VM->Name ." settle down for ${SleepAfterRevert}s\n"; + sleep($SleepAfterRevert); + } + + return ChangeStatus("sleeping", "idle", "done") ? 0 : 1; } -if ($SleepAfterRevert != 0) + +my $Rc; +if ($Action eq "revert") { - Debug(Elapsed($Start), " Sleeping\n"); - LogMsg "Letting ", $VM->Name, " settle for ${SleepAfterRevert}s\n"; - sleep($SleepAfterRevert); + $Rc = Revert(); } -Debug(Elapsed($Start), " Done\n"); - -# Get the up-to-date VM status and exit if someone else changed it -$VM = CreateVMs()->GetItem($VMKey); -exit 1 if ($VM->Status ne "sleeping"); -$VM->Status("idle"); -$VM->ChildPid(undef); -($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +else { - FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM; + Error("Unsupported action $Action!\n"); + $Rc = 1; } +LogMsg "$Action on $VMKey completed in ", Elapsed($Start), " s\n"; -LogMsg "Revert of $VMKey completed in ", Elapsed($Start), " s\n"; - -exit 0; +exit $Rc; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 4dd7cc9..1c6cdd7 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -276,7 +276,7 @@ sub RunRevert($) delete $ENV{ENV}; require WineTestBot::Log; WineTestBot::Log::SetupRedirects(); - exec("$BinDir/LibvirtTool.pl", $self->GetKey()) or + exec("$BinDir/LibvirtTool.pl", "revert", $self->GetKey()) or WineTestBot::Log::LogMsg("Unable to exec LibvirtTool.pl: $!\n"); exit(1); }

1 0

Francois Gouget : testbot: Rename RevertVM.pl to LibvirtTool.pl to match LibvirtDomain.pm.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: tools Branch: master Commit: 702db480581c1ef33c53ce1e5e11b8a1ce442cf4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=702db480581c1ef33c53ce1e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 9 11:32:06 2017 +0200 testbot: Rename RevertVM.pl to LibvirtTool.pl to match LibvirtDomain.pm. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/{RevertVM.pl => LibvirtTool.pl} | 0 testbot/lib/WineTestBot/VMs.pm | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/LibvirtTool.pl similarity index 100% rename from testbot/bin/RevertVM.pl rename to testbot/bin/LibvirtTool.pl diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 5e4f951..4dd7cc9 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -276,8 +276,8 @@ sub RunRevert($) delete $ENV{ENV}; require WineTestBot::Log; WineTestBot::Log::SetupRedirects(); - exec("$BinDir/RevertVM.pl", $self->GetKey()) or - WineTestBot::Log::LogMsg("Unable to exec RevertVM.pl: $!\n"); + exec("$BinDir/LibvirtTool.pl", $self->GetKey()) or + WineTestBot::Log::LogMsg("Unable to exec LibvirtTool.pl: $!\n"); exit(1); }

1 0

Jacek Caban : server: Store named pipe fd in pipe_end throughout its whole life time.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: c295dd6bda731553f835447c4049d79d11c43b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c295dd6bda731553f835447c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:28:46 2017 +0200 server: Store named pipe fd in pipe_end throughout its whole life time. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 63 ++++++++++++----------------------------------------- 1 file changed, 14 insertions(+), 49 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index b5738ad..5796089 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -75,7 +75,6 @@ struct pipe_end struct pipe_server { struct pipe_end pipe_end; /* common header for pipe_client and pipe_server */ - struct fd *ioctl_fd; /* file descriptor for ioctls when not connected */ struct list entry; /* entry in named pipe servers list */ enum pipe_state state; /* server state */ struct pipe_client *client; /* client that this server is connected to */ @@ -142,6 +141,7 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); +static struct fd *pipe_end_get_fd( struct object *obj ); static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static int pipe_end_flush( struct fd *fd, struct async *async ); @@ -150,7 +150,6 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); -static struct fd *pipe_server_get_fd( struct object *obj ); static void pipe_server_destroy( struct object *obj); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -164,7 +163,7 @@ static const struct object_ops pipe_server_ops = default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - pipe_server_get_fd, /* get_fd */ + pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -193,7 +192,6 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry ); -static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -207,7 +205,7 @@ static const struct object_ops pipe_client_ops = pipe_client_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - pipe_client_get_fd, /* get_fd */ + pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -324,13 +322,10 @@ static void named_pipe_destroy( struct object *obj) free_async_queue( &pipe->waiters ); } -static struct fd *pipe_client_get_fd( struct object *obj ) +static struct fd *pipe_end_get_fd( struct object *obj ) { - struct pipe_client *client = (struct pipe_client *) obj; - if (client->pipe_end.fd) - return (struct fd *) grab_object( client->pipe_end.fd ); - set_error( STATUS_PIPE_DISCONNECTED ); - return NULL; + struct pipe_end *pipe_end = (struct pipe_end *) obj; + return (struct fd *) grab_object( pipe_end->fd ); } static void set_server_state( struct pipe_server *server, enum pipe_state state ) @@ -341,27 +336,17 @@ static void set_server_state( struct pipe_server *server, enum pipe_state state { case ps_connected_server: case ps_wait_disconnect: - assert( server->pipe_end.fd ); break; case ps_wait_open: case ps_idle_server: - assert( !server->pipe_end.fd ); - set_no_fd_status( server->ioctl_fd, STATUS_PIPE_LISTENING ); + set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_LISTENING ); break; case ps_wait_connect: - assert( !server->pipe_end.fd ); - set_no_fd_status( server->ioctl_fd, STATUS_PIPE_DISCONNECTED ); + set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_DISCONNECTED ); break; } } -static struct fd *pipe_server_get_fd( struct object *obj ) -{ - struct pipe_server *server = (struct pipe_server *) obj; - - return (struct fd *)grab_object( server->pipe_end.fd ? server->pipe_end.fd : server->ioctl_fd ); -} - static void wake_message( struct pipe_message *message ) { @@ -411,19 +396,6 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status } } -static void do_disconnect( struct pipe_server *server ) -{ - /* we may only have a server fd, if the client disconnected */ - if (server->client) - { - assert( server->client->server == server ); - assert( server->client->pipe_end.fd ); - } - assert( server->pipe_end.fd ); - release_object( server->pipe_end.fd ); - server->pipe_end.fd = NULL; -} - static void pipe_end_destroy( struct pipe_end *pipe_end ) { struct pipe_message *message; @@ -437,6 +409,7 @@ static void pipe_end_destroy( struct pipe_end *pipe_end ) free_async_queue( &pipe_end->read_q ); free_async_queue( &pipe_end->write_q ); + if (pipe_end->fd) release_object( pipe_end->fd ); } static void pipe_server_destroy( struct object *obj) @@ -447,8 +420,6 @@ static void pipe_server_destroy( struct object *obj) pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); - if (server->pipe_end.fd) do_disconnect( server ); - pipe_end_destroy( &server->pipe_end ); if (server->client) { @@ -459,7 +430,6 @@ static void pipe_server_destroy( struct object *obj) assert( server->pipe->instances ); server->pipe->instances--; - if (server->ioctl_fd) release_object( server->ioctl_fd ); list_remove( &server->entry ); release_object( server->pipe ); } @@ -494,7 +464,6 @@ static void pipe_client_destroy( struct object *obj) } pipe_end_destroy( &client->pipe_end ); - if (client->pipe_end.fd) release_object( client->pipe_end.fd ); } static void named_pipe_device_dump( struct object *obj, int verbose ) @@ -849,7 +818,7 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as { case ps_idle_server: case ps_wait_connect: - fd_queue_async( server->ioctl_fd, async, ASYNC_TYPE_WAIT ); + fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); set_server_state( server, ps_wait_open ); async_wake_up( &server->pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); @@ -871,11 +840,9 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as { case ps_connected_server: assert( server->client ); - assert( server->client->pipe_end.fd ); /* dump the client and server fds - client loses all waiting data */ pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - do_disconnect( server ); server->client->server = NULL; server->client = NULL; set_server_state( server, ps_wait_connect ); @@ -883,7 +850,6 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as case ps_wait_disconnect: assert( !server->client ); pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - do_disconnect( server ); set_server_state( server, ps_wait_connect ); break; case ps_idle_server: @@ -953,12 +919,12 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); - if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) + if (!(server->pipe_end.fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) { release_object( server ); return NULL; } - set_fd_signaled( server->ioctl_fd, 1 ); + set_fd_signaled( server->pipe_end.fd, 1 ); set_server_state( server, ps_idle_server ); return server; } @@ -1048,11 +1014,10 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) { - server->pipe_end.fd = (struct fd *)grab_object( server->ioctl_fd ); - set_no_fd_status( server->ioctl_fd, STATUS_BAD_DEVICE_TYPE ); + set_no_fd_status( server->pipe_end.fd, STATUS_BAD_DEVICE_TYPE ); allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) - fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); set_server_state( server, ps_connected_server ); server->client = client; client->server = server;

1 0

Hugh McMaster : reg/tests: Add REG_BINARY to the empty hex data import tests.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 6607065356381941e4ffbb7d07b5a8b78b7e93a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6607065356381941e4ffbb7d0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 9 11:46:58 2017 +0000 reg/tests: Add REG_BINARY to the empty hex data import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e93062b..3a3ff8d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2354,7 +2354,8 @@ static void test_import(void) "\"Wine68d\"=hex(4):\n" "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" - "\"Wine68g\"=hex(abcd):\n\n", &r); + "\"Wine68g\"=hex(abcd):\n" + "\"Wine68h\"=hex:\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -2363,6 +2364,7 @@ static void test_import(void) verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3852,7 +3854,8 @@ static void test_unicode_import(void) "\"Wine68d\"=hex(4):\n" "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" - "\"Wine68g\"=hex(abcd):\n\n", &r); + "\"Wine68g\"=hex(abcd):\n" + "\"Wine68h\"=hex:\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -3861,6 +3864,7 @@ static void test_unicode_import(void) verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Alexandre Julliard : opengl32: Store GL extensions in a private XML file instead of Perl arrays.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: e8767bed3c7461a2dcbdeebb06e1ab16c7133a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8767bed3c7461a2dcbdeebb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 20:13:01 2017 +0200 opengl32: Store GL extensions in a private XML file instead of Perl arrays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 165 +----------------- dlls/opengl32/opengl_ext.c | 36 ++-- dlls/opengl32/opengl_norm.c | 44 ++--- dlls/opengl32/winegl.xml | 410 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/wgl_driver.h | 44 ++--- 5 files changed, 480 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8767bed3c7461a2dcbde…

1 0

Andrey Gusev : winspool.drv: Avoid bitwise operation.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: b7987c6b32bcad1e8f282adee5e2cbd4b5ccacda URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7987c6b32bcad1e8f282adee… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 9 16:03:05 2017 +0300 winspool.drv: Avoid bitwise operation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f09745d..9c24256 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -606,7 +606,7 @@ static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) res = AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ); TRACE("got %d and %d for %s (%s)\n", res, GetLastError(), debugstr_w(name), debugstr_w(di3.pEnvironment)); - if (!res & (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) + if (!res && (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) { ERR("failed with %u for %s (%s) %s\n", GetLastError(), debugstr_w(name), debugstr_w(di3.pEnvironment), debugstr_w(di3.pDriverPath));

1 0

Andrey Gusev : hid/tests: Remove redundant comparison.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: d4ea289dc189520735f226cf8282dd1c1e0d3d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ea289dc189520735f226cf8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 9 15:10:22 2017 +0300 hid/tests: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ef2f729..ce9b3a5 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -167,7 +167,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D { ULONG usage_length = 100; status = HidP_GetUsages(HidP_Input, i, 0, button_pages, &usage_length, ppd, data, data_length); - ok (status == HIDP_STATUS_SUCCESS || (status != HIDP_STATUS_SUCCESS && usage_length == 0), + ok (status == HIDP_STATUS_SUCCESS || usage_length == 0, "HidP_GetUsages failed (%x) but usage length still %i\n", status, usage_length); if (usage_length) {

1 0

Dmitry Kislyuk : vbscript: Improve parsing of separators in loops and switches.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 56b31ba2e11ccc46584b0a1d96c27dd310d18eeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b31ba2e11ccc46584b0a1d9… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Fri Oct 6 16:27:44 2017 -0500 vbscript: Improve parsing of separators in loops and switches. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 6 ++++-- dlls/vbscript/tests/lang.vbs | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 6b303ee..beb4e4c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -164,7 +164,7 @@ StatementsNl | StatementNl StatementsNl { $$ = link_statements($1, $2); } StatementNl - : Statement tNL { $$ = $1; } + : Statement tNL { $$ = $1; } Statement : ':' { $$ = NULL; } @@ -448,10 +448,12 @@ Identifier : tIdentifier { $$ = $1; } | tPROPERTY { $$ = propertyW; } -/* Some statements accept both new line and ':' as a separator */ +/* Most statements accept both new line and ':' as separators */ StSep : tNL | ':' + | tNL StSep + | ':' StSep %% diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 23402cd..7f7c835 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -330,6 +330,13 @@ WHILE x < 3 : x = x + 1 Wend Call ok(x = 3, "x not equal to 3") +z = 2 +while z > -4 : + + +z = z -2 +wend + x = false y = false do while not (x and y) @@ -353,6 +360,12 @@ Do While x < 2 : x = x + 1 Loop Call ok(x = 2, "x not equal to 2") +x = 0 +Do While x >= -2 : +x = x - 1 +Loop +Call ok(x = -3, "x not equal to -3") + x = false y = false do until x and y @@ -376,6 +389,14 @@ Do: :: x = x + 2 Loop Until x = 4 Call ok(x = 4, "x not equal to 4") +x = 5 +Do: : + +: x = x * 2 +Loop Until x = 40 +Call ok(x = 40, "x not equal to 40") + + x = false do if x then exit do @@ -495,6 +516,12 @@ for x = 1 to 100 Call ok(false, "exit for not escaped the loop?") next +for x = 1 to 5 : +: +: :exit for + Call ok(false, "exit for not escaped the loop?") +next + do while true for x = 1 to 100 exit do @@ -509,6 +536,14 @@ wend Call collectionObj.reset() y = 0 +for each x in collectionObj : + + :y = y + 3 +next +Call ok(y = 9, "y = " & y) + +Call collectionObj.reset() +y = 0 x = 10 z = 0 for each x in collectionObj : z = z + 2 @@ -611,6 +646,21 @@ select case 2: case 5,6,7: Call ok(false, "unexpected case") end select Call ok(x, "wrong case") +x = False +select case 1 : + + :case 3, 4 : + + + case 5 +: + Call ok(false, "unexpected case") : + Case Else: + + x = True +end select +Call ok(x, "wrong case") + if false then Sub testsub x = true

1 0

Akihiro Sagawa : d3d9: Return success in d3d9_device_SetMaximumFrameLatency().
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 7bdfb745ea22fe8417a6c9dfc981d0361c9be5a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdfb745ea22fe8417a6c9dfc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 9 17:28:37 2017 +0200 d3d9: Return success in d3d9_device_SetMaximumFrameLatency(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index cd42cbc..50bba6b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3548,9 +3548,12 @@ static HRESULT WINAPI d3d9_device_CheckResourceResidency(IDirect3DDevice9Ex *ifa static HRESULT WINAPI d3d9_device_SetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT max_latency) { - FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); + TRACE("iface %p, max_latency %u.\n", iface, max_latency); - return E_NOTIMPL; + if (max_latency) + FIXME("Ignoring max_latency %u.\n", max_latency); + + return S_OK; } static HRESULT WINAPI d3d9_device_GetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT *max_latency)

1 0