April 2017 - Wine-Commits - list.winehq.org

Jacek Caban : server: Use async_is_blocking in queue_irp.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 5126849f7f500d0602f9af9273e7ec47bf2238fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5126849f7f500d0602f9af927… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:53:53 2017 +0200 server: Use async_is_blocking in queue_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/server/device.c b/server/device.c index 8c46a69..82614ee 100644 --- a/server/device.c +++ b/server/device.c @@ -462,12 +462,11 @@ static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) } /* queue an irp to the device */ -static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, - struct async *async, int blocking ) +static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, struct async *async ) { obj_handle_t handle = 0; - if (blocking && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; + if (async_is_blocking( async ) && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) { @@ -501,7 +500,7 @@ static obj_handle_t device_file_read( struct fd *fd, struct async *async, int bl irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -522,7 +521,7 @@ static obj_handle_t device_file_write( struct fd *fd, struct async *async, int b irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -541,7 +540,7 @@ static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int b irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -562,7 +561,7 @@ static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; }

1 0

Jacek Caban : server: Remove no longer needed blocking requests arguments.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: aa1580398e4c9eda851d475213e07d865d9238bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1580398e4c9eda851d47521… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:55:17 2017 +0200 server: Remove no longer needed blocking requests arguments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 18 +++++++----------- include/wine/server_protocol.h | 10 ++++------ server/protocol.def | 4 ---- server/request.h | 6 +----- server/trace.c | 10 +++------- 5 files changed, 15 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 264ad65..fd5a690 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -574,9 +574,8 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a SERVER_START_REQ( read ) { - req->blocking = !apc && !event && !apc_context; - req->async = server_async( handle, &async->io, event, apc, apc_context, io ); - req->pos = offset ? offset->QuadPart : 0; + req->async = server_async( handle, &async->io, event, apc, apc_context, io ); + req->pos = offset ? offset->QuadPart : 0; wine_server_set_reply( req, buffer, size ); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); @@ -615,9 +614,8 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE SERVER_START_REQ( write ) { - req->blocking = !apc && !event && !apc_context; - req->async = server_async( handle, &async->io, event, apc, apc_context, io ); - req->pos = offset ? offset->QuadPart : 0; + req->async = server_async( handle, &async->io, event, apc, apc_context, io ); + req->pos = offset ? offset->QuadPart : 0; wine_server_add_data( req, buffer, size ); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); @@ -1528,9 +1526,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, SERVER_START_REQ( ioctl ) { - req->code = code; - req->blocking = !apc && !event && !apc_context; - req->async = server_async( handle, &async->io, event, apc, apc_context, io ); + req->code = code; + req->async = server_async( handle, &async->io, event, apc, apc_context, io ); wine_server_add_data( req, in_buffer, in_size ); if ((code & 3) != METHOD_BUFFERED) wine_server_add_data( req, out_buffer, out_size ); @@ -3414,8 +3411,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock { SERVER_START_REQ( flush ) { - req->blocking = 1; /* always blocking */ - req->async = server_async( hFile, NULL, NULL, NULL, NULL, IoStatusBlock ); + req->async = server_async( hFile, NULL, NULL, NULL, NULL, IoStatusBlock ); ret = wine_server_call( req ); hEvent = wine_server_ptr_handle( reply->event ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6c80dab..bfdf22f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1507,7 +1507,7 @@ struct get_directory_cache_entry_reply struct flush_request { struct request_header __header; - int blocking; + char __pad_12[4]; async_data_t async; }; struct flush_reply @@ -3239,7 +3239,7 @@ struct get_async_result_reply struct read_request { struct request_header __header; - int blocking; + char __pad_12[4]; async_data_t async; file_pos_t pos; }; @@ -3256,7 +3256,7 @@ struct read_reply struct write_request { struct request_header __header; - int blocking; + char __pad_12[4]; async_data_t async; file_pos_t pos; /* VARARG(data,bytes); */ @@ -3277,9 +3277,7 @@ struct ioctl_request struct request_header __header; ioctl_code_t code; async_data_t async; - int blocking; /* VARARG(in_data,bytes); */ - char __pad_60[4]; }; struct ioctl_reply { @@ -6409,6 +6407,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 526 +#define SERVER_PROTOCOL_VERSION 527 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 222ff95..87285a4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1242,7 +1242,6 @@ enum server_fd_type /* Flush a file buffers */ @REQ(flush) - int blocking; /* whether it's a blocking flush */ async_data_t async; /* async I/O parameters */ @REPLY obj_handle_t event; /* event set when finished */ @@ -2358,7 +2357,6 @@ enum message_type /* Perform a read on a file object */ @REQ(read) - int blocking; /* whether it's a blocking read */ async_data_t async; /* async I/O parameters */ file_pos_t pos; /* read position */ @REPLY @@ -2370,7 +2368,6 @@ enum message_type /* Perform a write on a file object */ @REQ(write) - int blocking; /* whether it's a blocking write */ async_data_t async; /* async I/O parameters */ file_pos_t pos; /* write position */ VARARG(data,bytes); /* write data */ @@ -2385,7 +2382,6 @@ enum message_type @REQ(ioctl) ioctl_code_t code; /* ioctl code */ async_data_t async; /* async I/O parameters */ - int blocking; /* whether it's a blocking ioctl */ VARARG(in_data,bytes); /* ioctl input data */ @REPLY obj_handle_t wait; /* handle to wait on for blocking ioctl */ diff --git a/server/request.h b/server/request.h index cd396ee..41016bd 100644 --- a/server/request.h +++ b/server/request.h @@ -1009,7 +1009,6 @@ C_ASSERT( FIELD_OFFSET(struct get_directory_cache_entry_request, handle) == 12 ) C_ASSERT( sizeof(struct get_directory_cache_entry_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_directory_cache_entry_reply, entry) == 8 ); C_ASSERT( sizeof(struct get_directory_cache_entry_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct flush_request, blocking) == 12 ); C_ASSERT( FIELD_OFFSET(struct flush_request, async) == 16 ); C_ASSERT( sizeof(struct flush_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct flush_reply, event) == 8 ); @@ -1584,14 +1583,12 @@ C_ASSERT( FIELD_OFFSET(struct get_async_result_request, user_arg) == 16 ); C_ASSERT( sizeof(struct get_async_result_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_async_result_reply, size) == 8 ); C_ASSERT( sizeof(struct get_async_result_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct read_request, blocking) == 12 ); C_ASSERT( FIELD_OFFSET(struct read_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct read_request, pos) == 56 ); C_ASSERT( sizeof(struct read_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct read_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct read_reply, options) == 12 ); C_ASSERT( sizeof(struct read_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct write_request, blocking) == 12 ); C_ASSERT( FIELD_OFFSET(struct write_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct write_request, pos) == 56 ); C_ASSERT( sizeof(struct write_request) == 64 ); @@ -1601,8 +1598,7 @@ C_ASSERT( FIELD_OFFSET(struct write_reply, size) == 16 ); C_ASSERT( sizeof(struct write_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct ioctl_request, code) == 12 ); C_ASSERT( FIELD_OFFSET(struct ioctl_request, async) == 16 ); -C_ASSERT( FIELD_OFFSET(struct ioctl_request, blocking) == 56 ); -C_ASSERT( sizeof(struct ioctl_request) == 64 ); +C_ASSERT( sizeof(struct ioctl_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct ioctl_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct ioctl_reply, options) == 12 ); C_ASSERT( sizeof(struct ioctl_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 5ebd909..fc7fd35 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1776,8 +1776,7 @@ static void dump_get_directory_cache_entry_reply( const struct get_directory_cac static void dump_flush_request( const struct flush_request *req ) { - fprintf( stderr, " blocking=%d", req->blocking ); - dump_async_data( ", async=", &req->async ); + dump_async_data( " async=", &req->async ); } static void dump_flush_reply( const struct flush_reply *req ) @@ -2880,8 +2879,7 @@ static void dump_get_async_result_reply( const struct get_async_result_reply *re static void dump_read_request( const struct read_request *req ) { - fprintf( stderr, " blocking=%d", req->blocking ); - dump_async_data( ", async=", &req->async ); + dump_async_data( " async=", &req->async ); dump_uint64( ", pos=", &req->pos ); } @@ -2894,8 +2892,7 @@ static void dump_read_reply( const struct read_reply *req ) static void dump_write_request( const struct write_request *req ) { - fprintf( stderr, " blocking=%d", req->blocking ); - dump_async_data( ", async=", &req->async ); + dump_async_data( " async=", &req->async ); dump_uint64( ", pos=", &req->pos ); dump_varargs_bytes( ", data=", cur_size ); } @@ -2911,7 +2908,6 @@ static void dump_ioctl_request( const struct ioctl_request *req ) { dump_ioctl_code( " code=", &req->code ); dump_async_data( ", async=", &req->async ); - fprintf( stderr, ", blocking=%d", req->blocking ); dump_varargs_bytes( ", in_data=", cur_size ); }

1 0

Jacek Caban : server: Remove no longer needed blocking argument from flush fd op.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 9d666869f3e005cca46e2e3542844acbe6c20e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d666869f3e005cca46e2e354… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:54:56 2017 +0200 server: Remove no longer needed blocking argument from flush fd op. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 4 ++-- server/fd.c | 4 ++-- server/file.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 16 ++++++++-------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/device.c b/server/device.c index 0b39cb3..1d129c3 100644 --- a/server/device.c +++ b/server/device.c @@ -176,7 +176,7 @@ static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static obj_handle_t device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); -static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int blocking ); +static obj_handle_t device_file_flush( struct fd *fd, struct async *async ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops device_file_ops = @@ -526,7 +526,7 @@ static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_ return handle; } -static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int blocking ) +static obj_handle_t device_file_flush( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; diff --git a/server/fd.c b/server/fd.c index 6297b83..3c8f1bd 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2172,7 +2172,7 @@ obj_handle_t no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) } /* default flush() routine */ -obj_handle_t no_fd_flush( struct fd *fd, struct async *async, int blocking ) +obj_handle_t no_fd_flush( struct fd *fd, struct async *async ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2376,7 +2376,7 @@ DECL_HANDLER(flush) async = create_async( current, &req->async, NULL ); if (async) { - reply->event = fd->fd_ops->flush( fd, async, req->blocking ); + reply->event = fd->fd_ops->flush( fd, async ); release_object( async ); } release_object( fd ); diff --git a/server/file.c b/server/file.c index 85bd950..341c3c8 100644 --- a/server/file.c +++ b/server/file.c @@ -74,7 +74,7 @@ static struct object *file_open_file( struct object *obj, unsigned int access, static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); -static obj_handle_t file_flush( struct fd *fd, struct async *async, int blocking ); +static obj_handle_t file_flush( struct fd *fd, struct async *async ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -295,7 +295,7 @@ static int file_get_poll_events( struct fd *fd ) return events; } -static obj_handle_t file_flush( struct fd *fd, struct async *async, int blocking ) +static obj_handle_t file_flush( struct fd *fd, struct async *async ) { int unix_fd = get_unix_fd( fd ); if (unix_fd != -1 && fsync( unix_fd ) == -1) file_set_error(); diff --git a/server/file.h b/server/file.h index 7bcbc45..5ea8f0f 100644 --- a/server/file.h +++ b/server/file.h @@ -56,7 +56,7 @@ struct fd_ops /* perform a write on the file */ obj_handle_t (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ - obj_handle_t (*flush)(struct fd *, struct async *, int); + obj_handle_t (*flush)(struct fd *, struct async *); /* perform an ioctl on the file */ obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, struct async *async ); /* queue an async operation */ @@ -102,7 +102,7 @@ extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern obj_handle_t no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); -extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async, int blocking ); +extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async ); extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 9fc3f2d..a10ba46 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -162,7 +162,7 @@ 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 obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int blocking ); +static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ); static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ); static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -206,7 +206,7 @@ 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 obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int blocking ); +static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async ); static obj_handle_t pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ); @@ -650,7 +650,7 @@ static void check_flushed( void *arg ) } } -static obj_handle_t pipe_end_flush( struct pipe_end *pipe_end, struct async *async, int blocking ) +static obj_handle_t pipe_end_flush( struct pipe_end *pipe_end, struct async *async ) { obj_handle_t handle = 0; @@ -659,12 +659,12 @@ static obj_handle_t pipe_end_flush( struct pipe_end *pipe_end, struct async *asy if (!fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT )) return 0; - if (!blocking || (handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) + if (!async_is_blocking( async ) || (handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) set_error( STATUS_PENDING ); return handle; } -static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int blocking ) +static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ) { struct pipe_server *server = get_fd_user( fd ); obj_handle_t handle; @@ -673,7 +673,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int b if (!pipe_data_remaining( server )) return 0; - handle = pipe_end_flush( &server->pipe_end, async, blocking ); + 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) @@ -681,11 +681,11 @@ static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int b return handle; } -static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int blocking ) +static obj_handle_t 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, blocking ) : 0; + return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 0; } static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb )

1 0

Jacek Caban : server: Remove no longer needed blocking argument from write fd op.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: c9d9adaf65299b0c6984e69f1c83053354c947ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d9adaf65299b0c6984e69f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:54:45 2017 +0200 server: Remove no longer needed blocking argument from write fd op. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 4 ++-- server/fd.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/device.c b/server/device.c index 16043f5..0b39cb3 100644 --- a/server/device.c +++ b/server/device.c @@ -175,7 +175,7 @@ static int device_file_close_handle( struct object *obj, struct process *process static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static obj_handle_t device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); -static obj_handle_t device_file_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int blocking ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -505,7 +505,7 @@ static obj_handle_t device_file_read( struct fd *fd, struct async *async, file_p return handle; } -static obj_handle_t device_file_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; diff --git a/server/fd.c b/server/fd.c index 894e6b4..6297b83 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2165,7 +2165,7 @@ obj_handle_t no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) } /* default write() routine */ -obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +obj_handle_t no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2478,7 +2478,7 @@ DECL_HANDLER(write) async = create_async( current, &req->async, iosb ); if (async) { - reply->wait = fd->fd_ops->write( fd, async, req->blocking, req->pos ); + reply->wait = fd->fd_ops->write( fd, async, req->pos ); reply->options = fd->options; release_object( async ); } diff --git a/server/file.h b/server/file.h index a08224e..7bcbc45 100644 --- a/server/file.h +++ b/server/file.h @@ -54,7 +54,7 @@ struct fd_ops /* perform a read on the file */ obj_handle_t (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ - obj_handle_t (*write)(struct fd *, struct async *, int, file_pos_t ); + obj_handle_t (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ obj_handle_t (*flush)(struct fd *, struct async *, int); /* perform an ioctl on the file */ @@ -101,7 +101,7 @@ extern int fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern obj_handle_t no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); -extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async, int blocking ); extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 3d96c96..9fc3f2d 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -154,7 +154,7 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); -static obj_handle_t pipe_end_write( struct fd *fd, struct async *async_data, int blocking, file_pos_t pos ); +static obj_handle_t pipe_end_write( struct fd *fd, struct async *async_data, 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 ); @@ -845,14 +845,14 @@ static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, file_pos_ return handle; } -static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, 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 (!use_server_io( write_end )) return no_fd_write( fd, async, pos ); if (!read_end) { @@ -877,7 +877,7 @@ static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, int bloc reselect_write_queue( write_end ); set_error( STATUS_PENDING ); - if (!blocking) + if (!async_is_blocking( async )) { struct iosb *iosb; iosb = async_get_iosb( async );

1 0

Jacek Caban : server: Remove no longer needed blocking argument from read fd op.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 5e584e936b3ec2ccebd1f2c20e9621254834e866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e584e936b3ec2ccebd1f2c20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:54:35 2017 +0200 server: Remove no longer needed blocking argument from read fd op. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 4 ++-- server/fd.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/device.c b/server/device.c index 6726f4b..16043f5 100644 --- a/server/device.c +++ b/server/device.c @@ -174,7 +174,7 @@ static struct fd *device_file_get_fd( struct object *obj ); static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); -static obj_handle_t device_file_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +static obj_handle_t device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); static obj_handle_t device_file_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int blocking ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -484,7 +484,7 @@ static enum server_fd_type device_file_get_fd_type( struct fd *fd ) return FD_TYPE_DEVICE; } -static obj_handle_t device_file_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +static obj_handle_t device_file_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; diff --git a/server/fd.c b/server/fd.c index 7e1baf5..894e6b4 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2158,7 +2158,7 @@ static void unmount_device( struct fd *device_fd ) } /* default read() routine */ -obj_handle_t no_fd_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +obj_handle_t no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2455,7 +2455,7 @@ DECL_HANDLER(read) async = create_async( current, &req->async, iosb ); if (async) { - reply->wait = fd->fd_ops->read( fd, async, req->blocking, req->pos ); + reply->wait = fd->fd_ops->read( fd, async, req->pos ); reply->options = fd->options; release_object( async ); } diff --git a/server/file.h b/server/file.h index 25b411b..a08224e 100644 --- a/server/file.h +++ b/server/file.h @@ -52,7 +52,7 @@ struct fd_ops /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); /* perform a read on the file */ - obj_handle_t (*read)(struct fd *, struct async *, int, file_pos_t ); + obj_handle_t (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ obj_handle_t (*write)(struct fd *, struct async *, int, file_pos_t ); /* flush the object buffers */ @@ -100,7 +100,7 @@ extern void default_poll_event( struct fd *fd, int event ); extern int fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); -extern obj_handle_t no_fd_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +extern obj_handle_t no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async, int blocking ); extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 44c71fc..3d96c96 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -153,7 +153,7 @@ static const struct object_ops named_pipe_ops = }; /* common server and client pipe end functions */ -static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); 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 ); @@ -811,12 +811,12 @@ static void reselect_write_queue( struct pipe_end *pipe_end ) reselect_read_queue( reader ); } -static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *pipe_end = get_fd_user( fd ); obj_handle_t handle = 0; - if (!use_server_io( pipe_end )) return no_fd_read( fd, async, blocking, pos ); + if (!use_server_io( pipe_end )) return no_fd_read( fd, async, pos ); if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) { @@ -831,7 +831,7 @@ static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, int block reselect_read_queue( pipe_end ); set_error( STATUS_PENDING ); - if (!blocking) + if (!async_is_blocking( async )) { struct iosb *iosb; iosb = async_get_iosb( async );

1 0

Hugh McMaster : regedit/tests: Add some REG_SZ import tests.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 5af62255ef081c2cf8007c93f026b7bcc7ae0a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af62255ef081c2cf8007c93f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 12 13:45:11 2017 +0000 regedit/tests: Add some REG_SZ import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 54d20ed..9ff760a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -238,6 +238,11 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Empty string\"=\"\"\n\n"); + verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Line1\"=\"Value1\"\n\n" "\"Line2\"=\"Value2\"\n\n\n" "\"Line3\"=\"Value3\"\n\n\n\n" @@ -541,6 +546,17 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Test15a"); todo_wine verify_reg_nonexist(hkey, "Test15b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test16a\"=\n" + "\"Test16b\"=\\\"\n" + "\"Test16c\"=\\\"Value\\\"\n" + "\"Test16d\"=\\\"Value\"\n\n"); + verify_reg_nonexist(hkey, "Test16a"); + verify_reg_nonexist(hkey, "Test16b"); + verify_reg_nonexist(hkey, "Test16c"); + verify_reg_nonexist(hkey, "Test16d"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -653,6 +669,17 @@ static void test_comments(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine26a\"=\"Value1\" ;comment\n" + "\"Wine26b\"=\"Value2\"\t\t;comment\n" + "\"Wine26c\"=\"Value3\" #comment\n" + "\"Wine26d\"=\"Value4\"\t\t#comment\n\n"); + todo_wine verify_reg(hkey, "Wine26a", REG_SZ, "Value1", 7, 0); + todo_wine verify_reg(hkey, "Wine26b", REG_SZ, "Value2", 7, 0); + verify_reg_nonexist(hkey, "Wine26c"); + verify_reg_nonexist(hkey, "Wine26d"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" " 63,6f,6e,\\;comment\n" " 63,61,74,\\;comment\n"

1 0

Hugh McMaster : reg/tests: Add some missing REG_SZ import tests from regedit.exe.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 66fd7339900bdfbe1579eae7a61a8a5e5726664d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66fd7339900bdfbe1579eae7a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 12 13:45:00 2017 +0000 reg/tests: Add some missing REG_SZ import tests from regedit.exe. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f301c13..9d2426c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1313,6 +1313,49 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoBeginQuote\"=Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoBeginQuote"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoEndQuote\"=\"Asdffdsa\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoEndQuote"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoQuotes\"=Asdffdsa\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoQuotes"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "NameNoBeginQuote\"=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoBeginQuote"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"NameNoEndQuote=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoEndQuote"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "NameNoQuotes=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoQuotes"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"MixedQuotes=Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "MixedQuotes"); + todo_wine verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1775,6 +1818,49 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoBeginQuote\"=Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoBeginQuote"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoEndQuote\"=\"Asdffdsa\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoEndQuote"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoQuotes\"=Asdffdsa\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoQuotes"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "NameNoBeginQuote\"=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoBeginQuote"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"NameNoEndQuote=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoEndQuote"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "NameNoQuotes=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoQuotes"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"MixedQuotes=Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "MixedQuotes"); + todo_wine verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\;comment\n"

1 0

Józef Kucia : wined3d: Avoid using deprecated gl_ClipVertex.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: f5de978a9cc658628ecd11d5c99ffdedc4908492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5de978a9cc658628ecd11d5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 12 12:42:30 2017 +0200 wined3d: Avoid using deprecated gl_ClipVertex. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 165 +++++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5de978a9cc658628ecd1…

1 0

Józef Kucia : wined3d: Explicitly bind frag data location for fragment shader outputs.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 9ddc01e0c156cf7c27d395564334b69cefd37b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ddc01e0c156cf7c27d395564… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 12 12:42:27 2017 +0200 wined3d: Explicitly bind frag data location for fragment shader outputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0aaa35e..319805b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3172,6 +3172,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glBeginTransformFeedback) /* OpenGL 3.0 */ USE_GL_FUNC(glBindAttribLocation) /* OpenGL 2.0 */ USE_GL_FUNC(glBindBuffer) /* OpenGL 1.5 */ + USE_GL_FUNC(glBindFragDataLocation) /* OpenGL 3.0 */ USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */ USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */ USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */ @@ -3305,6 +3306,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glBeginQuery, glBeginQueryARB); MAP_GL_FUNCTION(glBindAttribLocation, glBindAttribLocationARB); MAP_GL_FUNCTION(glBindBuffer, glBindBufferARB); + MAP_GL_FUNCTION(glBindFragDataLocation, glBindFragDataLocationEXT); MAP_GL_FUNCTION(glBlendColor, glBlendColorEXT); MAP_GL_FUNCTION(glBlendEquation, glBlendEquationEXT); MAP_GL_FUNCTION(glBlendEquationSeparate, glBlendEquationSeparateEXT); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1631768..2eba072 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9254,7 +9254,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { /* Bind vertex attributes to a corresponding index number to match * the same index numbers as ARB_vertex_programs (makes loading - * vertex attributes simpler). With this method, we can use the + * vertex attributes simpler). With this method, we can use the * exact same code to load the attributes later for both ARB and * GLSL shaders. * @@ -9279,6 +9279,12 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const } checkGLcall("glBindAttribLocation"); string_buffer_release(&priv->string_buffers, tmp_name); + + if (!needs_legacy_glsl_syntax(gl_info)) + { + GL_EXTCALL(glBindFragDataLocation(program_id, 0, "ps_out")); + checkGLcall("glBindFragDataLocation"); + } } if (gshader)

1 0

Michael Stefaniuc : dwrite: Use SetRectEmpty() instead of memset().
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 5a4cb67db9fe566ea1692a8053c6aa5e8bad36ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a4cb67db9fe566ea1692a805… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 12 13:20:29 2017 +0200 dwrite: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/freetype.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8bf8753..b665161 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4875,12 +4875,12 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal TRACE("(%p)->(%d %p)\n", This, type, bounds); if ((UINT32)type > DWRITE_TEXTURE_CLEARTYPE_3x1) { - memset(bounds, 0, sizeof(*bounds)); + SetRectEmpty(bounds); return E_INVALIDARG; } if (type != This->texture_type) { - memset(bounds, 0, sizeof(*bounds)); + SetRectEmpty(bounds); return S_OK; } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 2a926d7..2ad513e 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -986,12 +986,12 @@ INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace4 *fontface, UINT16 le void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) { - memset(&bitmap->bbox, 0, sizeof(bitmap->bbox)); + SetRectEmpty(&bitmap->bbox); } void freetype_get_design_glyph_bbox(IDWriteFontFace4 *fontface, UINT16 unitsperEm, UINT16 glyph, RECT *bbox) { - memset(bbox, 0, sizeof(*bbox)); + SetRectEmpty(bbox); } BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap)

1 0