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 March 26, 2019

March 26, 2019

1 0

Jacek Caban : ntoskrnl.exe: Support waiting on kernel objects.
by Alexandre Julliard March 26, 2019

March 26, 2019

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

Piotr Caban : msvcrt: Use _strnicmp instead of strncasecmp.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: f48ea297268e832c93a22fb5b92f73620c717280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f48ea297268e832c93a22fb5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 11:31:13 2019 +0100 msvcrt: Use _strnicmp instead of strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/string.c | 11 +---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 1e05711..fc41f05 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -142,7 +142,7 @@ static int compare_info(LCID lcid, DWORD flags, char* buff, const char* cmp, BOO if(exact || len<=3) return !MSVCRT__stricmp(cmp, buff); else - return !strncasecmp(cmp, buff, len); + return !MSVCRT__strnicmp(cmp, buff, len); } static BOOL CALLBACK diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index bc528f1..95b4f2b 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -133,7 +133,7 @@ static inline int u_strncmp( const unsigned char *s1, const unsigned char *s2, M static inline int u_strncasecmp( const unsigned char *s1, const unsigned char *s2, MSVCRT_size_t len ) { - return strncasecmp( (const char*)s1, (const char*)s2, len ); + return MSVCRT__strnicmp( (const char*)s1, (const char*)s2, len ); } static inline unsigned char *u_strchr( const unsigned char *s, unsigned char x ) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 17eee1c..f9185cc 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -694,7 +694,7 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strncasecmp(str1, str2, count); + return MSVCRT__strnicmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, MSVCRT_strnlen(str1, count), str2, MSVCRT_strnlen(str2, count))-CSTR_EQUAL; @@ -1960,7 +1960,6 @@ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, MSVCRT_size_t count, MSVCRT__locale_t locale) { - MSVCRT_pthreadlocinfo locinfo; int c1, c2; if(s1==NULL || s2==NULL) @@ -1969,14 +1968,6 @@ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, if(!count) return 0; - if(!locale) - locinfo = get_locinfo(); - else - locinfo = locale->locinfo; - - if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) - return strncasecmp(s1, s2, count); - do { c1 = MSVCRT__tolower_l(*s1++, locale); c2 = MSVCRT__tolower_l(*s2++, locale);

1 0

Jacek Caban : server: Store pointers to objects created by kernel_object_from_handle in server.
by Alexandre Julliard March 26, 2019

March 26, 2019

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 : ntoskrnl.exe: Support creating event objects from server handle.
by Alexandre Julliard March 26, 2019

March 26, 2019

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 : server: Notify client about freed object so that it may free associated kernel object.
by Alexandre Julliard March 26, 2019

March 26, 2019

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 : server: Allow queuing IRPs with no file associated.
by Alexandre Julliard March 26, 2019

March 26, 2019

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: Allow kernel to keep reference to server objects by client pointer.
by Alexandre Julliard March 26, 2019

March 26, 2019

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

Piotr Caban : ntdll: Use NTDLL_tolower in _strlwr.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 985178578379c9355429f9737977d772ac11cb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=985178578379c9355429f973… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:26:29 2019 +0100 ntdll: Use NTDLL_tolower in _strlwr. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 0323c09..efae4d4 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -311,7 +311,7 @@ LPSTR __cdecl _strupr( LPSTR str ) LPSTR __cdecl _strlwr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = tolower(*str); + for ( ; *str; str++) *str = NTDLL_tolower(*str); return ret; }

1 0

Nikolay Sivov : winegstreamer: Actually pin module on initialization.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 11401be90b91236240695a6c876d4140044d7f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11401be90b91236240695a6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 26 08:57:36 2019 +0300 winegstreamer: Actually pin module on initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index fdc8966..2a5dbd1 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -275,17 +275,17 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct *status = gst_init_check(&argc, &argv, &err); if (*status) { - HINSTANCE newhandle; + HINSTANCE handle; TRACE("Inititialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); /* Unloading glib is a bad idea.. it installs atexit handlers, * so never unload the dll after loading */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (LPCWSTR)hInst, &newhandle); - if (!newhandle) - ERR("Could not pin module %p\n", hInst); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + (LPCWSTR)hInst, &handle); + if (!handle) + ERR("Failed to pin module %p.\n", hInst); start_dispatch_thread(); }

1 0