From 3347ad003a1f86b6d1cd83b63a8e8dac1e8e784f Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 15 Jul 2020 20:27:58 -0500 Subject: [PATCH] server: Remove no longer used unlink_object request. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard --- 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 fc808774be2..1176d9cbead 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 4d38393a6c8..198fc48ece2 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 9c8aec6960b..4a59c327287 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3442,12 +3442,6 @@ struct handle_info @END -/* Unlink a named object */ -@REQ(unlink_object) - obj_handle_t handle; /* handle to the object */ -@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 2dfa76f9399..31ca6326691 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 5fd68111955..585ac50a0f0 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",