ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Use OBJ_PERMANENT for permanent objects. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-09-23 11:42:27 +02:00
parent 5c4d6cf837
commit 82c84548eb
3 changed files with 64 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
server/directory.c
View File

@ -234,15 +234,9 @@ struct object_type *get_object_type( const struct unicode_str *name )
{ {
struct object_type *type; struct object_type *type;
if ((type = create_named_object( &dir_objtype->obj, &object_type_ops, name, OBJ_OPENIF, NULL ))) if ((type = create_named_object( &dir_objtype->obj, &object_type_ops, name,
{ OBJ_OPENIF | OBJ_PERMANENT, NULL )))
if (get_error() != STATUS_OBJECT_NAME_EXISTS)
{
grab_object( type );
make_object_static( &type->obj );
}
clear_error(); clear_error();
}
return type; return type;
} }
@ -281,28 +275,28 @@ static void create_session( unsigned int id )
if (!id) if (!id)
{ {
dir_bno_global = create_directory( &root_directory->obj, &dir_bno_str, 0, HASH_SIZE, NULL ); dir_bno_global = create_directory( &root_directory->obj, &dir_bno_str, OBJ_PERMANENT, HASH_SIZE, NULL );
dir_sessions = create_directory( &root_directory->obj, &dir_sessions_str, 0, HASH_SIZE, NULL ); dir_sessions = create_directory( &root_directory->obj, &dir_sessions_str, OBJ_PERMANENT, HASH_SIZE, NULL );
dir_bnolinks = create_directory( &dir_sessions->obj, &dir_bnolinks_str, 0, HASH_SIZE, NULL ); dir_bnolinks = create_directory( &dir_sessions->obj, &dir_bnolinks_str, OBJ_PERMANENT, HASH_SIZE, NULL );
make_object_static( (struct object *)dir_bno_global ); release_object( dir_bno_global );
make_object_static( (struct object *)dir_bnolinks ); release_object( dir_bnolinks );
make_object_static( (struct object *)dir_sessions ); release_object( dir_sessions );
} }
sprintf( id_strA, "%u", id ); sprintf( id_strA, "%u", id );
id_strW = ascii_to_unicode_str( id_strA, &id_str ); id_strW = ascii_to_unicode_str( id_strA, &id_str );
dir_id = create_directory( &dir_sessions->obj, &id_str, 0, HASH_SIZE, NULL ); dir_id = create_directory( &dir_sessions->obj, &id_str, 0, HASH_SIZE, NULL );
dir_dosdevices = create_directory( &dir_id->obj, &dir_dosdevices_str, 0, HASH_SIZE, NULL ); dir_dosdevices = create_directory( &dir_id->obj, &dir_dosdevices_str, OBJ_PERMANENT, HASH_SIZE, NULL );
/* for session 0, directories are created under the root */ /* for session 0, directories are created under the root */
if (!id) if (!id)
{ {
dir_bno = (struct directory *)grab_object( dir_bno_global ); dir_bno = (struct directory *)grab_object( dir_bno_global );
dir_windows = create_directory( &root_directory->obj, &dir_windows_str, 0, HASH_SIZE, NULL ); dir_windows = create_directory( &root_directory->obj, &dir_windows_str, 0, HASH_SIZE, NULL );
link_bno = create_obj_symlink( &dir_id->obj, &dir_bno_str, 0, &dir_bno->obj, NULL ); link_bno = create_obj_symlink( &dir_id->obj, &dir_bno_str, OBJ_PERMANENT, &dir_bno->obj, NULL );
link_windows = create_obj_symlink( &dir_id->obj, &dir_windows_str, 0, &dir_windows->obj, NULL ); link_windows = create_obj_symlink( &dir_id->obj, &dir_windows_str, OBJ_PERMANENT, &dir_windows->obj, NULL );
make_object_static( link_bno ); release_object( link_bno );
make_object_static( link_windows ); release_object( link_windows );
} }
else else
{ {
@ -310,19 +304,19 @@ static void create_session( unsigned int id )
dir_bno = create_directory( &dir_id->obj, &dir_bno_str, 0, 37, NULL ); dir_bno = create_directory( &dir_id->obj, &dir_bno_str, 0, 37, NULL );
dir_windows = create_directory( &dir_id->obj, &dir_windows_str, 0, HASH_SIZE, NULL ); dir_windows = create_directory( &dir_id->obj, &dir_windows_str, 0, HASH_SIZE, NULL );
} }
dir_winstation = create_directory( &dir_windows->obj, &dir_winstations_str, 0, HASH_SIZE, NULL ); dir_winstation = create_directory( &dir_windows->obj, &dir_winstations_str, OBJ_PERMANENT, HASH_SIZE, NULL );
link_global = create_obj_symlink( &dir_bno->obj, &link_global_str, 0, &dir_bno_global->obj, NULL ); link_global = create_obj_symlink( &dir_bno->obj, &link_global_str, OBJ_PERMANENT, &dir_bno_global->obj, NULL );
link_local = create_obj_symlink( &dir_bno->obj, &link_local_str, 0, &dir_bno->obj, NULL ); link_local = create_obj_symlink( &dir_bno->obj, &link_local_str, OBJ_PERMANENT, &dir_bno->obj, NULL );
link_session = create_obj_symlink( &dir_bno->obj, &link_session_str, 0, &dir_bnolinks->obj, NULL ); link_session = create_obj_symlink( &dir_bno->obj, &link_session_str, OBJ_PERMANENT, &dir_bnolinks->obj, NULL );
link_bno = create_obj_symlink( &dir_bnolinks->obj, &id_str, 0, &dir_bno->obj, NULL ); link_bno = create_obj_symlink( &dir_bnolinks->obj, &id_str, OBJ_PERMANENT, &dir_bno->obj, NULL );
make_object_static( link_global ); release_object( link_global );
make_object_static( link_local ); release_object( link_local );
make_object_static( link_session ); release_object( link_session );
make_object_static( link_bno ); release_object( link_bno );
make_object_static( &dir_dosdevices->obj ); release_object( dir_dosdevices );
make_object_static( &dir_winstation->obj ); release_object( dir_winstation );
release_object( dir_windows ); release_object( dir_windows );
release_object( dir_bno ); release_object( dir_bno );
release_object( dir_id ); release_object( dir_id );
@ -406,73 +400,54 @@ void init_directories(void)
static const struct unicode_str user_data_str = {user_dataW, sizeof(user_dataW)}; static const struct unicode_str user_data_str = {user_dataW, sizeof(user_dataW)};
struct directory *dir_driver, *dir_device, *dir_global, *dir_kernel; struct directory *dir_driver, *dir_device, *dir_global, *dir_kernel;
struct object *link_dosdev, *link_global, *link_nul, *link_pipe, *link_mailslot; struct object *named_pipe_device, *mailslot_device, *null_device;
struct object *link_conin, *link_conout, *link_con;
struct object *named_pipe_device, *mailslot_device, *null_device, *user_data_mapping, *console_device, *socket_device;
struct keyed_event *keyed_event;
unsigned int i; unsigned int i;
root_directory = create_directory( NULL, NULL, 0, HASH_SIZE, NULL ); root_directory = create_directory( NULL, NULL, OBJ_PERMANENT, HASH_SIZE, NULL );
dir_driver = create_directory( &root_directory->obj, &dir_driver_str, 0, HASH_SIZE, NULL ); dir_driver = create_directory( &root_directory->obj, &dir_driver_str, OBJ_PERMANENT, HASH_SIZE, NULL );
dir_device = create_directory( &root_directory->obj, &dir_device_str, 0, HASH_SIZE, NULL ); dir_device = create_directory( &root_directory->obj, &dir_device_str, OBJ_PERMANENT, HASH_SIZE, NULL );
dir_objtype = create_directory( &root_directory->obj, &dir_objtype_str, 0, HASH_SIZE, NULL ); dir_objtype = create_directory( &root_directory->obj, &dir_objtype_str, OBJ_PERMANENT, HASH_SIZE, NULL );
dir_kernel = create_directory( &root_directory->obj, &dir_kernel_str, 0, HASH_SIZE, NULL ); dir_kernel = create_directory( &root_directory->obj, &dir_kernel_str, OBJ_PERMANENT, HASH_SIZE, NULL );
dir_global = create_directory( &root_directory->obj, &dir_global_str, 0, HASH_SIZE, NULL ); dir_global = create_directory( &root_directory->obj, &dir_global_str, OBJ_PERMANENT, HASH_SIZE, NULL );
make_object_static( &root_directory->obj );
make_object_static( &dir_driver->obj );
make_object_static( &dir_objtype->obj );
/* devices */ /* devices */
named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str, 0, NULL ); named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str, OBJ_PERMANENT, NULL );
mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str, 0, NULL ); mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str, OBJ_PERMANENT, NULL );
console_device = create_console_device( &dir_device->obj, &condrv_str, 0, NULL ); null_device = create_unix_device( &dir_device->obj, &null_str, OBJ_PERMANENT, NULL, "/dev/null" );
socket_device = create_socket_device( &dir_device->obj, &afd_str, 0, NULL ); release_object( create_console_device( &dir_device->obj, &condrv_str, OBJ_PERMANENT, NULL ));
null_device = create_unix_device( &dir_device->obj, &null_str, 0, NULL, "/dev/null" ); release_object( create_socket_device( &dir_device->obj, &afd_str, OBJ_PERMANENT, NULL ));
make_object_static( named_pipe_device );
make_object_static( mailslot_device );
make_object_static( null_device );
make_object_static( console_device );
make_object_static( socket_device );
/* sessions */ /* sessions */
create_session( 0 ); create_session( 0 );
create_session( 1 ); create_session( 1 );
/* symlinks */ /* symlinks */
link_dosdev = create_obj_symlink( &root_directory->obj, &link_dosdev_str, 0, &dir_global->obj, NULL ); release_object( create_obj_symlink( &root_directory->obj, &link_dosdev_str, OBJ_PERMANENT, &dir_global->obj, NULL ));
link_global = create_obj_symlink( &dir_global->obj, &link_global_str, 0, &dir_global->obj, NULL ); release_object( create_obj_symlink( &dir_global->obj, &link_global_str, OBJ_PERMANENT, &dir_global->obj, NULL ));
link_nul = create_obj_symlink( &dir_global->obj, &link_nul_str, 0, null_device, NULL ); release_object( create_obj_symlink( &dir_global->obj, &link_nul_str, OBJ_PERMANENT, null_device, NULL ));
link_pipe = create_obj_symlink( &dir_global->obj, &link_pipe_str, 0, named_pipe_device, NULL ); release_object( create_obj_symlink( &dir_global->obj, &link_pipe_str, OBJ_PERMANENT, named_pipe_device, NULL ));
link_mailslot = create_obj_symlink( &dir_global->obj, &link_mailslot_str, 0, mailslot_device, NULL ); release_object( create_obj_symlink( &dir_global->obj, &link_mailslot_str, OBJ_PERMANENT, mailslot_device, NULL ));
link_conin = create_symlink( &dir_global->obj, &link_conin_str, 0, &link_currentin_str, NULL ); release_object( create_symlink( &dir_global->obj, &link_conin_str, OBJ_PERMANENT, &link_currentin_str, NULL ));
link_conout = create_symlink( &dir_global->obj, &link_conout_str, 0, &link_currentout_str, NULL ); release_object( create_symlink( &dir_global->obj, &link_conout_str, OBJ_PERMANENT, &link_currentout_str, NULL ));
link_con = create_symlink( &dir_global->obj, &link_con_str, 0, &link_console_str, NULL ); release_object( create_symlink( &dir_global->obj, &link_con_str, OBJ_PERMANENT, &link_console_str, NULL ));
make_object_static( link_dosdev );
make_object_static( link_global );
make_object_static( link_nul );
make_object_static( link_pipe );
make_object_static( link_mailslot );
make_object_static( link_conin );
make_object_static( link_conout );
make_object_static( link_con );
/* events */ /* events */
for (i = 0; i < ARRAY_SIZE( kernel_events ); i++) for (i = 0; i < ARRAY_SIZE( kernel_events ); i++)
{ release_object( create_event( &dir_kernel->obj, &kernel_events[i], OBJ_PERMANENT, 1, 0, NULL ));
struct event *event = create_event( &dir_kernel->obj, &kernel_events[i], 0, 1, 0, NULL ); release_object( create_keyed_event( &dir_kernel->obj, &keyed_event_crit_sect_str, OBJ_PERMANENT, NULL ));
make_object_static( (struct object *)event );
}
keyed_event = create_keyed_event( &dir_kernel->obj, &keyed_event_crit_sect_str, 0, NULL );
make_object_static( (struct object *)keyed_event );
/* user data mapping */ /* user data mapping */
user_data_mapping = create_user_data_mapping( &dir_kernel->obj, &user_data_str, 0, NULL ); release_object( create_user_data_mapping( &dir_kernel->obj, &user_data_str, OBJ_PERMANENT, NULL ));
make_object_static( user_data_mapping );
/* the objects hold references so we can release these directories */ release_object( named_pipe_device );
release_object( dir_global ); release_object( mailslot_device );
release_object( null_device );
release_object( root_directory );
release_object( dir_driver );
release_object( dir_device ); release_object( dir_device );
release_object( dir_objtype );
release_object( dir_kernel ); release_object( dir_kernel );
release_object( dir_global );
} }
/* create a directory object */ /* create a directory object */

14
server/object.c
View File

@ -293,11 +293,6 @@ static struct object *create_object( struct object *parent, const struct object_
name_ptr->obj = obj; name_ptr->obj = obj;
obj->name = name_ptr; obj->name = name_ptr;
if (attributes & OBJ_PERMANENT)
{
make_object_static( obj );
grab_object( obj );
}
return obj; return obj;
failed: failed:
@ -325,7 +320,7 @@ void *create_named_object( struct object *parent, const struct object_ops *ops,
free_object( new_obj ); free_object( new_obj );
return NULL; return NULL;
} }
return new_obj; goto done;
} }
if (!(obj = lookup_named_object( parent, name, attributes, &new_name ))) return NULL; if (!(obj = lookup_named_object( parent, name, attributes, &new_name ))) return NULL;
@ -348,6 +343,13 @@ void *create_named_object( struct object *parent, const struct object_ops *ops,
new_obj = create_object( obj, ops, &new_name, attributes, sd ); new_obj = create_object( obj, ops, &new_name, attributes, sd );
release_object( obj ); release_object( obj );
done:
if (attributes & OBJ_PERMANENT)
{
make_object_static( new_obj );
grab_object( new_obj );
}
return new_obj; return new_obj;
} }

4
server/process.c
View File

@ -1633,8 +1633,8 @@ DECL_HANDLER(make_process_system)
if (!shutdown_event) if (!shutdown_event)
{ {
if (!(shutdown_event = create_event( NULL, NULL, 0, 1, 0, NULL ))) return; if (!(shutdown_event = create_event( NULL, NULL, OBJ_PERMANENT, 1, 0, NULL ))) return;
make_object_static( (struct object *)shutdown_event ); release_object( shutdown_event );
} }
if (!(reply->event = alloc_handle( current->process, shutdown_event, SYNCHRONIZE, 0 ))) if (!(reply->event = alloc_handle( current->process, shutdown_event, SYNCHRONIZE, 0 )))