wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Nick Burns : ddraw: Fix surface version setting.
by Alexandre Julliard 26 Dec '08

26 Dec '08

Module: wine Branch: master Commit: a537fb0a93e4c4bdab7769e3a748524ea5a11919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a537fb0a93e4c4bdab7769e3a… Author: Nick Burns <adger44(a)hotmail.com> Date: Wed Dec 24 17:01:02 2008 -0800 ddraw: Fix surface version setting. --- dlls/ddraw/ddraw.c | 1 + dlls/ddraw/ddraw_thunks.c | 25 +++++++++++++++++++++---- dlls/ddraw/surface.c | 7 +++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 919d995..8033b15 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2084,6 +2084,7 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, ICOM_INIT_INTERFACE(*ppSurf, IDirect3DTexture, IDirect3DTexture1_Vtbl); (*ppSurf)->ref = 1; (*ppSurf)->version = 7; + TRACE("%p->version = %d\n", (*ppSurf), (*ppSurf)->version); (*ppSurf)->ddraw = This; (*ppSurf)->surface_desc.dwSize = sizeof(DDSURFACEDESC2); (*ppSurf)->surface_desc.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index b748ad4..da61e1f 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -377,6 +377,23 @@ IDirectDraw4Impl_CreatePalette(LPDIRECTDRAW4 This, DWORD dwFlags, return hr; } +/* Must set all attached surfaces (e.g. mipmaps) versions as well */ +static void set_surf_version(IDirectDrawSurfaceImpl *surf, int version) +{ + int i; + TRACE("%p->version(%d) = %d\n", surf, surf->version, version); + surf->version = version; + for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) + { + if(!surf->complex_array[i]) break; + set_surf_version(surf->complex_array[i], version); + } + while( (surf = surf->next_attached) ) + { + set_surf_version(surf, version); + } +} + static HRESULT WINAPI IDirectDrawImpl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, LPDIRECTDRAWSURFACE *ppSurface, @@ -407,7 +424,7 @@ IDirectDrawImpl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, impl = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, pSurface7); if(SUCCEEDED(hr) && impl) { - impl->version = 1; + set_surf_version(impl, 1); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw, IDirectDraw7, @@ -442,7 +459,7 @@ IDirectDraw2Impl_CreateSurface(LPDIRECTDRAW2 This, LPDDSURFACEDESC pSDesc, impl = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, pSurface7); if(SUCCEEDED(hr) && impl) { - impl->version = 2; + set_surf_version(impl, 2); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw2, IDirectDraw7, @@ -477,7 +494,7 @@ IDirectDraw3Impl_CreateSurface(LPDIRECTDRAW3 This, LPDDSURFACEDESC pSDesc, impl = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, pSurface7); if(SUCCEEDED(hr) && impl) { - impl->version = 3; + set_surf_version(impl, 3); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw3, IDirectDraw7, @@ -507,7 +524,7 @@ IDirectDraw4Impl_CreateSurface(LPDIRECTDRAW4 This, LPDDSURFACEDESC2 pSDesc, impl = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, *ppSurface); if(SUCCEEDED(hr) && impl) { - impl->version = 4; + set_surf_version(impl, 4); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw4, IDirectDraw7, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d263f67..f184111 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -475,15 +475,18 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface, TRACE("(%p)->(%p,%p)\n", This, Caps, Surface); EnterCriticalSection(&ddraw_cs); - our_caps = *Caps; - if(This->version < 7) { /* Earlier dx apps put garbage into these members, clear them */ + our_caps.dwCaps = Caps->dwCaps; our_caps.dwCaps2 = 0; our_caps.dwCaps3 = 0; our_caps.dwCaps4 = 0; } + else + { + our_caps = *Caps; + } TRACE("(%p): Looking for caps: %x,%x,%x,%x\n", This, our_caps.dwCaps, our_caps.dwCaps2, our_caps.dwCaps3, our_caps.dwCaps4); /* FIXME: Better debugging */

1 0

Nick Burns : wined3d: Fix glReadPixels call from read_from_framebuffer.
by Alexandre Julliard 26 Dec '08

26 Dec '08

Module: wine Branch: master Commit: 9dea6f7de5cf5161825f24b6b33f2e0e15b83ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dea6f7de5cf5161825f24b6b… Author: Nick Burns <adger44(a)hotmail.com> Date: Mon Dec 22 06:08:10 2008 -0800 wined3d: Fix glReadPixels call from read_from_framebuffer. --- dlls/wined3d/surface.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0eedf23..67097ac 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -691,6 +691,9 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v BOOL bpp; RECT local_rect; BOOL srcIsUpsideDown; + GLint rowLen = 0; + GLint skipPix = 0; + GLint skipRow = 0; if(wined3d_settings.rendertargetlock_mode == RTL_DISABLE) { static BOOL warned = FALSE; @@ -786,14 +789,42 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); checkGLcall("glBindBufferARB"); + if(mem != NULL) { + ERR("mem not null for pbo -- unexpected\n"); + mem = NULL; + } } - glReadPixels(local_rect.left, local_rect.top, + /* Save old pixel store pack state */ + glGetIntegerv(GL_PACK_ROW_LENGTH, &rowLen); + checkGLcall("glIntegerv"); + glGetIntegerv(GL_PACK_SKIP_PIXELS, &skipPix); + checkGLcall("glIntegerv"); + glGetIntegerv(GL_PACK_SKIP_ROWS, &skipRow); + checkGLcall("glIntegerv"); + + /* Setup pixel store pack state -- to glReadPixels into the correct place */ + glPixelStorei(GL_PACK_ROW_LENGTH, This->currentDesc.Width); + checkGLcall("glPixelStorei"); + glPixelStorei(GL_PACK_SKIP_PIXELS, local_rect.left); + checkGLcall("glPixelStorei"); + glPixelStorei(GL_PACK_SKIP_ROWS, local_rect.top); + checkGLcall("glPixelStorei"); + + glReadPixels(local_rect.left, (!srcIsUpsideDown) ? (This->currentDesc.Height - local_rect.bottom) : local_rect.top , local_rect.right - local_rect.left, local_rect.bottom - local_rect.top, fmt, type, mem); checkGLcall("glReadPixels"); + /* Reset previous pixel store pack state */ + glPixelStorei(GL_PACK_ROW_LENGTH, rowLen); + checkGLcall("glPixelStorei"); + glPixelStorei(GL_PACK_SKIP_PIXELS, skipPix); + checkGLcall("glPixelStorei"); + glPixelStorei(GL_PACK_SKIP_ROWS, skipRow); + checkGLcall("glPixelStorei"); + if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); @@ -828,7 +859,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v } top = mem + pitch * local_rect.top; - bottom = mem + pitch * ( local_rect.bottom - local_rect.top - 1); + bottom = mem + pitch * (local_rect.bottom - 1); for(i = 0; i < (local_rect.bottom - local_rect.top) / 2; i++) { memcpy(row, top + off, len); memcpy(top + off, bottom + off, len);

1 0

Maarten Lankhorst : ntdll: Make the loader process relocations correctly for x86_64.
by Alexandre Julliard 26 Dec '08

26 Dec '08

Module: wine Branch: master Commit: 72423f5f6d8e0619ee4e3ad53fa2c2e5aceb2392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72423f5f6d8e0619ee4e3ad53… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 22 00:07:58 2008 +0100 ntdll: Make the loader process relocations correctly for x86_64. --- dlls/ntdll/loader.c | 8 +++++++- dlls/ntdll/virtual.c | 2 +- include/winternl.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 968d7fd..aa103ac 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2101,7 +2101,7 @@ NTSTATUS WINAPI LdrAddRefDll( ULONG flags, HMODULE module ) * Apply relocations to a given page of a mapped PE image. */ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count, - USHORT *relocs, INT delta ) + USHORT *relocs, INT_PTR delta ) { while (count--) { @@ -2111,6 +2111,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count { case IMAGE_REL_BASED_ABSOLUTE: break; +#ifdef __i386__ case IMAGE_REL_BASED_HIGH: *(short *)((char *)page + offset) += HIWORD(delta); break; @@ -2120,6 +2121,11 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count case IMAGE_REL_BASED_HIGHLOW: *(int *)((char *)page + offset) += delta; break; +#elif defined(__x86_64__) + case IMAGE_REL_BASED_DIR64: + *(INT_PTR *)((char *)page + offset) += delta; + break; +#endif default: FIXME("Unknown/unsupported fixup type %x.\n", type); return NULL; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index bda8be1..7801941 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -993,7 +993,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz struct stat st; struct file_view *view = NULL; char *ptr, *header_end; - int delta = 0; + INT_PTR delta = 0; /* zero-map the whole range */ diff --git a/include/winternl.h b/include/winternl.h index d0180a5..ed93bbf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1978,7 +1978,7 @@ NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, UL NTSYSAPI void WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG*); -IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT); +IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR); NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(SYSTEM_MODULE_INFORMATION*, ULONG, ULONG*); NTSYSAPI void WINAPI LdrShutdownProcess(void); NTSYSAPI void WINAPI LdrShutdownThread(void);

1 0

Maarten Lankhorst : ntdll: Print the expected and found assembly versions if no compatible version is found .
by Alexandre Julliard 26 Dec '08

26 Dec '08

Module: wine Branch: master Commit: 83ee191f7e372c8745d2b378996eec1aa8d66f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ee191f7e372c8745d2b3789… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 22 00:07:08 2008 +0100 ntdll: Print the expected and found assembly versions if no compatible version is found. --- dlls/ntdll/actctx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f1f9ad7..79d475f 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1398,7 +1398,11 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, if (assembly->type == ASSEMBLY_MANIFEST && memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) { - FIXME("wrong version for assembly manifest\n"); + FIXME("wrong version for assembly manifest: %u.%u.%u.%u / %u.%u.%u.%u\n", + expected_ai->version.major, expected_ai->version.minor, + expected_ai->version.build, expected_ai->version.revision, + assembly->id.version.major, assembly->id.version.minor, + assembly->id.version.build, assembly->id.version.revision); return FALSE; } else if (assembly->type == ASSEMBLY_SHARED_MANIFEST &&

1 0

Alexandre Julliard : server: Get rid of the unused count parameter in fd_queue_async().
by Alexandre Julliard 26 Dec '08

26 Dec '08

Module: wine Branch: master Commit: 9ed42d2709fe336d8ee32f9f00a8adacd7cfa925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed42d2709fe336d8ee32f9f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 12:27:48 2008 +0100 server: Get rid of the unused count parameter in fd_queue_async(). --- server/change.c | 2 +- server/device.c | 2 +- server/fd.c | 4 ++-- server/file.h | 2 +- server/mailslot.c | 2 +- server/named_pipe.c | 4 ++-- server/serial.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/change.c b/server/change.c index d731a9c..63985f4 100644 --- a/server/change.c +++ b/server/change.c @@ -1144,7 +1144,7 @@ DECL_HANDLER(read_directory_changes) return; /* requests don't timeout */ - if (!(async = fd_queue_async( dir->fd, &req->async, ASYNC_TYPE_WAIT, 0 ))) goto end; + if (!(async = fd_queue_async( dir->fd, &req->async, ASYNC_TYPE_WAIT ))) goto end; /* assign it once */ if (!dir->filter) diff --git a/server/device.c b/server/device.c index abf0ac5..754b257 100644 --- a/server/device.c +++ b/server/device.c @@ -332,7 +332,7 @@ static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_ return 0; } - if (!(ioctl->async = fd_queue_async( device->fd, async_data, ASYNC_TYPE_WAIT, 0 ))) + if (!(ioctl->async = fd_queue_async( device->fd, async_data, ASYNC_TYPE_WAIT ))) { close_handle( current->process, handle ); release_object( ioctl ); diff --git a/server/fd.c b/server/fd.c index 7f01c39..09b93ce 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1769,7 +1769,7 @@ void default_poll_event( struct fd *fd, int event ) else if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); } -struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ) { struct async_queue *queue; struct async *async; @@ -1830,7 +1830,7 @@ void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, { struct async *async; - if ((async = fd_queue_async( fd, data, type, count ))) + if ((async = fd_queue_async( fd, data, type ))) { release_object( async ); set_error( STATUS_PENDING ); diff --git a/server/file.h b/server/file.h index 00b1fa7..b9a83c3 100644 --- a/server/file.h +++ b/server/file.h @@ -75,7 +75,7 @@ extern int default_fd_signaled( struct object *obj, struct thread *thread ); extern unsigned int default_fd_map_access( struct object *obj, unsigned int access ); extern int default_fd_get_poll_events( struct fd *fd ); extern void default_poll_event( struct fd *fd, int event ); -extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ); 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, diff --git a/server/mailslot.c b/server/mailslot.c index e223b83..97da8d2 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -307,7 +307,7 @@ static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int t assert(mailslot->obj.ops == &mailslot_ops); - if ((async = fd_queue_async( fd, data, type, count ))) + if ((async = fd_queue_async( fd, data, type ))) { async_set_timeout( async, mailslot->read_timeout ? mailslot->read_timeout : -1, STATUS_IO_TIMEOUT ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 6db9a7a..e9cb14a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -610,13 +610,13 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) break; new_data.event = wait_handle; - if (!(async = fd_queue_async( server->ioctl_fd, &new_data, ASYNC_TYPE_WAIT, 0 ))) + if (!(async = fd_queue_async( server->ioctl_fd, &new_data, ASYNC_TYPE_WAIT ))) { close_handle( current->process, wait_handle ); break; } } - else async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT, 0 ); + else async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT ); if (async) { diff --git a/server/serial.c b/server/serial.c index d1b3822..6fa60e5 100644 --- a/server/serial.c +++ b/server/serial.c @@ -188,7 +188,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ break; } - if ((async = fd_queue_async( fd, data, type, count ))) + if ((async = fd_queue_async( fd, data, type ))) { if (timeout) async_set_timeout( async, timeout * -10000, STATUS_TIMEOUT ); release_object( async );

1 0

Alexandre Julliard : server: Use the same field for process and thread handle in the queue_apc request.
by Alexandre Julliard 26 Dec '08

26 Dec '08

Module: wine Branch: master Commit: b660aaa9ea3a74c052bd1254939c67ee37f22ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b660aaa9ea3a74c052bd12549… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 12:19:41 2008 +0100 server: Use the same field for process and thread handle in the queue_apc request. --- dlls/ntdll/sync.c | 2 +- dlls/ntdll/thread.c | 2 +- include/wine/server_protocol.h | 5 ++--- server/protocol.def | 3 +-- server/thread.c | 10 +++++----- server/trace.c | 3 +-- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 002bf42..0614eea 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1032,7 +1032,7 @@ NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_re SERVER_START_REQ( queue_apc ) { - req->process = wine_server_obj_handle( process ); + req->handle = wine_server_obj_handle( process ); req->call = *call; if (!(ret = wine_server_call( req ))) { diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 89d5ce9..b164727 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -747,7 +747,7 @@ NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1 NTSTATUS ret; SERVER_START_REQ( queue_apc ) { - req->thread = wine_server_obj_handle( handle ); + req->handle = wine_server_obj_handle( handle ); if (func) { req->call.type = APC_USER; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 103b572..1889947 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -749,8 +749,7 @@ struct unload_dll_reply struct queue_apc_request { struct request_header __header; - obj_handle_t thread; - obj_handle_t process; + obj_handle_t handle; apc_call_t call; }; struct queue_apc_reply @@ -5051,6 +5050,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 354 +#define SERVER_PROTOCOL_VERSION 355 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index ad05b64..a4c154c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -673,8 +673,7 @@ typedef union /* Queue an APC for a thread or process */ @REQ(queue_apc) - obj_handle_t thread; /* thread handle */ - obj_handle_t process; /* process handle */ + obj_handle_t handle; /* thread or process handle */ apc_call_t call; /* call arguments */ @REPLY obj_handle_t handle; /* APC handle */ diff --git a/server/thread.c b/server/thread.c index 0c496db..1eeb59f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1242,7 +1242,7 @@ DECL_HANDLER(queue_apc) { case APC_NONE: case APC_USER: - thread = get_thread_from_handle( req->thread, THREAD_SET_CONTEXT ); + thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT ); break; case APC_VIRTUAL_ALLOC: case APC_VIRTUAL_FREE: @@ -1251,13 +1251,13 @@ DECL_HANDLER(queue_apc) case APC_VIRTUAL_LOCK: case APC_VIRTUAL_UNLOCK: case APC_UNMAP_VIEW: - process = get_process_from_handle( req->process, PROCESS_VM_OPERATION ); + process = get_process_from_handle( req->handle, PROCESS_VM_OPERATION ); break; case APC_VIRTUAL_QUERY: - process = get_process_from_handle( req->process, PROCESS_QUERY_INFORMATION ); + process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ); break; case APC_MAP_VIEW: - process = get_process_from_handle( req->process, PROCESS_VM_OPERATION ); + process = get_process_from_handle( req->handle, PROCESS_VM_OPERATION ); if (process && process != current->process) { /* duplicate the handle into the target process */ @@ -1272,7 +1272,7 @@ DECL_HANDLER(queue_apc) } break; case APC_CREATE_THREAD: - process = get_process_from_handle( req->process, PROCESS_CREATE_THREAD ); + process = get_process_from_handle( req->handle, PROCESS_CREATE_THREAD ); break; default: set_error( STATUS_INVALID_PARAMETER ); diff --git a/server/trace.c b/server/trace.c index 165c83f..5d39293 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1077,8 +1077,7 @@ static void dump_unload_dll_request( const struct unload_dll_request *req ) static void dump_queue_apc_request( const struct queue_apc_request *req ) { - fprintf( stderr, " thread=%04x,", req->thread ); - fprintf( stderr, " process=%04x,", req->process ); + fprintf( stderr, " handle=%04x,", req->handle ); fprintf( stderr, " call=" ); dump_apc_call( &req->call ); }

1 0

Alexandre Julliard : server: Store the async handle inside the async_data_t structure.
by Alexandre Julliard 26 Dec '08

26 Dec '08

Module: wine Branch: master Commit: a7b3efde0e3d04ec0c5db843e3f13f567d93a062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b3efde0e3d04ec0c5db843e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 12:17:20 2008 +0100 server: Store the async handle inside the async_data_t structure. --- dlls/ntdll/directory.c | 2 +- dlls/ntdll/file.c | 10 +++++----- dlls/ws2_32/socket.c | 10 +++++----- include/wine/server_protocol.h | 8 +++----- server/change.c | 2 +- server/fd.c | 4 ++-- server/protocol.def | 6 ++---- server/trace.c | 8 +++----- tools/make_requests | 2 +- 9 files changed, 23 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7b3efde0e3d04ec0c5db…

1 0

Andrew Talbot : msvcrt: Remove a superfluous semicolon.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: cb08534a3d6bdaa93b925d598ad98dd0989ed012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb08534a3d6bdaa93b925d598… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 24 18:13:12 2008 +0000 msvcrt: Remove a superfluous semicolon. --- dlls/msvcrt/errno.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 1b5fd96..e52c49d 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -129,7 +129,7 @@ void msvcrt_set_errno(int err) switch(err) { #define ERR_CASE(oserr) case oserr: -#define ERR_MAPS(oserr,crterr) case oserr:*errno = crterr;break; +#define ERR_MAPS(oserr, crterr) case oserr: *errno = crterr; break ERR_CASE(ERROR_ACCESS_DENIED) ERR_CASE(ERROR_NETWORK_ACCESS_DENIED) ERR_CASE(ERROR_CANNOT_MAKE)

1 0

Andrew Talbot : ntdll: Remove a superfluous semicolon.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: e198b4eb84269b135fbfb0a838891f548f3d53ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e198b4eb84269b135fbfb0a83… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 24 18:13:15 2008 +0000 ntdll: Remove a superfluous semicolon. --- dlls/ntdll/serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index e174c12..dc16cc5 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -87,7 +87,7 @@ static const char* iocode2str(DWORD ioc) { switch (ioc) { -#define X(x) case (x): return #x; +#define X(x) case (x): return #x X(IOCTL_SERIAL_CLEAR_STATS); X(IOCTL_SERIAL_CLR_DTR); X(IOCTL_SERIAL_CLR_RTS);

1 0

Andrew Talbot : wined3d: Remove superfluous semicolons.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: f9762d6082e48816e8a9b3f0b9c511b559d9e8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9762d6082e48816e8a9b3f0b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 24 18:13:21 2008 +0000 wined3d: Remove superfluous semicolons. --- dlls/wined3d/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 95ee0ec..d62ef07 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -754,7 +754,7 @@ const char* debug_d3ddeclusage(BYTE usage) { const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res) { switch (res) { -#define RES_TO_STR(res) case res: return #res; +#define RES_TO_STR(res) case res: return #res RES_TO_STR(WINED3DRTYPE_SURFACE); RES_TO_STR(WINED3DRTYPE_VOLUME); RES_TO_STR(WINED3DRTYPE_TEXTURE); @@ -771,7 +771,7 @@ const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res) { const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) { switch (PrimitiveType) { -#define PRIM_TO_STR(prim) case prim: return #prim; +#define PRIM_TO_STR(prim) case prim: return #prim PRIM_TO_STR(WINED3DPT_POINTLIST); PRIM_TO_STR(WINED3DPT_LINELIST); PRIM_TO_STR(WINED3DPT_LINESTRIP); @@ -1098,7 +1098,7 @@ const char* debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) { const char* debug_d3dpool(WINED3DPOOL Pool) { switch (Pool) { -#define POOL_TO_STR(p) case p: return #p; +#define POOL_TO_STR(p) case p: return #p POOL_TO_STR(WINED3DPOOL_DEFAULT); POOL_TO_STR(WINED3DPOOL_MANAGED); POOL_TO_STR(WINED3DPOOL_SYSTEMMEM);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2008