May 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : include/msvcrt: Define more math functions.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 54bd7e655a4c21d769f6f57402ea38b6b8c8ac3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=54bd7e655a4c21d769f6f574… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 09:57:08 2019 +0200 include/msvcrt: Define more math functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 82 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index c539ebe..b82961e 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -70,6 +70,9 @@ double __cdecl ldexp(double, int); double __cdecl frexp(double, int*); double __cdecl modf(double, double*); double __cdecl fmod(double, double); +double __cdecl fmin(double, double); +double __cdecl fmax(double, double); +double __cdecl erf(double); double __cdecl _hypot(double, double); double __cdecl _j0(double); @@ -98,7 +101,16 @@ long __cdecl lrintf(float); long __cdecl lround(double); long __cdecl lroundf(float); -#if defined(__x86_64__) || defined(__arm__) +double __cdecl _copysign (double, double); +double __cdecl _chgsign (double); +double __cdecl _scalb(double, __msvcrt_long); +double __cdecl _logb(double); +double __cdecl _nextafter(double, double); +int __cdecl _finite(double); +int __cdecl _isnan(double); +int __cdecl _fpclass(double); + +#ifndef __i386__ float __cdecl sinf(float); float __cdecl cosf(float); @@ -121,41 +133,57 @@ float __cdecl sqrtf(float); float __cdecl ceilf(float); float __cdecl floorf(float); float __cdecl fabsf(float); -float __cdecl ldexpf(float, int); float __cdecl frexpf(float, int*); float __cdecl modff(float, float*); float __cdecl fmodf(float, float); +float __cdecl _copysignf(float, float); +float __cdecl _chgsignf(float); +float __cdecl _logbf(float); +int __cdecl _finitef(float); +int __cdecl _isnanf(float); +int __cdecl _fpclassf(float); + #else -#define sinf(x) ((float)sin((double)(x))) -#define cosf(x) ((float)cos((double)(x))) -#define tanf(x) ((float)tan((double)(x))) -#define sinhf(x) ((float)sinh((double)(x))) -#define coshf(x) ((float)cosh((double)(x))) -#define tanhf(x) ((float)tanh((double)(x))) -#define asinf(x) ((float)asin((double)(x))) -#define acosf(x) ((float)acos((double)(x))) -#define atanf(x) ((float)atan((double)(x))) -#define atan2f(x,y) ((float)atan2((double)(x), (double)(y))) -#define asinhf(x) ((float)asinh((double)(x))) -#define acoshf(x) ((float)acosh((double)(x))) -#define atanhf(x) ((float)atanh((double)(x))) -#define expf(x) ((float)exp((double)(x))) -#define logf(x) ((float)log((double)(x))) -#define log10f(x) ((float)log10((double)(x))) -#define powf(x,y) ((float)pow((double)(x), (double)(y))) -#define sqrtf(x) ((float)sqrt((double)(x))) -#define ceilf(x) ((float)ceil((double)(x))) -#define floorf(x) ((float)floor((double)(x))) -#define fabsf(x) ((float)fabs((double)(x))) -#define frexpf(x) ((float)frexp((double)(x))) -#define modff(x,y) ((float)modf((double)(x), (double*)(y))) -#define fmodf(x,y) ((float)fmod((double)(x), (double)(y))) +static inline float sinf(float x) { return sin(x); } +static inline float cosf(float x) { return cos(x); } +static inline float tanf(float x) { return tan(x); } +static inline float sinhf(float x) { return sinh(x); } +static inline float coshf(float x) { return cosh(x); } +static inline float tanhf(float x) { return tanh(x); } +static inline float asinf(float x) { return asin(x); } +static inline float acosf(float x) { return acos(x); } +static inline float atanf(float x) { return atan(x); } +static inline float atan2f(float x, float y) { return atan2(x, y); } +static inline float asinhf(float x) { return asinh(x); } +static inline float acoshf(float x) { return acosh(x); } +static inline float atanhf(float x) { return atanh(x); } +static inline float expf(float x) { return exp(x); } +static inline float logf(float x) { return log(x); } +static inline float log10f(float x) { return log10(x); } +static inline float powf(float x, float y) { return pow(x, y); } +static inline float sqrtf(float x) { return sqrt(x); } +static inline float ceilf(float x) { return ceil(x); } +static inline float floorf(float x) { return floor(x); } +static inline float fabsf(float x) { return fabs(x); } +static inline float frexpf(float x, int *y) { return frexp(x, y); } +static inline float modff(float x, float *y) { double yd, ret = modf(x, &yd); *y = yd; return ret; } +static inline float fmodf(float x, float y) { return fmod(x, y); } + +static inline float _copysignf(float x, float y) { return _copysign(x, y); } +static inline float _chgsignf(float x) { return _chgsign(x); } +static inline float _logbf(float x) { return _logb(x); } +static inline int _finitef(float x) { return _finite(x); } +static inline int _isnanf(float x) { return _isnan(x); } +static inline int _fpclassf(float x) { return _fpclass(x); } #endif -#define ldexpf(x,y) ((float)ldexp((double)(x),(y))) +static inline float ldexpf(float x, int y) { return ldexp(x, y); } + +#define copysign(x,y) _copysign(x,y) +#define copysignf(x,y) _copysignf(x,y) double __cdecl nearbyint(double); float __cdecl nearbyintf(float);

1 0

Jacek Caban : server: Use stored current kernel call to interpret IRP dispatch status.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: dfe20465e894057d34da531fcd8a6e1fe4dfc310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe20465e894057d34da531f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 14:09:22 2019 +0200 server: Use stored current kernel call to interpret IRP dispatch status. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/server/device.c b/server/device.c index 1dcd500..d6ab1c5 100644 --- a/server/device.c +++ b/server/device.c @@ -884,20 +884,14 @@ DECL_HANDLER(get_next_device_request) 0, &device_manager_ops ))) return; - if (req->prev) - { - if ((irp = (struct irp_call *)get_handle_obj( current->process, req->prev, 0, &irp_call_ops ))) - { - set_irp_result( irp, req->status, NULL, 0, 0 ); - close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ - release_object( irp ); - } - } + if (req->prev) close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ if (manager->current_call) { irp = manager->current_call; - if (irp->async) + if (req->status) + set_irp_result( irp, req->status, NULL, 0, 0 ); + else if (irp->async) set_async_pending( irp->async, irp->file && is_fd_overlapped( irp->file->fd ) ); free_irp_params( irp ); release_object( irp );

1 0

Jacek Caban : server: Store IRP client pointer on server side.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 101da2b5127ae698e79bca4ac0bfa780c785722b URL: https://source.winehq.org/git/wine.git/?a=commit;h=101da2b5127ae698e79bca4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 14:09:47 2019 +0200 server: Store IRP client pointer on server side. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 +++++++--- include/wine/server_protocol.h | 3 ++- server/device.c | 6 ++++++ server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 10cf2e2..1892809 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -557,6 +557,7 @@ struct dispatch_context { irp_params_t params; HANDLE handle; + IRP *irp; ULONG in_size; void *in_buff; }; @@ -570,6 +571,7 @@ static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_conte KeQueryTickCount( &count ); /* update the global KeTickCount */ + context->irp = irp; device->CurrentIrp = irp; IoCallDriver( device, irp ); device->CurrentIrp = NULL; @@ -931,9 +933,10 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) SERVER_START_REQ( get_next_device_request ) { - req->manager = wine_server_obj_handle( manager ); - req->prev = wine_server_obj_handle( context.handle ); - req->status = status; + req->manager = wine_server_obj_handle( manager ); + req->prev = wine_server_obj_handle( context.handle ); + req->user_ptr = wine_server_client_ptr( context.irp ); + req->status = status; wine_server_set_reply( req, context.in_buff, context.in_size ); if (!(status = wine_server_call( req ))) { @@ -949,6 +952,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (status == STATUS_BUFFER_OVERFLOW) context.in_size = reply->in_size; } + context.irp = NULL; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a45d092..eab5755 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5252,6 +5252,7 @@ struct get_next_device_request_request obj_handle_t manager; obj_handle_t prev; unsigned int status; + client_ptr_t user_ptr; }; struct get_next_device_request_reply { @@ -6694,6 +6695,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 583 +#define SERVER_PROTOCOL_VERSION 584 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index d6ab1c5..e123583 100644 --- a/server/device.c +++ b/server/device.c @@ -52,6 +52,7 @@ struct irp_call struct async *async; /* pending async op */ irp_params_t params; /* irp parameters */ struct iosb *iosb; /* I/O status block */ + client_ptr_t user_ptr; /* client side pointer */ }; static void irp_call_dump( struct object *obj, int verbose ); @@ -351,6 +352,7 @@ static struct irp_call *create_irp( struct device_file *file, const irp_params_t irp->async = NULL; irp->params = *params; irp->iosb = NULL; + irp->user_ptr = 0; if (async) irp->iosb = async_get_iosb( async ); if (!irp->iosb && !(irp->iosb = create_iosb( NULL, 0, 0 ))) @@ -886,13 +888,17 @@ DECL_HANDLER(get_next_device_request) if (req->prev) close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ + /* process result of previous call */ if (manager->current_call) { irp = manager->current_call; + irp->user_ptr = req->user_ptr; + if (req->status) set_irp_result( irp, req->status, NULL, 0, 0 ); else if (irp->async) set_async_pending( irp->async, irp->file && is_fd_overlapped( irp->file->fd ) ); + free_irp_params( irp ); release_object( irp ); manager->current_call = NULL; diff --git a/server/protocol.def b/server/protocol.def index 21008d7..6b6e868 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3633,6 +3633,7 @@ struct handle_info obj_handle_t manager; /* handle to the device manager */ obj_handle_t prev; /* handle to the previous irp */ unsigned int status; /* status of the previous irp */ + client_ptr_t user_ptr; /* user pointer of the previous irp */ @REPLY irp_params_t params; /* irp parameters */ obj_handle_t next; /* handle to the next irp */ diff --git a/server/request.h b/server/request.h index 07918df..1858b41 100644 --- a/server/request.h +++ b/server/request.h @@ -2287,7 +2287,8 @@ C_ASSERT( sizeof(struct delete_device_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, manager) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, prev) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, status) == 20 ); -C_ASSERT( sizeof(struct get_next_device_request_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, user_ptr) == 24 ); +C_ASSERT( sizeof(struct get_next_device_request_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, params) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, next) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_tid) == 44 ); diff --git a/server/trace.c b/server/trace.c index 28bf3dd..82ea93f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4282,6 +4282,7 @@ static void dump_get_next_device_request_request( const struct get_next_device_r fprintf( stderr, " manager=%04x", req->manager ); fprintf( stderr, ", prev=%04x", req->prev ); fprintf( stderr, ", status=%08x", req->status ); + dump_uint64( ", user_ptr=", &req->user_ptr ); } static void dump_get_next_device_request_reply( const struct get_next_device_request_reply *req )

1 0

Jacek Caban : server: Remove IRP from device queue before terminating async.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: dc5421f9506da691dbc631fb319e8d10a0e22ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc5421f9506da691dbc631fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 14:09:59 2019 +0200 server: Remove IRP from device queue before terminating async. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/device.c b/server/device.c index e123583..1cebc3b 100644 --- a/server/device.c +++ b/server/device.c @@ -378,6 +378,9 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, iosb->out_size = min( iosb->out_size, out_size ); if (iosb->out_size && !(iosb->out_data = memdup( out_data, iosb->out_size ))) iosb->out_size = 0; + + /* remove it from the device queue */ + list_remove( &irp->dev_entry ); irp->file = NULL; if (irp->async) { @@ -388,8 +391,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, } wake_up( &irp->obj, 0 ); - /* remove it from the device queue */ - list_remove( &irp->dev_entry ); release_object( irp ); /* no longer on the device queue */ release_object( file ); }

1 0

Jacek Caban : server: Notify kernel when IRP is terminated by server.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: b724024d5a0db520f5f76a04ede604f313b4a578 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b724024d5a0db520f5f76a04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 14:10:20 2019 +0200 server: Notify kernel when IRP is terminated by server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 +++++++++- include/wine/server_protocol.h | 11 +++++++-- server/device.c | 51 ++++++++++++++++++++++++++++++++++++++++-- server/protocol.def | 9 +++++++- server/trace.c | 5 +++++ 5 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1892809..04a3f31 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -838,6 +838,15 @@ static NTSTATUS dispatch_free( struct dispatch_context *context ) return STATUS_SUCCESS; } +static NTSTATUS dispatch_cancel( struct dispatch_context *context ) +{ + IRP *irp = wine_server_get_ptr( context->params.cancel.irp ); + + FIXME( "%p\n", irp ); + + return STATUS_SUCCESS; +} + typedef NTSTATUS (*dispatch_func)( struct dispatch_context *context ); static const dispatch_func dispatch_funcs[] = @@ -849,7 +858,8 @@ static const dispatch_func dispatch_funcs[] = dispatch_write, /* IRP_CALL_WRITE */ dispatch_flush, /* IRP_CALL_FLUSH */ dispatch_ioctl, /* IRP_CALL_IOCTL */ - dispatch_free /* IRP_CALL_FREE */ + dispatch_free, /* IRP_CALL_FREE */ + dispatch_cancel /* IRP_CALL_CANCEL */ }; /* helper function to update service status */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index eab5755..15ad91c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -649,7 +649,8 @@ enum irp_type IRP_CALL_WRITE, IRP_CALL_FLUSH, IRP_CALL_IOCTL, - IRP_CALL_FREE + IRP_CALL_FREE, + IRP_CALL_CANCEL }; typedef union @@ -706,6 +707,12 @@ typedef union int __pad; client_ptr_t obj; } free; + struct + { + enum irp_type type; + int __pad; + client_ptr_t irp; + } cancel; } irp_params_t; @@ -6695,6 +6702,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 584 +#define SERVER_PROTOCOL_VERSION 585 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 1cebc3b..ee7df5a 100644 --- a/server/device.c +++ b/server/device.c @@ -52,6 +52,7 @@ struct irp_call struct async *async; /* pending async op */ irp_params_t params; /* irp parameters */ struct iosb *iosb; /* I/O status block */ + int canceled; /* the call was canceled */ client_ptr_t user_ptr; /* client side pointer */ }; @@ -188,6 +189,7 @@ 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 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 void device_file_reselect_async( struct fd *fd, struct async_queue *queue ); static const struct object_ops device_file_ops = { @@ -224,7 +226,7 @@ static const struct fd_ops device_file_fd_ops = no_fd_get_volume_info, /* get_volume_info */ device_file_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async /* reselect_async */ + device_file_reselect_async /* reselect_async */ }; @@ -352,6 +354,7 @@ static struct irp_call *create_irp( struct device_file *file, const irp_params_t irp->async = NULL; irp->params = *params; irp->iosb = NULL; + irp->canceled = 0; irp->user_ptr = 0; if (async) irp->iosb = async_get_iosb( async ); @@ -548,6 +551,7 @@ static int fill_irp_params( struct device_manager *manager, struct irp_call *irp { case IRP_CALL_NONE: case IRP_CALL_FREE: + case IRP_CALL_CANCEL: break; case IRP_CALL_CREATE: irp->params.create.file = alloc_handle( current->process, irp->file, @@ -653,6 +657,40 @@ static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *as return queue_irp( file, &params, async ); } +static void cancel_irp_call( struct irp_call *irp ) +{ + struct irp_call *cancel_irp; + irp_params_t params; + + irp->canceled = 1; + if (!irp->user_ptr || !irp->file || !irp->file->device->manager) return; + + memset( &params, 0, sizeof(params) ); + params.cancel.type = IRP_CALL_CANCEL; + params.cancel.irp = irp->user_ptr; + + if ((cancel_irp = create_irp( NULL, &params, NULL ))) + { + add_irp_to_queue( irp->file->device->manager, cancel_irp, NULL ); + release_object( cancel_irp ); + } + + set_irp_result( irp, STATUS_CANCELLED, NULL, 0, 0 ); +} + +static void device_file_reselect_async( struct fd *fd, struct async_queue *queue ) +{ + struct device_file *file = get_fd_user( fd ); + struct irp_call *irp; + + LIST_FOR_EACH_ENTRY( irp, &file->requests, struct irp_call, dev_entry ) + if (irp->iosb->status != STATUS_PENDING) + { + cancel_irp_call( irp ); + return; + } +} + static struct device *create_device( struct object *root, const struct unicode_str *name, struct device_manager *manager ) { @@ -897,6 +935,10 @@ DECL_HANDLER(get_next_device_request) if (req->status) set_irp_result( irp, req->status, NULL, 0, 0 ); + if (irp->canceled) + /* if it was canceled during dispatch, we couldn't queue cancel call without client pointer, + * so we need to do it now */ + cancel_irp_call( irp ); else if (irp->async) set_async_pending( irp->async, irp->file && is_fd_overlapped( irp->file->fd ) ); @@ -947,7 +989,12 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); + if (!irp->canceled) + set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); + else if(irp->user_ptr) /* cancel already queued */ + set_error( STATUS_MORE_PROCESSING_REQUIRED ); + else /* we may be still dispatching the IRP. don't bother queuing cancel if it's already complete */ + irp->canceled = 0; close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp ); } diff --git a/server/protocol.def b/server/protocol.def index 6b6e868..e450388 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -665,7 +665,8 @@ enum irp_type IRP_CALL_WRITE, IRP_CALL_FLUSH, IRP_CALL_IOCTL, - IRP_CALL_FREE + IRP_CALL_FREE, + IRP_CALL_CANCEL }; typedef union @@ -722,6 +723,12 @@ typedef union int __pad; client_ptr_t obj; /* opaque ptr for the freed object */ } free; + struct + { + enum irp_type type; /* IRP_CALL_CANCEL */ + int __pad; + client_ptr_t irp; /* opaque ptr for canceled irp */ + } cancel; } irp_params_t; /* information about a PE image mapping, roughly equivalent to SECTION_IMAGE_INFORMATION */ diff --git a/server/trace.c b/server/trace.c index 82ea93f..8d3de65 100644 --- a/server/trace.c +++ b/server/trace.c @@ -363,6 +363,11 @@ static void dump_irp_params( const char *prefix, const irp_params_t *data ) dump_uint64( ",obj=", &data->free.obj ); fputc( '}', stderr ); break; + case IRP_CALL_CANCEL: + fprintf( stderr, "%s{CANCEL", prefix ); + dump_uint64( ",irp=", &data->cancel.irp ); + fputc( '}', stderr ); + break; } }

1 0

Jacek Caban : ntoskrnl.exe: Cancel IRPs terminated by server.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 9157129fc86c8759e75fc6f68b49b28693c6c9ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9157129fc86c8759e75fc6f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 14:10:48 2019 +0200 ntoskrnl.exe: Cancel IRPs terminated by server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 --- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 04a3f31..b5d89f6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -523,15 +523,31 @@ static void *create_file_object( HANDLE handle ) return file; } +DECLARE_CRITICAL_SECTION(irp_completion_cs); + +static void WINAPI cancel_completed_irp( DEVICE_OBJECT *device, IRP *irp ) +{ + TRACE( "(%p %p)\n", device, irp ); + + IoReleaseCancelSpinLock(irp->CancelIrql); + + irp->IoStatus.u.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { HANDLE irp_handle = context; void *out_buff = irp->UserBuffer; + NTSTATUS status; if (irp->Flags & IRP_WRITE_OPERATION) out_buff = NULL; /* do not transfer back input buffer */ + EnterCriticalSection( &irp_completion_cs ); + SERVER_START_REQ( set_irp_result ) { req->handle = wine_server_obj_handle( irp_handle ); @@ -541,16 +557,29 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, req->size = irp->IoStatus.Information; if (out_buff) wine_server_add_data( req, out_buff, irp->IoStatus.Information ); } - wine_server_call( req ); + status = wine_server_call( req ); } SERVER_END_REQ; + if (status == STATUS_MORE_PROCESSING_REQUIRED) + { + /* IRP is complete, but server may have already ordered cancel call. In such case, + * it will return STATUS_MORE_PROCESSING_REQUIRED, leaving the IRP alive until + * cancel frees it. */ + if (irp->Cancel) + status = STATUS_SUCCESS; + else + IoSetCancelRoutine( irp, cancel_completed_irp ); + } + if (irp->UserBuffer != irp->AssociatedIrp.SystemBuffer) { HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); irp->UserBuffer = NULL; } - return STATUS_SUCCESS; + + LeaveCriticalSection( &irp_completion_cs ); + return status; } struct dispatch_context @@ -842,8 +871,11 @@ static NTSTATUS dispatch_cancel( struct dispatch_context *context ) { IRP *irp = wine_server_get_ptr( context->params.cancel.irp ); - FIXME( "%p\n", irp ); + TRACE( "%p\n", irp ); + EnterCriticalSection( &irp_completion_cs ); + IoCancelIrp( irp ); + LeaveCriticalSection( &irp_completion_cs ); return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index d505643..43418f3 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -234,7 +234,6 @@ static void test_overlapped(void) cancel_cnt = 0xdeadbeef; res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - todo_wine ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); /* test cancelling selected overlapped event */ @@ -254,7 +253,6 @@ static void test_overlapped(void) cancel_cnt = 0xdeadbeef; res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - todo_wine ok(cancel_cnt == 1, "cancel_cnt = %u\n", cancel_cnt); pCancelIoEx(file, &overlapped2); @@ -262,7 +260,6 @@ static void test_overlapped(void) cancel_cnt = 0xdeadbeef; res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - todo_wine ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); }

1 0

Nikolay Sivov : mf: Implement presentation clock methods for sample grabber.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 2407a0f53b0e4805406fae0bd578c06fef4d9f02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2407a0f53b0e4805406fae0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 28 15:08:28 2019 +0300 mf: Implement presentation clock methods for sample grabber. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 51 +++++++++++++++++++++++++++++++++++++++++++++---- dlls/mf/tests/mf.c | 18 +++++++++++------ 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 86dcb13..755d80f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -50,6 +50,7 @@ struct sample_grabber BOOL is_shut_down; IMFStreamSink *stream; IMFMediaEventQueue *event_queue; + IMFPresentationClock *clock; CRITICAL_SECTION cs; }; @@ -430,6 +431,8 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFMediaEventQueue_Shutdown(grabber->event_queue); IMFMediaEventQueue_Release(grabber->event_queue); } + if (grabber->clock) + IMFPresentationClock_Release(grabber->clock); DeleteCriticalSection(&grabber->cs); heap_free(grabber); } @@ -539,16 +542,56 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkById(IMFMediaSink *iface, static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) { - FIXME("%p, %p.\n", iface, clock); + struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, clock); + + EnterCriticalSection(&grabber->cs); + + if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(grabber->callback, clock))) + { + if (grabber->clock) + { + IMFPresentationClock_RemoveClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); + IMFPresentationClock_Release(grabber->clock); + } + grabber->clock = clock; + if (grabber->clock) + { + IMFPresentationClock_AddRef(grabber->clock); + IMFPresentationClock_AddClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); + } + } + + LeaveCriticalSection(&grabber->cs); + + return hr; } static HRESULT WINAPI sample_grabber_sink_GetPresentationClock(IMFMediaSink *iface, IMFPresentationClock **clock) { - FIXME("%p, %p.\n", iface, clock); + struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, clock); + + if (!clock) + return E_POINTER; + + EnterCriticalSection(&grabber->cs); + + if (grabber->clock) + { + *clock = grabber->clock; + IMFPresentationClock_AddRef(*clock); + } + else + hr = MF_E_NO_CLOCK; + + LeaveCriticalSection(&grabber->cs); + + return hr; } static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b381daf..2285eb8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1605,7 +1605,7 @@ static HRESULT WINAPI grabber_callback_OnClockSetRate(IMFSampleGrabberSinkCallba static HRESULT WINAPI grabber_callback_OnSetPresentationClock(IMFSampleGrabberSinkCallback *iface, IMFPresentationClock *clock) { - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI grabber_callback_OnProcessSample(IMFSampleGrabberSinkCallback *iface, REFGUID major_type, @@ -1641,9 +1641,9 @@ static void test_sample_grabber(void) IMFMediaType *media_type, *media_type2, *media_type3; IMFMediaTypeHandler *handler, *handler2; IMFPresentationTimeSource *time_source; + IMFPresentationClock *clock, *clock2; IMFStreamSink *stream, *stream2; IMFClockStateSink *clocksink; - IMFPresentationClock *clock; IMFMediaEventGenerator *eg; IMFMediaSink *sink, *sink2; DWORD flags, count, id; @@ -1742,8 +1742,17 @@ static void test_sample_grabber(void) hr = MFCreatePresentationClock(&clock); ok(hr == S_OK, "Failed to create clock object, hr %#x.\n", hr); + hr = IMFMediaSink_GetPresentationClock(sink, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetPresentationClock(sink, &clock2); + ok(hr == MF_E_NO_CLOCK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_SetPresentationClock(sink, NULL); + ok(hr == S_OK, "Failed to set presentation clock, hr %#x.\n", hr); + hr = IMFMediaSink_SetPresentationClock(sink, clock); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set presentation clock, hr %#x.\n", hr); hr = MFCreateSystemTimeSource(&time_source); ok(hr == S_OK, "Failed to create time source, hr %#x.\n", hr); @@ -1752,9 +1761,6 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); IMFPresentationTimeSource_Release(time_source); - hr = IMFMediaSink_SetPresentationClock(sink, clock); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); - IMFPresentationClock_Release(clock); hr = IMFActivate_ShutdownObject(activate);

1 0

Nikolay Sivov : mf: Detach sink stream on sample grabber shutdown.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 5d6241fbcb470778af4b56bee12575d72f09ee04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d6241fbcb470778af4b56be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 28 15:08:29 2019 +0300 mf: Detach sink stream on sample grabber shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 65 ++++++++++++++++++++++------ dlls/mf/tests/mf.c | 112 +++++++++++++++++++++++++++--------------------- 2 files changed, 114 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d6241fbcb470778af4b…

1 0

Andrey Gusev : ext-ms-win-ntuser-windowclass-l1-1-0: Update spec file.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 82a0181a59a97bb8f8de7c0d6023607c0100c314 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a0181a59a97bb8f8de7c0d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 28 18:22:22 2019 +0300 ext-ms-win-ntuser-windowclass-l1-1-0: Update spec file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47280 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-ntuser-windowclass-l1-1-0.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec index 8b2ab2b..ad8dafe 100644 --- a/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec @@ -5,11 +5,13 @@ @ stdcall GetClassNameA(long ptr long) user32.GetClassNameA @ stdcall GetClassNameW(long ptr long) user32.GetClassNameW @ stdcall GetWindowLongA(long long) user32.GetWindowLongA +@ stdcall -arch=win64 GetWindowLongPtrW(long long) user32.GetWindowLongPtrW @ stdcall GetWindowLongW(long long) user32.GetWindowLongW @ stdcall RegisterClassA(ptr) user32.RegisterClassA @ stdcall RegisterClassExW(ptr) user32.RegisterClassExW @ stdcall RegisterClassW(ptr) user32.RegisterClassW @ stdcall SetWindowLongA(long long long) user32.SetWindowLongA +@ stdcall -arch=win64 SetWindowLongPtrW(long long long) user32.SetWindowLongPtrW @ stdcall SetWindowLongW(long long long) user32.SetWindowLongW @ stdcall UnregisterClassA(str long) user32.UnregisterClassA @ stdcall UnregisterClassW(wstr long) user32.UnregisterClassW

1 0

Jacek Caban : mshtml/tests: Fix tests on some recent IE versions.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 6941232d8be5b0f6e46f4a01b70ff60db9895773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6941232d8be5b0f6e46f4a01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 17:33:35 2019 +0200 mshtml/tests: Fix tests on some recent IE versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index c0ddc81..7d6afd2 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -135,6 +135,7 @@ DEFINE_EXPECT(QS_VariantConversion); DEFINE_EXPECT(QS_IActiveScriptSite); DEFINE_EXPECT(QS_GetCaller); DEFINE_EXPECT(ChangeType); +DEFINE_EXPECT(GetTypeInfo); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" @@ -399,7 +400,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); + CHECK_EXPECT2(GetTypeInfo); return E_NOTIMPL; } @@ -3453,9 +3454,12 @@ static void run_js_tests(void) { run_js_script("jstest.html"); run_js_script("exectest.html"); - run_js_script("vbtest.html"); run_js_script("events.html"); + SET_EXPECT(GetTypeInfo); + run_js_script("vbtest.html"); + CLEAR_CALLED(GetTypeInfo); + if(!is_ie9plus) { win_skip("Skipping some script tests on IE older than 9.\n"); return;

1 0