December 2008 - Wine-Commits

Alexandre Julliard : server: Make a couple of fields smaller in the apc_call_t/apc_result_t structures.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: c86ec6445cb210445dac34e404985067ec92c361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86ec6445cb210445dac34e40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 15:22:45 2008 +0100 server: Make a couple of fields smaller in the apc_call_t/apc_result_t structures. --- dlls/ntdll/sync.c | 4 +- dlls/ntdll/virtual.c | 44 ++++++++++++++++++++-------------------- include/wine/server_protocol.h | 14 ++++++------ server/protocol.def | 12 +++++----- tools/make_requests | 4 +- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 86a80bd..ecfe6f7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -916,10 +916,10 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) result->virtual_query.base = wine_server_client_ptr( info.BaseAddress ); result->virtual_query.alloc_base = wine_server_client_ptr( info.AllocationBase ); result->virtual_query.size = info.RegionSize; - result->virtual_query.state = info.State; result->virtual_query.prot = info.Protect; result->virtual_query.alloc_prot = info.AllocationProtect; - result->virtual_query.alloc_type = info.Type; + result->virtual_query.state = info.State >> 12; + result->virtual_query.alloc_type = info.Type >> 16; } break; } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f804eba..d2610e9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1963,10 +1963,10 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, info->BaseAddress = wine_server_get_ptr( result.virtual_query.base ); info->AllocationBase = wine_server_get_ptr( result.virtual_query.alloc_base ); info->RegionSize = result.virtual_query.size; - info->State = result.virtual_query.state; info->Protect = result.virtual_query.prot; info->AllocationProtect = result.virtual_query.alloc_prot; - info->Type = result.virtual_query.alloc_type; + info->State = (DWORD)result.virtual_query.state << 12; + info->Type = (DWORD)result.virtual_query.alloc_type << 16; if (info->RegionSize != result.virtual_query.size) /* truncated */ return STATUS_INVALID_PARAMETER; /* FIXME */ if (res_len) *res_len = sizeof(*info); @@ -2233,6 +2233,26 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_INVALID_PARAMETER; + switch(protect) + { + case PAGE_NOACCESS: + access = SECTION_QUERY; + break; + case PAGE_READWRITE: + case PAGE_EXECUTE_READWRITE: + access = SECTION_QUERY | SECTION_MAP_WRITE; + break; + case PAGE_READONLY: + case PAGE_WRITECOPY: + case PAGE_EXECUTE: + case PAGE_EXECUTE_READ: + case PAGE_EXECUTE_WRITECOPY: + access = SECTION_QUERY | SECTION_MAP_READ; + break; + default: + return STATUS_INVALID_PARAMETER; + } + if (process != NtCurrentProcess()) { apc_call_t call; @@ -2259,26 +2279,6 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p return result.map_view.status; } - switch(protect) - { - case PAGE_NOACCESS: - access = SECTION_QUERY; - break; - case PAGE_READWRITE: - case PAGE_EXECUTE_READWRITE: - access = SECTION_QUERY | SECTION_MAP_WRITE; - break; - case PAGE_READONLY: - case PAGE_WRITECOPY: - case PAGE_EXECUTE: - case PAGE_EXECUTE_READ: - case PAGE_EXECUTE_WRITECOPY: - access = SECTION_QUERY | SECTION_MAP_READ; - break; - default: - return STATUS_INVALID_PARAMETER; - } - SERVER_START_REQ( get_mapping_info ) { req->handle = wine_server_obj_handle( handle ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6499753..6e60dab 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -349,9 +349,9 @@ typedef union client_ptr_t addr; mem_size_t size; file_pos_t offset; - unsigned int zero_bits; unsigned int alloc_type; - unsigned int prot; + unsigned short zero_bits; + unsigned short prot; } map_view; struct { @@ -400,10 +400,10 @@ typedef union client_ptr_t base; client_ptr_t alloc_base; mem_size_t size; - unsigned int state; - unsigned int prot; - unsigned int alloc_prot; - unsigned int alloc_type; + unsigned short state; + unsigned short prot; + unsigned short alloc_prot; + unsigned short alloc_type; } virtual_query; struct { @@ -5059,6 +5059,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 368 +#define SERVER_PROTOCOL_VERSION 369 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index f064838..966e900 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -365,9 +365,9 @@ typedef union client_ptr_t addr; /* requested address */ mem_size_t size; /* allocation size */ file_pos_t offset; /* file offset */ - unsigned int zero_bits; /* allocation alignment */ unsigned int alloc_type;/* allocation type */ - unsigned int prot; /* memory protection flags */ + unsigned short zero_bits; /* allocation alignment */ + unsigned short prot; /* memory protection flags */ } map_view; struct { @@ -416,10 +416,10 @@ typedef union client_ptr_t base; /* resulting base address */ client_ptr_t alloc_base;/* resulting allocation base */ 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 */ - unsigned int alloc_type;/* resulting region allocation type */ + unsigned short state; /* resulting region state */ + unsigned short prot; /* resulting region protection */ + unsigned short alloc_prot;/* resulting allocation protection */ + unsigned short alloc_type;/* resulting region allocation type */ } virtual_query; struct { diff --git a/tools/make_requests b/tools/make_requests index c5b6ad1..eeec934 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -45,8 +45,8 @@ my %formats = "timeout_t" => [ 8, 8, "&dump_timeout" ], "rectangle_t" => [ 16, 4, "&dump_rectangle" ], "char_info_t" => [ 4, 2, "&dump_char_info" ], - "apc_call_t" => [ 44, 8, "&dump_apc_call" ], - "apc_result_t" => [ 48, 8, "&dump_apc_result" ], + "apc_call_t" => [ 40, 8, "&dump_apc_call" ], + "apc_result_t" => [ 40, 8, "&dump_apc_result" ], "async_data_t" => [ 32, 8, "&dump_async_data" ], "luid_t" => [ 8, 4, "&dump_luid" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ],

1 0

Alexandre Julliard : server: Make padding explicit in the wake_up_reply structure.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: 7560a890225a8ab56c326206224fe9bedc69aefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7560a890225a8ab56c3262062… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 15:15:06 2008 +0100 server: Make padding explicit in the wake_up_reply structure. --- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/thread.c | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1845692..6499753 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -137,6 +137,7 @@ struct wake_up_reply { client_ptr_t cookie; int signaled; + int __pad; }; @@ -5058,6 +5059,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 367 +#define SERVER_PROTOCOL_VERSION 368 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index e51c24c..f064838 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -153,6 +153,7 @@ struct wake_up_reply { client_ptr_t cookie; /* magic cookie that was passed in select_request */ int signaled; /* wait result */ + int __pad; }; /* NT-style timeout, in 100ns units, negative means relative timeout */ diff --git a/server/thread.c b/server/thread.c index 98a24d8..9681c1a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -565,6 +565,7 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s struct wake_up_reply reply; int ret; + memset( &reply, 0, sizeof(reply) ); reply.cookie = cookie; reply.signaled = signaled; if ((ret = write( get_unix_fd( thread->wait_fd ), &reply, sizeof(reply) )) == sizeof(reply))

1 0

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

Dec. 31, 2008

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 argument for read/ write_process_memory a client_ptr_t.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

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 address parameters in inter-process virtual memory calls client_ptr_t .
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

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

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

Dec. 31, 2008

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

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

Dec. 30, 2008

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

Christian Costa : quartz: Remove unused IMemInputPin vtables.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

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 : winedos: Increase extended memory from 7MB to 15MB.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

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 : winedos: Compute CMOS image checksum automatically.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

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