March 2017 - Wine-commits - list.winehq.org

Francois Gouget : winetest/dissect: Remove some pointless sprintfs.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: tools Branch: master Commit: 91fa8fe2d6d989eee5960fbd9133449d5ee7a0d9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=91fa8fe2d6d989eee5960fbd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 13:02:14 2017 +0100 winetest/dissect: Remove some pointless sprintfs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index c6b4b71..d8fc7cf 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -130,9 +130,9 @@ $_ = <IN>; my $box = create_box( "version", "version", "Version information for $tag" ); $box->{data} .= "<h2>Build version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; -$box->{data} .= sprintf "<tr><td>Build</td><td><a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></td></tr>\n", $testbuild, $testbuild, $shortbuild; +$box->{data} .= "<tr><td>Build</td><td><a title=\"$testbuild\" href=\"$gitweb/?a=shortlog;h=$testbuild\">$shortbuild</a></td></tr>\n"; $box->{data} .= "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">$tag</a></td></tr></table>\n"; -$box->{data} .= sprintf "<div class=\"output\"> </div>\n"; +$box->{data} .= "<div class=\"output\"> </div>\n"; while (($_ = <IN>) =~ s/^ //) { chomp; @@ -301,7 +301,7 @@ while (<IN>) { } if ($3 eq "skipped") { - $testbox->{data} .= sprintf "<div class=\"test result skipped\">Skipped by user request.</div>\n"; + $testbox->{data} .= "<div class=\"test result skipped\">Skipped by user request.</div>\n"; print SUM "- $dll $unit skipped - - - $source $rev\n"; $dll = undef; mydie "too many tests skipped by user request\n" if ++$user_skips > $maxuserskips; @@ -428,7 +428,7 @@ for (my $i = 0; $i <= $#boxes; $i++) printf REPORT "<div class=\"updownbar\"><table><tr><td width=\"100%%\">%s</td>\n", $boxes[$i]->{title}; printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↑</a></td>\n", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↓</a></td>\n", $boxes[$i]->{next} if defined $boxes[$i]->{next}; - printf REPORT "</tr></table></div>\n"; + print REPORT "</tr></table></div>\n"; print REPORT $boxes[$i]->{data}, "</div>\n"; } print REPORT end_html();

1 0

Francois Gouget : testbot/web: Take into account the optional pid when reporting timeouts.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: tools Branch: master Commit: 6fc3305498ed4b14f7aa176eb429257edfa86ffc URL: http://source.winehq.org/git/tools.git/?a=commit;h=6fc3305498ed4b14f7aa176e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 15:13:45 2017 +0100 testbot/web: Take into account the optional pid when reporting timeouts. The 'done' line will not have a test unit name if there was no command line parameter. Furthermore it may or may not have a process pid too. So make sure that when the JobDetails page shows a timeout error it does not mistake the pid for the test unit name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 4a5596c..1d47763 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -372,9 +372,10 @@ sub GenerateBody($) print "<pre><code>"; $First = !1; } - if (! $FullLog && $Line =~ m/^[^:]+:([^ ]+) done $258$/) + if (! $FullLog && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) { - print "$1: Timeout\n"; + my $Unit = $1 ne "" ? "$1: " : ""; + print "${Unit}Timeout\n"; } else {

1 0

Jacek Caban : server: Implement disconnecting message queue.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 2fad531cb5441d833842f5fe16bc13097b3a403f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fad531cb5441d833842f5fe1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 21 13:03:12 2017 +0100 server: Implement disconnecting message queue. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/server/named_pipe.c b/server/named_pipe.c index 044bc97..6dc032d 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -401,6 +401,21 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status pipe_end->connection = NULL; + if (use_server_io( pipe_end )) + { + struct pipe_message *message, *next; + struct async *async; + if (pipe_end->fd) fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); + LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) + { + async = message->async; + if (async || status == STATUS_PIPE_DISCONNECTED) free_message( message ); + if (!async) continue; + async_terminate( async, status ); + release_object( async ); + } + if (status == STATUS_PIPE_DISCONNECTED) set_fd_signaled( pipe_end->fd, 0 ); + } if (connection) { connection->connection = NULL;

1 0

Jacek Caban : server Introduce write queue for server-side named pipe I/O.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 4b2d5171e01427a8c003a5c61263c726508f64a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2d5171e01427a8c003a5c61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 21 13:03:26 2017 +0100 server Introduce write queue for server-side named pipe I/O. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 6dc032d..b0aa55d 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -81,6 +81,7 @@ struct pipe_end struct pipe_end *connection; /* the other end of the pipe */ data_size_t buffer_size;/* size of buffered data that doesn't block caller */ struct list message_queue; + struct async_queue *write_q; /* write queue */ }; struct pipe_server @@ -154,6 +155,7 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ 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 ); /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); @@ -196,7 +198,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_server_flush, /* flush */ pipe_server_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ - default_fd_reselect_async /* reselect_async */ + pipe_end_reselect_async /* reselect_async */ }; /* client end functions */ @@ -239,7 +241,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_client_flush, /* flush */ default_fd_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ - default_fd_reselect_async /* reselect_async */ + pipe_end_reselect_async /* reselect_async */ }; static void named_pipe_device_dump( struct object *obj, int verbose ); @@ -388,6 +390,20 @@ static void notify_empty( struct pipe_server *server ) 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; + + message->async = NULL; + message->iosb->status = STATUS_SUCCESS; + message->iosb->result = message->iosb->in_size; + if (async) + { + async_terminate( async, message->iosb->result ? STATUS_ALERTED : STATUS_SUCCESS ); + release_object( async ); + } +} + static void free_message( struct pipe_message *message ) { list_remove( &message->entry ); @@ -450,6 +466,8 @@ static void pipe_end_destroy( struct pipe_end *pipe_end ) assert( !message->async ); free_message( message ); } + + free_async_queue( pipe_end->write_q ); } static void pipe_server_destroy( struct object *obj) @@ -660,6 +678,39 @@ static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int b return 0; } +/* We call async_terminate in our reselect implementation, which causes recursive reselect. + * We're not interested in such reselect calls, so we ignore them. */ +static int ignore_reselect; + +static void reselect_write_queue( struct pipe_end *pipe_end ) +{ + struct pipe_message *message, *next; + struct pipe_end *reader = pipe_end->connection; + data_size_t avail = 0; + + if (!reader) return; + + ignore_reselect = 1; + + LIST_FOR_EACH_ENTRY_SAFE( message, next, &reader->message_queue, struct pipe_message, entry ) + { + if (message->async && message->iosb->status != STATUS_PENDING) + { + release_object( message->async ); + message->async = NULL; + free_message( message ); + } + else + { + avail += message->iosb->in_size - message->read_pos; + if (message->iosb->status == STATUS_PENDING && (avail <= reader->buffer_size || !message->iosb->in_size)) + wake_message( message ); + } + } + + ignore_reselect = 0; +} + static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct pipe_end *pipe_end = get_fd_user( fd ); @@ -667,6 +718,18 @@ static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, else default_fd_queue_async( fd, async, type, count ); } +static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ) +{ + struct pipe_end *pipe_end = get_fd_user( fd ); + + if (ignore_reselect) return; + + if (!use_server_io( pipe_end )) + default_fd_reselect_async( fd, queue ); + else if (pipe_end->write_q && pipe_end->write_q == queue) + reselect_write_queue( pipe_end ); +} + static inline int is_overlapped( unsigned int options ) { return !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); @@ -767,6 +830,7 @@ static void init_pipe_end( struct pipe_end *pipe_end, unsigned int pipe_flags, d pipe_end->flags = pipe_flags; pipe_end->connection = NULL; pipe_end->buffer_size = buffer_size; + pipe_end->write_q = NULL; list_init( &pipe_end->message_queue ); }

1 0

Jacek Caban : server: Implement server-side named pipe write.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 7ae689d668aca276671ac22dc77e74ee045fd315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae689d668aca276671ac22dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 21 13:03:39 2017 +0100 server: Implement server-side named pipe write. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index b0aa55d..adc27ca 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -154,6 +154,7 @@ static const struct object_ops named_pipe_ops = }; /* common server and client pipe end functions */ +static obj_handle_t pipe_end_write( struct fd *fd, struct async *async_data, int blocking, file_pos_t pos ); 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 ); @@ -194,7 +195,7 @@ static const struct fd_ops pipe_server_fd_ops = default_poll_event, /* poll_event */ pipe_server_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ - no_fd_write, /* write */ + pipe_end_write, /* write */ pipe_server_flush, /* flush */ pipe_server_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ @@ -237,7 +238,7 @@ static const struct fd_ops pipe_client_fd_ops = default_poll_event, /* poll_event */ pipe_client_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ - no_fd_write, /* write */ + pipe_end_write, /* write */ pipe_client_flush, /* flush */ default_fd_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ @@ -711,6 +712,52 @@ static void reselect_write_queue( struct pipe_end *pipe_end ) ignore_reselect = 0; } +static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +{ + struct pipe_end *write_end = get_fd_user( fd ); + struct pipe_end *read_end = write_end->connection; + struct pipe_message *message; + obj_handle_t handle = 0; + + if (!use_server_io( write_end )) return no_fd_write( fd, async, blocking, pos ); + + if (!read_end) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return 0; + } + + if (!write_end->write_q && !(write_end->write_q = create_async_queue( fd ))) return 0; + if (!(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) return 0; + + if (!(message = mem_alloc( sizeof(*message) ))) + { + close_handle( current->process, handle ); + return 0; + } + message->async = (struct async *)grab_object( async ); + message->iosb = async_get_iosb( async ); + message->read_pos = 0; + list_add_tail( &read_end->message_queue, &message->entry ); + + queue_async( write_end->write_q, async ); + reselect_write_queue( write_end ); + set_error( STATUS_PENDING ); + + if (!blocking) + { + struct iosb *iosb; + iosb = async_get_iosb( async ); + if (iosb->status == STATUS_PENDING) + { + close_handle( current->process, handle ); + handle = 0; + } + release_object( iosb ); + } + return handle; +} + static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct pipe_end *pipe_end = get_fd_user( fd );

1 0

Jacek Caban : server: Added server-side FSCTL_PIPE_PEEK implementation.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 134c83203a03c08f50701f97cd08f1ce7b2a6847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134c83203a03c08f50701f97c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 21 13:03:55 2017 +0100 server: Added server-side FSCTL_PIPE_PEEK implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 5 +++++ server/named_pipe.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c2678d5..c153e7b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1727,7 +1727,12 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc } if ((status = server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL ))) + { + if (status == STATUS_BAD_DEVICE_TYPE) + status = server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); break; + } #ifdef FIONREAD if (ioctl( fd, FIONREAD, &avail ) != 0) diff --git a/server/named_pipe.c b/server/named_pipe.c index adc27ca..85521e0 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -208,6 +208,8 @@ static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *en static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int blocking ); +static obj_handle_t pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async, + int blocking ); static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ); static const struct object_ops pipe_client_ops = @@ -240,7 +242,7 @@ static const struct fd_ops pipe_client_fd_ops = no_fd_read, /* read */ pipe_end_write, /* write */ pipe_client_flush, /* flush */ - default_fd_ioctl, /* ioctl */ + pipe_client_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ }; @@ -792,6 +794,44 @@ static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ) return FD_TYPE_PIPE; } +static void pipe_end_peek( struct pipe_end *pipe_end ) +{ + unsigned reply_size = get_reply_max_size(); + FILE_PIPE_PEEK_BUFFER *buffer; + struct pipe_message *message; + data_size_t avail = 0; + + if (!use_server_io( pipe_end )) + { + set_error( STATUS_NOT_SUPPORTED ); + return; + } + + if (reply_size < offsetof( FILE_PIPE_PEEK_BUFFER, Data )) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + reply_size -= offsetof( FILE_PIPE_PEEK_BUFFER, Data ); + + LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) + avail += message->iosb->in_size - message->read_pos; + + if (avail) + { + message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); + reply_size = min( reply_size, message->iosb->in_size - message->read_pos ); + } + else reply_size = 0; + + if (!(buffer = set_reply_data_size( offsetof( FILE_PIPE_PEEK_BUFFER, Data[reply_size] )))) return; + buffer->NamedPipeState = 0; /* FIXME */ + buffer->ReadDataAvailable = avail; + buffer->NumberOfMessages = 0; /* FIXME */ + buffer->MessageLength = 0; /* FIXME */ + if (reply_size) memcpy( buffer->Data, (const char *)message->iosb->in_data + message->read_pos, reply_size ); +} + static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async, int blocking ) { @@ -858,6 +898,26 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct } return 0; + case FSCTL_PIPE_PEEK: + pipe_end_peek( &server->pipe_end ); + return 0; + + default: + return default_fd_ioctl( fd, code, async, blocking ); + } +} + +static obj_handle_t pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async, + int blocking ) +{ + struct pipe_client *client = get_fd_user( fd ); + + switch(code) + { + case FSCTL_PIPE_PEEK: + pipe_end_peek( &client->pipe_end ); + return 0; + default: return default_fd_ioctl( fd, code, async, blocking ); }

1 0

Nikolay Sivov : comctl32/taskdialog: Initial implementation of a minimal task dialog.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 995b6900a7002b716654edbe28ab2ba992433c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=995b6900a7002b716654edbe2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 21 17:31:20 2017 +0300 comctl32/taskdialog: Initial implementation of a minimal task dialog. Based on patches by Fabian Maurer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.h | 8 ++ dlls/comctl32/comctl32.rc | 10 ++ dlls/comctl32/taskdialog.c | 350 +++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 343 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=995b6900a7002b716654e…

1 0

Andrey Gusev : uiautomationcore: Add UiaGetReservedMixedAttributeValue stub.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 6405677297a176d5ca8d14caced276b267f194b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6405677297a176d5ca8d14cac… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 22 14:03:03 2017 +0100 uiautomationcore: Add UiaGetReservedMixedAttributeValue stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 10 ++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index ceb2d1d..a4fdd22 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -47,6 +47,16 @@ BOOL WINAPI UiaClientsAreListening(void) } /*********************************************************************** + * UiaGetReservedMixedAttributeValue (uiautomationcore.@) + */ +HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) +{ + FIXME("(%p) stub!\n", value); + *value = NULL; + return S_OK; +} + +/*********************************************************************** * UiaLookupId (uiautomationcore.@) */ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid) diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 39af30a..989dc43 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -59,7 +59,7 @@ @ stub UiaGetErrorDescription @ stub UiaGetPatternProvider @ stub UiaGetPropertyValue -@ stub UiaGetReservedMixedAttributeValue +@ stdcall UiaGetReservedMixedAttributeValue(ptr) @ stub UiaGetReservedNotSupportedValue @ stub UiaGetRootNode @ stub UiaGetRuntimeId diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 7d9fdba..c8c442f 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -48,6 +48,7 @@ enum AutomationIdentifierType AutomationIdentifierType_TextAttribute }; +HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Andrey Gusev : uiautomationcore: Add UiaGetReservedNotSupportedValue stub.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 6dd8779b553db7947a10a90d5dc4d7ee7a25beeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd8779b553db7947a10a90d5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 22 14:03:22 2017 +0100 uiautomationcore: Add UiaGetReservedNotSupportedValue stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 10 ++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index a4fdd22..af98681 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -57,6 +57,16 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) } /*********************************************************************** + * UiaGetReservedNotSupportedValue (uiautomationcore.@) + */ +HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value) +{ + FIXME("(%p) stub!\n", value); + *value = NULL; + return S_OK; +} + +/*********************************************************************** * UiaLookupId (uiautomationcore.@) */ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid) diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 989dc43..ddf84f6 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -60,7 +60,7 @@ @ stub UiaGetPatternProvider @ stub UiaGetPropertyValue @ stdcall UiaGetReservedMixedAttributeValue(ptr) -@ stub UiaGetReservedNotSupportedValue +@ stdcall UiaGetReservedNotSupportedValue(ptr) @ stub UiaGetRootNode @ stub UiaGetRuntimeId @ stub UiaGetUpdatedCache diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index c8c442f..fbe47ad 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -49,6 +49,7 @@ enum AutomationIdentifierType }; HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); +HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Akihiro Sagawa : version: Add support for FILE_VER_GET_LOCALISED flag.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 7811de1b7334ab97b0701bfc5683649d63dc12ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7811de1b7334ab97b0701bfc5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 23 00:01:01 2017 +0900 version: Add support for FILE_VER_GET_LOCALISED flag. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 82 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 9c6869d..ed060c8 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -127,22 +127,30 @@ static inline int push_language( WORD *list, int pos, WORD lang ) * find_entry_language */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, - const void *root ) + const void *root, DWORD flags ) { const IMAGE_RESOURCE_DIRECTORY *ret; WORD list[9]; int i, pos = 0; - /* cf. LdrFindResource_U */ - pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); - pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) ); - pos = push_language( list, pos, GetUserDefaultLangID() ); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_NEUTRAL )); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_DEFAULT )); - pos = push_language( list, pos, GetSystemDefaultLangID() ); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL )); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT )); - pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + if (flags & FILE_VER_GET_LOCALISED) + { + /* cf. LdrFindResource_U */ + pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); + pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) ); + pos = push_language( list, pos, GetUserDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, GetSystemDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + } + else + { + /* FIXME: resolve LN file here */ + pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + } for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret; return find_entry_default( dir, root ); @@ -254,7 +262,7 @@ static BOOL find_ne_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) /*********************************************************************** * find_pe_resource [internal] */ -static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) +static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff, DWORD flags ) { union { @@ -356,7 +364,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) TRACE("No resid entry found\n" ); goto done; } - resPtr = find_entry_language( resPtr, resDir ); + resPtr = find_entry_language( resPtr, resDir, flags ); if ( !resPtr ) { TRACE("No default language entry found\n" ); @@ -393,7 +401,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) /*********************************************************************** * find_version_resource [internal] */ -static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset ) +static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset, DWORD flags ) { DWORD magic = read_xx_header( lzfd ); @@ -403,7 +411,7 @@ static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset ) if (!find_ne_resource( lzfd, reslen, offset )) magic = 0; break; case IMAGE_NT_SIGNATURE: - if (!find_pe_resource( lzfd, reslen, offset )) magic = 0; + if (!find_pe_resource( lzfd, reslen, offset, flags )) magic = 0; break; } return magic; @@ -607,7 +615,7 @@ typedef struct */ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) { - return GetFileVersionInfoSizeExW( 0, filename, handle ); + return GetFileVersionInfoSizeExW( FILE_VER_GET_LOCALISED, filename, handle ); } /*********************************************************************** @@ -615,7 +623,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) */ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) { - return GetFileVersionInfoSizeExA( 0, filename, handle ); + return GetFileVersionInfoSizeExA( FILE_VER_GET_LOCALISED, filename, handle ); } /****************************************************************************** @@ -642,19 +650,27 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h SetLastError(ERROR_BAD_PATHNAME); return 0; } - if (flags) - FIXME("flags 0x%x ignored\n", flags); + if (flags & ~FILE_VER_GET_LOCALISED) + FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { - magic = find_version_resource( lzfd, &len, &offset ); + magic = find_version_resource( lzfd, &len, &offset, flags ); LZClose( lzfd ); } if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { - HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO ); + HRSRC hRsrc = NULL; + if (!(flags & FILE_VER_GET_LOCALISED)) + { + LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO, english ); + } + if (!hRsrc) + hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO ); if (hRsrc) { magic = IMAGE_NT_SIGNATURE; @@ -736,12 +752,12 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, SetLastError(ERROR_INVALID_DATA); return FALSE; } - if (flags) - FIXME("flags 0x%x ignored\n", flags); + if (flags & ~FILE_VER_GET_LOCALISED) + FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { - if ((magic = find_version_resource( lzfd, &len, &offset )) > 1) + if ((magic = find_version_resource( lzfd, &len, &offset, flags )) > 1) { LZSeek( lzfd, offset, 0 /* SEEK_SET */ ); len = LZRead( lzfd, data, min( len, datasize ) ); @@ -751,8 +767,16 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { - HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO ); + HRSRC hRsrc = NULL; + if (!(flags & FILE_VER_GET_LOCALISED)) + { + LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO, english ); + } + if (!hRsrc) + hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO ); if (hRsrc) { HGLOBAL hMem = LoadResource( hModule, hRsrc ); @@ -820,7 +844,7 @@ BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, D */ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - return GetFileVersionInfoExW(0, filename, handle, datasize, data); + return GetFileVersionInfoExW(FILE_VER_GET_LOCALISED, filename, handle, datasize, data); } /*********************************************************************** @@ -828,7 +852,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, */ BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - return GetFileVersionInfoExA(0, filename, handle, datasize, data); + return GetFileVersionInfoExA(FILE_VER_GET_LOCALISED, filename, handle, datasize, data); } /***********************************************************************

1 0