December 2008 - Wine-commits

Alexandre Julliard : server: Make the arguments for CreateRemoteThread client_ptr_t instead of void pointers .
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: f69e62207ba8650a01bf74a89ee6d4e78d7acfb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69e62207ba8650a01bf74a89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 15:30:11 2008 +0100 server: Make the arguments for CreateRemoteThread client_ptr_t instead of void pointers. --- dlls/ntdll/sync.c | 10 +++++----- dlls/ntdll/thread.c | 4 ++-- include/wine/server_protocol.h | 8 ++++---- server/protocol.def | 6 +++--- server/trace.c | 7 +++++-- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index ecfe6f7..ba8d65b 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1007,16 +1007,16 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) HANDLE handle; SIZE_T reserve = call->create_thread.reserve; SIZE_T commit = call->create_thread.commit; + void *func = wine_server_get_ptr( call->create_thread.func ); + void *arg = wine_server_get_ptr( call->create_thread.arg ); result->type = call->type; - if (reserve == call->create_thread.reserve && commit == call->create_thread.commit) + if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && + (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { result->create_thread.status = RtlCreateUserThread( NtCurrentProcess(), NULL, call->create_thread.suspend, NULL, - reserve, commit, - call->create_thread.func, - call->create_thread.arg, - &handle, &id ); + reserve, commit, func, arg, &handle, &id ); result->create_thread.handle = wine_server_obj_handle( handle ); result->create_thread.tid = HandleToULong(id.UniqueThread); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b164727..a79bdf3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -483,8 +483,8 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * memset( &call, 0, sizeof(call) ); call.create_thread.type = APC_CREATE_THREAD; - call.create_thread.func = start; - call.create_thread.arg = param; + call.create_thread.func = wine_server_client_ptr( start ); + call.create_thread.arg = wine_server_client_ptr( param ); call.create_thread.reserve = stack_reserve; call.create_thread.commit = stack_commit; call.create_thread.suspend = suspended; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6e60dab..521f727 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -362,11 +362,11 @@ typedef union struct { enum apc_type type; - void (__stdcall *func)(void*); - void *arg; + int suspend; + client_ptr_t func; + client_ptr_t arg; mem_size_t reserve; mem_size_t commit; - int suspend; } create_thread; } apc_call_t; @@ -5059,6 +5059,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 369 +#define SERVER_PROTOCOL_VERSION 370 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 966e900..62717a5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -378,11 +378,11 @@ typedef union struct { enum apc_type type; /* APC_CREATE_THREAD */ - void (__stdcall *func)(void*); /* start function */ - void *arg; /* argument for start function */ + int suspend; /* suspended thread? */ + client_ptr_t func; /* void (__stdcall *func)(void*); start function */ + client_ptr_t arg; /* argument for start function */ 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; diff --git a/server/trace.c b/server/trace.c index 9954efd..d2a7cec 100644 --- a/server/trace.c +++ b/server/trace.c @@ -193,8 +193,11 @@ static void dump_apc_call( const apc_call_t *call ) dump_uint64( &call->unmap_view.addr ); break; case APC_CREATE_THREAD: - fprintf( stderr, "APC_CREATE_THREAD,func=%p,arg=%p,reserve=", - call->create_thread.func, call->create_thread.arg ); + fprintf( stderr, "APC_CREATE_THREAD,func=" ); + dump_uint64( &call->create_thread.func ); + fprintf( stderr, ",arg=" ); + dump_uint64( &call->create_thread.arg ); + fprintf( stderr, ",reserve=" ); dump_uint64( &call->create_thread.reserve ); fprintf( stderr, ",commit=" ); dump_uint64( &call->create_thread.commit );

1 0

Alexandre Julliard : server: Explicitly specify when an ioctl call needs to be blocking.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 7ec95c5beefe33c5f7c373a809cb742b896c9aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec95c5beefe33c5f7c373a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 20:37:20 2008 +0100 server: Explicitly specify when an ioctl call needs to be blocking. --- dlls/ntdll/file.c | 1 + include/wine/server_protocol.h | 3 ++- server/device.c | 4 ++-- server/fd.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 16 ++++++++-------- server/protocol.def | 1 + server/trace.c | 1 + 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0a070b5..1dfbd01 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1198,6 +1198,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, SERVER_START_REQ( ioctl ) { req->code = code; + req->blocking = !apc && !event; req->async.handle = wine_server_obj_handle( handle ); req->async.callback = ioctl_completion; req->async.iosb = io; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 521f727..91656df 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2710,6 +2710,7 @@ struct ioctl_request struct request_header __header; ioctl_code_t code; async_data_t async; + int blocking; /* VARARG(in_data,bytes); */ }; struct ioctl_reply @@ -5059,6 +5060,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 370 +#define SERVER_PROTOCOL_VERSION 371 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 48bccd2..9de2f54 100644 --- a/server/device.c +++ b/server/device.c @@ -125,7 +125,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static enum server_fd_type device_get_fd_type( struct fd *fd ); static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ); + int blocking, const void *data, data_size_t size ); static const struct object_ops device_ops = { @@ -308,7 +308,7 @@ static struct ioctl_call *find_ioctl_call( struct device *device, struct thread } static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ) + int blocking, const void *data, data_size_t size ) { struct device *device = get_fd_user( fd ); struct ioctl_call *ioctl; diff --git a/server/fd.c b/server/fd.c index 09b93ce..c8b6f7a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1912,7 +1912,7 @@ static void unmount_device( struct fd *device_fd ) /* default ioctl() routine */ obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - const void *data, data_size_t size ) + int blocking, const void *data, data_size_t size ) { switch(code) { @@ -2015,7 +2015,7 @@ DECL_HANDLER(ioctl) if (fd) { - reply->wait = fd->fd_ops->ioctl( fd, req->code, &req->async, + reply->wait = fd->fd_ops->ioctl( fd, req->code, &req->async, req->blocking, get_req_data(), get_req_data_size() ); reply->options = fd->options; release_object( fd ); diff --git a/server/file.h b/server/file.h index b9a83c3..3abfc02 100644 --- a/server/file.h +++ b/server/file.h @@ -39,7 +39,7 @@ struct fd_ops /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); /* perform an ioctl on the file */ - obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, const async_data_t *async, + obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking, const void *data, data_size_t size); /* queue an async operation */ void (*queue_async)(struct fd *, const async_data_t *data, int type, int count); @@ -79,7 +79,7 @@ extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, in extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - const void *data, data_size_t size ); + int blocking, const void *data, data_size_t size ); extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern void default_fd_cancel_async( struct fd *fd ); diff --git a/server/named_pipe.c b/server/named_pipe.c index e9cb14a..1651a67 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -140,7 +140,7 @@ static void pipe_server_destroy( struct object *obj); static void pipe_server_flush( struct fd *fd, struct event **event ); static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ); static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - const void *data, data_size_t size ); + int blocking, const void *data, data_size_t size ); static const struct object_ops pipe_server_ops = { @@ -223,7 +223,7 @@ static struct object *named_pipe_device_open_file( struct object *obj, unsigned static void named_pipe_device_destroy( struct object *obj ); static enum server_fd_type named_pipe_device_get_fd_type( struct fd *fd ); static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ); + int blocking, const void *data, data_size_t size ); static const struct object_ops named_pipe_device_ops = { @@ -592,7 +592,7 @@ static obj_handle_t alloc_wait_event( struct process *process ) } static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ) + int blocking, const void *data, data_size_t size ) { struct pipe_server *server = get_fd_user( fd ); struct async *async; @@ -605,7 +605,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - if (!async_data->event && !async_data->apc) + if (blocking) { async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) break; @@ -673,7 +673,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a return 0; default: - return default_fd_ioctl( fd, code, async_data, data, size ); + return default_fd_ioctl( fd, code, async_data, blocking, data, size ); } } @@ -854,7 +854,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc } static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ) + int blocking, const void *data, data_size_t size ) { struct named_pipe_device *device = get_fd_user( fd ); @@ -887,7 +887,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) goto done; - if (!async_data->event && !async_data->apc) + if (blocking) { async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) goto done; @@ -916,7 +916,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c } default: - return default_fd_ioctl( fd, code, async_data, data, size ); + return default_fd_ioctl( fd, code, async_data, blocking, data, size ); } } diff --git a/server/protocol.def b/server/protocol.def index 62717a5..397c54e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2003,6 +2003,7 @@ enum message_type @REQ(ioctl) ioctl_code_t code; /* ioctl code */ async_data_t async; /* async I/O parameters */ + int blocking; /* whether it's a blocking ioctl */ VARARG(in_data,bytes); /* ioctl input data */ @REPLY obj_handle_t wait; /* handle to wait on for blocking ioctl */ diff --git a/server/trace.c b/server/trace.c index d2a7cec..60b2318 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2591,6 +2591,7 @@ static void dump_ioctl_request( const struct ioctl_request *req ) fprintf( stderr, " async=" ); dump_async_data( &req->async ); fprintf( stderr, "," ); + fprintf( stderr, " blocking=%d,", req->blocking ); fprintf( stderr, " in_data=" ); dump_varargs_bytes( cur_size ); }

1 0

Alexandre Julliard : server: Make the message callback function a client_ptr_t instead of a void pointer .
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 4261476d1302d0cba683b6a0c65c7f89506d9e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4261476d1302d0cba683b6a0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 14:02:07 2008 +0100 server: Make the message callback function a client_ptr_t instead of a void pointer. --- dlls/user32/message.c | 4 ++-- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index feaafd7..5719664 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2096,7 +2096,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (size >= sizeof(struct callback_msg_data)) { const struct callback_msg_data *data = buffer; - call_sendmsg_callback( data->callback, info.msg.hwnd, + call_sendmsg_callback( wine_server_get_ptr(data->callback), info.msg.hwnd, info.msg.message, data->data, data->result ); } continue; @@ -2333,7 +2333,7 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * } else if (info->type == MSG_CALLBACK) { - msg_data.callback.callback = info->callback; + msg_data.callback.callback = wine_server_client_ptr( info->callback ); msg_data.callback.data = info->data; msg_data.callback.result = 0; data.data[0] = &msg_data; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a65932e..8130a3c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -184,7 +184,7 @@ struct hardware_msg_data struct callback_msg_data { - void *callback; + client_ptr_t callback; lparam_t data; lparam_t result; }; @@ -5052,6 +5052,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 363 +#define SERVER_PROTOCOL_VERSION 364 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index ca32a41..ea7da5e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -200,7 +200,7 @@ struct hardware_msg_data struct callback_msg_data { - void *callback; /* callback function */ + client_ptr_t callback; /* callback function */ lparam_t data; /* user data for callback */ lparam_t result; /* message result */ };

1 0

Alexandre Julliard : server: Make the address argument for read/ write_process_memory a client_ptr_t.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 8e9c156e14c25a968f9eee54fecbb0f93588599f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9c156e14c25a968f9eee54f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 14:11:58 2008 +0100 server: Make the address argument for read/write_process_memory a client_ptr_t. --- dlls/ntdll/virtual.c | 4 ++-- include/wine/server_protocol.h | 6 +++--- server/mach.c | 22 ++++++++++++++++------ server/process.c | 2 +- server/process.h | 4 ++-- server/procfs.c | 24 ++++++++++++++++++------ server/protocol.def | 4 ++-- server/ptrace.c | 24 ++++++++++++++++++------ server/trace.c | 7 +++++-- 9 files changed, 67 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e9c156e14c25a968f9ee…

1 0

Alexandre Julliard : server: Make the mapping base address a client_ptr_t instead of a void pointer.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: d066a9a01ab850797b6172c4cf89a325d3b9312d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d066a9a01ab850797b6172c4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 14:18:21 2008 +0100 server: Make the mapping base address a client_ptr_t instead of a void pointer. --- dlls/ntdll/virtual.c | 3 ++- include/wine/server_protocol.h | 4 ++-- server/mapping.c | 10 +++++----- server/protocol.def | 2 +- server/trace.c | 4 +++- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5b3ca77..7d57af9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2285,11 +2285,12 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p req->access = access; res = wine_server_call( req ); map_vprot = reply->protect; - base = reply->base; + base = wine_server_get_ptr( reply->base ); full_size = reply->size; header_size = reply->header_size; dup_mapping = wine_server_ptr_handle( reply->mapping ); shared_file = wine_server_ptr_handle( reply->shared_file ); + if ((ULONG_PTR)base != reply->base) base = NULL; } SERVER_END_REQ; if (res) return res; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index bc9ea96..434d52a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1737,7 +1737,7 @@ struct get_mapping_info_reply mem_size_t size; int protect; int header_size; - void* base; + client_ptr_t base; obj_handle_t mapping; obj_handle_t shared_file; }; @@ -5052,6 +5052,6 @@ union generic_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 */ diff --git a/server/mapping.c b/server/mapping.c index 0982b86..81c5096 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -58,7 +58,7 @@ struct mapping int protect; /* protection flags */ struct file *file; /* file mapped */ 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 file *shared_file; /* temp file for shared PE mapping */ 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 ); 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->protect = VPROT_IMAGE; @@ -389,7 +389,7 @@ static struct object *create_mapping( struct directory *root, const struct unico DACL_SECURITY_INFORMATION| SACL_SECURITY_INFORMATION ); mapping->header_size = 0; - mapping->base = NULL; + mapping->base = 0; mapping->file = NULL; mapping->shared_file = NULL; mapping->committed = NULL; @@ -453,11 +453,11 @@ static void mapping_dump( struct object *obj, int verbose ) { struct mapping *mapping = (struct mapping *)obj; 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 ", (unsigned int)(mapping->size >> 32), (unsigned int)mapping->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 ); fputc( '\n', stderr ); } diff --git a/server/protocol.def b/server/protocol.def index 962446a..25dc626 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1369,7 +1369,7 @@ enum char_info_mode mem_size_t size; /* mapping size */ int protect; /* protection flags */ 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 shared_file; /* shared mapping file handle */ @END diff --git a/server/trace.c b/server/trace.c index 391f65c..fb8c867 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1813,7 +1813,9 @@ static void dump_get_mapping_info_reply( const struct get_mapping_info_reply *re fprintf( stderr, "," ); fprintf( stderr, " protect=%d,", req->protect ); 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, " shared_file=%04x", req->shared_file ); }

1 0

Alexandre Julliard : server: Make the address parameters in inter-process virtual memory calls client_ptr_t .
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 838803ce24f0ba7f52dcca63e561ad62bc35b9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=838803ce24f0ba7f52dcca63e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 15:05:38 2008 +0100 server: Make the address parameters in inter-process virtual memory calls client_ptr_t. Add explicit padding fields in the corresponding structures. --- dlls/ntdll/sync.c | 89 +++++++++++++++++++++------------------ dlls/ntdll/virtual.c | 36 ++++++++-------- include/wine/server_protocol.h | 52 +++++++++++++---------- server/protocol.def | 50 ++++++++++++---------- server/trace.c | 89 +++++++++++++++++++++++++++------------ tools/make_requests | 4 +- 6 files changed, 186 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=838803ce24f0ba7f52dcc…

1 0

Christian Costa : winedos: Compute CMOS image checksum automatically.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: dd0faf7dd0dbb2da7cf3999fbe604e35b6f299e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0faf7dd0dbb2da7cf3999fb… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 30 12:19:52 2008 +0100 winedos: Compute CMOS image checksum automatically. --- dlls/winedos/ioports.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c index d03a4cd..6d505e5 100644 --- a/dlls/winedos/ioports.c +++ b/dlls/winedos/ioports.c @@ -67,9 +67,8 @@ static BYTE parport_8255[4] = {0x4f, 0x20, 0xff, 0xff}; static BYTE cmosaddress; -/* if you change anything here, use IO_FixCMOSCheckSum below to compute - * the checksum and put the right values in. - */ +static int cmos_image_initialized = 0; + static BYTE cmosimage[64] = { 0x27, /* 0x00: seconds */ @@ -118,8 +117,8 @@ static BYTE cmosimage[64] = 0x00, /* 0x2b: options 2 */ 0x00, /* 0x2c: options 3 */ 0x3f, /* 0x2d: reserved */ - 0x03, /* 0x2e: low CMOS ram checksum */ - 0x19, /* 0x2f: high CMOS ram checksum */ + 0xcc, /* 0x2e: low CMOS ram checksum (computed automatically) */ + 0xcc, /* 0x2f: high CMOS ram checksum (computed automatically) */ 0x00, /* 0x30: low extended memory byte */ 0x1c, /* 0x31: high extended memory byte */ 0x19, /* 0x32: century byte */ @@ -138,7 +137,6 @@ static BYTE cmosimage[64] = 0x5f /* 0x3f: reserved */ }; -#if 0 static void IO_FixCMOSCheckSum(void) { WORD sum = 0; @@ -148,9 +146,8 @@ static void IO_FixCMOSCheckSum(void) sum += cmosimage[i]; cmosimage[0x2e] = sum >> 8; /* yes, this IS hi byte !! */ cmosimage[0x2f] = sum & 0xff; - MESSAGE("calculated hi %02x, lo %02x\n", cmosimage[0x2e], cmosimage[0x2f]); + TRACE("calculated hi %02x, lo %02x\n", cmosimage[0x2e], cmosimage[0x2f]); } -#endif #ifdef DIRECT_IO_ACCESS @@ -459,6 +456,11 @@ DWORD WINAPI DOSVM_inport( int port, int size ) res = (DWORD)cmosaddress; break; case 0x71: + if (!cmos_image_initialized) + { + IO_FixCMOSCheckSum(); + cmos_image_initialized = 1; + } res = (DWORD)cmosimage[cmosaddress & 0x3f]; break; case 0x200: @@ -506,8 +508,8 @@ DWORD WINAPI DOSVM_inport( int port, int size ) case 0x3dd: case 0x3de: case 0x3df: - if(size > 1) - FIXME("Trying to read more than one byte from VGA!\n"); + if (size > 1) + FIXME("Trying to read more than one byte from VGA!\n"); res = (DWORD)VGA_ioport_in( port ); break; case 0x00: @@ -677,6 +679,11 @@ void WINAPI DOSVM_outport( int port, int size, DWORD value ) cmosaddress = (BYTE)value & 0x7f; break; case 0x71: + if (!cmos_image_initialized) + { + IO_FixCMOSCheckSum(); + cmos_image_initialized = 1; + } cmosimage[cmosaddress & 0x3f] = (BYTE)value; break; case 0x226:

1 0

Christian Costa : winedos: Increase extended memory from 7MB to 15MB.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 95810a89993cc3cd40f8f105e785d896106a4d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95810a89993cc3cd40f8f105e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 30 12:20:29 2008 +0100 winedos: Increase extended memory from 7MB to 15MB. --- dlls/winedos/ioports.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c index 6d505e5..2de1b15 100644 --- a/dlls/winedos/ioports.c +++ b/dlls/winedos/ioports.c @@ -95,7 +95,7 @@ static BYTE cmosimage[64] = 0x80, /* 0x15: low base memory */ 0x02, /* 0x16: high base memory (0x280 => 640KB) */ 0x00, /* 0x17: low extended memory */ - 0x1c, /* 0x18: high extended memory (0x1c00 => 7MB) */ + 0x3b, /* 0x18: high extended memory (0x3b00 => 15MB) */ 0x00, /* 0x19: HD 1 extended type byte */ 0x00, /* 0x1a: HD 2 extended type byte */ 0xad, /* 0x1b: reserved */

1 0

Christian Costa : quartz: Remove unused IMemInputPin vtables.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: fa8cd7435fb38900024f40762580947c797bb4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8cd7435fb38900024f40762… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 30 13:25:32 2008 +0100 quartz: Remove unused IMemInputPin vtables. --- dlls/quartz/nullrenderer.c | 13 ------------- dlls/quartz/transform.c | 14 -------------- dlls/quartz/videorenderer.c | 13 ------------- 3 files changed, 0 insertions(+), 40 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 2f9ec94..b64e1d1 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -67,19 +67,6 @@ typedef struct NullRendererImpl MediaSeekingImpl mediaSeeking; } NullRendererImpl; -static const IMemInputPinVtbl MemInputPin_Vtbl = -{ - MemInputPin_QueryInterface, - MemInputPin_AddRef, - MemInputPin_Release, - MemInputPin_GetAllocator, - MemInputPin_NotifyAllocator, - MemInputPin_GetAllocatorRequirements, - MemInputPin_Receive, - MemInputPin_ReceiveMultiple, - MemInputPin_ReceiveCanBlock -}; - static HRESULT NullRenderer_Sample(LPVOID iface, IMediaSample * pSample) { NullRendererImpl *This = (NullRendererImpl *)iface; diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 57e02b8..77ca4d7 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -45,7 +45,6 @@ static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n' static const IBaseFilterVtbl TransformFilter_Vtbl; static const IPinVtbl TransformFilter_InputPin_Vtbl; -static const IMemInputPinVtbl MemInputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; static HRESULT TransformFilter_Input_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) @@ -650,16 +649,3 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = OutputPin_EndFlush, OutputPin_NewSegment }; - -static const IMemInputPinVtbl MemInputPin_Vtbl = -{ - MemInputPin_QueryInterface, - MemInputPin_AddRef, - MemInputPin_Release, - MemInputPin_GetAllocator, - MemInputPin_NotifyAllocator, - MemInputPin_GetAllocatorRequirements, - MemInputPin_Receive, - MemInputPin_ReceiveMultiple, - MemInputPin_ReceiveCanBlock -}; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 0d9896e..ac948d5 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -256,19 +256,6 @@ static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) return TRUE; } -static const IMemInputPinVtbl MemInputPin_Vtbl = -{ - MemInputPin_QueryInterface, - MemInputPin_AddRef, - MemInputPin_Release, - MemInputPin_GetAllocator, - MemInputPin_NotifyAllocator, - MemInputPin_GetAllocatorRequirements, - MemInputPin_Receive, - MemInputPin_ReceiveMultiple, - MemInputPin_ReceiveCanBlock -}; - static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { AM_MEDIA_TYPE amt;

1 0

Christian Costa : cmd.exe: Use WCMD_CURRENTTIME resource to show the time.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 656b627340741c917def5d13bdf49052bbd49e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=656b627340741c917def5d13b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 30 13:26:53 2008 +0100 cmd.exe: Use WCMD_CURRENTTIME resource to show the time. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 564ce45..ad186ff 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2135,7 +2135,7 @@ void WCMD_setshow_time (void) { GetLocalTime(&st); if (GetTimeFormat (LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, sizeof(curtime)/sizeof(WCHAR))) { - WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curtime); + WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer,

1 0