October 2017 - Wine-commits

Hans Leidekker : wldap32: Create version 3 contexts by default.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: accdabadba740af6455ece7809bf9644d71124fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=accdabadba740af6455ece780… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 5 10:05:33 2017 +0200 wldap32: Create version 3 contexts by default. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/init.c | 17 ++++++++++++++--- dlls/wldap32/tests/parse.c | 10 ++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index 46a078a..6b413f8 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -206,6 +206,17 @@ static char *urlify_hostnames( const char *scheme, char *hostnames, ULONG port ) WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#ifdef HAVE_LDAP +static LDAP *create_context( const char *url ) +{ + LDAP *ld; + int version = LDAP_VERSION3; + if (ldap_initialize( &ld, url ) != LDAP_SUCCESS) return NULL; + ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + return ld; +} +#endif + /*********************************************************************** * cldap_openA (WLDAP32.@) * @@ -276,7 +287,7 @@ WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber ) url = urlify_hostnames( "cldap://", hostnameU, portnumber ); if (!url) goto exit; - ldap_initialize( &ld, url ); + ld = create_context( url ); exit: strfreeU( hostnameU ); @@ -385,7 +396,7 @@ WLDAP32_LDAP * CDECL ldap_initW( const PWCHAR hostname, ULONG portnumber ) url = urlify_hostnames( "ldap://", hostnameU, portnumber ); if (!url) goto exit; - ldap_initialize( &ld, url ); + ld = create_context( url ); exit: strfreeU( hostnameU ); @@ -467,7 +478,7 @@ WLDAP32_LDAP * CDECL ldap_openW( PWCHAR hostname, ULONG portnumber ) url = urlify_hostnames( "ldap://", hostnameU, portnumber ); if (!url) goto exit; - ldap_initialize( &ld, url ); + ld = create_context( url ); exit: strfreeU( hostnameU ); diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 5c84929..c4c97e1 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -123,6 +123,15 @@ static void test_ldap_set_optionW( LDAP *ld ) ok( !ret, "ldap_set_optionW failed 0x%08x\n", ret ); } +static void test_ldap_get_optionW( LDAP *ld ) +{ + ULONG ret, version; + + ret = ldap_get_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + ok( !ret, "ldap_get_optionW failed 0x%08x\n", ret ); + ok( version == LDAP_VERSION3, "got %u\n", version ); +} + START_TEST (parse) { LDAP *ld; @@ -132,6 +141,7 @@ START_TEST (parse) test_ldap_parse_sort_control( ld ); test_ldap_search_extW( ld ); + test_ldap_get_optionW( ld ); test_ldap_set_optionW( ld ); ldap_unbind( ld ); }

1 0

Hans Leidekker : wbemprox: Avoid an invalid write when there are no forwards in the route table ( Valgrind).
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 94892721ec0c917cf9700d4090f02ce4176a617d URL: http://source.winehq.org/git/wine.git/?a=commit;h=94892721ec0c917cf9700d409… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 5 11:04:37 2017 +0200 wbemprox: Avoid an invalid write when there are no forwards in the route table (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 73d93a0..93bea52 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2070,7 +2070,7 @@ static enum fill_status fill_ip4routetable( struct table *table, const struct ex heap_free( forwards ); return FILL_STATUS_FAILED; } - if (!resize_table( table, forwards->dwNumEntries, sizeof(*rec) )) + if (!resize_table( table, max(forwards->dwNumEntries, 1), sizeof(*rec) )) { heap_free( forwards ); return FILL_STATUS_FAILED;

1 0

Francois Gouget : testbot: Import URI before using it.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: tools Branch: master Commit: 432247ab155bcffc3946153cc4fdb1e660a6d385 URL: http://source.winehq.org/git/tools.git/?a=commit;h=432247ab155bcffc3946153c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 5 11:14:41 2017 +0200 testbot: Import URI before using it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7e861e3..5e4f951 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -200,6 +200,7 @@ sub GetAgent($) my $TunnelInfo; if ($URI =~ s/^(?:[a-z]+\+)?(?:ssh|libssh2):/ssh:/) { + require URI; my $ParsedURI = URI->new($URI); %$TunnelInfo = %$TunnelDefaults if ($TunnelDefaults); $TunnelInfo->{sshhost} = $ParsedURI->host;

1 0

Jacek Caban : server: Don't queue zero size writes in byte mode.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: e5a43fa9c804367520e98f051bf9a19008be5405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a43fa9c804367520e98f051… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 4 15:18:02 2017 +0200 server: Don't queue zero size writes in byte mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/named_pipe.c b/server/named_pipe.c index 2141f44..a98041e 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -863,6 +863,8 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) return 0; } + if (!(write_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && !get_req_data_size()) return 1; + if (!(message = mem_alloc( sizeof(*message) ))) return 0; message->async = (struct async *)grab_object( async ); message->iosb = async_get_iosb( async );

1 0

Jacek Caban : server: Use server side named pipe implementation in byte mode.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 7eb785416193f7ca154872222b9cfcd3db7a7418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb785416193f7ca154872222… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 4 15:18:29 2017 +0200 server: Use server side named pipe implementation in byte mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 6 +----- dlls/ntdll/tests/pipe.c | 6 ++---- server/named_pipe.c | 5 +++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 18ffa7a..87e64ef 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2576,7 +2576,6 @@ static void test_readfileex_pending(void) SetLastError(0xdeadbeef); ret = ReadFile(server, read_buf, 0, &num_bytes, &overlapped); ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(num_bytes == 0, "bytes %u\n", num_bytes); ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %#lx\n", overlapped.Internal); @@ -2592,11 +2591,9 @@ todo_wine ok(num_bytes == 1, "bytes %u\n", num_bytes); wait = WaitForSingleObject(event, 100); -todo_wine ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); ok(num_bytes == 1, "bytes %u\n", num_bytes); -todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", overlapped.Internal); ok(overlapped.InternalHigh == 0, "expected 0, got %lu\n", overlapped.InternalHigh); @@ -3132,6 +3129,5 @@ START_TEST(pipe) test_readfileex_pending(); test_overlapped_transport(TRUE, FALSE); test_overlapped_transport(TRUE, TRUE); - if (broken(1)) /* FIXME: Remove once Wine is ready. */ - test_overlapped_transport(FALSE, FALSE); + test_overlapped_transport(FALSE, FALSE); } diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 897c44b..9628cc2 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -726,7 +726,7 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) ok( !reserved, "reserved is not 0: %x\n", reserved ); } -static void test_peek(HANDLE pipe, BOOL is_msgmode) +static void test_peek(HANDLE pipe) { FILE_PIPE_PEEK_BUFFER buf; IO_STATUS_BLOCK iosb; @@ -745,7 +745,6 @@ static void test_peek(HANDLE pipe, BOOL is_msgmode) ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %x\n", status); ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %u\n", buf.ReadDataAvailable); ok(!iosb.Status, "iosb.Status = %x\n", iosb.Status); - todo_wine_if(!is_msgmode) ok(is_signaled(event), "event is not signaled\n"); CloseHandle(event); @@ -857,7 +856,7 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); - test_peek(read, pipe_type & PIPE_TYPE_MESSAGE); + test_peek(read); status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); @@ -984,7 +983,6 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ok( !apc_count, "apc was called\n" ); CloseHandle( write ); Sleep(1); /* FIXME: needed for wine to run the i/o apc */ - todo_wine_if(!(pipe_type & PIPE_TYPE_MESSAGE) && (pipe_flags & PIPE_ACCESS_OUTBOUND)) ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is not signaled\n" ); diff --git a/server/named_pipe.c b/server/named_pipe.c index a98041e..3566663 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -294,10 +294,11 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_reselect_async /* reselect_async */ }; -/* Returns if we handle I/O via server calls. Currently message-mode pipes are handled this way. */ +/* Returns if we handle I/O via server calls. + * FIXME: no longer needed. */ static int use_server_io( struct pipe_end *pipe_end ) { - return pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE; + return 1; } static void named_pipe_dump( struct object *obj, int verbose )

1 0

Jacek Caban : server: Get rid of no longer used support for creating socket-based named pipes.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 4dbb2cbfc4b28edce22df104a4e414f7e7f318de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbb2cbfc4b28edce22df104a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 4 15:18:40 2017 +0200 server: Get rid of no longer used support for creating socket-based named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 88 ++++++++++++++--------------------------------------- 1 file changed, 22 insertions(+), 66 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 3566663..9c11e2e 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1091,7 +1091,8 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned return server; } -static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int pipe_flags, data_size_t buffer_size ) +static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int pipe_flags, + data_size_t buffer_size, unsigned int options ) { struct pipe_client *client; @@ -1103,6 +1104,15 @@ static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int client->flags = flags; init_pipe_end( &client->pipe_end, pipe_flags, buffer_size ); + client->pipe_end.fd = alloc_pseudo_fd( &pipe_client_fd_ops, &client->pipe_end.obj, options ); + if (!client->pipe_end.fd) + { + release_object( client ); + return NULL; + } + allow_fd_caching( client->pipe_end.fd ); + set_fd_signaled( client->pipe_end.fd, 1 ); + return client; } @@ -1148,7 +1158,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc struct pipe_server *server; struct pipe_client *client; unsigned int pipe_sharing; - int fds[2]; if (!(server = find_available_server( pipe ))) { @@ -1165,71 +1174,18 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return NULL; } - if ((client = create_pipe_client( options, pipe->flags, pipe->outsize ))) + if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) { - if (use_server_io( &server->pipe_end )) - { - client->pipe_end.fd = alloc_pseudo_fd( &pipe_client_fd_ops, &client->pipe_end.obj, options ); - if (client->pipe_end.fd) - { - set_fd_signaled( client->pipe_end.fd, 1 ); - server->pipe_end.fd = (struct fd *)grab_object( server->ioctl_fd ); - set_no_fd_status( server->ioctl_fd, STATUS_BAD_DEVICE_TYPE ); - } - else - { - release_object( client ); - client = NULL; - } - } - else if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds )) - { - assert( !server->pipe_end.fd ); - - fcntl( fds[0], F_SETFL, O_NONBLOCK ); - fcntl( fds[1], F_SETFL, O_NONBLOCK ); - - if (pipe->insize) - { - setsockopt( fds[0], SOL_SOCKET, SO_RCVBUF, &pipe->insize, sizeof(pipe->insize) ); - setsockopt( fds[1], SOL_SOCKET, SO_RCVBUF, &pipe->insize, sizeof(pipe->insize) ); - } - if (pipe->outsize) - { - setsockopt( fds[0], SOL_SOCKET, SO_SNDBUF, &pipe->outsize, sizeof(pipe->outsize) ); - setsockopt( fds[1], SOL_SOCKET, SO_SNDBUF, &pipe->outsize, sizeof(pipe->outsize) ); - } - - client->pipe_end.fd = create_anonymous_fd( &pipe_client_fd_ops, fds[1], &client->pipe_end.obj, options ); - server->pipe_end.fd = create_anonymous_fd( &pipe_server_fd_ops, fds[0], &server->pipe_end.obj, server->options ); - if (client->pipe_end.fd && server->pipe_end.fd) - { - fd_copy_completion( server->ioctl_fd, server->pipe_end.fd ); - } - else - { - release_object( client ); - client = NULL; - } - } - else - { - file_set_error(); - release_object( client ); - client = NULL; - } - if (client) - { - allow_fd_caching( client->pipe_end.fd ); - 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 ); - set_server_state( server, ps_connected_server ); - server->client = client; - client->server = server; - server->pipe_end.connection = &client->pipe_end; - client->pipe_end.connection = &server->pipe_end; - } + server->pipe_end.fd = (struct fd *)grab_object( server->ioctl_fd ); + set_no_fd_status( server->ioctl_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 ); + set_server_state( server, ps_connected_server ); + server->client = client; + client->server = server; + server->pipe_end.connection = &client->pipe_end; + client->pipe_end.connection = &server->pipe_end; } release_object( server ); return &client->pipe_end.obj;

1 0

Jacek Caban : server: Get rid of no longer used support for flush on socket-based named pipes.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: f16f7dc8ce0a425bc8a5e6173b09023d25faca2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16f7dc8ce0a425bc8a5e6173… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 4 15:18:53 2017 +0200 server: Get rid of no longer used support for flush on socket-based named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 112 +++++----------------------------------------------- 1 file changed, 9 insertions(+), 103 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 9c11e2e..6f5b3b0 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -24,21 +24,10 @@ #include "wine/port.h" #include <assert.h> -#include <fcntl.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#include <sys/time.h> -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#include <time.h> -#include <unistd.h> -#ifdef HAVE_POLL_H -#include <poll.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -91,7 +80,6 @@ struct pipe_server enum pipe_state state; /* server state */ struct pipe_client *client; /* client that this server is connected to */ struct named_pipe *pipe; - struct timeout_user *flush_poll; unsigned int options; /* pipe options */ }; @@ -156,6 +144,7 @@ static const struct object_ops named_pipe_ops = static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); 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 ); static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ); static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -164,7 +153,6 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); 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_flush( struct fd *fd, struct async *async ); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_server_ops = @@ -196,7 +184,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_end_get_fd_type, /* get_fd_type */ pipe_end_read, /* read */ pipe_end_write, /* write */ - pipe_server_flush, /* flush */ + pipe_end_flush, /* flush */ pipe_end_get_volume_info, /* get_volume_info */ pipe_server_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ @@ -208,7 +196,6 @@ 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_flush( struct fd *fd, struct async *async ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_client_ops = @@ -240,7 +227,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_end_get_fd_type, /* get_fd_type */ pipe_end_read, /* read */ pipe_end_write, /* write */ - pipe_client_flush, /* flush */ + pipe_end_flush, /* flush */ pipe_end_get_volume_info, /* get_volume_info */ pipe_client_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ @@ -384,16 +371,6 @@ static struct fd *pipe_server_get_fd( struct object *obj ) } -static void notify_empty( struct pipe_server *server ) -{ - if (!server->flush_poll) - return; - assert( server->state == ps_connected_server ); - remove_timeout_user( server->flush_poll ); - server->flush_poll = NULL; - fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); -} - static void wake_message( struct pipe_message *message ) { struct async *async = message->async; @@ -458,8 +435,6 @@ static void do_disconnect( struct pipe_server *server ) } } assert( server->pipe_end.fd ); - if (!use_server_io( &server->pipe_end )) - shutdown( get_unix_fd( server->pipe_end.fd ), SHUT_RDWR ); release_object( server->pipe_end.fd ); server->pipe_end.fd = NULL; } @@ -487,11 +462,7 @@ static void pipe_server_destroy( struct object *obj) pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); - if (server->pipe_end.fd) - { - notify_empty( server ); - do_disconnect( server ); - } + if (server->pipe_end.fd) do_disconnect( server ); pipe_end_destroy( &server->pipe_end ); if (server->client) @@ -519,8 +490,6 @@ static void pipe_client_destroy( struct object *obj) if (server) { - notify_empty( server ); - switch(server->state) { case ps_connected_server: @@ -615,78 +584,18 @@ struct object *create_named_pipe_device( struct object *root, const struct unico return &dev->obj; } -static int pipe_data_remaining( struct pipe_server *server ) -{ - struct pollfd pfd; - int fd; - - assert( server->client ); - - if (use_server_io( &server->pipe_end )) - return !list_empty( &server->client->pipe_end.message_queue ); - - fd = get_unix_fd( server->client->pipe_end.fd ); - if (fd < 0) - return 0; - pfd.fd = fd; - pfd.events = POLLIN; - pfd.revents = 0; - - if (0 > poll( &pfd, 1, 0 )) - return 0; - - return pfd.revents&POLLIN; -} - -static void check_flushed( void *arg ) +static int pipe_end_flush( struct fd *fd, struct async *async ) { - struct pipe_server *server = (struct pipe_server*) arg; + struct pipe_end *pipe_end = get_fd_user( fd ); - if (pipe_data_remaining( server )) - { - server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); - } - else + if (pipe_end->connection && !list_empty( &pipe_end->connection->message_queue )) { - server->flush_poll = NULL; - fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT ); + set_error( STATUS_PENDING ); } -} - -static int pipe_end_flush( struct pipe_end *pipe_end, struct async *async ) -{ - if (use_server_io( pipe_end ) && (!pipe_end->connection || list_empty( &pipe_end->connection->message_queue ))) - return 1; - - fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT ); - set_error( STATUS_PENDING ); return 1; } -static int pipe_server_flush( struct fd *fd, struct async *async ) -{ - struct pipe_server *server = get_fd_user( fd ); - obj_handle_t handle; - - if (!server || server->state != ps_connected_server) return 1; - - if (!pipe_data_remaining( server )) return 1; - - handle = pipe_end_flush( &server->pipe_end, async ); - - /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ - if (handle && !use_server_io( &server->pipe_end ) && !server->flush_poll) - server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); - return handle; -} - -static int pipe_client_flush( struct fd *fd, struct async *async ) -{ - struct pipe_end *pipe_end = get_fd_user( fd ); - /* FIXME: Support byte mode. */ - return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 1; -} - static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ) { switch (info_class) @@ -998,8 +907,6 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as assert( server->client ); assert( server->client->pipe_end.fd ); - notify_empty( server ); - /* dump the client and server fds - client loses all waiting data */ pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); do_disconnect( server ); @@ -1075,7 +982,6 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->pipe = pipe; server->client = NULL; - server->flush_poll = NULL; server->options = options; init_pipe_end( &server->pipe_end, pipe_flags, pipe->insize );

1 0

Nikolay Sivov : include: Added some definitions used for UIAnimationTimer.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 7a3c6da674b0efc80abc56c6a244130da5f130fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3c6da674b0efc80abc56c6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 4 12:57:52 2017 +0300 include: Added some definitions used for UIAnimationTimer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uianimation.idl | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/include/uianimation.idl b/include/uianimation.idl index 1c17d44..6c026a6 100644 --- a/include/uianimation.idl +++ b/include/uianimation.idl @@ -58,6 +58,24 @@ typedef enum UI_ANIMATION_STORYBOARD_INSUFFICIENT_PRIORITY } UI_ANIMATION_STORYBOARD_STATUS; +typedef enum +{ + UI_ANIMATION_UPDATE_NO_CHANGE, + UI_ANIMATION_UPDATE_VARIABLES_CHANGED, +} UI_ANIMATION_UPDATE_RESULT; + +typedef enum +{ + UI_ANIMATION_TIMER_CLIENT_IDLE, + UI_ANIMATION_TIMER_CLIENT_BUSY, +} UI_ANIMATION_TIMER_CLIENT_STATUS; + +typedef enum +{ + UI_ANIMATION_IDLE_BEHAVIOR_CONTINUE, + UI_ANIMATION_IDLE_BEHAVIOR_DISABLE, +} UI_ANIMATION_IDLE_BEHAVIOR; + [ local, object, @@ -240,3 +258,93 @@ interface IUIAnimationStoryboard : IUnknown HRESULT SetStoryboardEventHandler ([in, unique] IUIAnimationStoryboardEventHandler *handler); } + +[ + local, + object, + uuid(bedb4db6-94fa-4bfb-a47f-ef2d9e408c25), + pointer_default(unique) +] +interface IUIAnimationTimerClientEventHandler : IUnknown +{ + HRESULT OnTimerClientStatusChanged ( + [in] UI_ANIMATION_TIMER_CLIENT_STATUS new_status, + [in] UI_ANIMATION_TIMER_CLIENT_STATUS previous_status); +} + +[ + local, + object, + uuid(195509b7-5d5e-4e3e-b278-ee3759b367ad), + pointer_default(unique) +] +interface IUIAnimationTimerUpdateHandler : IUnknown +{ + HRESULT OnUpdate ( + [in] UI_ANIMATION_SECONDS now, + [out, retval] UI_ANIMATION_UPDATE_RESULT *result); + + HRESULT SetTimerClientEventHandler ( + [in] IUIAnimationTimerClientEventHandler *handler); + + HRESULT ClearTimerClientEventHandler (); +} + +[ + local, + object, + uuid(274a7dea-d771-4095-abbd-8df7abd23ce3), + pointer_default(unique) +] +interface IUIAnimationTimerEventHandler : IUnknown +{ + HRESULT OnPreUpdate (); + + HRESULT OnPostUpdate (); + + HRESULT OnRenderingTooSlow ( + [in] UINT32 fps); +} + +[ + local, + object, + uuid(6b0efad1-a053-41d6-9085-33a689144665), + pointer_default(unique) +] +interface IUIAnimationTimer : IUnknown +{ + HRESULT SetTimerUpdateHandler ( + [in, unique] IUIAnimationTimerUpdateHandler *handler, + [in] UI_ANIMATION_IDLE_BEHAVIOR idlebehavior); + + HRESULT SetTimerEventHandler ( + [in, unique] IUIAnimationTimerEventHandler *handler); + + HRESULT Enable (); + + HRESULT Disable (); + + HRESULT IsEnabled (); + + HRESULT GetTime ( + [out] UI_ANIMATION_SECONDS *time); + + HRESULT SetFrameRateThreshold ( + [in] UINT32 fps); +} + +[ + uuid(44ca24db-1a92-4149-bab5-fb14d64b401e), + version(1.0) +] +library UIAnimation +{ + [ + uuid(bfcd4a0c-06b6-4384-b768-0daa792c380e) + ] + coclass UIAnimationTimer + { + [default] interface IUIAnimationTimer; + } +}

1 0

Vincent Povirk : gdiplus: Store the gdi32 transform at Graphics creation time.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 31e4dede0f12135505287c14ac1e77be565cab52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e4dede0f12135505287c14a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 4 14:54:17 2017 -0500 gdiplus: Store the gdi32 transform at Graphics creation time. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 9ca1d4e..66a3f76 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2249,6 +2249,20 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) return GdipCreateFromHDC2(hdc, NULL, graphics); } +static void get_gdi_transform(GpGraphics *graphics, GpMatrix *matrix) +{ + XFORM xform; + + if (graphics->hdc == NULL) + { + GdipSetMatrixElements(matrix, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + return; + } + + GetTransform(graphics->hdc, 0x204, &xform); + GdipSetMatrixElements(matrix, xform.eM11, xform.eM12, xform.eM21, xform.eM22, xform.eDx, xform.eDy); +} + GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **graphics) { GpStatus retval; @@ -2299,6 +2313,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->textcontrast = 4; list_init(&(*graphics)->containers); (*graphics)->contid = 0; + get_gdi_transform(*graphics, &(*graphics)->gdi_transform); TRACE("<-- %p\n", *graphics); @@ -2313,6 +2328,7 @@ GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) if(!*graphics) return OutOfMemory; GdipSetMatrixElements(&(*graphics)->worldtrans, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + GdipSetMatrixElements(&(*graphics)->gdi_transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); if((retval = GdipCreateRegion(&(*graphics)->clip)) != Ok){ heap_free(*graphics); @@ -6629,31 +6645,10 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) return Ok; } -static void get_gdi_transform(GpGraphics *graphics, GpMatrix *matrix) -{ - XFORM xform; - - if (graphics->hdc == NULL) - { - GdipSetMatrixElements(matrix, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); - return; - } - - if (graphics->gdi_transform_acquire_count) - { - *matrix = graphics->gdi_transform; - return; - } - - GetTransform(graphics->hdc, 0x204, &xform); - GdipSetMatrixElements(matrix, xform.eM11, xform.eM12, xform.eM21, xform.eM22, xform.eDx, xform.eDy); -} - GpStatus gdi_transform_acquire(GpGraphics *graphics) { if (graphics->gdi_transform_acquire_count == 0 && graphics->hdc) { - get_gdi_transform(graphics, &graphics->gdi_transform); graphics->gdi_transform_save = SaveDC(graphics->hdc); SetGraphicsMode(graphics->hdc, GM_COMPATIBLE); SetMapMode(graphics->hdc, MM_TEXT); @@ -6706,7 +6701,7 @@ GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_spac case WineCoordinateSpaceGdiDevice: { GpMatrix gdixform; - get_gdi_transform(graphics, &gdixform); + gdixform = graphics->gdi_transform; stat = GdipInvertMatrix(&gdixform); if (stat != Ok) break; @@ -6747,9 +6742,7 @@ GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_spac /* else fall-through */ case CoordinateSpaceDevice: { - GpMatrix gdixform; - get_gdi_transform(graphics, &gdixform); - GdipMultiplyMatrix(matrix, &gdixform, MatrixOrderAppend); + GdipMultiplyMatrix(matrix, &graphics->gdi_transform, MatrixOrderAppend); break; } }

1 0

Vincent Povirk : gdiplus: Store the gdi32 clip region at Graphics creation time.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 3558dea0bd30f1adcf93bcaf04f9e4a730c51f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3558dea0bd30f1adcf93bcaf0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 4 14:54:18 2017 -0500 gdiplus: Store the gdi32 clip region at Graphics creation time. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 59 ++++++++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 33f6ceb..566092e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -262,6 +262,7 @@ struct GpGraphics{ INT origin_x, origin_y; INT gdi_transform_acquire_count, gdi_transform_save; GpMatrix gdi_transform; + HRGN gdi_clip; /* For giving the caller an HDC when we technically can't: */ HBITMAP temp_hbitmap; int temp_hbitmap_width; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 66a3f76..0207385 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -348,6 +348,17 @@ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) GdipDeleteRegion(rgn); } + if (stat == Ok && graphics->gdi_clip) + { + if (*hrgn) + CombineRgn(*hrgn, *hrgn, graphics->gdi_clip, RGN_AND); + else + { + *hrgn = CreateRectRgn(0,0,0,0); + CombineRgn(*hrgn, graphics->gdi_clip, graphics->gdi_clip, RGN_COPY); + } + } + return stat; } @@ -498,8 +509,7 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst save = SaveDC(graphics->hdc); - if (hrgn) - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); if (hregion) ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); @@ -2315,6 +2325,13 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->contid = 0; get_gdi_transform(*graphics, &(*graphics)->gdi_transform); + (*graphics)->gdi_clip = CreateRectRgn(0,0,0,0); + if (!GetClipRgn(hdc, (*graphics)->gdi_clip)) + { + DeleteObject((*graphics)->gdi_clip); + (*graphics)->gdi_clip = NULL; + } + TRACE("<-- %p\n", *graphics); return Ok; @@ -2439,6 +2456,8 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) GdipDeleteRegion(graphics->clip); + DeleteObject(graphics->gdi_clip); + /* Native returns ObjectBusy on the second free, instead of crashing as we'd * do otherwise, but we can't have that in the test suite because it means * accessing freed memory. */ @@ -3223,9 +3242,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image stat = get_clip_hrgn(graphics, &hrgn); - if (stat == Ok && hrgn) + if (stat == Ok) { - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); DeleteObject(hrgn); } @@ -3466,8 +3485,7 @@ static GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *pat if (retval != Ok) goto end; - if (hrgn) - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); gdi_transform_acquire(graphics); @@ -4155,8 +4173,7 @@ static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath if (retval != Ok) goto end; - if (hrgn) - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); gdi_transform_acquire(graphics); @@ -4443,32 +4460,30 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if(!graphics->hdc || !brush_can_fill_path(brush, TRUE)) return NotImplemented; - status = GdipGetRegionHRgn(region, graphics, &hrgn); - if(status != Ok) - return status; - save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); - - DeleteObject(hrgn); - hrgn = NULL; status = get_clip_hrgn(graphics, &hrgn); - if (status != Ok) { RestoreDC(graphics->hdc, save_state); return status; } - if (hrgn) + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); + DeleteObject(hrgn); + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + if (status != Ok) { - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); - DeleteObject(hrgn); + RestoreDC(graphics->hdc, save_state); + return status; } + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + DeleteObject(hrgn); + if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { BeginPath(graphics->hdc); @@ -7001,9 +7016,9 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 status = get_clip_hrgn(graphics, &hrgn); - if (status == Ok && hrgn) + if (status == Ok) { - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); DeleteObject(hrgn); }

1 0