July 2020 - Wine-commits - list.winehq.org

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 : 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 */ +(a)REQ(make_temporary) + obj_handle_t handle; /* handle to the object */ +(a)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 : ntoskrnl.exe: Create symbolic links as permanent objects.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 088ababfc24751b951008570f6160a1e8dca0e0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=088ababfc24751b951008570… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 20:27:56 2020 -0500 ntoskrnl.exe: Create symbolic links as 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.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d407cffee6..fa85979d0b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1591,17 +1591,19 @@ NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *targ { HANDLE handle; OBJECT_ATTRIBUTES attr; + NTSTATUS ret; attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = name; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_PERMANENT; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; TRACE( "%s -> %s\n", debugstr_us(name), debugstr_us(target) ); - /* FIXME: store handle somewhere */ - return NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ); + if (!(ret = NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ))) + NtClose( handle ); + return ret; } @@ -1612,17 +1614,19 @@ NTSTATUS WINAPI IoCreateUnprotectedSymbolicLink( UNICODE_STRING *name, UNICODE_S { HANDLE handle; OBJECT_ATTRIBUTES attr; + NTSTATUS ret; attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = name; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_PERMANENT; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; TRACE( "%s -> %s\n", debugstr_us(name), debugstr_us(target) ); - /* FIXME: store handle somewhere */ - return NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ); + if (!(ret = NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ))) + NtClose( handle ); + return ret; } @@ -1644,12 +1648,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) if (!(status = NtOpenSymbolicLinkObject( &handle, 0, &attr ))) { - SERVER_START_REQ( unlink_object ) - { - req->handle = wine_server_obj_handle( handle ); - status = wine_server_call( req ); - } - SERVER_END_REQ; + NtMakeTemporaryObject( handle ); NtClose( handle ); } return status;

1 0

Zebediah Figura : kernelbase: Create DOS drive links as permanent objects.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 1cf4a1c0880f0f39f6d986db53a3b108a6e5c648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf4a1c0880f0f39f6d986db… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 20:27:57 2020 -0500 kernelbase: Create DOS drive links as permanent objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/volume.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 9939ea3bef..53cc0d49b6 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -972,18 +972,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device lstrcatW( link_name, device ); RtlInitUnicodeString( &nt_name, link_name ); - InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); + InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, 0, NULL ); if (flags & DDD_REMOVE_DEFINITION) { if (!set_ntstatus( NtOpenSymbolicLinkObject( &handle, 0, &attr ) )) return FALSE; - SERVER_START_REQ( unlink_object ) - { - req->handle = wine_server_obj_handle( handle ); - status = wine_server_call( req ); - } - SERVER_END_REQ; + status = NtMakeTemporaryObject( handle ); NtClose( handle ); return set_ntstatus( status ); @@ -1000,7 +995,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device else RtlInitUnicodeString( &nt_target, target ); - return set_ntstatus( NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, &nt_target ) ); + if (!(status = NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, &nt_target ))) + NtClose( handle ); + return set_ntstatus( status ); }

1 0

Zebediah Figura : server: Remove no longer used unlink_object request.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 3347ad003a1f86b6d1cd83b63a8e8dac1e8e784f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3347ad003a1f86b6d1cd83b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 20:27:58 2020 -0500 server: Remove no longer used unlink_object request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 17 +---------------- server/directory.c | 12 ------------ server/protocol.def | 6 ------ server/request.h | 4 ---- server/trace.c | 8 -------- 5 files changed, 1 insertion(+), 46 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fc808774be..1176d9cbea 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4957,18 +4957,6 @@ struct get_object_type_reply -struct unlink_object_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct unlink_object_reply -{ - struct reply_header __header; -}; - - - struct get_token_impersonation_level_request { struct request_header __header; @@ -5834,7 +5822,6 @@ enum request REQ_query_symlink, REQ_get_object_info, REQ_get_object_type, - REQ_unlink_object, REQ_get_token_impersonation_level, REQ_allocate_locally_unique_id, REQ_create_device_manager, @@ -6129,7 +6116,6 @@ union generic_request struct query_symlink_request query_symlink_request; struct get_object_info_request get_object_info_request; struct get_object_type_request get_object_type_request; - struct unlink_object_request unlink_object_request; struct get_token_impersonation_level_request get_token_impersonation_level_request; struct allocate_locally_unique_id_request allocate_locally_unique_id_request; struct create_device_manager_request create_device_manager_request; @@ -6422,7 +6408,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; struct get_object_info_reply get_object_info_reply; struct get_object_type_reply get_object_type_reply; - struct unlink_object_reply unlink_object_reply; struct get_token_impersonation_level_reply get_token_impersonation_level_reply; struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; struct create_device_manager_reply create_device_manager_reply; @@ -6467,7 +6452,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 627 +#define SERVER_PROTOCOL_VERSION 628 /* ### protocol_version end ### */ diff --git a/server/directory.c b/server/directory.c index 4d38393a6c..198fc48ece 100644 --- a/server/directory.c +++ b/server/directory.c @@ -534,18 +534,6 @@ DECL_HANDLER(get_directory_entry) } } -/* unlink a named object */ -DECL_HANDLER(unlink_object) -{ - struct object *obj = get_handle_obj( current->process, req->handle, 0, NULL ); - - if (obj) - { - unlink_named_object( obj ); - release_object( obj ); - } -} - /* query object type name information */ DECL_HANDLER(get_object_type) { diff --git a/server/protocol.def b/server/protocol.def index 9c8aec6960..4a59c32728 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3442,12 +3442,6 @@ struct handle_info @END -/* Unlink a named object */ -(a)REQ(unlink_object) - obj_handle_t handle; /* handle to the object */ -(a)END - - /* Query the impersonation level of an impersonation token */ @REQ(get_token_impersonation_level) obj_handle_t handle; /* handle to the object */ diff --git a/server/request.h b/server/request.h index 2dfa76f939..31ca632669 100644 --- a/server/request.h +++ b/server/request.h @@ -366,7 +366,6 @@ DECL_HANDLER(open_symlink); DECL_HANDLER(query_symlink); DECL_HANDLER(get_object_info); DECL_HANDLER(get_object_type); -DECL_HANDLER(unlink_object); DECL_HANDLER(get_token_impersonation_level); DECL_HANDLER(allocate_locally_unique_id); DECL_HANDLER(create_device_manager); @@ -660,7 +659,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_query_symlink, (req_handler)req_get_object_info, (req_handler)req_get_object_type, - (req_handler)req_unlink_object, (req_handler)req_get_token_impersonation_level, (req_handler)req_allocate_locally_unique_id, (req_handler)req_create_device_manager, @@ -2162,8 +2160,6 @@ C_ASSERT( FIELD_OFFSET(struct get_object_type_request, handle) == 12 ); C_ASSERT( sizeof(struct get_object_type_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_object_type_reply, total) == 8 ); C_ASSERT( sizeof(struct get_object_type_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct unlink_object_request, handle) == 12 ); -C_ASSERT( sizeof(struct unlink_object_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_impersonation_level_request, handle) == 12 ); C_ASSERT( sizeof(struct get_token_impersonation_level_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_impersonation_level_reply, impersonation_level) == 8 ); diff --git a/server/trace.c b/server/trace.c index 5fd6811195..585ac50a0f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4123,11 +4123,6 @@ static void dump_get_object_type_reply( const struct get_object_type_reply *req dump_varargs_unicode_str( ", type=", cur_size ); } -static void dump_unlink_object_request( const struct unlink_object_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - static void dump_get_token_impersonation_level_request( const struct get_token_impersonation_level_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4749,7 +4744,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_query_symlink_request, (dump_func)dump_get_object_info_request, (dump_func)dump_get_object_type_request, - (dump_func)dump_unlink_object_request, (dump_func)dump_get_token_impersonation_level_request, (dump_func)dump_allocate_locally_unique_id_request, (dump_func)dump_create_device_manager_request, @@ -5040,7 +5034,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_query_symlink_reply, (dump_func)dump_get_object_info_reply, (dump_func)dump_get_object_type_reply, - NULL, (dump_func)dump_get_token_impersonation_level_reply, (dump_func)dump_allocate_locally_unique_id_reply, (dump_func)dump_create_device_manager_reply, @@ -5331,7 +5324,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "query_symlink", "get_object_info", "get_object_type", - "unlink_object", "get_token_impersonation_level", "allocate_locally_unique_id", "create_device_manager",

1 0

Nikolay Sivov : comctl32/listview: Rename helper argument.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: f6802b7a318a749540e00ca4a68772cc2ac280e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6802b7a318a749540e00ca4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:38:20 2020 +0300 comctl32/listview: Rename helper argument. Rpcndr.h defines "small" as char. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f1f09d201e..1092a6ce9b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8740,7 +8740,7 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) return oldspacing; } -static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) +static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL is_small) { INT cx, cy; @@ -8751,8 +8751,8 @@ static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) } else { - size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON); - size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON); + size->cx = GetSystemMetrics(is_small ? SM_CXSMICON : SM_CXICON); + size->cy = GetSystemMetrics(is_small ? SM_CYSMICON : SM_CYICON); } }

1 0

Nikolay Sivov : comctl32/listview: Use case-insensitive compare in LVM_FINDITEM.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: ab81945d6568569ac23fad56b1bc895687feeb55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab81945d6568569ac23fad56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:38:21 2020 +0300 comctl32/listview: Use case-insensitive compare in LVM_FINDITEM. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/listview.c | 10 +++++++--- dlls/comctl32/tests/listview.c | 13 +++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index e548d3761a..4ea068ea73 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_COMCTL32_ MODULE = comctl32.dll IMPORTLIB = comctl32 -IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 +IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase DELAYIMPORTS = winmm uxtheme EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1092a6ce9b..6cee291dd6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -140,6 +140,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -6313,6 +6314,7 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, INT nItem = nStart + 1, nLast = infoPtr->nItemCount, nNearestItem = -1; ULONG xdist, ydist, dist, mindist = 0x7fffffff; POINT Position, Destination; + int search_len = 0; LVITEMW lvItem; /* Search in virtual listviews should be done by application, not by @@ -6378,6 +6380,9 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, nItem = bNearest ? -1 : nStart + 1; + if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) + search_len = lstrlenW(lpFindInfo->psz); + again: for (; nItem < nLast; nItem++) { @@ -6398,12 +6403,11 @@ again: { if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) { - WCHAR *p = wcsstr(lvItem.pszText, lpFindInfo->psz); - if (!p || p != lvItem.pszText) continue; + if (StrCmpNIW(lvItem.pszText, lpFindInfo->psz, search_len)) continue; } else { - if (lstrcmpW(lvItem.pszText, lpFindInfo->psz) != 0) continue; + if (StrCmpIW(lvItem.pszText, lpFindInfo->psz)) continue; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 20b9873d30..c19de7f03f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5366,6 +5366,19 @@ static void test_finditem(void) r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(0, r); + /* Case sensitivity. */ + strcpy(f, "Foo"); + fi.flags = LVFI_STRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + + strcpy(f, "F"); + fi.flags = LVFI_SUBSTRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + DestroyWindow(hwnd); }

1 0

Serge Gautherie : wininet: Get rid of user buffer in create_cookie_url().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: d2a1c906dc4979eeabe256f77a58d67290da372d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2a1c906dc4979eeabe256f7… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Jul 16 06:00:11 2020 +0200 wininet: Get rid of user buffer in create_cookie_url(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index b5f779b267..1786b3d281 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -147,28 +147,31 @@ static cookie_domain_t *get_cookie_domain(substr_t domain, BOOL create) static WCHAR *create_cookie_url(substr_t domain, substr_t path, substr_t *ret_path) { - WCHAR user[UNLEN], *p, *url; + WCHAR *p, *url; DWORD len, user_len, i; static const WCHAR cookie_prefix[] = {'C','o','o','k','i','e',':'}; - user_len = ARRAY_SIZE(user); - if(!GetUserNameW(user, &user_len)) - return FALSE; - user_len--; + user_len = 0; + if(GetUserNameW(NULL, &user_len) || GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return NULL; + /* user_len already accounts for terminating NULL */ len = ARRAY_SIZE(cookie_prefix) + user_len + 1 /* @ */ + domain.len + path.len; - url = heap_alloc((len+1) * sizeof(WCHAR)); + url = heap_alloc(len * sizeof(WCHAR)); if(!url) return NULL; memcpy(url, cookie_prefix, sizeof(cookie_prefix)); p = url + ARRAY_SIZE(cookie_prefix); - memcpy(p, user, user_len*sizeof(WCHAR)); + if(!GetUserNameW(p, &user_len)) { + heap_free(url); + return NULL; + } p += user_len; - *p++ = '@'; + *(p - 1) = '@'; memcpy(p, domain.str, domain.len*sizeof(WCHAR)); p += domain.len;

1 0

Daniel Lehman : msvcrt/tests: Check errno in strtod test.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 3f8b0891e75e4f4bf645946b227b6f1bdee42a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f8b0891e75e4f4bf645946b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Jul 16 13:10:18 2020 +0200 msvcrt/tests: Check errno in strtod test. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b5b877e7ec..ccbd049c4c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1938,6 +1938,7 @@ static void test__strtod(void) const char *str; int len; double ret; + int err; } tests[] = { { "12.1", 4, 12.1 }, { "-13.721", 7, -13.721 }, @@ -1953,7 +1954,7 @@ static void test__strtod(void) { "0.82181281288121", 16, 0.82181281288121 }, { "21921922352523587651128218821", 29, 21921922352523587651128218821.0 }, { "0.1d238", 7, 0.1e238 }, - { "0.1D-4736", 9, 0 }, + { "0.1D-4736", 9, 0, ERANGE }, { "3.4028234663852887e38", 21, FLT_MAX }, { "1.7976931348623158e+308", 23, DBL_MAX }, { "00", 2, 0 }, @@ -1975,7 +1976,8 @@ static void test__strtod(void) ok(d == tests[i].ret, "%d) d = %.16e\n", i, d); ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", i, (int)(end - tests[i].str)); - ok(errno = 0xdeadbeef, "%d) errno = %d\n", i, errno); + todo_wine_if(!tests[i].err) + ok(errno == tests[i].err, "%d) errno = %d\n", i, errno); } if (!p__strtod_l)

1 0

Daniel Lehman : msvcrt: Set errno in strtod.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 0945ba00fb813668ba94223851450eca439fbae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0945ba00fb813668ba942238… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Jul 16 13:10:31 2020 +0200 msvcrt: Set errno in strtod. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 6 +++++- dlls/msvcrt/tests/string.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 62ec54607e..49cc8e40ae 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -696,6 +696,11 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), nch = get(ctx); } + if(!err) err = MSVCRT__errno(); +#if _MSVCR_VER == 0 + *err = 0; +#endif + if(!found_digit) { if(nch != MSVCRT_WEOF) unget(ctx); if(found_dp) unget(ctx); @@ -759,7 +764,6 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(off < 0) off += LIMB_DIGITS; if(off) bnum_mult(&b, p10s[off]); - if(!err) err = MSVCRT__errno(); if(dp-1 > MSVCRT_DBL_MAX_10_EXP) return make_double(sign, INT_MAX, 1, ROUND_ZERO, err); /* Count part of exponent stored in denormalized mantissa. */ diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index ccbd049c4c..8a2d678b63 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1976,7 +1976,6 @@ static void test__strtod(void) ok(d == tests[i].ret, "%d) d = %.16e\n", i, d); ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", i, (int)(end - tests[i].str)); - todo_wine_if(!tests[i].err) ok(errno == tests[i].err, "%d) errno = %d\n", i, errno); }

1 0