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

Jacek Caban : server: Use create_request_async for write requests.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 2bd828b13cf0307ca087d098e67f192dd236c1b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd828b13cf0307ca087d098e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:18:23 2017 +0200 server: Use create_request_async for write requests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 +++++- server/async.c | 3 ++- server/device.c | 6 +++--- server/fd.c | 18 ++++++------------ server/file.h | 6 +++--- server/named_pipe.c | 26 ++++---------------------- 6 files changed, 23 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3d9840f..b73af7e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -624,6 +624,11 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; + if (wait_handle && status != STATUS_PENDING) + { + io->u.Status = status; + io->Information = reply->size; + } } SERVER_END_REQ; @@ -633,7 +638,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE { NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); status = io->u.Status; - NtClose( wait_handle ); } return status; diff --git a/server/async.c b/server/async.c index 7f2bcf5..b693c28 100644 --- a/server/async.c +++ b/server/async.c @@ -324,7 +324,7 @@ struct async *create_request_async( struct thread *thread, const async_data_t *d } /* return async object status and wait handle to client */ -obj_handle_t async_handoff( struct async *async, int success ) +obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ) { if (!success) { @@ -340,6 +340,7 @@ obj_handle_t async_handoff( struct async *async, int success ) set_reply_data_ptr( async->iosb->out_data, async->iosb->out_size ); async->iosb->out_data = NULL; } + if (result) *result = async->iosb->result; async->signaled = 1; } else diff --git a/server/device.c b/server/device.c index 4aa605b..4c7aa16 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 int 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 int 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 ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -506,7 +506,7 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos return handle; } -static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) +static int 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; @@ -522,7 +522,7 @@ static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_ irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 1 ); + handle = queue_irp( file, irp, async, 0 ); release_object( irp ); return handle; } diff --git a/server/fd.c b/server/fd.c index f6eb57d..0f1a15e 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2165,7 +2165,7 @@ int 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, file_pos_t pos ) +int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2451,7 +2451,7 @@ DECL_HANDLER(read) if ((async = create_request_async( current, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ) ); + reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL ); reply->options = fd->options; release_object( async ); } @@ -2463,20 +2463,14 @@ DECL_HANDLER(write) { struct fd *fd = get_handle_fd_obj( current->process, req->async.handle, FILE_WRITE_DATA ); struct async *async; - struct iosb *iosb; if (!fd) return; - if ((iosb = create_iosb( get_req_data(), get_req_data_size(), 0 ))) + if ((async = create_request_async( current, &req->async ))) { - async = create_async( current, &req->async, iosb ); - if (async) - { - reply->wait = fd->fd_ops->write( fd, async, req->pos ); - reply->options = fd->options; - release_object( async ); - } - release_object( iosb ); + reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size ); + reply->options = fd->options; + release_object( async ); } release_object( fd ); } diff --git a/server/file.h b/server/file.h index 8cc4d3b..96c1d23 100644 --- a/server/file.h +++ b/server/file.h @@ -54,7 +54,7 @@ struct fd_ops /* perform a read on the file */ int (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ - obj_handle_t (*write)(struct fd *, struct async *, file_pos_t ); + int (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ obj_handle_t (*flush)(struct fd *, struct async *); /* 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 int 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 int 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 ); 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 ); @@ -177,7 +177,7 @@ extern struct async_queue *create_async_queue( struct fd *fd ); extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ); extern struct async *create_request_async( struct thread *thread, const async_data_t *data ); -extern obj_handle_t async_handoff( struct async *async, int success ); +extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 07ec006..f33daf8 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -155,7 +155,7 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static int 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, file_pos_t pos ); +static int 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 ); @@ -830,12 +830,11 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) return 1; } -static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) +static int 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, pos ); @@ -846,13 +845,8 @@ static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos } 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; - } + if (!(message = mem_alloc( sizeof(*message) ))) return 0; message->async = (struct async *)grab_object( async ); message->iosb = async_get_iosb( async ); message->read_pos = 0; @@ -861,19 +855,7 @@ static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos queue_async( write_end->write_q, async ); reselect_write_queue( write_end ); set_error( STATUS_PENDING ); - - if (!async_is_blocking( async )) - { - 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; + return 1; } static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count )

1 0

Jacek Caban : server: Store fd reference in async object for unqueued asyncs.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: fa0dfe5967087edf5e9f77975dc1ad5e0e01a963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0dfe5967087edf5e9f77975… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:19:28 2017 +0200 server: Store fd reference in async object for unqueued asyncs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 35 +++++++++++++++++++++++------------ server/change.c | 2 +- server/fd.c | 10 +++++----- server/file.h | 4 ++-- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/server/async.c b/server/async.c index b693c28..409c9b5 100644 --- a/server/async.c +++ b/server/async.c @@ -41,6 +41,7 @@ struct async struct list queue_entry; /* entry in async queue list */ struct list process_entry; /* entry in process list */ struct async_queue *queue; /* queue containing this async */ + struct fd *fd; /* fd associated with an unqueued async */ unsigned int status; /* current status */ struct timeout_user *timeout; unsigned int timeout_status; /* status to report upon timeout */ @@ -167,6 +168,7 @@ static void async_destroy( struct object *obj ) release_object( async->queue ); } + if (async->fd) release_object( async->fd ); if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); if (async->iosb) release_object( async->iosb ); @@ -257,8 +259,10 @@ void free_async_queue( struct async_queue *queue ) void queue_async( struct async_queue *queue, struct async *async ) { - async->queue = (struct async_queue *)grab_object( queue ); + release_object( async->fd ); + async->fd = NULL; + async->queue = (struct async_queue *)grab_object( queue ); grab_object( async ); list_add_tail( &queue->queue, &async->queue_entry ); @@ -266,7 +270,7 @@ void queue_async( struct async_queue *queue, struct async *async ) } /* create an async on a given queue of a fd */ -struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ) +struct async *create_async( struct fd *fd, struct thread *thread, const async_data_t *data, struct iosb *iosb ) { struct event *event = NULL; struct async *async; @@ -286,6 +290,7 @@ struct async *create_async( struct thread *thread, const async_data_t *data, str async->data = *data; async->timeout = NULL; async->queue = NULL; + async->fd = (struct fd *)grab_object( fd ); async->signaled = 0; async->wait_handle = 0; async->direct_result = 0; @@ -301,7 +306,7 @@ struct async *create_async( struct thread *thread, const async_data_t *data, str /* create an async associated with iosb for async-based requests * returned async must be passed to async_handoff */ -struct async *create_request_async( struct thread *thread, const async_data_t *data ) +struct async *create_request_async( struct fd *fd, const async_data_t *data ) { struct async *async; struct iosb *iosb; @@ -309,7 +314,7 @@ struct async *create_request_async( struct thread *thread, const async_data_t *d if (!(iosb = create_iosb( get_req_data(), get_req_data_size(), get_reply_max_size() ))) return NULL; - async = create_async( current, data, iosb ); + async = create_async( fd, current, data, iosb ); release_object( iosb ); if (async) { @@ -365,13 +370,15 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta async->timeout_status = status; } -static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, unsigned int status, +static void add_async_completion( struct async *async, apc_param_t cvalue, unsigned int status, apc_param_t information ) { - if (queue->fd) + struct fd *fd = async->queue ? async->queue->fd : async->fd; + + if (fd) { apc_param_t ckey; - struct completion *completion = fd_get_completion( queue->fd, &ckey ); + struct completion *completion = fd_get_completion( fd, &ckey ); if (completion) { @@ -379,8 +386,8 @@ static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, release_object( completion ); } } - else if (queue->completion) add_completion( queue->completion, queue->comp_key, - cvalue, status, information ); + else if (async->queue && async->queue->completion) + add_completion( async->queue->completion, async->queue->comp_key, cvalue, status, information ); } /* store the result of the client-side async callback */ @@ -410,8 +417,6 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota async->status = status; if (status == STATUS_MORE_PROCESSING_REQUIRED) return; /* don't report the completion */ - if (async->queue && !async->data.apc && async->data.apc_context) - add_async_completion( async->queue, async->data.apc_context, status, total ); if (async->data.apc) { apc_call_t data; @@ -423,7 +428,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota data.user.args[2] = 0; thread_queue_apc( async->thread, NULL, &data ); } + else if (async->data.apc_context) + add_async_completion( async, async->data.apc_context, status, total ); + if (async->event) set_event( async->event ); + else if (async->fd) set_fd_signaled( async->fd, 1 ); else if (async->queue && async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); if (!async->signaled) { @@ -454,13 +463,15 @@ int async_waiting( struct async_queue *queue ) static int cancel_async( struct process *process, struct object *obj, struct thread *thread, client_ptr_t iosb ) { struct async *async; + struct fd *fd; int woken = 0; restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { if (async->status == STATUS_CANCELLED) continue; - if ((!obj || (async->queue && async->queue->fd && get_fd_user( async->queue->fd ) == obj)) && + fd = async->queue ? async->queue->fd : async->fd; + if ((!obj || (fd && get_fd_user( fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) { diff --git a/server/change.c b/server/change.c index 14fb2f1..88423fe 100644 --- a/server/change.c +++ b/server/change.c @@ -1246,7 +1246,7 @@ DECL_HANDLER(read_directory_changes) return; /* requests don't timeout */ - if (!(async = create_async( current, &req->async, NULL ))) goto end; + if (!(async = create_async( dir->fd, current, &req->async, NULL ))) goto end; if (!fd_queue_async( dir->fd, async, ASYNC_TYPE_WAIT )) goto end; /* assign it once */ diff --git a/server/fd.c b/server/fd.c index 0f1a15e..a073c54 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2373,7 +2373,7 @@ DECL_HANDLER(flush) if (!fd) return; - async = create_async( current, &req->async, NULL ); + async = create_async( fd, current, &req->async, NULL ); if (async) { reply->event = fd->fd_ops->flush( fd, async ); @@ -2449,7 +2449,7 @@ DECL_HANDLER(read) if (!fd) return; - if ((async = create_request_async( current, &req->async ))) + if ((async = create_request_async( fd, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL ); reply->options = fd->options; @@ -2466,7 +2466,7 @@ DECL_HANDLER(write) if (!fd) return; - if ((async = create_request_async( current, &req->async ))) + if ((async = create_request_async( fd, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size ); reply->options = fd->options; @@ -2487,7 +2487,7 @@ DECL_HANDLER(ioctl) if ((iosb = create_iosb( get_req_data(), get_req_data_size(), get_reply_max_size() ))) { - if ((async = create_async( current, &req->async, iosb ))) + if ((async = create_async( fd, current, &req->async, iosb ))) { reply->wait = fd->fd_ops->ioctl( fd, req->code, async ); reply->options = fd->options; @@ -2520,7 +2520,7 @@ DECL_HANDLER(register_async) if ((fd = get_handle_fd_obj( current->process, req->async.handle, access ))) { - if (get_unix_fd( fd ) != -1 && (async = create_async( current, &req->async, NULL ))) + if (get_unix_fd( fd ) != -1 && (async = create_async( fd, current, &req->async, NULL ))) { fd->fd_ops->queue_async( fd, async, req->type, req->count ); release_object( async ); diff --git a/server/file.h b/server/file.h index 96c1d23..1e5ea7a 100644 --- a/server/file.h +++ b/server/file.h @@ -175,8 +175,8 @@ extern struct object *create_serial( struct fd *fd ); /* async I/O functions */ extern struct async_queue *create_async_queue( struct fd *fd ); extern void free_async_queue( struct async_queue *queue ); -extern struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ); -extern struct async *create_request_async( struct thread *thread, const async_data_t *data ); +extern struct async *create_async( struct fd *fd, struct thread *thread, const async_data_t *data, struct iosb *iosb ); +extern struct async *create_request_async( struct fd *fd, const async_data_t *data ); extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status );

1 0

Jacek Caban : server: Allow async_handoff users to set result themselves.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 74364ed0172ad91f0516cc95a4a5c1062a561e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74364ed0172ad91f0516cc95a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:19:40 2017 +0200 server: Allow async_handoff users to set result themselves. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 409c9b5..3a83a63 100644 --- a/server/async.c +++ b/server/async.c @@ -338,13 +338,23 @@ obj_handle_t async_handoff( struct async *async, int success, data_size_t *resul return 0; } - if (async->iosb->status != STATUS_PENDING) + if (get_error() != STATUS_PENDING) + { + /* status and data are already set and returned */ + async_terminate( async, get_error() ); + } + else if (async->iosb->status != STATUS_PENDING) { + /* result is already available in iosb, return it */ if (async->iosb->out_data) { set_reply_data_ptr( async->iosb->out_data, async->iosb->out_size ); async->iosb->out_data = NULL; } + } + + if (async->iosb->status != STATUS_PENDING) + { if (result) *result = async->iosb->result; async->signaled = 1; }

1 0

Jacek Caban : ntdll: Set iosb status in server_ioctl_file.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 4e02a3bb1383f7191226b6b03c07aee47151c80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e02a3bb1383f7191226b6b03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:19:56 2017 +0200 ntdll: Set iosb status in server_ioctl_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b73af7e..0d7efc3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1560,6 +1560,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, NtClose( wait_handle ); } + if (status != STATUS_PENDING && code != FSCTL_PIPE_LISTEN) io->u.Status = status; return status; } @@ -1644,8 +1645,8 @@ NTSTATUS WINAPI NtDeviceIoControlFile(HANDLE handle, HANDLE event, } if (status == STATUS_NOT_SUPPORTED || status == STATUS_BAD_DEVICE_TYPE) - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); + return server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); if (status != STATUS_PENDING) io->u.Status = status; return status; @@ -1694,7 +1695,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); if (!status) status = DIR_unmount_device( handle ); - break; + return status; case FSCTL_PIPE_PEEK: { @@ -1710,8 +1711,8 @@ 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 ); + return server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); break; } @@ -1767,11 +1768,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc int fd = server_remove_fd_from_cache( handle ); if (fd != -1) close( fd ); } - break; - - case FSCTL_PIPE_LISTEN: - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); return status; case FSCTL_PIPE_IMPERSONATE: @@ -1814,11 +1810,9 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc io->Information = 0; status = STATUS_SUCCESS; break; - case FSCTL_PIPE_WAIT: default: - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - break; + return server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); } if (status != STATUS_PENDING) io->u.Status = status;

1 0

Jacek Caban : server: Use create_request_async in ioctl request handler.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: c56c42ff79515a79b1913d31e21d6fecd7c11ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56c42ff79515a79b1913d31e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:20:10 2017 +0200 server: Use create_request_async in ioctl request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 8 +++++--- dlls/ntdll/tests/pipe.c | 6 +++--- server/device.c | 6 +++--- server/fd.c | 19 +++++++------------ server/file.h | 6 +++--- server/named_pipe.c | 44 ++++++++++++++++++++------------------------ server/serial.c | 47 +++++++++++++++++++++++++++-------------------- server/sock.c | 8 +++----- 8 files changed, 71 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c56c42ff79515a79b1913…

1 0

Jacek Caban : server: Use create_request_async in flush request handler.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 10c1f245e45a387046e2075e3a74dc3b450d47d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c1f245e45a387046e2075e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:20:20 2017 +0200 server: Use create_request_async in flush request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 1 - server/device.c | 6 +++--- server/fd.c | 7 +++---- server/file.c | 12 ++++++++---- server/file.h | 4 ++-- server/named_pipe.c | 25 +++++++++++-------------- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 380b370..0381e55 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3424,7 +3424,6 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock if (hEvent) { NtWaitForSingleObject( hEvent, FALSE, NULL ); - NtClose( hEvent ); ret = STATUS_SUCCESS; } } diff --git a/server/device.c b/server/device.c index c19905b..cf405b8 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 int device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); static int 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 ); +static int device_file_flush( struct fd *fd, struct async *async ); static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops device_file_ops = @@ -527,7 +527,7 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos return handle; } -static obj_handle_t device_file_flush( struct fd *fd, struct async *async ) +static int device_file_flush( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; @@ -541,7 +541,7 @@ static obj_handle_t device_file_flush( struct fd *fd, struct async *async ) irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 1 ); + handle = queue_irp( file, irp, async, 0 ); release_object( irp ); return handle; } diff --git a/server/fd.c b/server/fd.c index 5ab0ff0..f64c8c9 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2172,7 +2172,7 @@ int 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 no_fd_flush( struct fd *fd, struct async *async ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2373,10 +2373,9 @@ DECL_HANDLER(flush) if (!fd) return; - async = create_async( fd, current, &req->async, NULL ); - if (async) + if ((async = create_request_async( fd, &req->async ))) { - reply->event = fd->fd_ops->flush( fd, async ); + reply->event = async_handoff( async, fd->fd_ops->flush( fd, async ), NULL ); release_object( async ); } release_object( fd ); diff --git a/server/file.c b/server/file.c index 341c3c8..3809012 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 ); +static int 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,11 +295,15 @@ static int file_get_poll_events( struct fd *fd ) return events; } -static obj_handle_t file_flush( struct fd *fd, struct async *async ) +static int 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(); - return 0; + if (unix_fd != -1 && fsync( unix_fd ) == -1) + { + file_set_error(); + return 0; + } + return 1; } static enum server_fd_type file_get_fd_type( struct fd *fd ) diff --git a/server/file.h b/server/file.h index 0dbf8d4..386f76c 100644 --- a/server/file.h +++ b/server/file.h @@ -56,7 +56,7 @@ struct fd_ops /* perform a write on the file */ int (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ - obj_handle_t (*flush)(struct fd *, struct async *); + int (*flush)(struct fd *, struct async *); /* perform an ioctl on the file */ int (*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 int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern int 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 ); +extern int no_fd_flush( struct fd *fd, struct async *async ); extern int no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern int 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 1e51ce8..c0bfc2a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -163,7 +163,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 ); +static int pipe_server_flush( struct fd *fd, struct async *async ); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_server_ops = @@ -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 ); +static int pipe_client_flush( struct fd *fd, struct async *async ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_client_ops = @@ -648,28 +648,25 @@ static void check_flushed( void *arg ) } } -static obj_handle_t pipe_end_flush( struct pipe_end *pipe_end, struct async *async ) +static int pipe_end_flush( struct pipe_end *pipe_end, struct async *async ) { - obj_handle_t handle = 0; - if (use_server_io( pipe_end ) && (!pipe_end->connection || list_empty( &pipe_end->connection->message_queue ))) - return 0; + return 1; if (!fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT )) return 0; - if (!async_is_blocking( async ) || (handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) - set_error( STATUS_PENDING ); - return handle; + set_error( STATUS_PENDING ); + return 1; } -static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ) +static int pipe_server_flush( struct fd *fd, struct async *async ) { struct pipe_server *server = get_fd_user( fd ); obj_handle_t handle; - if (!server || server->state != ps_connected_server) return 0; + if (!server || server->state != ps_connected_server) return 1; - if (!pipe_data_remaining( server )) return 0; + if (!pipe_data_remaining( server )) return 1; handle = pipe_end_flush( &server->pipe_end, async ); @@ -679,11 +676,11 @@ static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ) return handle; } -static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async ) +static int pipe_client_flush( struct fd *fd, struct async *async ) { struct pipe_end *pipe_end = get_fd_user( fd ); /* FIXME: Support byte mode. */ - return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 0; + return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 1; } static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb )

1 0

Jacek Caban : server: Remove no longer needed need_handle from queue_irp.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 84bc9c3d56225d0bdd9f4bbc76986ef4ef83e22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bc9c3d56225d0bdd9f4bbc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:20:27 2017 +0200 server: Remove no longer needed need_handle from queue_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/server/device.c b/server/device.c index cf405b8..fc5bcbe 100644 --- a/server/device.c +++ b/server/device.c @@ -462,22 +462,14 @@ 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 need_handle ) +static int queue_irp( struct device_file *file, struct irp_call *irp, struct async *async ) { - obj_handle_t handle = 0; + if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) return 0; - if (!need_handle) handle = 1; - else if (async_is_blocking( async ) && !(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) return 0; - - if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) - { - if (need_handle && handle) close_handle( current->process, handle ); - return 0; - } irp->async = (struct async *)grab_object( async ); add_irp_to_queue( file, irp, current ); set_error( STATUS_PENDING ); - return handle; + return 1; } static enum server_fd_type device_file_get_fd_type( struct fd *fd ) @@ -501,7 +493,7 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -522,7 +514,7 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -541,7 +533,7 @@ static int device_file_flush( struct fd *fd, struct async *async ) irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -561,7 +553,7 @@ static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *as irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; }

1 0

Huw Davies : winex11: Use logical co-ords to call GdiAlphaBlend().
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: daae0d6adc5dca126c43a143c460d1bb66336be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daae0d6adc5dca126c43a143c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 16:40:36 2017 +0100 winex11: Use logical co-ords to call GdiAlphaBlend(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ea4933f..eaf6dcf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2583,7 +2583,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; void *src_bits, *dst_bits; - RECT rect; + RECT rect, src_rect; HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; @@ -2631,11 +2631,13 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); } + src_rect = rect; + if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); + DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 ); + ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, - rect.left + (info->pptSrc ? info->pptSrc->x : 0), - rect.top + (info->pptSrc ? info->pptSrc->y : 0), - rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, src_rect.left, src_rect.top, + src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); if (ret) {

1 0

Huw Davies : wineandroid: Use logical co-ords to call GdiAlphaBlend().
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 99069934f735fe57978b011f8a57792638de5047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99069934f735fe57978b011f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 16:40:38 2017 +0100 wineandroid: Use logical co-ords to call GdiAlphaBlend(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index f7a13df..ff8b1e0 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1247,7 +1247,7 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; void *src_bits, *dst_bits; - RECT rect; + RECT rect, src_rect; HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; @@ -1297,11 +1297,13 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); } + src_rect = rect; + if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); + DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 ); + ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, - rect.left + (info->pptSrc ? info->pptSrc->x : 0), - rect.top + (info->pptSrc ? info->pptSrc->y : 0), - rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, src_rect.left, src_rect.top, + src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); if (ret) {

1 0

Huw Davies : msvcrt: _difftime64() takes 64-bit args.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: b7bb360be363cca4ca14dbf88dfdbe8cd6621df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bb360be363cca4ca14dbf88… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 28 13:49:58 2017 +0100 msvcrt: _difftime64() takes 64-bit args. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 6cd46b4..db36c29 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -15,7 +15,7 @@ @ cdecl _ctime64(ptr) ucrtbase._ctime64 @ cdecl _ctime64_s(str long ptr) ucrtbase._ctime64_s @ cdecl _difftime32(long long) ucrtbase._difftime32 -@ cdecl _difftime64(long long) ucrtbase._difftime64 +@ cdecl _difftime64(int64 int64) ucrtbase._difftime64 @ cdecl _ftime32(ptr) ucrtbase._ftime32 @ cdecl _ftime32_s(ptr) ucrtbase._ftime32_s @ cdecl _ftime64(ptr) ucrtbase._ftime64 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 964f600..fcf235a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -768,7 +768,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b2c5745..e0b7761 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1116,7 +1116,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d6f2110..5a2f9c9 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1108,7 +1108,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _dclass(double) MSVCR120__dclass @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ cdecl _dpcomp(double double) MSVCR120__dpcomp @ cdecl _dsign(double) MSVCR120__dsign diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 4bb1afb..5c6093c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1047,7 +1047,7 @@ @ extern _daylight msvcr120._daylight @ cdecl _dclass(double) msvcr120._dclass @ cdecl _difftime32(long long) msvcr120._difftime32 -@ cdecl _difftime64(long long) msvcr120._difftime64 +@ cdecl _difftime64(int64 int64) msvcr120._difftime64 @ stub _dosmaperr @ cdecl _dpcomp(double double) msvcr120._dpcomp @ cdecl _dsign(double) msvcr120._dsign diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index de945d5..6c3c33c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -433,7 +433,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8b4a77c..d0ce271 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -416,7 +416,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1a887d3..e2b72e8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -403,7 +403,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ extern _dstbias MSVCRT__dstbias @ cdecl _dup (long) MSVCRT__dup @ cdecl _dup2 (long long) MSVCRT__dup2 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 78ae7d6..5d13712 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -252,7 +252,7 @@ @ cdecl _dclass(double) MSVCR120__dclass @ stub _dexp @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dlog @ stub _dnorm @ cdecl _dpcomp(double double) MSVCR120__dpcomp

1 0