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

Jacek Caban : server: Remove no longer needed blocking argument from ioctl fd op.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 047062b28b84b62a279b2e6104aed00791fe4557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047062b28b84b62a279b2e610… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:54:17 2017 +0200 server: Remove no longer needed blocking argument from ioctl fd op. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 ++--- server/fd.c | 6 +++--- server/file.h | 6 +++--- server/named_pipe.c | 27 +++++++++++---------------- server/sock.c | 4 ++-- 5 files changed, 21 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=047062b28b84b62a279b2…

1 0

Jacek Caban : server: Remove no longer needed blocking argument from read fd op.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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

Jacek Caban : server: Remove no longer needed blocking argument from write fd op.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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 flush fd op.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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 requests arguments.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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

Henri Verbeet : wined3d: Avoid modifying the device' s shader list outside the command stream.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 6302d5edf82b212d5d32838f40279d4304e60ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6302d5edf82b212d5d32838f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:19 2017 +0200 wined3d: Avoid modifying the device's shader list outside the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 208a09a..7927062 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3073,6 +3073,13 @@ ULONG CDECL wined3d_shader_incref(struct wined3d_shader *shader) return refcount; } +static void wined3d_shader_init_object(void *object) +{ + struct wined3d_shader *shader = object; + + list_add_head(&shader->device->shaders, &shader->shader_list_entry); +} + static void wined3d_shader_destroy_object(void *object) { shader_cleanup(object); @@ -3327,7 +3334,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device list_init(&shader->constantsI); shader->lconst_inf_or_nan = FALSE; list_init(&shader->reg_maps.indexable_temps); - list_add_head(&device->shaders, &shader->shader_list_entry); + list_init(&shader->shader_list_entry); byte_code_size = desc->byte_code_size; if (byte_code_size == ~(size_t)0) @@ -3366,10 +3373,13 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); + return hr; } shader->load_local_constsF = shader->lconst_inf_or_nan; + wined3d_cs_init_object(shader->device->cs, wined3d_shader_init_object, shader); + return hr; } @@ -3429,7 +3439,7 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 *d = *so_desc; if (!(d->elements = wined3d_calloc(so_desc->element_count, sizeof(*d->elements)))) { - shader_cleanup(shader); + wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); return E_OUTOFMEMORY; } memcpy(d->elements, so_desc->elements, so_desc->element_count * sizeof(*d->elements));

1 0

Henri Verbeet : wined3d: Send texture dirty region updates through the command stream.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: d6557e812984e010a989a3360039453eb978bd12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6557e812984e010a989a3360… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 12 00:08:50 2017 +0200 wined3d: Send texture dirty region updates through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 45 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 17 +--------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0866a16..85594e4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -65,6 +65,7 @@ enum wined3d_cs_op WINED3D_CS_OP_UNMAP, WINED3D_CS_OP_BLT_SUB_RESOURCE, WINED3D_CS_OP_UPDATE_SUB_RESOURCE, + WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION, }; struct wined3d_cs_present @@ -372,6 +373,13 @@ struct wined3d_cs_update_sub_resource struct wined3d_sub_resource_data data; }; +struct wined3d_cs_add_dirty_texture_region +{ + enum wined3d_cs_op opcode; + struct wined3d_texture *texture; + unsigned int layer; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1957,6 +1965,42 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r cs->ops->submit(cs); } +static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_add_dirty_texture_region *op = data; + struct wined3d_texture *texture = op->texture; + unsigned int sub_resource_idx, i; + struct wined3d_context *context; + + context = context_acquire(cs->device, NULL, 0); + sub_resource_idx = op->layer * texture->level_count; + for (i = 0; i < texture->level_count; ++i, ++sub_resource_idx) + { + if (wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); + else + ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); + } + context_release(context); + + wined3d_resource_release(&texture->resource); +} + +void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, + struct wined3d_texture *texture, unsigned int layer) +{ + struct wined3d_cs_add_dirty_texture_region *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION; + op->texture = texture; + op->layer = layer; + + wined3d_resource_acquire(&texture->resource); + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1998,6 +2042,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_UNMAP */ wined3d_cs_exec_unmap, /* WINED3D_CS_OP_BLT_SUB_RESOURCE */ wined3d_cs_exec_blt_sub_resource, /* WINED3D_CS_OP_UPDATE_SUB_RESOURCE */ wined3d_cs_exec_update_sub_resource, + /* WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION */ wined3d_cs_exec_add_dirty_texture_region, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3219305..2419616 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1639,9 +1639,6 @@ static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(str HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) { - unsigned int sub_resource_idx, i; - struct wined3d_context *context; - TRACE("texture %p, layer %u, dirty_region %s.\n", texture, layer, debug_box(dirty_region)); if (layer >= texture->layer_count) @@ -1653,19 +1650,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, if (dirty_region) FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); - context = context_acquire(texture->resource.device, NULL, 0); - sub_resource_idx = layer * texture->level_count; - for (i = 0; i < texture->level_count; ++i, ++sub_resource_idx) - { - if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) - { - ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); - context_release(context); - return E_OUTOFMEMORY; - } - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); - } - context_release(context); + wined3d_cs_emit_add_dirty_texture_region(texture->resource.device->cs, texture, layer); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 600fc04..b39bc2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3243,6 +3243,8 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HID void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; +void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, + struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags,

1 0

Henri Verbeet : wined3d: The destination width and height are always valid in surface_cpu_blt().
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 3e3685755783602de257ef89258a1ebad6d30959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3685755783602de257ef892… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:21 2017 +0200 wined3d: The destination width and height are always valid in surface_cpu_blt(). Since they have been validated by the caller. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d809282..a811d6a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2945,9 +2945,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int { int sx, xinc, sy, yinc; - if (!dst_width || !dst_height) /* Hmm... stupid program? */ - goto release; - if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT && (src_width != dst_width || src_height != dst_height)) {

1 0

Henri Verbeet : wined3d: The source texture is always non-NULL in surface_cpu_blt().
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 1b034f7fdb663d9681d1b623ce3782b7fba75c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b034f7fdb663d9681d1b623c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:22 2017 +0200 wined3d: The source texture is always non-NULL in surface_cpu_blt(). Since fills no longer go through the blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 543 ++++++++++++++++++++++++------------------------- 1 file changed, 263 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b034f7fdb663d9681d1b…

1 0

Henri Verbeet : wined3d: Avoid updating the swapchain swap interval from outside the command stream.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: c70486c53fb77a298f7140445308feb586238972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70486c53fb77a298f7140445… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:23 2017 +0200 wined3d: Avoid updating the swapchain swap interval from outside the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 84 ++++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 454a775..476259b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -674,6 +674,49 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } +static void wined3d_swapchain_update_swap_interval_cs(void *object) +{ + struct wined3d_swapchain *swapchain = object; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + int swap_interval; + + context = context_acquire(swapchain->device, swapchain->front_buffer, 0); + gl_info = context->gl_info; + + switch (swapchain->desc.swap_interval) + { + case WINED3DPRESENT_INTERVAL_IMMEDIATE: + swap_interval = 0; + break; + case WINED3DPRESENT_INTERVAL_DEFAULT: + case WINED3DPRESENT_INTERVAL_ONE: + swap_interval = 1; + break; + case WINED3DPRESENT_INTERVAL_TWO: + swap_interval = 2; + break; + case WINED3DPRESENT_INTERVAL_THREE: + swap_interval = 3; + break; + case WINED3DPRESENT_INTERVAL_FOUR: + swap_interval = 4; + break; + default: + FIXME("Unhandled present interval %#x.\n", swapchain->desc.swap_interval); + swap_interval = 1; + } + + if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) + { + if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) + ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", + swap_interval, context, GetLastError()); + } + + context_release(context); +} + static void wined3d_swapchain_cs_init(void *object) { struct wined3d_swapchain *swapchain = object; @@ -715,7 +758,7 @@ static void wined3d_swapchain_cs_init(void *object) context_release(swapchain->context[0]); - swapchain_update_swap_interval(swapchain); + wined3d_swapchain_update_swap_interval_cs(swapchain); } static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, @@ -1083,44 +1126,7 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) void swapchain_update_swap_interval(struct wined3d_swapchain *swapchain) { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - int swap_interval; - - context = context_acquire(swapchain->device, swapchain->front_buffer, 0); - gl_info = context->gl_info; - - switch (swapchain->desc.swap_interval) - { - case WINED3DPRESENT_INTERVAL_IMMEDIATE: - swap_interval = 0; - break; - case WINED3DPRESENT_INTERVAL_DEFAULT: - case WINED3DPRESENT_INTERVAL_ONE: - swap_interval = 1; - break; - case WINED3DPRESENT_INTERVAL_TWO: - swap_interval = 2; - break; - case WINED3DPRESENT_INTERVAL_THREE: - swap_interval = 3; - break; - case WINED3DPRESENT_INTERVAL_FOUR: - swap_interval = 4; - break; - default: - FIXME("Unhandled present interval %#x.\n", swapchain->desc.swap_interval); - swap_interval = 1; - } - - if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) - { - if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) - ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", - swap_interval, context, GetLastError()); - } - - context_release(context); + wined3d_cs_init_object(swapchain->device->cs, wined3d_swapchain_update_swap_interval_cs, swapchain); } void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate)

1 0