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

server: Make the mapping base address a client_ptr_t instead of a void pointer.

This commit is contained in:
Alexandre Julliard 2008-12-30 14:18:21 +01:00
parent 8e9c156e14
commit d066a9a01a
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ntdll/virtual.c
View File

@ -2285,11 +2285,12 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p
req->access = access; req->access = access;
res = wine_server_call( req ); res = wine_server_call( req );
map_vprot = reply->protect; map_vprot = reply->protect;
base = reply->base; base = wine_server_get_ptr( reply->base );
full_size = reply->size; full_size = reply->size;
header_size = reply->header_size; header_size = reply->header_size;
dup_mapping = wine_server_ptr_handle( reply->mapping ); dup_mapping = wine_server_ptr_handle( reply->mapping );
shared_file = wine_server_ptr_handle( reply->shared_file ); shared_file = wine_server_ptr_handle( reply->shared_file );
if ((ULONG_PTR)base != reply->base) base = NULL;
} }
SERVER_END_REQ; SERVER_END_REQ;
if (res) return res; if (res) return res;

4
include/wine/server_protocol.h
View File

@ -1737,7 +1737,7 @@ struct get_mapping_info_reply
mem_size_t size; mem_size_t size;
int protect; int protect;
int header_size; int header_size;
void* base; client_ptr_t base;
obj_handle_t mapping; obj_handle_t mapping;
obj_handle_t shared_file; obj_handle_t shared_file;
}; };
@ -5052,6 +5052,6 @@ union generic_reply
struct set_window_layered_info_reply set_window_layered_info_reply; struct set_window_layered_info_reply set_window_layered_info_reply;
}; };
#define SERVER_PROTOCOL_VERSION 365 #define SERVER_PROTOCOL_VERSION 366
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

10
server/mapping.c
View File

@ -58,7 +58,7 @@ struct mapping
int protect; /* protection flags */ int protect; /* protection flags */
struct file *file; /* file mapped */ 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) */
void *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 */
struct file *shared_file; /* temp file for shared PE mapping */ struct file *shared_file; /* temp file for shared PE mapping */
struct list shared_entry; /* entry in global shared PE mappings list */ struct list shared_entry; /* entry in global shared PE mappings list */
@ -341,7 +341,7 @@ static int get_image_params( struct mapping *mapping )
if (mapping->shared_file) list_add_head( &shared_list, &mapping->shared_entry ); if (mapping->shared_file) list_add_head( &shared_list, &mapping->shared_entry );
mapping->size = ROUND_SIZE( nt.OptionalHeader.SizeOfImage ); mapping->size = ROUND_SIZE( nt.OptionalHeader.SizeOfImage );
mapping->base = (void *)nt.OptionalHeader.ImageBase; mapping->base = nt.OptionalHeader.ImageBase;
mapping->header_size = max( pos + size, nt.OptionalHeader.SizeOfHeaders ); mapping->header_size = max( pos + size, nt.OptionalHeader.SizeOfHeaders );
mapping->protect = VPROT_IMAGE; mapping->protect = VPROT_IMAGE;
@ -389,7 +389,7 @@ static struct object *create_mapping( struct directory *root, const struct unico
DACL_SECURITY_INFORMATION| DACL_SECURITY_INFORMATION|
SACL_SECURITY_INFORMATION ); SACL_SECURITY_INFORMATION );
mapping->header_size = 0; mapping->header_size = 0;
mapping->base = NULL; mapping->base = 0;
mapping->file = NULL; mapping->file = NULL;
mapping->shared_file = NULL; mapping->shared_file = NULL;
mapping->committed = NULL; mapping->committed = NULL;
@ -453,11 +453,11 @@ static void mapping_dump( struct object *obj, int verbose )
{ {
struct mapping *mapping = (struct mapping *)obj; struct mapping *mapping = (struct mapping *)obj;
assert( obj->ops == &mapping_ops ); assert( obj->ops == &mapping_ops );
fprintf( stderr, "Mapping size=%08x%08x prot=%08x file=%p header_size=%08x base=%p " fprintf( stderr, "Mapping size=%08x%08x prot=%08x file=%p header_size=%08x base=%08lx "
"shared_file=%p ", "shared_file=%p ",
(unsigned int)(mapping->size >> 32), (unsigned int)mapping->size, (unsigned int)(mapping->size >> 32), (unsigned int)mapping->size,
mapping->protect, mapping->file, mapping->header_size, mapping->protect, mapping->file, mapping->header_size,
mapping->base, mapping->shared_file ); (unsigned long)mapping->base, mapping->shared_file );
dump_object_name( &mapping->obj ); dump_object_name( &mapping->obj );
fputc( '\n', stderr ); fputc( '\n', stderr );
} }

2
server/protocol.def
View File

@ -1369,7 +1369,7 @@ enum char_info_mode
mem_size_t size; /* mapping size */ mem_size_t size; /* mapping size */
int protect; /* protection flags */ int protect; /* protection flags */
int header_size; /* header size (for VPROT_IMAGE mapping) */ int header_size; /* header size (for VPROT_IMAGE mapping) */
void* base; /* default base addr (for VPROT_IMAGE mapping) */ client_ptr_t base; /* default base addr (for VPROT_IMAGE mapping) */
obj_handle_t mapping; /* duplicate mapping handle unless removable */ obj_handle_t mapping; /* duplicate mapping handle unless removable */
obj_handle_t shared_file; /* shared mapping file handle */ obj_handle_t shared_file; /* shared mapping file handle */
@END @END

4
server/trace.c
View File

@ -1813,7 +1813,9 @@ static void dump_get_mapping_info_reply( const struct get_mapping_info_reply *re
fprintf( stderr, "," ); fprintf( stderr, "," );
fprintf( stderr, " protect=%d,", req->protect ); fprintf( stderr, " protect=%d,", req->protect );
fprintf( stderr, " header_size=%d,", req->header_size ); fprintf( stderr, " header_size=%d,", req->header_size );
fprintf( stderr, " base=%p,", req->base ); fprintf( stderr, " base=" );
dump_uint64( &req->base );
fprintf( stderr, "," );
fprintf( stderr, " mapping=%04x,", req->mapping ); fprintf( stderr, " mapping=%04x,", req->mapping );
fprintf( stderr, " shared_file=%04x", req->shared_file ); fprintf( stderr, " shared_file=%04x", req->shared_file );
} }