wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zebediah Figura : ntdll: Implement NtMakeTemporaryObject().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 77e74fb1dbc8a435cefe17998dc73a4e40c3aeed URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e74fb1dbc8a435cefe1799… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 20:27:55 2020 -0500 ntdll: Implement NtMakeTemporaryObject(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/om.c | 16 +++++++++++++--- dlls/ntoskrnl.exe/tests/driver.c | 8 ++++---- include/wine/server_protocol.h | 17 ++++++++++++++++- server/handle.c | 14 ++++++++++++++ server/object.c | 10 ++++++++++ server/object.h | 1 + server/protocol.def | 6 ++++++ server/request.h | 4 ++++ server/trace.c | 8 ++++++++ 9 files changed, 76 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 2234f870d6..4bfa7620bb 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -476,8 +476,18 @@ NTSTATUS WINAPI NtAllocateUuids( ULARGE_INTEGER *time, ULONG *delta, ULONG *sequ * Success: STATUS_SUCCESS. * Failure: An NTSTATUS error code. */ -NTSTATUS WINAPI NtMakeTemporaryObject( HANDLE Handle ) +NTSTATUS WINAPI NtMakeTemporaryObject( HANDLE handle ) { - FIXME("(%p), stub.\n", Handle); - return STATUS_SUCCESS; + NTSTATUS ret; + + TRACE("%p\n", handle); + + SERVER_START_REQ( make_temporary ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 72d2272d5c..0671a56efc 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2056,20 +2056,20 @@ static void test_permanence(void) status = ZwClose( handle ); ok(!status, "got %#x\n", status); status = ZwOpenDirectoryObject( &handle, 0, &attr ); - todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); attr.Attributes = OBJ_PERMANENT; status = ZwOpenDirectoryObject( &handle2, 0, &attr ); ok(status == STATUS_SUCCESS, "got %#x\n", status); status = ZwClose( handle2 ); ok(!status, "got %#x\n", status); status = ZwClose( handle ); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); attr.Attributes = 0; status = ZwOpenDirectoryObject( &handle, 0, &attr ); - todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e6e772553c..fc808774be 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1218,6 +1218,18 @@ struct dup_handle_reply +struct make_temporary_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct make_temporary_reply +{ + struct reply_header __header; +}; + + + struct open_process_request { struct request_header __header; @@ -5600,6 +5612,7 @@ enum request REQ_close_handle, REQ_set_handle_info, REQ_dup_handle, + REQ_make_temporary, REQ_open_process, REQ_open_thread, REQ_select, @@ -5894,6 +5907,7 @@ union generic_request struct close_handle_request close_handle_request; struct set_handle_info_request set_handle_info_request; struct dup_handle_request dup_handle_request; + struct make_temporary_request make_temporary_request; struct open_process_request open_process_request; struct open_thread_request open_thread_request; struct select_request select_request; @@ -6186,6 +6200,7 @@ union generic_reply struct close_handle_reply close_handle_reply; struct set_handle_info_reply set_handle_info_reply; struct dup_handle_reply dup_handle_reply; + struct make_temporary_reply make_temporary_reply; struct open_process_reply open_process_reply; struct open_thread_reply open_thread_reply; struct select_reply select_reply; @@ -6452,7 +6467,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 626 +#define SERVER_PROTOCOL_VERSION 627 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index a2a8bb5479..9ae99cd0c6 100644 --- a/server/handle.c +++ b/server/handle.c @@ -833,3 +833,17 @@ DECL_HANDLER(get_system_handles) enum_processes( enum_handles, &info ); } } + +DECL_HANDLER(make_temporary) +{ + struct object *obj; + + if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; + + if (obj->is_permanent) + { + make_object_temporary( obj ); + release_object( obj ); + } + release_object( obj ); +} diff --git a/server/object.c b/server/object.c index 6c0bb9be3a..8ec6609f69 100644 --- a/server/object.c +++ b/server/object.c @@ -414,6 +414,16 @@ void make_object_static( struct object *obj ) #endif } +/* mark an object as no longer static */ +void make_object_temporary( struct object *obj ) +{ + obj->is_permanent = 0; +#ifdef DEBUG_OBJECTS + list_remove( &obj->obj_list ); + list_add_head( &object_list, &obj->obj_list ); +#endif +} + /* grab an object (i.e. increment its refcount) and return the object */ struct object *grab_object( void *ptr ) { diff --git a/server/object.h b/server/object.h index fac35f0984..1f5c4a5f06 100644 --- a/server/object.h +++ b/server/object.h @@ -144,6 +144,7 @@ extern void *open_named_object( struct object *parent, const struct object_ops * const struct unicode_str *name, unsigned int attributes ); extern void unlink_named_object( struct object *obj ); extern void make_object_static( struct object *obj ); +extern void make_object_temporary( struct object *obj ); extern struct namespace *create_namespace( unsigned int hash_size ); extern void free_kernel_objects( struct object *obj ); /* grab/release_object can take any pointer, but you better make sure */ diff --git a/server/protocol.def b/server/protocol.def index 03e567c3dd..9c8aec6960 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1080,6 +1080,12 @@ struct rawinput_device #define DUP_HANDLE_MAKE_GLOBAL 0x80000000 /* Not a Windows flag */ +/* Make an object temporary */ +@REQ(make_temporary) + obj_handle_t handle; /* handle to the object */ +@END + + /* Open a handle to a process */ @REQ(open_process) process_id_t pid; /* process id to open */ diff --git a/server/request.h b/server/request.h index 0b271b8479..2dfa76f939 100644 --- a/server/request.h +++ b/server/request.h @@ -144,6 +144,7 @@ DECL_HANDLER(get_apc_result); DECL_HANDLER(close_handle); DECL_HANDLER(set_handle_info); DECL_HANDLER(dup_handle); +DECL_HANDLER(make_temporary); DECL_HANDLER(open_process); DECL_HANDLER(open_thread); DECL_HANDLER(select); @@ -437,6 +438,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_close_handle, (req_handler)req_set_handle_info, (req_handler)req_dup_handle, + (req_handler)req_make_temporary, (req_handler)req_open_process, (req_handler)req_open_thread, (req_handler)req_select, @@ -904,6 +906,8 @@ C_ASSERT( FIELD_OFFSET(struct dup_handle_reply, handle) == 8 ); C_ASSERT( FIELD_OFFSET(struct dup_handle_reply, self) == 12 ); C_ASSERT( FIELD_OFFSET(struct dup_handle_reply, closed) == 16 ); C_ASSERT( sizeof(struct dup_handle_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct make_temporary_request, handle) == 12 ); +C_ASSERT( sizeof(struct make_temporary_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, access) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, attributes) == 20 ); diff --git a/server/trace.c b/server/trace.c index 7acab95efe..5fd6811195 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1590,6 +1590,11 @@ static void dump_dup_handle_reply( const struct dup_handle_reply *req ) fprintf( stderr, ", closed=%d", req->closed ); } +static void dump_make_temporary_request( const struct make_temporary_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + static void dump_open_process_request( const struct open_process_request *req ) { fprintf( stderr, " pid=%04x", req->pid ); @@ -4522,6 +4527,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_close_handle_request, (dump_func)dump_set_handle_info_request, (dump_func)dump_dup_handle_request, + (dump_func)dump_make_temporary_request, (dump_func)dump_open_process_request, (dump_func)dump_open_thread_request, (dump_func)dump_select_request, @@ -4812,6 +4818,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_set_handle_info_reply, (dump_func)dump_dup_handle_reply, + NULL, (dump_func)dump_open_process_reply, (dump_func)dump_open_thread_reply, (dump_func)dump_select_reply, @@ -5102,6 +5109,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "close_handle", "set_handle_info", "dup_handle", + "make_temporary", "open_process", "open_thread", "select",

1 0

Zebediah Figura : server: Implement OBJ_PERMANENT.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: c7032e9222fdfd3b4364d6c729fa5ca6f0b35f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7032e9222fdfd3b4364d6c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 20:27:54 2020 -0500 server: Implement OBJ_PERMANENT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 12 ++++++------ server/object.c | 11 +++++++++-- server/object.h | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0ae63ffafb..72d2272d5c 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2048,28 +2048,28 @@ static void test_permanence(void) attr.Attributes = 0; status = ZwOpenDirectoryObject( &handle, 0, &attr ); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); status = ZwMakeTemporaryObject( handle ); ok(!status, "got %#x\n", status); status = ZwMakeTemporaryObject( handle ); ok(!status, "got %#x\n", status); status = ZwClose( handle ); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); status = ZwOpenDirectoryObject( &handle, 0, &attr ); - ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); - ok(!status, "got %#x\n", status); + todo_wine ok(!status, "got %#x\n", status); attr.Attributes = OBJ_PERMANENT; status = ZwOpenDirectoryObject( &handle2, 0, &attr ); ok(status == STATUS_SUCCESS, "got %#x\n", status); status = ZwClose( handle2 ); ok(!status, "got %#x\n", status); status = ZwClose( handle ); - ok(!status, "got %#x\n", status); + todo_wine ok(!status, "got %#x\n", status); attr.Attributes = 0; status = ZwOpenDirectoryObject( &handle, 0, &attr ); - ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) diff --git a/server/object.c b/server/object.c index dacfe1d71a..6c0bb9be3a 100644 --- a/server/object.c +++ b/server/object.c @@ -278,7 +278,8 @@ data_size_t get_path_element( const WCHAR *name, data_size_t len ) } static struct object *create_object( struct object *parent, const struct object_ops *ops, - const struct unicode_str *name, const struct security_descriptor *sd ) + const struct unicode_str *name, unsigned int attributes, + const struct security_descriptor *sd ) { struct object *obj; struct object_name *name_ptr; @@ -292,6 +293,11 @@ static struct object *create_object( struct object *parent, const struct object_ name_ptr->obj = obj; obj->name = name_ptr; + if (attributes & OBJ_PERMANENT) + { + make_object_static( obj ); + grab_object( obj ); + } return obj; failed: @@ -340,7 +346,7 @@ void *create_named_object( struct object *parent, const struct object_ops *ops, return obj; } - new_obj = create_object( obj, ops, &new_name, sd ); + new_obj = create_object( obj, ops, &new_name, attributes, sd ); release_object( obj ); return new_obj; } @@ -401,6 +407,7 @@ void unlink_named_object( struct object *obj ) /* mark an object as being stored statically, i.e. only released at shutdown */ void make_object_static( struct object *obj ) { + obj->is_permanent = 1; #ifdef DEBUG_OBJECTS list_remove( &obj->obj_list ); list_add_head( &static_object_list, &obj->obj_list ); diff --git a/server/object.h b/server/object.h index f0b889d589..fac35f0984 100644 --- a/server/object.h +++ b/server/object.h @@ -105,6 +105,7 @@ struct object struct list wait_queue; struct object_name *name; struct security_descriptor *sd; + unsigned int is_permanent:1; #ifdef DEBUG_OBJECTS struct list obj_list; #endif

1 0

Zebediah Figura : ntoskrnl.exe: Add tests for permanent objects.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 26c8fb8ce7a09698cdba73576cf924185dffd3a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c8fb8ce7a09698cdba7357… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 20:27:53 2020 -0500 ntoskrnl.exe: Add tests for permanent objects. These tests have to live in ntoskrnl, since only kernel drivers and processes running as LOCAL SYSTEM can create permanent objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 ++--- dlls/ntoskrnl.exe/tests/driver.c | 49 +++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6acdec5dc5..0f65490b48 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1378,7 +1378,7 @@ @ stdcall ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort -@ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject +@ stdcall ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall ZwCreateEvent(ptr long ptr long long) NtCreateEvent @ stdcall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion @@ -1412,11 +1412,11 @@ @ stdcall -private ZwLoadKey(ptr ptr) NtLoadKey @ stdcall -private ZwLockFile(long long ptr ptr ptr ptr ptr ptr long long) NtLockFile @ stdcall -private ZwLockVirtualMemory(long ptr ptr long) NtLockVirtualMemory -@ stdcall -private ZwMakeTemporaryObject(long) NtMakeTemporaryObject +@ stdcall ZwMakeTemporaryObject(long) NtMakeTemporaryObject @ stdcall -private ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection @ stdcall -private ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall -private ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey -@ stdcall -private ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject +@ stdcall ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject @ stdcall -private ZwOpenEvent(ptr long ptr) NtOpenEvent @ stdcall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private ZwOpenJobObject(ptr long ptr) NtOpenJobObject diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index bb5bbeb4fa..0ae63ffafb 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2024,6 +2024,54 @@ static void test_process_memory(const struct test_input *test_input) ObDereferenceObject(process); } +static void test_permanence(void) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle, handle2; + UNICODE_STRING str; + NTSTATUS status; + + RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\wine_test_dir"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + attr.Attributes = OBJ_PERMANENT; + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + attr.Attributes = OBJ_PERMANENT; + status = ZwOpenDirectoryObject( &handle2, 0, &attr ); + ok(status == STATUS_SUCCESS, "got %#x\n", status); + status = ZwClose( handle2 ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -2080,6 +2128,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_affinity(); test_dpc(); test_process_memory(test_input); + test_permanence(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR;

1 0

Alexandre Julliard : ntdll: Use syscall thunks for object manager functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 0534beb331ff9f1444db47cfb3c03224c1837aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=0534beb331ff9f1444db47cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:44:54 2020 +0200 ntdll: Use syscall thunks for object manager functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 12 ++++++------ dlls/ntdll/om.c | 35 ----------------------------------- dlls/ntdll/unix/loader.c | 3 --- dlls/ntdll/unixlib.h | 9 +-------- 4 files changed, 7 insertions(+), 52 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 72bf4c25ca..4c8a1f6165 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -200,7 +200,7 @@ @ stdcall NtDeleteValueKey(long ptr) @ stdcall -syscall NtDeviceIoControlFile(long long ptr ptr ptr long ptr long ptr long) @ stdcall NtDisplayString(ptr) -@ stdcall NtDuplicateObject(long long long ptr long long long) +@ stdcall -syscall NtDuplicateObject(long long long ptr long long long) @ stdcall NtDuplicateToken(long long ptr long long ptr) # @ stub NtEnumerateBootEntries @ stub NtEnumerateBus @@ -305,7 +305,7 @@ @ stdcall NtQueryLicenseValue(ptr ptr ptr long ptr) @ stdcall NtQueryMultipleValueKey(long ptr long ptr long ptr) @ stdcall -syscall NtQueryMutant(long long ptr long ptr) -@ stdcall NtQueryObject(long long ptr long ptr) +@ stdcall -syscall NtQueryObject(long long ptr long ptr) @ stub NtQueryOpenSubKeys @ stdcall NtQueryPerformanceCounter(ptr ptr) # @ stub NtQueryPortInformationProcess @@ -376,7 +376,7 @@ @ stdcall -syscall NtSetInformationFile(long ptr ptr long long) @ stdcall -syscall NtSetInformationJobObject(long long ptr long) @ stdcall NtSetInformationKey(long long ptr long) -@ stdcall NtSetInformationObject(long long ptr long) +@ stdcall -syscall NtSetInformationObject(long long ptr long) @ stdcall -syscall NtSetInformationProcess(long long ptr long) @ stdcall -syscall NtSetInformationThread(long long ptr long) @ stdcall NtSetInformationToken(long long ptr long) @@ -1187,7 +1187,7 @@ @ stdcall -private ZwDeleteValueKey(long ptr) NtDeleteValueKey @ stdcall -private -syscall ZwDeviceIoControlFile(long long ptr ptr ptr long ptr long ptr long) NtDeviceIoControlFile @ stdcall -private ZwDisplayString(ptr) NtDisplayString -@ stdcall -private ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject +@ stdcall -private -syscall ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject @ stdcall -private ZwDuplicateToken(long long ptr long long ptr) NtDuplicateToken # @ stub ZwEnumerateBootEntries @ stub ZwEnumerateBus @@ -1292,7 +1292,7 @@ @ stdcall -private ZwQueryLicenseValue(ptr ptr ptr long ptr) NtQueryLicenseValue @ stdcall -private ZwQueryMultipleValueKey(long ptr long ptr long ptr) NtQueryMultipleValueKey @ stdcall -private -syscall ZwQueryMutant(long long ptr long ptr) NtQueryMutant -@ stdcall -private ZwQueryObject(long long ptr long ptr) NtQueryObject +@ stdcall -private -syscall ZwQueryObject(long long ptr long ptr) NtQueryObject @ stub ZwQueryOpenSubKeys @ stdcall -private ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter # @ stub ZwQueryPortInformationProcess @@ -1363,7 +1363,7 @@ @ stdcall -private -syscall ZwSetInformationFile(long ptr ptr long long) NtSetInformationFile @ stdcall -private -syscall ZwSetInformationJobObject(long long ptr long) NtSetInformationJobObject @ stdcall -private ZwSetInformationKey(long long ptr long) NtSetInformationKey -@ stdcall -private ZwSetInformationObject(long long ptr long) NtSetInformationObject +@ stdcall -private -syscall ZwSetInformationObject(long long ptr long) NtSetInformationObject @ stdcall -private -syscall ZwSetInformationProcess(long long ptr long) NtSetInformationProcess @ stdcall -private -syscall ZwSetInformationThread(long long ptr long) NtSetInformationThread @ stdcall -private ZwSetInformationToken(long long ptr long) NtSetInformationToken diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 601e6ede12..2234f870d6 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -39,29 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); * Generic object functions */ -/****************************************************************************** - * NtQueryObject [NTDLL.@] - * ZwQueryObject [NTDLL.@] - */ -NTSTATUS WINAPI NtQueryObject(IN HANDLE handle, - IN OBJECT_INFORMATION_CLASS info_class, - OUT PVOID ptr, IN ULONG len, OUT PULONG used_len) -{ - return unix_funcs->NtQueryObject( handle, info_class, ptr, len, used_len ); -} - -/****************************************************************** - * NtSetInformationObject [NTDLL.@] - * ZwSetInformationObject [NTDLL.@] - * - */ -NTSTATUS WINAPI NtSetInformationObject(IN HANDLE handle, - IN OBJECT_INFORMATION_CLASS info_class, - IN PVOID ptr, IN ULONG len) -{ - return unix_funcs->NtSetInformationObject( handle, info_class, ptr, len ); -} - /****************************************************************************** * NtQuerySecurityObject [NTDLL.@] * @@ -150,18 +127,6 @@ NtQuerySecurityObject( } -/****************************************************************************** - * NtDuplicateObject [NTDLL.@] - * ZwDuplicateObject [NTDLL.@] - */ -NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, - HANDLE dest_process, PHANDLE dest, - ACCESS_MASK access, ULONG attributes, ULONG options ) -{ - return unix_funcs->NtDuplicateObject( source_process, source, dest_process, - dest, access, attributes, options ); -} - static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) { EXCEPTION_RECORD *rec = eptr->ExceptionRecord; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6a7fe28515..a343274087 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1360,11 +1360,8 @@ static struct unix_funcs unix_funcs = { NtClose, NtCurrentTeb, - NtDuplicateObject, NtGetContextThread, - NtQueryObject, NtQueryPerformanceCounter, - NtSetInformationObject, DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 931a681e16..e4206762b1 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,22 +28,15 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 87 +#define NTDLL_UNIXLIB_VERSION 88 struct unix_funcs { /* Nt* functions */ NTSTATUS (WINAPI *NtClose)( HANDLE handle ); TEB * (WINAPI *NtCurrentTeb)(void); - NTSTATUS (WINAPI *NtDuplicateObject)( HANDLE source_process, HANDLE source, - HANDLE dest_process, HANDLE *dest, - ACCESS_MASK access, ULONG attributes, ULONG options ); NTSTATUS (WINAPI *NtGetContextThread)( HANDLE handle, CONTEXT *context ); - NTSTATUS (WINAPI *NtQueryObject)( HANDLE handle, OBJECT_INFORMATION_CLASS info_class, - void *ptr, ULONG len, ULONG *used_len ); NTSTATUS (WINAPI *NtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); - NTSTATUS (WINAPI *NtSetInformationObject)( HANDLE handle, OBJECT_INFORMATION_CLASS info_class, - void *ptr, ULONG len ); /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process );

1 0

Alexandre Julliard : ntdll: Use syscall thunks for system functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 40d403c926e8f96c77d067188c842c12f099f9a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d403c926e8f96c77d06718… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:43:13 2020 +0200 ntdll: Use syscall thunks for system functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 31 ------------------------------- dlls/ntdll/ntdll.spec | 20 ++++++++++---------- dlls/ntdll/time.c | 27 --------------------------- dlls/ntdll/unix/loader.c | 5 ----- dlls/ntdll/unixlib.h | 11 +---------- 5 files changed, 11 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40d403c926e8f96c77d0…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for virtual memory functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: e3e477e6a14fbcb153258b47d1905915dc4c1f22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e477e6a14fbcb153258b47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:52:07 2020 +0200 ntdll: Use syscall thunks for virtual memory functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 68 +++++++++--------- dlls/ntdll/unix/loader.c | 17 ----- dlls/ntdll/unixlib.h | 36 +--------- dlls/ntdll/virtual.c | 184 ----------------------------------------------- 4 files changed, 35 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3e477e6a14fbcb15325…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for file functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 3b4c2ffb7bcc86165c67def31debfa63ccae7a62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4c2ffb7bcc86165c67def3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:40:24 2020 +0200 ntdll: Use syscall thunks for file functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 18 --- dlls/ntdll/file.c | 322 ----------------------------------------------- dlls/ntdll/ntdll.spec | 72 +++++------ dlls/ntdll/unix/loader.c | 18 --- dlls/ntdll/unixlib.h | 57 +-------- 5 files changed, 37 insertions(+), 450 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b4c2ffb7bcc86165c67…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for process functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 635e914bdeca3a148dab8aeabc8037a2e7ac8151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=635e914bdeca3a148dab8aea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:36:17 2020 +0200 ntdll: Use syscall thunks for process functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 34 ++++++------ dlls/ntdll/process.c | 140 ----------------------------------------------- dlls/ntdll/unix/loader.c | 9 --- dlls/ntdll/unixlib.h | 19 +------ 4 files changed, 19 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=635e914bdeca3a148dab…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for thread functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 00e7d50f8bd3dccf2c34dac2501937b7d294ab76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e7d50f8bd3dccf2c34dac2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:35:07 2020 +0200 ntdll: Use syscall thunks for thread functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 9 --- dlls/ntdll/ntdll.spec | 59 +++++++++---------- dlls/ntdll/thread.c | 146 ----------------------------------------------- dlls/ntdll/unix/loader.c | 15 ----- dlls/ntdll/unixlib.h | 23 +------- 5 files changed, 31 insertions(+), 221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00e7d50f8bd3dccf2c34…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for I/O completion functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: c5f66fc784d20154f3d5905d25f8243a0fc6a330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5f66fc784d20154f3d5905d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:32:23 2020 +0200 ntdll: Use syscall thunks for I/O completion functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 24 ++++++++++---------- dlls/ntdll/sync.c | 59 ------------------------------------------------ dlls/ntdll/unix/loader.c | 6 ----- dlls/ntdll/unixlib.h | 15 +----------- 4 files changed, 13 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5f66fc784d20154f3d5…

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020