July 2011 - Wine-commits - list.winehq.org

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DVertexBuffer8 iface.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 9ab233ea24c617a71a2fd8ba43279ad5dd2223cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab233ea24c617a71a2fd8ba4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 12:24:46 2011 +0200 d3d8: COM cleanup for the IDirect3DVertexBuffer8 iface. --- dlls/d3d8/buffer.c | 42 ++++++++++++++++++++++++++---------------- dlls/d3d8/d3d8_private.h | 6 ++---- dlls/d3d8/device.c | 2 +- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 19ce7e4..6d9040d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static inline IDirect3DVertexBuffer8Impl *impl_from_IDirect3DVertexBuffer8(IDirect3DVertexBuffer8 *iface) { - return CONTAINING_RECORD(iface, IDirect3DVertexBuffer8Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DVertexBuffer8Impl, IDirect3DVertexBuffer8_iface); } static HRESULT WINAPI d3d8_vertexbuffer_QueryInterface(IDirect3DVertexBuffer8 *iface, REFIID riid, void **object) @@ -48,7 +48,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_QueryInterface(IDirect3DVertexBuffer8 *i static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface) { - IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); ULONG refcount = InterlockedIncrement(&buffer->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -66,7 +66,7 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface) static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) { - IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); ULONG refcount = InterlockedDecrement(&buffer->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -86,11 +86,14 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) return refcount; } -static HRESULT WINAPI d3d8_vertexbuffer_GetDevice(IDirect3DVertexBuffer8 *iface, IDirect3DDevice8 **device) +static HRESULT WINAPI d3d8_vertexbuffer_GetDevice(IDirect3DVertexBuffer8 *iface, + IDirect3DDevice8 **device) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); + TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice8 *)((IDirect3DVertexBuffer8Impl *)iface)->parentDevice; + *device = buffer->parentDevice; IDirect3DDevice8_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -152,12 +155,13 @@ static HRESULT WINAPI d3d8_vertexbuffer_FreePrivateData(IDirect3DVertexBuffer8 * static DWORD WINAPI d3d8_vertexbuffer_SetPriority(IDirect3DVertexBuffer8 *iface, DWORD priority) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); DWORD previous; TRACE("iface %p, priority %u.\n", iface, priority); wined3d_mutex_lock(); - previous = wined3d_buffer_set_priority(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer, priority); + previous = wined3d_buffer_set_priority(buffer->wineD3DVertexBuffer, priority); wined3d_mutex_unlock(); return previous; @@ -165,12 +169,13 @@ static DWORD WINAPI d3d8_vertexbuffer_SetPriority(IDirect3DVertexBuffer8 *iface, static DWORD WINAPI d3d8_vertexbuffer_GetPriority(IDirect3DVertexBuffer8 *iface) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); DWORD priority; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - priority = wined3d_buffer_get_priority(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); + priority = wined3d_buffer_get_priority(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); return priority; @@ -178,10 +183,12 @@ static DWORD WINAPI d3d8_vertexbuffer_GetPriority(IDirect3DVertexBuffer8 *iface) static void WINAPI d3d8_vertexbuffer_PreLoad(IDirect3DVertexBuffer8 *iface) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_preload(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); + wined3d_buffer_preload(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); } @@ -192,17 +199,17 @@ static D3DRESOURCETYPE WINAPI d3d8_vertexbuffer_GetType(IDirect3DVertexBuffer8 * return D3DRTYPE_VERTEXBUFFER; } -static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, - UINT offset, UINT size, BYTE **data, DWORD flags) +static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT offset, UINT size, + BYTE **data, DWORD flags) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); wined3d_mutex_lock(); - hr = wined3d_buffer_map(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer, - offset, size, data, flags); + hr = wined3d_buffer_map(buffer->wineD3DVertexBuffer, offset, size, data, flags); wined3d_mutex_unlock(); return hr; @@ -210,18 +217,21 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, static HRESULT WINAPI d3d8_vertexbuffer_Unlock(IDirect3DVertexBuffer8 *iface) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); + wined3d_buffer_unmap(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); return D3D_OK; } -static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, D3DVERTEXBUFFER_DESC *desc) +static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, + D3DVERTEXBUFFER_DESC *desc) { - IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; @@ -278,7 +288,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im { HRESULT hr; - buffer->lpVtbl = &Direct3DVertexBuffer8_Vtbl; + buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; buffer->ref = 1; buffer->fvf = fvf; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index cbc0186..8a4e5b2 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -266,10 +266,8 @@ IDirect3DSurface8Impl *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *ifa */ struct IDirect3DVertexBuffer8Impl { - /* IUnknown fields */ - const IDirect3DVertexBuffer8Vtbl *lpVtbl; - LONG ref; - + IDirect3DVertexBuffer8 IDirect3DVertexBuffer8_iface; + LONG ref; struct wined3d_buffer *wineD3DVertexBuffer; IDirect3DDevice8 *parentDevice; DWORD fvf; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cd3c16d..b561274 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -839,7 +839,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(IDirect3DDevice8 * } TRACE("Created vertex buffer %p.\n", object); - *buffer = (IDirect3DVertexBuffer8 *)object; + *buffer = &object->IDirect3DVertexBuffer8_iface; return D3D_OK; }

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DExecuteBuffer iface .
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 663483e16eeb5d48c1e55407c5a7dba5c6d85095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663483e16eeb5d48c1e55407c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 12:26:57 2011 +0200 ddraw: COM cleanup for the IDirect3DExecuteBuffer iface. --- dlls/ddraw/ddraw_private.h | 6 ++---- dlls/ddraw/device.c | 2 +- dlls/ddraw/executebuffer.c | 38 +++++++++++++++++++------------------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0f3864a..755ac2a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -486,10 +486,8 @@ void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) *****************************************************************************/ struct IDirect3DExecuteBufferImpl { - /* IUnknown */ - const IDirect3DExecuteBufferVtbl *lpVtbl; - LONG ref; - + IDirect3DExecuteBuffer IDirect3DExecuteBuffer_iface; + LONG ref; /* IDirect3DExecuteBuffer fields */ IDirectDrawImpl *ddraw; IDirect3DDeviceImpl *d3ddev; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b395272..f8dfaa8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -685,7 +685,7 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface, return hr; } - *ExecuteBuffer = (IDirect3DExecuteBuffer *)object; + *ExecuteBuffer = &object->IDirect3DExecuteBuffer_iface; TRACE(" Returning IDirect3DExecuteBuffer at %p, implementation is at %p\n", *ExecuteBuffer, object); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 86a3aa9..5f738bb 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -547,6 +547,11 @@ end_of_buffer: return D3D_OK; } +static inline IDirect3DExecuteBufferImpl *impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer_iface); +} + /***************************************************************************** * IDirect3DExecuteBuffer::QueryInterface * @@ -598,10 +603,9 @@ IDirect3DExecuteBufferImpl_QueryInterface(IDirect3DExecuteBuffer *iface, * The new refcount * *****************************************************************************/ -static ULONG WINAPI -IDirect3DExecuteBufferImpl_AddRef(IDirect3DExecuteBuffer *iface) +static ULONG WINAPI IDirect3DExecuteBufferImpl_AddRef(IDirect3DExecuteBuffer *iface) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", This, ref); @@ -618,10 +622,9 @@ IDirect3DExecuteBufferImpl_AddRef(IDirect3DExecuteBuffer *iface) * The new refcount * *****************************************************************************/ -static ULONG WINAPI -IDirect3DExecuteBufferImpl_Release(IDirect3DExecuteBuffer *iface) +static ULONG WINAPI IDirect3DExecuteBufferImpl_Release(IDirect3DExecuteBuffer *iface) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", This, ref); @@ -669,11 +672,10 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Initialize(IDirect3DExecuteBuff * This implementation always returns D3D_OK * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DExecuteBufferImpl_Lock(IDirect3DExecuteBuffer *iface, - D3DEXECUTEBUFFERDESC *lpDesc) +static HRESULT WINAPI IDirect3DExecuteBufferImpl_Lock(IDirect3DExecuteBuffer *iface, + D3DEXECUTEBUFFERDESC *lpDesc) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); DWORD dwSize; TRACE("iface %p, desc %p.\n", iface, lpDesc); @@ -719,11 +721,10 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Unlock(IDirect3DExecuteBuffer * * DDERR_OUTOFMEMORY if the vertex buffer allocation failed * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DExecuteBufferImpl_SetExecuteData(IDirect3DExecuteBuffer *iface, - D3DEXECUTEDATA *lpData) +static HRESULT WINAPI IDirect3DExecuteBufferImpl_SetExecuteData(IDirect3DExecuteBuffer *iface, + D3DEXECUTEDATA *lpData) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); DWORD nbvert; TRACE("iface %p, data %p.\n", iface, lpData); @@ -755,11 +756,10 @@ IDirect3DExecuteBufferImpl_SetExecuteData(IDirect3DExecuteBuffer *iface, * D3D_OK on success * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DExecuteBufferImpl_GetExecuteData(IDirect3DExecuteBuffer *iface, - D3DEXECUTEDATA *lpData) +static HRESULT WINAPI IDirect3DExecuteBufferImpl_GetExecuteData(IDirect3DExecuteBuffer *iface, + D3DEXECUTEDATA *lpData) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); DWORD dwSize; TRACE("iface %p, data %p.\n", iface, lpData); @@ -839,7 +839,7 @@ static const struct IDirect3DExecuteBufferVtbl d3d_execute_buffer_vtbl = HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) { - execute_buffer->lpVtbl = &d3d_execute_buffer_vtbl; + execute_buffer->IDirect3DExecuteBuffer_iface.lpVtbl = &d3d_execute_buffer_vtbl; execute_buffer->ref = 1; execute_buffer->d3ddev = device;

1 0

Michael Stefaniuc : ddraw: Use unsafe_impl_from_IDirect3DExecuteBuffer for an app provided iface.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: faa269c42a6ef957acb2802153eca80a69146968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa269c42a6ef957acb280215… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 12:28:27 2011 +0200 ddraw: Use unsafe_impl_from_IDirect3DExecuteBuffer for an app provided iface. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 13 +++++-------- dlls/ddraw/executebuffer.c | 9 +++++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 755ac2a..7bce353 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -508,6 +508,7 @@ struct IDirect3DExecuteBufferImpl HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) DECLSPEC_HIDDEN; +IDirect3DExecuteBufferImpl *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface) DECLSPEC_HIDDEN; /* The execute function */ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *execute_buffer, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f8dfaa8..dbe1af6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -707,25 +707,22 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface, * D3D_OK on success * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, - IDirect3DExecuteBuffer *ExecuteBuffer, - IDirect3DViewport *Viewport, - DWORD Flags) +static HRESULT WINAPI IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, + IDirect3DExecuteBuffer *ExecuteBuffer, IDirect3DViewport *Viewport, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device1(iface); - IDirect3DExecuteBufferImpl *Direct3DExecuteBufferImpl = (IDirect3DExecuteBufferImpl *)ExecuteBuffer; + IDirect3DExecuteBufferImpl *buffer = unsafe_impl_from_IDirect3DExecuteBuffer(ExecuteBuffer); IDirect3DViewportImpl *Direct3DViewportImpl = (IDirect3DViewportImpl *)Viewport; HRESULT hr; TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, Viewport, Flags); - if(!Direct3DExecuteBufferImpl) + if(!buffer) return DDERR_INVALIDPARAMS; /* Execute... */ EnterCriticalSection(&ddraw_cs); - hr = d3d_execute_buffer_execute(Direct3DExecuteBufferImpl, This, Direct3DViewportImpl); + hr = d3d_execute_buffer_execute(buffer, This, Direct3DViewportImpl); LeaveCriticalSection(&ddraw_cs); return hr; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 5f738bb..379862a 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -870,3 +870,12 @@ HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, return D3D_OK; } + +IDirect3DExecuteBufferImpl *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d_execute_buffer_vtbl); + + return impl_from_IDirect3DExecuteBuffer(iface); +}

1 0

Alexandre Julliard : winex11: Pass a generic PHYSDEV to all graphics entry points.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 6c951b7d0d6c88f7f41dd24b131f1f77371e878e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c951b7d0d6c88f7f41dd24b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 15:55:11 2011 +0200 winex11: Pass a generic PHYSDEV to all graphics entry points. --- dlls/winex11.drv/bitblt.c | 13 +++-- dlls/winex11.drv/bitmap.c | 5 +- dlls/winex11.drv/brush.c | 7 ++- dlls/winex11.drv/dib.c | 15 ++++-- dlls/winex11.drv/graphics.c | 106 +++++++++++++++++++++---------------------- dlls/winex11.drv/init.c | 12 ++++- dlls/winex11.drv/opengl.c | 96 +++++++++++++++++++++++--------------- dlls/winex11.drv/palette.c | 14 +++--- dlls/winex11.drv/pen.c | 7 ++- dlls/winex11.drv/text.c | 14 +++--- dlls/winex11.drv/x11drv.h | 65 ++++++++++++++------------ dlls/winex11.drv/xfont.c | 14 ++++-- dlls/winex11.drv/xrender.c | 4 +- dlls/winex11.drv/xvidmode.c | 4 +- 14 files changed, 213 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c951b7d0d6c88f7f41dd…

1 0

Alexandre Julliard : winex11: Use the HDC from the gdi_physdev structure.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 00647af50b898afe5f1a18e4cb514cba06bf4991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00647af50b898afe5f1a18e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 16:03:59 2011 +0200 winex11: Use the HDC from the gdi_physdev structure. --- dlls/winex11.drv/bitblt.c | 22 ++++++++-------- dlls/winex11.drv/brush.c | 8 +++--- dlls/winex11.drv/dib.c | 14 +++++----- dlls/winex11.drv/graphics.c | 56 +++++++++++++++++++++--------------------- dlls/winex11.drv/init.c | 11 +++----- dlls/winex11.drv/opengl.c | 26 ++++++++++---------- dlls/winex11.drv/palette.c | 16 +++++------- dlls/winex11.drv/pen.c | 4 +- dlls/winex11.drv/text.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xfont.c | 4 +- dlls/winex11.drv/xrender.c | 26 ++++++++++---------- 12 files changed, 92 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00647af50b898afe5f1a1…

1 0

Henri Verbeet : wined3d: Make the rt parameter to surface_set_compatible_renderbuffer() const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: bb4b86f3659b393a9a617aef5bda2e3aaa839390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4b86f3659b393a9a617aef5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:35 2011 +0200 wined3d: Make the rt parameter to surface_set_compatible_renderbuffer() const. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d44904d..65ab767 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2349,7 +2349,7 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru * render target dimensions. With FBOs, the dimensions have to be an exact match. */ /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* GL locking is done by the caller */ -void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct wined3d_surface *rt) +void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; struct wined3d_renderbuffer_entry *entry; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 535e2d3..5e7930a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2080,7 +2080,8 @@ void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) DECLSPEC_HIDDEN; void surface_prepare_texture(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN; -void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct wined3d_surface *rt) DECLSPEC_HIDDEN; +void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, + const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_set_container(struct wined3d_surface *surface, enum wined3d_container_type type, void *container) DECLSPEC_HIDDEN; void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_translate_drawable_coords() const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: faebcc023604ec1a07055c6c1fb4a2e5cfabe9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faebcc023604ec1a07055c6c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:36 2011 +0200 wined3d: Make the surface parameter to surface_translate_drawable_coords() const. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 65ab767..1403e1e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4975,7 +4975,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st * drawable is limited to the window's client area. The sysmem and texture * copies do have the full screen size. Note that GL has a bottom-left * origin, while D3D has a top-left origin. */ -void surface_translate_drawable_coords(struct wined3d_surface *surface, HWND window, RECT *rect) +void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) { UINT drawable_height; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5e7930a..7599e2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2086,7 +2086,7 @@ void surface_set_container(struct wined3d_surface *surface, enum wined3d_container_type type, void *container) DECLSPEC_HIDDEN; void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target) DECLSPEC_HIDDEN; -void surface_translate_drawable_coords(struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; +void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_upload_data( ) const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 0d18f5df0ee6715764eb864d7da338d99829b2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d18f5df0ee6715764eb864d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:37 2011 +0200 wined3d: Make the surface parameter to surface_upload_data() const. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1403e1e..f26cffe 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2161,7 +2161,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, +void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7599e2d..a33d94f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2087,7 +2087,7 @@ void surface_set_container(struct wined3d_surface *surface, void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; -void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, +void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the src_surface parameter to draw_textured_quad() const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: aa554046820b782bcc7ae504e2c707730c20829d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa554046820b782bcc7ae504e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:38 2011 +0200 wined3d: Make the src_surface parameter to draw_textured_quad() const. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f26cffe..f162764 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -288,7 +288,7 @@ static inline void surface_get_rect(struct wined3d_surface *surface, const RECT } /* GL locking and context activation is done by the caller */ -void draw_textured_quad(struct wined3d_surface *src_surface, const RECT *src_rect, +void draw_textured_quad(const struct wined3d_surface *src_surface, const RECT *src_rect, const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) { struct blt_info info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a33d94f..a0941b6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2095,8 +2095,8 @@ void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *wi void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_fbo(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; -void draw_textured_quad(struct wined3d_surface *src_surface, const RECT *src_rect, - const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) DECLSPEC_HIDDEN; +void draw_textured_quad(const struct wined3d_surface *src_surface, const RECT *src_rect, + const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) DECLSPEC_HIDDEN; void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) DECLSPEC_HIDDEN; /* Surface flags: */

1 0

Henri Verbeet : wined3d: Make the surface parameter to d3dfmt_get_conv() const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: a26c5f9b1366696e5c27214a73d4d2b07534a715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26c5f9b1366696e5c27214a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:39 2011 +0200 wined3d: Make the surface parameter to d3dfmt_get_conv() const. --- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f162764..ce669e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4131,11 +4131,11 @@ static void flush_to_framebuffer_drawpixels(struct wined3d_surface *surface, context_release(context); } -HRESULT d3dfmt_get_conv(struct wined3d_surface *surface, BOOL need_alpha_ck, +HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, CONVERT_TYPES *convert) { BOOL colorkey_active = need_alpha_ck && (surface->CKeyFlags & WINEDDSD_CKSRCBLT); - struct wined3d_device *device = surface->resource.device; + const struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL blit_supported = FALSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0941b6..374c631 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2159,7 +2159,7 @@ typedef enum { CONVERT_RGB32_888 } CONVERT_TYPES; -HRESULT d3dfmt_get_conv(struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, +HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, CONVERT_TYPES *convert) DECLSPEC_HIDDEN; void d3dfmt_p8_init_palette(struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN;

1 0