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

Jacek Caban : server: Introduce kernel_object struct for generic association between server and kernel objects.
by Alexandre Julliard 26 Mar '19

26 Mar '19

1 0

Jacek Caban : server: Store pointers to objects created by kernel_object_from_handle in server.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 134e264ae5d0a1eb198a1312f6b80566689c061b URL: https://source.winehq.org/git/wine.git/?a=commit;h=134e264ae5d0a1eb198a1312… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 14:37:39 2019 +0100 server: Store pointers to objects created by kernel_object_from_handle in server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 126 +++++++++++++++++++++++++++++------------ include/wine/server_protocol.h | 38 ++++++++++++- server/device.c | 87 ++++++++++++++++++++++++++++ server/protocol.def | 17 ++++++ server/request.h | 13 +++++ server/trace.c | 24 ++++++++ 6 files changed, 268 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=134e264ae5d0a1eb198a…

1 0

Jacek Caban : server: Allow kernel to keep reference to server objects by client pointer.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 94c1ef0ee16f01ca998511ef0ce1aafd7690fb79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c1ef0ee16f01ca998511ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 14:37:57 2019 +0100 server: Allow kernel to keep reference to server objects by client pointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 46 +++++++++++++++++++++++++++++--- include/wine/server_protocol.h | 34 +++++++++++++++++++++++- server/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 14 ++++++++++ server/request.h | 10 +++++++ server/trace.c | 18 +++++++++++++ 6 files changed, 176 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94c1ef0ee16f01ca9985…

1 0

Jacek Caban : server: Allow queuing IRPs with no file associated.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 4db5879742a1206540596199fcc9f8d2fc77d469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4db5879742a1206540596199… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 14:38:19 2019 +0100 server: Allow queuing IRPs with no file associated. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/server/device.c b/server/device.c index b83a083..9eec374 100644 --- a/server/device.c +++ b/server/device.c @@ -334,7 +334,7 @@ static struct irp_call *create_irp( struct device_file *file, const irp_params_t { struct irp_call *irp; - if (!file->device->manager) /* it has been deleted */ + if (file && !file->device->manager) /* it has been deleted */ { set_error( STATUS_FILE_DELETED ); return NULL; @@ -342,7 +342,7 @@ static struct irp_call *create_irp( struct device_file *file, const irp_params_t if ((irp = alloc_object( &irp_call_ops ))) { - irp->file = (struct device_file *)grab_object( file ); + irp->file = file ? (struct device_file *)grab_object( file ) : NULL; irp->thread = NULL; irp->async = NULL; irp->params = *params; @@ -411,15 +411,11 @@ static void device_destroy( struct object *obj ) if (device->manager) list_remove( &device->entry ); } -static void add_irp_to_queue( struct device_file *file, struct irp_call *irp, struct thread *thread ) +static void add_irp_to_queue( struct device_manager *manager, struct irp_call *irp, struct thread *thread ) { - struct device_manager *manager = file->device->manager; - - assert( manager ); - grab_object( irp ); /* grab reference for queued irp */ irp->thread = thread ? (struct thread *)grab_object( thread ) : NULL; - list_add_tail( &file->requests, &irp->dev_entry ); + if (irp->file) list_add_tail( &irp->file->requests, &irp->dev_entry ); list_add_tail( &manager->requests, &irp->mgr_entry ); if (list_head( &manager->requests ) == &irp->mgr_entry) wake_up( &manager->obj, 0 ); /* first one */ } @@ -468,7 +464,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, if ((irp = create_irp( file, &params, NULL ))) { - add_irp_to_queue( file, irp, NULL ); + add_irp_to_queue( device->manager, irp, NULL ); release_object( irp ); } } @@ -504,7 +500,7 @@ static int device_file_close_handle( struct object *obj, struct process *process if ((irp = create_irp( file, &params, NULL ))) { - add_irp_to_queue( file, irp, NULL ); + add_irp_to_queue( file->device->manager, irp, NULL ); release_object( irp ); } } @@ -557,7 +553,7 @@ static int queue_irp( struct device_file *file, const irp_params_t *params, stru fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT ); irp->async = (struct async *)grab_object( async ); - add_irp_to_queue( file, irp, current ); + add_irp_to_queue( file->device->manager, irp, current ); release_object( irp ); set_error( STATUS_PENDING ); return 1; @@ -711,6 +707,14 @@ static void device_manager_destroy( struct object *obj ) struct device *device = LIST_ENTRY( ptr, struct device, entry ); delete_device( device ); } + + while ((ptr = list_head( &manager->requests ))) + { + struct irp_call *irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); + list_remove( &irp->mgr_entry ); + assert( !irp->file && !irp->async ); + release_object( irp ); + } } static struct device_manager *create_device_manager(void) @@ -837,13 +841,14 @@ DECL_HANDLER(get_next_device_request) reply->in_size = iosb->in_size; reply->out_size = iosb->out_size; if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); - else if ((reply->next = alloc_handle( current->process, irp, 0, 0 ))) + else if (!irp->file || (reply->next = alloc_handle( current->process, irp, 0, 0 ))) { set_reply_data_ptr( iosb->in_data, iosb->in_size ); iosb->in_data = NULL; iosb->in_size = 0; list_remove( &irp->mgr_entry ); list_init( &irp->mgr_entry ); + if (!irp->file) release_object( irp ); /* no longer on manager queue */ } } else set_error( STATUS_PENDING );

1 0

Jacek Caban : server: Notify client about freed object so that it may free associated kernel object.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: a5c2f043e688ca1dde9c272f92e0b0d993879570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5c2f043e688ca1dde9c272f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 14:38:30 2019 +0100 server: Notify client about freed object so that it may free associated kernel object. Long term, we may consider making interface between server and device manager more generic so that it could be used for messages other than IRPs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- include/wine/server_protocol.h | 6 ++++++ server/device.c | 15 +++++++++++++++ server/protocol.def | 6 ++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 14e85e6..1a4cc74 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -833,6 +833,18 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG return STATUS_SUCCESS; } +/* This is not a real IRP_MJ_CLEANUP dispatcher. We use it to notify client that server + * object associated with kernel object is freed so that we may free it on client side + * as well. */ +static NTSTATUS dispatch_cleanup( const irp_params_t *params, void *in_buff, ULONG in_size, + ULONG out_size, HANDLE irp_handle ) +{ + void *obj = wine_server_get_ptr( params->cleanup.obj ); + TRACE( "freeing %p object\n", obj ); + free_kernel_object( obj ); + return STATUS_SUCCESS; +} + typedef NTSTATUS (*dispatch_func)( const irp_params_t *params, void *in_buff, ULONG in_size, ULONG out_size, HANDLE irp_handle ); @@ -856,7 +868,7 @@ static const dispatch_func dispatch_funcs[IRP_MJ_MAXIMUM_FUNCTION + 1] = NULL, /* IRP_MJ_INTERNAL_DEVICE_CONTROL */ NULL, /* IRP_MJ_SHUTDOWN */ NULL, /* IRP_MJ_LOCK_CONTROL */ - NULL, /* IRP_MJ_CLEANUP */ + dispatch_cleanup, /* IRP_MJ_CLEANUP */ NULL, /* IRP_MJ_CREATE_MAILSLOT */ NULL, /* IRP_MJ_QUERY_SECURITY */ NULL, /* IRP_MJ_SET_SECURITY */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 54a5791..cd50894 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -683,6 +683,12 @@ typedef union ioctl_code_t code; client_ptr_t file; } ioctl; + struct + { + unsigned int major; + int __pad; + client_ptr_t obj; + } cleanup; } irp_params_t; diff --git a/server/device.c b/server/device.c index 9eec374..e9cf43f 100644 --- a/server/device.c +++ b/server/device.c @@ -739,7 +739,22 @@ void free_kernel_objects( struct object *obj ) while ((ptr = list_head( list ))) { struct kernel_object *kernel_object = LIST_ENTRY( ptr, struct kernel_object, list_entry ); + struct irp_call *irp; + irp_params_t params; + assert( !kernel_object->owned ); + + /* abuse IRP_MJ_CLEANUP to request client to free no longer valid kernel object */ + memset( &params, 0, sizeof(params) ); + params.cleanup.major = IRP_MJ_CLEANUP; + params.cleanup.obj = kernel_object->user_ptr; + + if ((irp = create_irp( NULL, &params, NULL ))) + { + add_irp_to_queue( kernel_object->manager, irp, NULL ); + release_object( irp ); + } + list_remove( &kernel_object->list_entry ); wine_rb_remove( &kernel_object->manager->kernel_objects, &kernel_object->rb_entry ); free( kernel_object ); diff --git a/server/protocol.def b/server/protocol.def index 3993ddd..f889e3b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -699,6 +699,12 @@ typedef union ioctl_code_t code; /* ioctl code */ client_ptr_t file; /* opaque ptr for the file object */ } ioctl; + struct + { + unsigned int major; /* IRP_MJ_DEVICE_CLEANUP */ + int __pad; + client_ptr_t obj; /* opaque ptr for the freed object */ + } cleanup; } irp_params_t; /* information about a PE image mapping, roughly equivalent to SECTION_IMAGE_INFORMATION */

1 0

Jacek Caban : ntoskrnl.exe: Support creating event objects from server handle.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 0decadd62a76b968abf75c9943dd0869249ec716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0decadd62a76b968abf75c99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 14:38:44 2019 +0100 ntoskrnl.exe: Support creating event objects from server handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl_private.h | 2 ++ dlls/ntoskrnl.exe/sync.c | 63 +++++++++++++++++++++++++++++------- dlls/ntoskrnl.exe/tests/driver.c | 41 +++++++++++++++++++++-- server/event.c | 11 ++++++- 4 files changed, 101 insertions(+), 16 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 58ecf0c..9bef13d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -27,6 +27,8 @@ struct _OBJECT_TYPE { void (*release)(void*); /* called when the last reference is released */ }; +void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; + extern POBJECT_TYPE ExEventObjectType; extern POBJECT_TYPE ExSemaphoreObjectType; extern POBJECT_TYPE IoDeviceObjectType; diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 926df05..7cb3185 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -76,6 +76,13 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], EnterCriticalSection( &sync_cs ); for (i = 0; i < count; i++) { + if (objs[i]->WaitListHead.Blink == INVALID_HANDLE_VALUE) + { + FIXME("unsupported on kernel objects\n"); + handles[i] = INVALID_HANDLE_VALUE; + continue; + } + ++*((ULONG_PTR *)&objs[i]->WaitListHead.Flink); if (!objs[i]->WaitListHead.Blink) { @@ -127,6 +134,8 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], } } + if (objs[i]->WaitListHead.Blink == INVALID_HANDLE_VALUE) continue; + if (!--*((ULONG_PTR *)&objs[i]->WaitListHead.Flink)) { switch (objs[i]->Type) @@ -186,10 +195,24 @@ void WINAPI KeInitializeEvent( PRKEVENT event, EVENT_TYPE type, BOOLEAN state ) event->Header.WaitListHead.Flink = NULL; } +static void *create_event_object( HANDLE handle ) +{ + EVENT_BASIC_INFORMATION info; + KEVENT *event; + + if (!(event = alloc_kernel_object( ExEventObjectType, handle, sizeof(*event), 0 ))) return NULL; + + if (!NtQueryEvent( handle, EventBasicInformation, &info, sizeof(info), NULL )) + KeInitializeEvent( event, info.EventType, info.EventState ); + event->Header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ + return event; +} + static const WCHAR event_type_name[] = {'E','v','e','n','t',0}; static struct _OBJECT_TYPE event_type = { event_type_name, + create_event_object }; POBJECT_TYPE ExEventObjectType = &event_type; @@ -200,15 +223,23 @@ POBJECT_TYPE ExEventObjectType = &event_type; LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) { HANDLE handle; - LONG ret; + ULONG ret = 0; TRACE("event %p, increment %d, wait %u.\n", event, increment, wait); - EnterCriticalSection( &sync_cs ); - ret = InterlockedExchange( &event->Header.SignalState, TRUE ); - if ((handle = event->Header.WaitListHead.Blink)) - SetEvent( handle ); - LeaveCriticalSection( &sync_cs ); + if (event->Header.WaitListHead.Blink != INVALID_HANDLE_VALUE) + { + EnterCriticalSection( &sync_cs ); + ret = InterlockedExchange( &event->Header.SignalState, TRUE ); + if ((handle = event->Header.WaitListHead.Blink)) + SetEvent( handle ); + LeaveCriticalSection( &sync_cs ); + } + else + { + FIXME("unsupported on kernel objects\n"); + event->Header.SignalState = TRUE; + } return ret; } @@ -219,15 +250,23 @@ LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) LONG WINAPI KeResetEvent( PRKEVENT event ) { HANDLE handle; - LONG ret; + ULONG ret = 0; TRACE("event %p.\n", event); - EnterCriticalSection( &sync_cs ); - ret = InterlockedExchange( &event->Header.SignalState, FALSE ); - if ((handle = event->Header.WaitListHead.Blink)) - ResetEvent( handle ); - LeaveCriticalSection( &sync_cs ); + if (event->Header.WaitListHead.Blink != INVALID_HANDLE_VALUE) + { + EnterCriticalSection( &sync_cs ); + ret = InterlockedExchange( &event->Header.SignalState, FALSE ); + if ((handle = event->Header.WaitListHead.Blink)) + ResetEvent( handle ); + LeaveCriticalSection( &sync_cs ); + } + else + { + FIXME("unsupported on kernel objects\n"); + event->Header.SignalState = FALSE; + } return ret; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 64abca4..55455d7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -308,6 +308,14 @@ static NTSTATUS wait_multiple(ULONG count, void *objs[], WAIT_TYPE wait_type, UL return KeWaitForMultipleObjects(count, objs, wait_type, Executive, KernelMode, FALSE, &integer, NULL); } +static NTSTATUS wait_single_handle(HANDLE handle, ULONGLONG timeout) +{ + LARGE_INTEGER integer; + + integer.QuadPart = timeout; + return ZwWaitForSingleObject(handle, FALSE, &integer); +} + static void run_thread(PKSTART_ROUTINE proc, void *arg) { OBJECT_ATTRIBUTES attr = {0}; @@ -341,11 +349,13 @@ static void WINAPI mutex_thread(void *arg) static void test_sync(void) { KSEMAPHORE semaphore, semaphore2; - KEVENT manual_event, auto_event; + KEVENT manual_event, auto_event, *event; KTIMER timer; LARGE_INTEGER timeout; + OBJECT_ATTRIBUTES attr; void *objs[2]; NTSTATUS ret; + HANDLE handle; int i; KeInitializeEvent(&manual_event, NotificationEvent, FALSE); @@ -440,6 +450,33 @@ static void test_sync(void) ret = wait_multiple(2, objs, WaitAny, 0); ok(ret == 1, "got %#x\n", ret); + InitializeObjectAttributes(&attr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); + ret = ZwCreateEvent(&handle, SYNCHRONIZE, &attr, NotificationEvent, TRUE); + ok(!ret, "ZwCreateEvent failed: %#x\n", ret); + + ret = ObReferenceObjectByHandle(handle, SYNCHRONIZE, *pExEventObjectType, KernelMode, (void **)&event, NULL); + ok(!ret, "ObReferenceObjectByHandle failed: %#x\n", ret); + + ret = wait_single(event, 0); + todo_wine + ok(ret == 0, "got %#x\n", ret); + KeResetEvent(event); + ret = wait_single(event, 0); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ret = wait_single_handle(handle, 0); + todo_wine + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + KeSetEvent(event, 0, FALSE); + ret = wait_single(event, 0); + todo_wine + ok(ret == 0, "got %#x\n", ret); + ret = wait_single_handle(handle, 0); + ok(!ret, "got %#x\n", ret); + + ZwClose(handle); + ObDereferenceObject(event); + /* test semaphores */ KeInitializeSemaphore(&semaphore, 0, 5); @@ -731,14 +768,12 @@ static void test_ob_reference(const WCHAR *test_path) status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pExEventObjectType, KernelMode, &obj2, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); - todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); ObDereferenceObject(obj2); status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, NULL, KernelMode, &obj2, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); - todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); ObDereferenceObject(obj2); diff --git a/server/event.c b/server/event.c index f5feca9..d339d85 100644 --- a/server/event.c +++ b/server/event.c @@ -39,6 +39,7 @@ struct event { struct object obj; /* object header */ + struct list kernel_object; /* list of kernel object pointers */ int manual_reset; /* is it a manual reset event? */ int signaled; /* event has been signaled */ }; @@ -49,6 +50,7 @@ static int event_signaled( struct object *obj, struct wait_queue_entry *entry ); static void event_satisfied( struct object *obj, struct wait_queue_entry *entry ); static unsigned int event_map_access( struct object *obj, unsigned int access ); static int event_signal( struct object *obj, unsigned int access); +static struct list *event_get_kernel_obj_list( struct object *obj ); static const struct object_ops event_ops = { @@ -68,7 +70,7 @@ static const struct object_ops event_ops = directory_link_name, /* link_name */ default_unlink_name, /* unlink_name */ no_open_file, /* open_file */ - no_kernel_obj_list, /* get_kernel_obj_list */ + event_get_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ no_destroy /* destroy */ }; @@ -119,6 +121,7 @@ struct event *create_event( struct object *root, const struct unicode_str *name, if (get_error() != STATUS_OBJECT_NAME_EXISTS) { /* initialize it if it didn't already exist */ + list_init( &event->kernel_object ); event->manual_reset = manual_reset; event->signaled = initial_state; } @@ -204,6 +207,12 @@ static int event_signal( struct object *obj, unsigned int access ) return 1; } +static struct list *event_get_kernel_obj_list( struct object *obj ) +{ + struct event *event = (struct event *)obj; + return &event->kernel_object; +} + struct keyed_event *create_keyed_event( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ) {

1 0

Jacek Caban : ntoskrnl.exe: Support waiting on kernel objects.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: f57a383d090469895954a861083401b2ab81eb02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57a383d090469895954a861… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 14:38:57 2019 +0100 ntoskrnl.exe: Support waiting on kernel objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/sync.c | 11 ++++++----- dlls/ntoskrnl.exe/tests/driver.c | 3 +-- include/wine/server_protocol.h | 22 +++++++++++++++++++++- server/device.c | 19 +++++++++++++++++++ server/protocol.def | 10 ++++++++++ server/request.h | 8 ++++++++ server/trace.c | 15 +++++++++++++++ 9 files changed, 95 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f57a383d090469895954…

1 0

Jacek Caban : ntoskrnl.exe: Support event functions on kernel objects.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: b9c621856ff058c8ec502436da5c57bc7617c27c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9c621856ff058c8ec502436… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 14:39:07 2019 +0100 ntoskrnl.exe: Support event functions on kernel objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 16 ++++++++++++---- dlls/ntoskrnl.exe/tests/driver.c | 2 -- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 5a72bc5..3085543 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -224,7 +224,7 @@ POBJECT_TYPE ExEventObjectType = &event_type; LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) { HANDLE handle; - ULONG ret = 0; + LONG ret = 0; TRACE("event %p, increment %d, wait %u.\n", event, increment, wait); @@ -238,7 +238,11 @@ LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) } else { - FIXME("unsupported on kernel objects\n"); + if ((handle = kernel_object_handle( event, EVENT_MODIFY_STATE ))) + { + NtSetEvent( handle, &ret ); + NtClose( handle ); + } event->Header.SignalState = TRUE; } @@ -251,7 +255,7 @@ LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) LONG WINAPI KeResetEvent( PRKEVENT event ) { HANDLE handle; - ULONG ret = 0; + LONG ret = 0; TRACE("event %p.\n", event); @@ -265,7 +269,11 @@ LONG WINAPI KeResetEvent( PRKEVENT event ) } else { - FIXME("unsupported on kernel objects\n"); + if ((handle = kernel_object_handle( event, EVENT_MODIFY_STATE ))) + { + NtResetEvent( handle, &ret ); + NtClose( handle ); + } event->Header.SignalState = FALSE; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0fc0058..8823746 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -461,10 +461,8 @@ static void test_sync(void) ok(ret == 0, "got %#x\n", ret); KeResetEvent(event); ret = wait_single(event, 0); - todo_wine ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); ret = wait_single_handle(handle, 0); - todo_wine ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); KeSetEvent(event, 0, FALSE);

1 0

Ken Thomases : .editorconfig: Remove the trim_trailing_whitespace setting.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 692d7c6f5c2f5b5d96f1f6ab6889bac3695a9215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=692d7c6f5c2f5b5d96f1f6ab… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 25 19:17:09 2019 -0500 .editorconfig: Remove the trim_trailing_whitespace setting. Editors don't behave consistently. Some remove trailing whitespace from the entire file, not just touched lines, on save. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .editorconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 289038d..82f5734 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,6 @@ indent_style = space indent_size = 4 tab_width = 8 charset = utf-8 -trim_trailing_whitespace = true insert_final_newline = true max_line_length = 100

1 0

Zebediah Figura : msi/tests: Test calling more functions from custom actions.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: ae0298d46e8d4b7b689783b9c459ceafc3631780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae0298d46e8d4b7b689783b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:00 2019 -0500 msi/tests: Test calling more functions from custom actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 54 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index c7ce4d2..6ae5bfc 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1112,11 +1112,57 @@ static void test_costs(MSIHANDLE hinst) ok(hinst, sz == 2, "got size %u\n", sz); } +static void test_invalid_functions(MSIHANDLE hinst) +{ + char path[MAX_PATH], package_name[20]; + MSIHANDLE db, preview, package; + UINT r; + + r = MsiGetDatabaseState(hinst); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + db = MsiGetActiveDatabase(hinst); + ok(hinst, db, "MsiGetActiveDatabase failed\n"); + + r = MsiDatabaseGenerateTransformA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r); + + GetCurrentDirectoryA(sizeof(path), path); + r = MsiDatabaseExportA(db, "Test", path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseImportA(db, path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseCommit(db); + ok(hinst, r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiDatabaseMergeA(db, db, "MergeErrors"); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiGetDatabaseState(db); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + r = MsiEnableUIPreview(db, &preview); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + sprintf(package_name, "#%u", db); + r = MsiOpenPackageA(package_name, &package); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + MsiCloseHandle(db); +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) { - UINT res; IUnknown *unk = NULL; HRESULT hr; @@ -1131,11 +1177,6 @@ UINT WINAPI main_test(MSIHANDLE hinst) ok(hinst, hr == S_OK, "got %#x\n", hr); CoUninitialize(); - /* Test MsiGetDatabaseState() */ - res = MsiGetDatabaseState(hinst); - todo_wine - ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); - test_props(hinst); test_db(hinst); test_doaction(hinst); @@ -1144,6 +1185,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_feature_states(hinst); test_format_record(hinst); test_costs(hinst); + test_invalid_functions(hinst); return ERROR_SUCCESS; }

1 0