mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 06:21:15 +00:00
server: Don't use size_t for module sizes, they are limited to 2Gb anyway.
This commit is contained in:
parent
db6e45488d
commit
77cf8034e4
|
@ -670,8 +670,8 @@ struct get_dll_info_request
|
||||||
struct get_dll_info_reply
|
struct get_dll_info_reply
|
||||||
{
|
{
|
||||||
struct reply_header __header;
|
struct reply_header __header;
|
||||||
size_t size;
|
|
||||||
void* entry_point;
|
void* entry_point;
|
||||||
|
data_size_t size;
|
||||||
data_size_t filename_len;
|
data_size_t filename_len;
|
||||||
/* VARARG(filename,unicode_str); */
|
/* VARARG(filename,unicode_str); */
|
||||||
};
|
};
|
||||||
|
@ -709,10 +709,10 @@ struct load_dll_request
|
||||||
struct request_header __header;
|
struct request_header __header;
|
||||||
obj_handle_t handle;
|
obj_handle_t handle;
|
||||||
void* base;
|
void* base;
|
||||||
size_t size;
|
void* name;
|
||||||
|
data_size_t size;
|
||||||
int dbg_offset;
|
int dbg_offset;
|
||||||
int dbg_size;
|
int dbg_size;
|
||||||
void* name;
|
|
||||||
/* VARARG(filename,unicode_str); */
|
/* VARARG(filename,unicode_str); */
|
||||||
};
|
};
|
||||||
struct load_dll_reply
|
struct load_dll_reply
|
||||||
|
@ -5046,6 +5046,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 348
|
#define SERVER_PROTOCOL_VERSION 349
|
||||||
|
|
||||||
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
|
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
|
||||||
|
|
|
@ -38,8 +38,8 @@ struct process_dll
|
||||||
struct list entry; /* entry in per-process dll list */
|
struct list entry; /* entry in per-process dll list */
|
||||||
struct file *file; /* dll file */
|
struct file *file; /* dll file */
|
||||||
void *base; /* dll base address (in process addr space) */
|
void *base; /* dll base address (in process addr space) */
|
||||||
size_t size; /* dll size */
|
|
||||||
void *name; /* ptr to ptr to name (in process addr space) */
|
void *name; /* ptr to ptr to name (in process addr space) */
|
||||||
|
data_size_t size; /* dll size */
|
||||||
int dbg_offset; /* debug info offset */
|
int dbg_offset; /* debug info offset */
|
||||||
int dbg_size; /* debug info size */
|
int dbg_size; /* debug info size */
|
||||||
data_size_t namelen; /* length of dll file name */
|
data_size_t namelen; /* length of dll file name */
|
||||||
|
|
|
@ -618,8 +618,8 @@ typedef union
|
||||||
obj_handle_t handle; /* process handle */
|
obj_handle_t handle; /* process handle */
|
||||||
void* base_address; /* base address of module */
|
void* base_address; /* base address of module */
|
||||||
@REPLY
|
@REPLY
|
||||||
size_t size; /* module size */
|
|
||||||
void* entry_point;
|
void* entry_point;
|
||||||
|
data_size_t size; /* module size */
|
||||||
data_size_t filename_len; /* buffer len in bytes required to store filename */
|
data_size_t filename_len; /* buffer len in bytes required to store filename */
|
||||||
VARARG(filename,unicode_str); /* file name of module */
|
VARARG(filename,unicode_str); /* file name of module */
|
||||||
@END
|
@END
|
||||||
|
@ -645,10 +645,10 @@ typedef union
|
||||||
@REQ(load_dll)
|
@REQ(load_dll)
|
||||||
obj_handle_t handle; /* file handle */
|
obj_handle_t handle; /* file handle */
|
||||||
void* base; /* base address */
|
void* base; /* base address */
|
||||||
size_t size; /* dll size */
|
void* name; /* ptr to ptr to name (in process addr space) */
|
||||||
|
data_size_t size; /* dll size */
|
||||||
int dbg_offset; /* debug info offset */
|
int dbg_offset; /* debug info offset */
|
||||||
int dbg_size; /* debug info size */
|
int dbg_size; /* debug info size */
|
||||||
void* name; /* ptr to ptr to name (in process addr space) */
|
|
||||||
VARARG(filename,unicode_str); /* file name of dll */
|
VARARG(filename,unicode_str); /* file name of dll */
|
||||||
@END
|
@END
|
||||||
|
|
||||||
|
|
|
@ -1014,8 +1014,8 @@ static void dump_get_dll_info_request( const struct get_dll_info_request *req )
|
||||||
|
|
||||||
static void dump_get_dll_info_reply( const struct get_dll_info_reply *req )
|
static void dump_get_dll_info_reply( const struct get_dll_info_reply *req )
|
||||||
{
|
{
|
||||||
fprintf( stderr, " size=%lu,", (unsigned long)req->size );
|
|
||||||
fprintf( stderr, " entry_point=%p,", req->entry_point );
|
fprintf( stderr, " entry_point=%p,", req->entry_point );
|
||||||
|
fprintf( stderr, " size=%u,", req->size );
|
||||||
fprintf( stderr, " filename_len=%u,", req->filename_len );
|
fprintf( stderr, " filename_len=%u,", req->filename_len );
|
||||||
fprintf( stderr, " filename=" );
|
fprintf( stderr, " filename=" );
|
||||||
dump_varargs_unicode_str( cur_size );
|
dump_varargs_unicode_str( cur_size );
|
||||||
|
@ -1045,10 +1045,10 @@ static void dump_load_dll_request( const struct load_dll_request *req )
|
||||||
{
|
{
|
||||||
fprintf( stderr, " handle=%04x,", req->handle );
|
fprintf( stderr, " handle=%04x,", req->handle );
|
||||||
fprintf( stderr, " base=%p,", req->base );
|
fprintf( stderr, " base=%p,", req->base );
|
||||||
fprintf( stderr, " size=%lu,", (unsigned long)req->size );
|
fprintf( stderr, " name=%p,", req->name );
|
||||||
|
fprintf( stderr, " size=%u,", req->size );
|
||||||
fprintf( stderr, " dbg_offset=%d,", req->dbg_offset );
|
fprintf( stderr, " dbg_offset=%d,", req->dbg_offset );
|
||||||
fprintf( stderr, " dbg_size=%d,", req->dbg_size );
|
fprintf( stderr, " dbg_size=%d,", req->dbg_size );
|
||||||
fprintf( stderr, " name=%p,", req->name );
|
|
||||||
fprintf( stderr, " filename=" );
|
fprintf( stderr, " filename=" );
|
||||||
dump_varargs_unicode_str( cur_size );
|
dump_varargs_unicode_str( cur_size );
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,6 @@ my %formats =
|
||||||
"unsigned int" => "%08x",
|
"unsigned int" => "%08x",
|
||||||
"unsigned long" => "%lx",
|
"unsigned long" => "%lx",
|
||||||
"void*" => "%p",
|
"void*" => "%p",
|
||||||
"size_t" => "%lu (unsigned long)",
|
|
||||||
"data_size_t" => "%u",
|
"data_size_t" => "%u",
|
||||||
"obj_handle_t" => "%04x",
|
"obj_handle_t" => "%04x",
|
||||||
"atom_t" => "%04x",
|
"atom_t" => "%04x",
|
||||||
|
|
Loading…
Reference in a new issue