system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 16:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: Don't create a file object for anonymous mappings.

Browse source
This commit is contained in:
Alexandre Julliard 2009-11-23 16:28:45 +01:00
parent 62eda39fc1
commit 028bca4cc5
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
server/mapping.c
View file

@ -57,7 +57,6 @@ struct mapping
mem_size_t size; /* mapping size */ mem_size_t size; /* mapping size */
int protect; /* protection flags */ int protect; /* protection flags */
struct fd *fd; /* fd for mapped file */ struct fd *fd; /* fd for mapped file */
struct file *file; /* file mapped */
int header_size; /* size of headers (for PE image mapping) */ int header_size; /* size of headers (for PE image mapping) */
client_ptr_t base; /* default base addr (for PE image mapping) */ client_ptr_t base; /* default base addr (for PE image mapping) */
struct ranges *committed; /* list of committed ranges in this mapping */ struct ranges *committed; /* list of committed ranges in this mapping */
@ -163,20 +162,24 @@ static int grow_file( int unix_fd, file_pos_t new_size )
} }
/* create a temp file for anonymous mappings */ /* create a temp file for anonymous mappings */
static struct file *create_temp_file( unsigned int access ) static int create_temp_file( file_pos_t size )
{ {
char tmpfn[16]; char tmpfn[16];
int fd; int fd;
sprintf( tmpfn, "anonmap.XXXXXX" ); /* create it in the server directory */ sprintf( tmpfn, "anonmap.XXXXXX" ); /* create it in the server directory */
fd = mkstemps( tmpfn, 0 ); fd = mkstemps( tmpfn, 0 );
if (fd == -1) if (fd != -1)
{ {
file_set_error(); if (!grow_file( fd, size ))
return NULL; {
close( fd );
fd = -1;
}
unlink( tmpfn );
} }
unlink( tmpfn ); else file_set_error();
return create_file_for_fd( fd, access, 0 ); return fd;
} }
/* find the shared PE mapping for a given mapping */ /* find the shared PE mapping for a given mapping */
@ -310,9 +313,9 @@ static int build_shared_mapping( struct mapping *mapping, int fd,
/* create a temp file for the mapping */ /* create a temp file for the mapping */
if (!(mapping->shared_file = create_temp_file( FILE_GENERIC_READ|FILE_GENERIC_WRITE ))) return 0; if ((shared_fd = create_temp_file( total_size )) == -1) return 0;
if ((shared_fd = get_file_unix_fd( mapping->shared_file )) == -1) goto error; if (!(mapping->shared_file = create_file_for_fd( shared_fd, FILE_GENERIC_READ|FILE_GENERIC_WRITE, 0 )))
if (!grow_file( shared_fd, total_size )) goto error; return 0;
if (!(buffer = malloc( max_size ))) goto error; if (!(buffer = malloc( max_size ))) goto error;
@ -446,7 +449,6 @@ static struct object *create_mapping( struct directory *root, const struct unico
mapping->header_size = 0; mapping->header_size = 0;
mapping->base = 0; mapping->base = 0;
mapping->fd = NULL; mapping->fd = NULL;
mapping->file = NULL;
mapping->shared_file = NULL; mapping->shared_file = NULL;
mapping->committed = NULL; mapping->committed = NULL;
@ -502,10 +504,9 @@ static struct object *create_mapping( struct directory *root, const struct unico
mapping->committed->count = 0; mapping->committed->count = 0;
mapping->committed->max = 8; mapping->committed->max = 8;
} }
if (!(mapping->file = create_temp_file( access ))) goto error; if ((unix_fd = create_temp_file( size )) == -1) goto error;
mapping->fd = get_obj_fd( (struct object *)mapping->file ); if (!(mapping->fd = create_anonymous_fd( &mapping_fd_ops, unix_fd, &mapping->obj,
if ((unix_fd = get_unix_fd( mapping->fd )) == -1) goto error; FILE_SYNCHRONOUS_IO_NONALERT ))) goto error;
if (!grow_file( unix_fd, size )) goto error;
} }
mapping->size = (size + page_mask) & ~((mem_size_t)page_mask); mapping->size = (size + page_mask) & ~((mem_size_t)page_mask);
mapping->protect = protect; mapping->protect = protect;
@ -555,7 +556,6 @@ static void mapping_destroy( struct object *obj )
{ {
struct mapping *mapping = (struct mapping *)obj; struct mapping *mapping = (struct mapping *)obj;
assert( obj->ops == &mapping_ops ); assert( obj->ops == &mapping_ops );
if (mapping->file) release_object( mapping->file );
if (mapping->fd) release_object( mapping->fd ); if (mapping->fd) release_object( mapping->fd );
if (mapping->shared_file) if (mapping->shared_file)
{ {