Skip to content

W
wine-cw
Commit 992d3cea authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

server: Add a mem_size_t type to represent memory sizes and offsets.

parent 5646fec9
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 34 deletions
include/wine/server_protocol.h
View file @ 992d3cea
......@@ -24,6 +24,7 @@ typedef unsigned int data_size_t;
typedef unsigned int ioctl_code_t;
typedef unsigned long lparam_t;
typedef unsigned long apc_param_t;
typedef unsigned long mem_size_t;
typedef unsigned __int64 file_pos_t;
struct request_header
......@@ -282,7 +283,7 @@ typedef union
{
enum apc_type type;
void *addr;
unsigned long size;
mem_size_t size;
unsigned int zero_bits;
unsigned int op_type;
unsigned int prot;
......@@ -291,7 +292,7 @@ typedef union
{
enum apc_type type;
void *addr;
unsigned long size;
mem_size_t size;
unsigned int op_type;
} virtual_free;
struct
......@@ -303,33 +304,33 @@ typedef union
{
enum apc_type type;
void *addr;
unsigned long size;
mem_size_t size;
unsigned int prot;
} virtual_protect;
struct
{
enum apc_type type;
const void *addr;
unsigned long size;
mem_size_t size;
} virtual_flush;
struct
{
enum apc_type type;
void *addr;
unsigned long size;
mem_size_t size;
} virtual_lock;
struct
{
enum apc_type type;
void *addr;
unsigned long size;
mem_size_t size;
} virtual_unlock;
struct
{
enum apc_type type;
obj_handle_t handle;
void *addr;
unsigned long size;
mem_size_t size;
file_pos_t offset;
unsigned int zero_bits;
unsigned int alloc_type;
......@@ -345,8 +346,8 @@ typedef union
enum apc_type type;
void (__stdcall *func)(void*);
void *arg;
unsigned long reserve;
unsigned long commit;
mem_size_t reserve;
mem_size_t commit;
int suspend;
} create_thread;
} apc_call_t;
......@@ -365,14 +366,14 @@ typedef union
enum apc_type type;
unsigned int status;
void *addr;
unsigned long size;
mem_size_t size;
} virtual_alloc;
struct
{
enum apc_type type;
unsigned int status;
void *addr;
unsigned long size;
mem_size_t size;
} virtual_free;
struct
{
......@@ -380,7 +381,7 @@ typedef union
unsigned int status;
void *base;
void *alloc_base;
unsigned long size;
mem_size_t size;
unsigned int state;
unsigned int prot;
unsigned int alloc_prot;
......@@ -391,7 +392,7 @@ typedef union
enum apc_type type;
unsigned int status;
void *addr;
unsigned long size;
mem_size_t size;
unsigned int prot;
} virtual_protect;
struct
......@@ -399,28 +400,28 @@ typedef union
enum apc_type type;
unsigned int status;
const void *addr;
unsigned long size;
mem_size_t size;
} virtual_flush;
struct
{
enum apc_type type;
unsigned int status;
void *addr;
unsigned long size;
mem_size_t size;
} virtual_lock;
struct
{
enum apc_type type;
unsigned int status;
void *addr;
unsigned long size;
mem_size_t size;
} virtual_unlock;
struct
{
enum apc_type type;
unsigned int status;
void *addr;
unsigned long size;
mem_size_t size;
} map_view;
struct
{
......
server/protocol.def
View file @ 992d3cea
......@@ -40,6 +40,7 @@ typedef unsigned int data_size_t;
typedef unsigned int ioctl_code_t;
typedef unsigned long lparam_t;
typedef unsigned long apc_param_t;
typedef unsigned long mem_size_t;
typedef unsigned __int64 file_pos_t;
struct request_header
......@@ -298,7 +299,7 @@ typedef union
{
enum apc_type type; /* APC_VIRTUAL_ALLOC */
void *addr; /* requested address */
unsigned long size; /* allocation size */
mem_size_t size; /* allocation size */
unsigned int zero_bits; /* allocation alignment */
unsigned int op_type; /* type of operation */
unsigned int prot; /* memory protection flags */
......@@ -307,7 +308,7 @@ typedef union
{
enum apc_type type; /* APC_VIRTUAL_FREE */
void *addr; /* requested address */
unsigned long size; /* allocation size */
mem_size_t size; /* allocation size */
unsigned int op_type; /* type of operation */
} virtual_free;
struct
......@@ -319,33 +320,33 @@ typedef union
{
enum apc_type type; /* APC_VIRTUAL_PROTECT */
void *addr; /* requested address */
unsigned long size; /* requested address */
mem_size_t size; /* requested size */
unsigned int prot; /* new protection flags */
} virtual_protect;
struct
{
enum apc_type type; /* APC_VIRTUAL_FLUSH */
const void *addr; /* requested address */
unsigned long size; /* requested address */
mem_size_t size; /* requested size */
} virtual_flush;
struct
{
enum apc_type type; /* APC_VIRTUAL_LOCK */
void *addr; /* requested address */
unsigned long size; /* requested address */
mem_size_t size; /* requested size */
} virtual_lock;
struct
{
enum apc_type type; /* APC_VIRTUAL_UNLOCK */
void *addr; /* requested address */
unsigned long size; /* requested address */
mem_size_t size; /* requested size */
} virtual_unlock;
struct
{
enum apc_type type; /* APC_MAP_VIEW */
obj_handle_t handle; /* mapping handle */
void *addr; /* requested address */
unsigned long size; /* allocation size */
mem_size_t size; /* allocation size */
file_pos_t offset; /* file offset */
unsigned int zero_bits; /* allocation alignment */
unsigned int alloc_type;/* allocation type */
......@@ -361,8 +362,8 @@ typedef union
enum apc_type type; /* APC_CREATE_THREAD */
void (__stdcall *func)(void*); /* start function */
void *arg; /* argument for start function */
unsigned long reserve; /* reserve size for thread stack */
unsigned long commit; /* commit size for thread stack */
mem_size_t reserve; /* reserve size for thread stack */
mem_size_t commit; /* commit size for thread stack */
int suspend; /* suspended thread? */
} create_thread;
} apc_call_t;
......@@ -381,14 +382,14 @@ typedef union
enum apc_type type; /* APC_VIRTUAL_ALLOC */
unsigned int status; /* status returned by call */
void *addr; /* resulting address */
unsigned long size; /* resulting size */
mem_size_t size; /* resulting size */
} virtual_alloc;
struct
{
enum apc_type type; /* APC_VIRTUAL_FREE */
unsigned int status; /* status returned by call */
void *addr; /* resulting address */
unsigned long size; /* resulting size */
mem_size_t size; /* resulting size */
} virtual_free;
struct
{
......@@ -396,7 +397,7 @@ typedef union
unsigned int status; /* status returned by call */
void *base; /* resulting base address */
void *alloc_base;/* resulting allocation base */
unsigned long size; /* resulting region size */
mem_size_t size; /* resulting region size */
unsigned int state; /* resulting region state */
unsigned int prot; /* resulting region protection */
unsigned int alloc_prot;/* resulting allocation protection */
......@@ -407,7 +408,7 @@ typedef union
enum apc_type type; /* APC_VIRTUAL_PROTECT */
unsigned int status; /* status returned by call */
void *addr; /* resulting address */
unsigned long size; /* resulting size */
mem_size_t size; /* resulting size */
unsigned int prot; /* old protection flags */
} virtual_protect;
struct
......@@ -415,28 +416,28 @@ typedef union
enum apc_type type; /* APC_VIRTUAL_FLUSH */
unsigned int status; /* status returned by call */
const void *addr; /* resulting address */
unsigned long size; /* resulting size */
mem_size_t size; /* resulting size */
} virtual_flush;
struct
{
enum apc_type type; /* APC_VIRTUAL_LOCK */
unsigned int status; /* status returned by call */
void *addr; /* resulting address */
unsigned long size; /* resulting size */
mem_size_t size; /* resulting size */
} virtual_lock;
struct
{
enum apc_type type; /* APC_VIRTUAL_UNLOCK */
unsigned int status; /* status returned by call */
void *addr; /* resulting address */
unsigned long size; /* resulting size */
mem_size_t size; /* resulting size */
} virtual_unlock;
struct
{
enum apc_type type; /* APC_MAP_VIEW */
unsigned int status; /* status returned by call */
void *addr; /* resulting address */
unsigned long size; /* resulting size */
mem_size_t size; /* resulting size */
} map_view;
struct
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment