wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DDevice3 for application provided interfaces.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: a90b2ad00266131d48b2242772223ff22c0e2d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90b2ad00266131d48b224277… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:53 2011 +0300 ddraw: Use unsafe_impl_from_IDirect3DDevice3 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/material.c | 14 +++++++------- dlls/ddraw/vertexbuffer.c | 16 ++++++++-------- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1072f67..ae94810 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -342,6 +342,7 @@ static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface) IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN; IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) DECLSPEC_HIDDEN; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectDrawClipper implementation structure diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index dcc6475..c72b253 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6746,6 +6746,13 @@ static const struct IDirect3DDeviceVtbl d3d_device1_vtbl = IDirect3DDeviceImpl_1_GetDirect3D }; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_device3_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice3_vtbl); +} + IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) { if (!iface) return NULL; diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 236b647..cec3122 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -295,18 +295,18 @@ static HRESULT WINAPI IDirect3DMaterialImpl_GetMaterial(IDirect3DMaterial3 *ifac * *****************************************************************************/ static HRESULT WINAPI IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, - IDirect3DDevice3 *lpDirect3DDevice3, D3DMATERIALHANDLE *lpHandle) + IDirect3DDevice3 *device, D3DMATERIALHANDLE *handle) { IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial3(iface); - IDirect3DDeviceImpl *device = device_from_device3(lpDirect3DDevice3); + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice3(device); - TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice3, lpHandle); + TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); EnterCriticalSection(&ddraw_cs); - This->active_device = device; + This->active_device = device_impl; if(!This->Handle) { - DWORD h = ddraw_allocate_handle(&device->handle_table, This, DDRAW_HANDLE_MATERIAL); + DWORD h = ddraw_allocate_handle(&device_impl->handle_table, This, DDRAW_HANDLE_MATERIAL); if (h == DDRAW_INVALID_HANDLE) { ERR("Failed to allocate a material handle.\n"); @@ -316,8 +316,8 @@ static HRESULT WINAPI IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, This->Handle = h + 1; } - *lpHandle = This->Handle; - TRACE(" returning handle %08x.\n", *lpHandle); + *handle = This->Handle; + TRACE(" returning handle %08x.\n", *handle); LeaveCriticalSection(&ddraw_cs); return D3D_OK; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 21a3b6f..f675cda 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -351,17 +351,17 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexB static HRESULT WINAPI IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVertexBuffer *iface, DWORD VertexOp, DWORD DestIndex, DWORD Count, IDirect3DVertexBuffer *SrcBuffer, - DWORD SrcIndex, IDirect3DDevice3 *D3DDevice, DWORD Flags) + DWORD SrcIndex, IDirect3DDevice3 *device, DWORD Flags) { IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); IDirect3DVertexBufferImpl *Src = unsafe_impl_from_IDirect3DVertexBuffer(SrcBuffer); - IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice3(device); TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n", - iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, D3DDevice, Flags); + iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, device, Flags); return IDirect3DVertexBuffer7_ProcessVertices(&This->IDirect3DVertexBuffer7_iface, VertexOp, - DestIndex, Count, &Src->IDirect3DVertexBuffer7_iface, SrcIndex, (IDirect3DDevice7 *)D3D, + DestIndex, Count, &Src->IDirect3DVertexBuffer7_iface, SrcIndex, (IDirect3DDevice7 *)device_impl, Flags); } @@ -451,15 +451,15 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 } static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface, - IDirect3DDevice3 *D3DDevice, DWORD Flags) + IDirect3DDevice3 *device, DWORD Flags) { IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); - IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice3(device); - TRACE("iface %p, device %p, flags %#x.\n", iface, D3DDevice, Flags); + TRACE("iface %p, device %p, flags %#x.\n", iface, device, Flags); return IDirect3DVertexBuffer7_Optimize(&This->IDirect3DVertexBuffer7_iface, - (IDirect3DDevice7 *)D3D, Flags); + (IDirect3DDevice7 *)device_impl, Flags); } /*****************************************************************************

1 0

Ričardas Barkauskas : ddraw: COM cleanup for IDirect3DDevice2 interface.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: d32df839ac0dbe7b812e20e1781cbabf1b9edac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32df839ac0dbe7b812e20e17… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:46 2011 +0300 ddraw: COM cleanup for IDirect3DDevice2 interface. --- dlls/ddraw/ddraw.c | 11 ++++++++--- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 10 +++++----- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/surface.c | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 831ee85..75a4546 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4359,15 +4359,20 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, { IDirectDrawImpl *This = impl_from_IDirect3D2(iface); IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface(surface); + IDirect3DDevice7 *device7; + IDirect3DDeviceImpl *device_impl; HRESULT hr; TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); hr = d3d7_CreateDevice(&This->IDirect3D7_iface, riid, - surface_impl ? &surface_impl->IDirectDrawSurface7_iface : NULL, - (IDirect3DDevice7 **)device); - if (*device) *device = (IDirect3DDevice2 *)&((IDirect3DDeviceImpl *)*device)->IDirect3DDevice2_vtbl; + surface_impl ? &surface_impl->IDirectDrawSurface7_iface : NULL, device ? &device7 : NULL); + if (SUCCEEDED(hr)) + { + device_impl = (IDirect3DDeviceImpl *)device7; + *device = &device_impl->IDirect3DDevice2_iface; + } return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6009a51..1072f67 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -279,7 +279,7 @@ struct IDirect3DDeviceImpl /* IUnknown */ const IDirect3DDevice7Vtbl *lpVtbl; const IDirect3DDevice3Vtbl *IDirect3DDevice3_vtbl; - const IDirect3DDevice2Vtbl *IDirect3DDevice2_vtbl; + IDirect3DDevice2 IDirect3DDevice2_iface; IDirect3DDevice IDirect3DDevice_iface; LONG ref; @@ -332,7 +332,7 @@ static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice(IDirect3DDevice *if static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) { - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_iface); } static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cbf2aae..dcc6475 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -167,7 +167,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3DDevice2 , refiid ) ) { - *obj = &This->IDirect3DDevice2_vtbl; + *obj = &This->IDirect3DDevice2_iface; TRACE("(%p) Returning IDirect3DDevice2 interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3DDevice3 , refiid ) ) { @@ -581,7 +581,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice * TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, D3DTex1, D3DTex2); - return IDirect3DDevice2_SwapTextureHandles((IDirect3DDevice2 *)&This->IDirect3DDevice2_vtbl, t1, t2); + return IDirect3DDevice2_SwapTextureHandles(&This->IDirect3DDevice2_iface, t1, t2); } /***************************************************************************** @@ -1274,7 +1274,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_EnumTextureFormats(IDirect3DDevice * TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg); - return IDirect3DDevice2_EnumTextureFormats((IDirect3DDevice2 *)&This->IDirect3DDevice2_vtbl, Callback, Arg); + return IDirect3DDevice2_EnumTextureFormats(&This->IDirect3DDevice2_iface, Callback, Arg); } /***************************************************************************** @@ -6750,7 +6750,7 @@ IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &d3d_device2_vtbl); - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_iface); } IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) @@ -6803,7 +6803,7 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi device->lpVtbl = &d3d_device7_fpu_setup_vtbl; device->IDirect3DDevice3_vtbl = &d3d_device3_vtbl; - device->IDirect3DDevice2_vtbl = &d3d_device2_vtbl; + device->IDirect3DDevice2_iface.lpVtbl = &d3d_device2_vtbl; device->IDirect3DDevice_iface.lpVtbl = &d3d_device1_vtbl; device->ref = 1; device->ddraw = ddraw; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 379862a..75687f6 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -292,7 +292,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This, case D3DOP_STATERENDER: { int i; - IDirect3DDevice2 *d3d_device2 = (IDirect3DDevice2 *)&lpDevice->IDirect3DDevice2_vtbl; + IDirect3DDevice2 *d3d_device2 = &lpDevice->IDirect3DDevice2_iface; TRACE("STATERENDER (%d)\n", count); for (i = 0; i < count; i++) { diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9ef33b3..7febc5e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4557,7 +4557,7 @@ static HRESULT WINAPI d3d_texture1_GetHandle(IDirect3DTexture *iface, TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); return d3d_texture2_GetHandle(&This->IDirect3DTexture2_iface, - device_impl ? (IDirect3DDevice2 *)&device_impl->IDirect3DDevice2_vtbl : NULL, handle); + device_impl ? &device_impl->IDirect3DDevice2_iface : NULL, handle); } /*****************************************************************************

1 0

Ričardas Barkauskas : ddraw: Rename device_from_device2 to impl_from_IDirect3DDevice2.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 1c045cbb28155dfc74fda1076f7d99b9ed227d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c045cbb28155dfc74fda1076… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:34 2011 +0300 ddraw: Rename device_from_device2 to impl_from_IDirect3DDevice2. --- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 75 ++++++++++++++++++++++++------------------- 2 files changed, 44 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c045cbb28155dfc74fda…

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DDevice2 for application provided interfaces.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: a870753dba5e14191cbbaeb585cc3909ce25dd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a870753dba5e14191cbbaeb58… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:19 2011 +0300 ddraw: Use unsafe_impl_from_IDirect3DDevice2 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/material.c | 9 +++++---- dlls/ddraw/surface.c | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 39b103b..c8553c2 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -341,6 +341,7 @@ static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface) } IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectDrawClipper implementation structure diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 37a778b..4d109e4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6737,6 +6737,13 @@ static const struct IDirect3DDeviceVtbl d3d_device1_vtbl = IDirect3DDeviceImpl_1_GetDirect3D }; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_device2_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_vtbl); +} + IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) { if (!iface) return NULL; diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index f873726..236b647 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -324,14 +324,15 @@ static HRESULT WINAPI IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, } static HRESULT WINAPI IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *iface, - IDirect3DDevice2 *lpDirect3DDevice2, D3DMATERIALHANDLE *lpHandle) + IDirect3DDevice2 *device, D3DMATERIALHANDLE *handle) { IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial2(iface); + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice2(device); - TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice2, lpHandle); + TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); - return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, lpDirect3DDevice2 ? - (IDirect3DDevice3 *)&device_from_device2(lpDirect3DDevice2)->IDirect3DDevice3_vtbl : NULL, lpHandle); + return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, device_impl ? + (IDirect3DDevice3 *)&device_impl->IDirect3DDevice3_vtbl : NULL, handle); } static HRESULT WINAPI IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index beb759f..9ef33b3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4521,6 +4521,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface, IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle) { IDirectDrawSurfaceImpl *surface = impl_from_IDirect3DTexture2(iface); + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice2(device); TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); @@ -4528,7 +4529,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface, if (!surface->Handle) { - DWORD h = ddraw_allocate_handle(&device_from_device2(device)->handle_table, surface, DDRAW_HANDLE_SURFACE); + DWORD h = ddraw_allocate_handle(&device_impl->handle_table, surface, DDRAW_HANDLE_SURFACE); if (h == DDRAW_INVALID_HANDLE) { ERR("Failed to allocate a texture handle.\n");

1 0

Ričardas Barkauskas : ddraw: COM cleanup for IDirect3DDevice interface.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: d5912c533fe7f7ed426b3279eee3bf921e081c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5912c533fe7f7ed426b3279e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:11 2011 +0300 ddraw: COM cleanup for IDirect3DDevice interface. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/surface.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 635465f..39b103b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -280,7 +280,7 @@ struct IDirect3DDeviceImpl const IDirect3DDevice7Vtbl *lpVtbl; const IDirect3DDevice3Vtbl *IDirect3DDevice3_vtbl; const IDirect3DDevice2Vtbl *IDirect3DDevice2_vtbl; - const IDirect3DDeviceVtbl *IDirect3DDevice_vtbl; + IDirect3DDevice IDirect3DDevice_iface; LONG ref; /* Other object connections */ @@ -327,7 +327,7 @@ WINED3DZBUFFERTYPE IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *T static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice(IDirect3DDevice *iface) { - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_iface); } static inline IDirect3DDeviceImpl *device_from_device2(IDirect3DDevice2 *iface) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 10a61d7..37a778b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -163,7 +163,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, /* Direct3DDevice */ else if ( IsEqualGUID( &IID_IDirect3DDevice , refiid ) ) { - *obj = &This->IDirect3DDevice_vtbl; + *obj = &This->IDirect3DDevice_iface; TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3DDevice2 , refiid ) ) { @@ -329,7 +329,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) { /* No FIXME here because this might happen because of sloppy applications. */ WARN("Leftover matrix handle %#x (%p), deleting.\n", i + 1, entry->object); - IDirect3DDevice_DeleteMatrix((IDirect3DDevice *)&This->IDirect3DDevice_vtbl, i + 1); + IDirect3DDevice_DeleteMatrix(&This->IDirect3DDevice_iface, i + 1); break; } @@ -6741,7 +6741,7 @@ IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &d3d_device1_vtbl); - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_iface); } /***************************************************************************** @@ -6788,7 +6788,7 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi device->IDirect3DDevice3_vtbl = &d3d_device3_vtbl; device->IDirect3DDevice2_vtbl = &d3d_device2_vtbl; - device->IDirect3DDevice_vtbl = &d3d_device1_vtbl; + device->IDirect3DDevice_iface.lpVtbl = &d3d_device1_vtbl; device->ref = 1; device->ddraw = ddraw; device->target = target; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f14374a..beb759f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -134,7 +134,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, if (d3d) { - *obj = (IDirect3DDevice *)&((IDirect3DDeviceImpl *)d3d)->IDirect3DDevice_vtbl; + *obj = &((IDirect3DDeviceImpl *)d3d)->IDirect3DDevice_iface; TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); return S_OK; }

1 0

Ričardas Barkauskas : ddraw: Rename device_from_device1 to impl_from_IDirect3DDevice.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: a0c9ab7894c6c68f4b2e99663b0ff755e4a85d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c9ab7894c6c68f4b2e99663… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:00 2011 +0300 ddraw: Rename device_from_device1 to impl_from_IDirect3DDevice. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 43 ++++++++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0c9ab7894c6c68f4b2e9…

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DDevice for application provided interfaces.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: d19e416dee0d9d12725b025a1dd1572b8f79a471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19e416dee0d9d12725b025a1… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:56:43 2011 +0300 ddraw: Use unsafe_impl_from_IDirect3DDevice for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/material.c | 9 +++++---- dlls/ddraw/surface.c | 5 +++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 4fb6fc4..a0a0fe4 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -340,6 +340,8 @@ static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface) return (IDirect3DDeviceImpl *)((char*)iface - FIELD_OFFSET(IDirect3DDeviceImpl, IDirect3DDevice3_vtbl)); } +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN; + /***************************************************************************** * IDirectDrawClipper implementation structure *****************************************************************************/ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8cfeac1..da74128 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6732,6 +6732,13 @@ static const struct IDirect3DDeviceVtbl d3d_device1_vtbl = IDirect3DDeviceImpl_1_GetDirect3D }; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_device1_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_vtbl); +} + /***************************************************************************** * IDirect3DDeviceImpl_UpdateDepthStencil * diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 9fca200..f873726 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -335,14 +335,15 @@ static HRESULT WINAPI IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *ifac } static HRESULT WINAPI IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface, - IDirect3DDevice *lpDirect3DDevice, D3DMATERIALHANDLE *lpHandle) + IDirect3DDevice *device, D3DMATERIALHANDLE *handle) { IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial(iface); + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice(device); - TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice, lpHandle); + TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); - return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, lpDirect3DDevice ? - (IDirect3DDevice3 *)&device_from_device1(lpDirect3DDevice)->IDirect3DDevice3_vtbl : NULL, lpHandle); + return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, device_impl ? + (IDirect3DDevice3 *)&device_impl->IDirect3DDevice3_vtbl : NULL, handle); } static HRESULT WINAPI IDirect3DMaterialImpl_2_QueryInterface(IDirect3DMaterial2 *iface, REFIID riid, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 24d0497..f14374a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4551,11 +4551,12 @@ static HRESULT WINAPI d3d_texture1_GetHandle(IDirect3DTexture *iface, IDirect3DDevice *device, D3DTEXTUREHANDLE *handle) { IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture(iface); - IDirect3DDevice2 *device2 = (IDirect3DDevice2 *)&device_from_device1(device)->IDirect3DDevice2_vtbl; + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice(device); TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); - return d3d_texture2_GetHandle(&This->IDirect3DTexture2_iface, device2, handle); + return d3d_texture2_GetHandle(&This->IDirect3DTexture2_iface, + device_impl ? (IDirect3DDevice2 *)&device_impl->IDirect3DDevice2_vtbl : NULL, handle); } /*****************************************************************************

1 0

Huw Davies : gdi32/tests: Add some StretchDIBits tests.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 4dbc0690ef31b0b3311d677198eb63885073f06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbc0690ef31b0b3311d67719… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 17 15:46:08 2011 +0100 gdi32/tests: Add some StretchDIBits tests. --- dlls/gdi32/tests/dib.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 9e27be5..5577918 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -127,6 +127,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "aaf62842bb98d8a2945c4f643baf50afaeea9307", "287b2f2f2fb5a1d7ee4a29b43342103d78a7a8ab", "d7dd4700f49808541bba99244b7eb5840e0a2439", + "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", + "568f87f0194ca19b69a5b2bcdef795d89c5721ce", NULL }; @@ -182,6 +184,8 @@ static const char *sha1_graphics_a8b8g8r8[] = "118bf4c5bddc206ba737f7aa8b239940cd1aadc2", "7cb51f6c5f1dae926601986c934533df5f8baa9f", "86c84cc8306975edecc6d4a89a8aff29f59b55a7", + "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", + "25675c30adfe24d6cae60793b156dfdaa36ac3ba", NULL }; @@ -237,6 +241,8 @@ static const char *sha1_graphics_r10g10b10[] = "43d67bc61ef54014b022891e5c024fc24b1fe797", "e8783644428b637adbe80bcd084a33428cb69983", "fc0c32afb719295f28bcfef22803bef94f798e20", + "36f6db4fbe2a1630a7597d3a446f2902755c96ef", + "d3f08946300e1700865042aed121870e292d1095", NULL }; @@ -292,6 +298,8 @@ static const char *sha1_graphics_r6g6b6[] = "cd01f2c0a63b2229d4467d2f874d58edca32b3d4", "94b54f1da5212b3f3a1195eda5ea927e160bc89d", "49341c297a887186bd47d7465d827ab3147f05e3", + "325279e76367200d3fd7194d81c09fd139988ece", + "c3def160a1e847605ff0fc7edd30397fa90635a0", NULL }; @@ -347,6 +355,8 @@ static const char *sha1_graphics_24[] = "1015e0217ea13eaa62c7666b8b81aafd75f8f610", "93e1aec608e037af3bfb7bd32dde446abe4eea11", "b25ba91487ec945410deb2b51bc1156890c032a8", + "d347ca5c6c4b6a61389247c3b6f61564033e8c25", + "ee315634ed92da3a32c2675ecd1b369471c60936", NULL }; @@ -406,6 +416,8 @@ static const char *sha1_graphics_r5g5b5[] = "585061e403d9cac1603a38af420efe87338f381a", "8f447a3820c83662086dfa836da2205b0130fd5f", "3772003c7fb420003512d0c437b3659d96d89ce4", + "dab47c9dc149e570045d699598b14a613bf319b3", + "2daca4d26a086ed34894693be0b0374402232809", NULL }; @@ -460,6 +472,8 @@ static const char *sha1_graphics_r4g4b4[] = "9af4907a8144458a73dbb7471784f8c3d9aeffcf", "e4731b63d41f6b51e30752ea52d85c4a2938731b", "f0acb3cfcda62e95bee5f7bc8830ffeb3dd7e5a7", + "07b10c3f191d0a93e5e5694aae37dcad407e10f5", + "f7900e60347029876ba55e8f0c4c02e89deb36b6", NULL }; @@ -520,6 +534,8 @@ static const char *sha1_graphics_8_color[] = "f3dc739da41fb299637c8660e8c46917ddcf87a8", "eae47bf865d932f22a6e59b6fe8d041f220e1fbc", "9ae38bb94c7b4c0c6dfebbee23d1de4db9b77488", + "678979a45126a76eb629992cd64734862f53a555", + "2f7ba8803604c032cb1a1228bc021f0f1c03e245", NULL }; @@ -584,6 +600,9 @@ static const char *sha1_graphics_8_grayscale[] = "a1a941fa270cda48c648553ed4b427e16e96f8e0", "f30a8d9f73ca043c5bfc18d9595e299fc0a39eec", "fb63bbb2f944fb63ed2d7399f07b168740c1034b", + "3685c9ae95118a83db3569832c29753276fa1264", + "09640bad951c33e7d70a1fced83b1869f65b3fc5", + "cb9ea8137eca1450e049879772f5c11a0e11ff0a", NULL }; @@ -642,6 +661,8 @@ static const char *sha1_graphics_8[] = "7d1bfff706b0713e53209407889f83a0da26a81d", "31e667c2dbb81dcf81d01cb88f794e88ddb90ff2", "31e667c2dbb81dcf81d01cb88f794e88ddb90ff2", + "465d9cd0a77ab4fcf035aa67544b2a26269e0b09", + "600d6b2713d5e4c0d90c02660245ed26c7ae3033", NULL }; @@ -696,6 +717,8 @@ static const char *sha1_graphics_4[] = "46760975993f9881b7bbe94123173e6a683d3f25", "df5feb905a31c288008cf5e82d73ac818a160d82", "df5feb905a31c288008cf5e82d73ac818a160d82", + "d8af3868c66c7d6dac35ec8ee0317b38a6910bb1", + "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", NULL }; @@ -750,6 +773,8 @@ static const char *sha1_graphics_4_grayscale[] = "5eeb56afea8040a8fb18c11f29931b836474126d", "a3405c085fc2f2184bcd0d1edcdcc66927e33659", "f8681c09f1abfc38d31e47622cb8798cd896a00e", + "b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7", + "d374d4d92c940ae42a9b42c14d744341b68a8c14", NULL }; @@ -819,6 +844,8 @@ static const char *sha1_graphics_1[] = "a2a928de9007d765da496abec8c21b23601f8c45", "28ded40e72d4327b9413571476b167fb28a1f420", "23366004515f3bc46796ea505d748f8d0f97fbe1", + "88763f8e8fcf4f78fa864325791a9dd35a0bd279", + "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", NULL }; @@ -1018,6 +1045,16 @@ static const BITMAPINFOHEADER dib_brush_header_8 = {sizeof(BITMAPINFOHEADER), static const BITMAPINFOHEADER dib_brush_header_4 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 4, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_1 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 1, BI_RGB, 0, 0, 0, 0, 0}; +static const BYTE rle8_data[20] = { 0x03, 0x02, 0x04, 0xf0, 0x00, 0x00, /* 2, 2, 2, f0, f0, f0, f0, <eol> */ + 0x00, 0x03, 0x04, 0x05, 0x06, 0x00, /* 4, 5, 6, <pad> */ + 0x00, 0x02, 0x01, 0x02, 0x05, 0x80, /* dx=1, dy=2, 80, 80, 80, 80, (80) */ + 0x00, 0x01 }; /* <eod> */ + +static const DWORD four_by_four_data[16] = { 0x000000, 0xff0000, 0x00ff00, 0x0000ff, + 0xffffff, 0x00ffff, 0xff00ff, 0xffff00, + 0x000000, 0xff0000, 0x00ff00, 0x0000ff, + 0xffffff, 0x00ffff, 0xff00ff, 0xffff00 }; + static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { DWORD dib_size = get_dib_size(bmi); @@ -1033,6 +1070,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh BITMAPINFO *brush_bi = (BITMAPINFO*)dib_brush_buf; BYTE *brush_bits, *src_bits; BOOL ret, dib_is_1bpp = (bmi->bmiHeader.biBitCount == 1); + BOOL dib_is_8bpp_gray = (bmi->bmiHeader.biBitCount == 8 && bmi->bmiColors[1].rgbRed == 1); BLENDFUNCTION blend; blend.BlendOp = AC_SRC_OVER; @@ -1821,6 +1859,75 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh DeleteDC( src_dc ); DeleteObject( bmp ); + + /* RLE StretchDIBits */ + src_bi->bmiHeader.biSize = sizeof(src_bi->bmiHeader); + src_bi->bmiHeader.biWidth = 8; + src_bi->bmiHeader.biHeight = 8; + src_bi->bmiHeader.biPlanes = 1; + src_bi->bmiHeader.biBitCount = 8; + src_bi->bmiHeader.biCompression = BI_RLE8; + src_bi->bmiHeader.biClrUsed = 0; + src_bi->bmiHeader.biSizeImage = sizeof(rle8_data); + + for (i = 0; i < 256; i++) + { + src_bi->bmiColors[i].rgbRed = i; + src_bi->bmiColors[i].rgbGreen = i; + src_bi->bmiColors[i].rgbBlue = i; + src_bi->bmiColors[i].rgbReserved = 0; + } + + StretchDIBits( hdc, 10, 10, 7, 7, 0, 0, 7, 7, rle8_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + StretchDIBits( hdc, 100, 10, 7, 7, 0, 0, 7, 7, rle8_data, src_bi, DIB_RGB_COLORS, SRCAND ); + StretchDIBits( hdc, 200, 10, 7, 7, 0, 1, 7, 7, rle8_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + StretchDIBits( hdc, 300, 10, 7, 7, 1, 0, 7, 7, rle8_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + StretchDIBits( hdc, 400, 10, 16, 16, 0, 0, 8, 8, rle8_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + compare_hash_broken_todo( bmi, bits, sha1, "rle stretchdibits", 0, dib_is_1bpp ); + memset(bits, 0xcc, dib_size); + + /* 32 bpp StretchDIBits */ + + src_bi->bmiHeader.biWidth = 4; + src_bi->bmiHeader.biHeight = 4; + src_bi->bmiHeader.biPlanes = 1; + src_bi->bmiHeader.biBitCount = 32; + src_bi->bmiHeader.biCompression = BI_RGB; + src_bi->bmiHeader.biClrUsed = 0; + src_bi->bmiHeader.biSizeImage = 0; + + ret = StretchDIBits( hdc, 10, 10, 4, 4, 0, 0, 4, 4, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + ok(ret == 4, "got %d\n", ret); + ret = StretchDIBits( hdc, 20, 10, 4, 4, 0, 0, 4, 4, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCAND ); + ok(ret == 4, "got %d\n", ret); + ret = StretchDIBits( hdc, 30, 10, 3, 3, 1, 1, 3, 3, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + ok(ret == 4, "got %d\n", ret); + ret = StretchDIBits( hdc, 40, 10, 3, 3, 1, 1, 3, 3, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCAND ); + ok(ret == 4, "got %d\n", ret); + ret = StretchDIBits( hdc, 50, 10, -2, -2, 2, 3, -2, -2, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + ok(ret == 4, "got %d\n", ret); + ret = StretchDIBits( hdc, 60, 10, -2, -2, 2, 3, -2, -2, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCAND ); + ok(ret == 4, "got %d\n", ret); + + src_bi->bmiHeader.biHeight = -4; + + ret = StretchDIBits( hdc, 10, 100, 4, 4, 0, 0, 4, 4, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + ok(ret == 4, "got %d\n", ret); + ret = StretchDIBits( hdc, 20, 100, 4, 4, 0, 0, 4, 4, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCAND ); + ok(ret == -4, "got %d\n", ret); + ret = StretchDIBits( hdc, 30, 100, 3, 3, 1, 1, 3, 3, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + ok(ret == 4, "got %d\n", ret); + ret = StretchDIBits( hdc, 40, 100, 3, 3, 1, 1, 3, 3, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCAND ); + ok(ret == -4, "got %d\n", ret); + ret = StretchDIBits( hdc, 50, 100, -2, -2, 2, 3, -2, -2, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCCOPY ); + ok(ret == 4, "got %d\n", ret); + ret = StretchDIBits( hdc, 60, 100, -2, -2, 2, 3, -2, -2, four_by_four_data, src_bi, DIB_RGB_COLORS, SRCAND ); + ok(ret == -4, "got %d\n", ret); + + compare_hash_broken_todo( bmi, bits, sha1, "stretchdibits", dib_is_8bpp_gray ? 1 : 0, dib_is_8bpp_gray ); + + memset(bits, 0xcc, dib_size); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(hrgn);

1 0

Huw Davies : gdi32: Implement nulldrv_StretchDIBits using the PutImage gdi driver function.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: c9a7bb715d2db1512db30deb11e4676e76791a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a7bb715d2db1512db30deb1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 17 15:46:07 2011 +0100 gdi32: Implement nulldrv_StretchDIBits using the PutImage gdi driver function. --- dlls/gdi32/dib.c | 160 ++++++++++++++++++++++++++++++++------------- dlls/gdi32/tests/bitmap.c | 4 +- 2 files changed, 116 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eea257c..550f099 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -388,68 +388,136 @@ fail: -/* nulldrv fallback implementation using SetDIBits/StretchBlt */ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, - BITMAPINFO *info, UINT coloruse, DWORD rop ) + BITMAPINFO *src_info, UINT coloruse, DWORD rop ) { DC *dc = get_nulldrv_dc( dev ); - INT ret; - LONG height; - HBITMAP hBitmap; - HDC hdcMem; + char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; + struct bitblt_coords src, dst; + struct gdi_image_bits src_bits; + DWORD err; + HRGN clip = NULL; + INT ret = 0; + INT height = abs( src_info->bmiHeader.biHeight ); + BOOL top_down = src_info->bmiHeader.biHeight < 0, non_stretch_from_origin = FALSE; + RECT rect, clip_rect; - /* make sure we have a real implementation for StretchBlt and PutImage */ - if (GET_DC_PHYSDEV( dc, pStretchBlt ) == dev || GET_DC_PHYSDEV( dc, pPutImage ) == dev) - return 0; + TRACE("%d %d %d %d <- %d %d %d %d rop %08x\n", xDst, yDst, widthDst, heightDst, + xSrc, ySrc, widthSrc, heightSrc, rop); + + src_bits.ptr = (void*)bits; + src_bits.is_copy = FALSE; + src_bits.free = NULL; + + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, dev->hdc )) return 0; - height = info->bmiHeader.biHeight; + rect.left = xDst; + rect.top = yDst; + rect.right = xDst + widthDst; + rect.bottom = yDst + heightDst; + LPtoDP( dc->hSelf, (POINT *)&rect, 2 ); + dst.x = rect.left; + dst.y = rect.top; + dst.width = rect.right - rect.left; + dst.height = rect.bottom - rect.top; + + if (dc->layout & LAYOUT_RTL && rop & NOMIRRORBITMAP) + { + dst.x += dst.width; + dst.width = -dst.width; + } + rop &= ~NOMIRRORBITMAP; + + src.x = xSrc; + src.width = widthSrc; + src.y = ySrc; + src.height = heightSrc; + + if (src.x == 0 && src.y == 0 && src.width == dst.width && src.height == dst.height) + non_stretch_from_origin = TRUE; - if (xSrc == 0 && ySrc == 0 && widthDst == widthSrc && heightDst == heightSrc && - info->bmiHeader.biCompression == BI_RGB) + if (src_info->bmiHeader.biCompression == BI_RLE4 || src_info->bmiHeader.biCompression == BI_RLE8) { - /* Windows appears to have a fast case optimization - * that uses the wrong origin for top-down DIBs */ - if (height < 0 && heightSrc < abs(height)) ySrc = abs(height) - heightSrc; + BOOL want_clip = non_stretch_from_origin && (rop == SRCCOPY); + if (!build_rle_bitmap( src_info, &src_bits, want_clip ? &clip : NULL )) return 0; + } - if (xDst == 0 && yDst == 0 && info->bmiHeader.biCompression == BI_RGB && rop == SRCCOPY) + if (rop != SRCCOPY || non_stretch_from_origin) + { + if (dst.width == 1 && src.width > 1) src.width--; + if (dst.height == 1 && src.height > 1) src.height--; + } + + if (rop != SRCCOPY) + { + if (dst.width < 0 && dst.width == src.width) { - BITMAP bm; - hBitmap = GetCurrentObject( dev->hdc, OBJ_BITMAP ); - if (GetObjectW( hBitmap, sizeof(bm), &bm ) && - bm.bmWidth == widthSrc && bm.bmHeight == heightSrc && - bm.bmBitsPixel == info->bmiHeader.biBitCount && bm.bmPlanes == 1) - { - /* fast path */ - return SetDIBits( dev->hdc, hBitmap, 0, abs( height ), bits, info, coloruse ); - } + /* This is off-by-one, but that's what Windows does */ + dst.x += dst.width; + src.x += src.width; + dst.width = -dst.width; + src.width = -src.width; + } + if (dst.height < 0 && dst.height == src.height) + { + dst.y += dst.height; + src.y += src.height; + dst.height = -dst.height; + src.height = -src.height; } } - hdcMem = CreateCompatibleDC( dev->hdc ); - hBitmap = CreateCompatibleBitmap( dev->hdc, info->bmiHeader.biWidth, height ); - SelectObject( hdcMem, hBitmap ); - if (coloruse == DIB_PAL_COLORS) - SelectPalette( hdcMem, GetCurrentObject( dev->hdc, OBJ_PAL ), FALSE ); + if (!top_down || (rop == SRCCOPY && !non_stretch_from_origin)) src.y = height - src.y - src.height; + + if (src.y >= height && src.y + src.height + 1 < height) + src.y = height - 1; + else if (src.y > 0 && src.y + src.height + 1 < 0) + src.y = -src.height - 1; + + get_bounding_rect( &rect, src.x, src.y, src.width, src.height ); + + src.visrect.left = 0; + src.visrect.right = src_info->bmiHeader.biWidth; + src.visrect.top = 0; + src.visrect.bottom = height; + if (!intersect_rect( &src.visrect, &src.visrect, &rect )) goto done; + + get_bounding_rect( &rect, dst.x, dst.y, dst.width, dst.height ); + + if (get_clip_box( dc, &clip_rect )) + intersect_rect( &dst.visrect, &rect, &clip_rect ); + else + dst.visrect = rect; + if (is_rect_empty( &dst.visrect )) goto done; + + if (!intersect_vis_rectangles( &dst, &src )) goto done; - if (info->bmiHeader.biCompression == BI_RLE4 || info->bmiHeader.biCompression == BI_RLE8) + if (clip) OffsetRgn( clip, dst.x - src.x, dst.y - src.y ); + + dev = GET_DC_PHYSDEV( dc, pPutImage ); + memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); + if (err == ERROR_BAD_FORMAT) + { + err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + if (!err) err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); + } + + if (err == ERROR_TRANSFORM_NOT_SUPPORTED) { - /* when RLE compression is used, there may be some gaps (ie the DIB doesn't - * contain all the rectangle described in bmiHeader, but only part of it. - * This mean that those undescribed pixels must be left untouched. - * So, we first copy on a memory bitmap the current content of the - * destination rectangle, blit the DIB bits on top of it - hence leaving - * the gaps untouched -, and blitting the rectangle back. - * This insure that gaps are untouched on the destination rectangle - */ - StretchBlt( hdcMem, xSrc, abs(height) - heightSrc - ySrc, widthSrc, heightSrc, - dev->hdc, xDst, yDst, widthDst, heightDst, rop ); + memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + err = stretch_bits( src_info, &src, dst_info, &dst, &src_bits, GetStretchBltMode( dev->hdc ) ); + if (!err) err = dev->funcs->pPutImage( dev, 0, NULL, dst_info, &src_bits, &src, &dst, rop ); } - ret = SetDIBits( hdcMem, hBitmap, 0, abs( height ), bits, info, coloruse ); - if (ret) StretchBlt( dev->hdc, xDst, yDst, widthDst, heightDst, - hdcMem, xSrc, abs(height) - heightSrc - ySrc, widthSrc, heightSrc, rop ); - DeleteDC( hdcMem ); - DeleteObject( hBitmap ); + if (err) ret = 0; + else if (rop == SRCCOPY) ret = height; + else ret = src_info->bmiHeader.biHeight; + +done: + if (src_bits.free) src_bits.free( &src_bits ); + if (clip) DeleteObject( clip ); return ret; } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 32fabb8..ed304aa 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -984,7 +984,7 @@ static void test_dib_formats(void) ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); ok( ret, "SetDIBitsToDevice failed with null bitfields\n" ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY ); - todo_wine ok( ret, "StretchDIBits failed with null bitfields\n" ); + ok( ret, "StretchDIBits failed with null bitfields\n" ); ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_RGB_COLORS); ok( ret, "GetDIBits failed with null bitfields\n" ); bi->bmiHeader.biPlanes = 1; @@ -3152,7 +3152,7 @@ static void test_StretchDIBits(void) expected[2] = 0x00000000, expected[3] = 0x00000000; legacy_expected[0] = 0x00543210, legacy_expected[1] = 0x00000000; legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; - todo_wine check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 2, 2, expected, legacy_expected, __LINE__); expected[0] = 0x00000000, expected[1] = 0x00000000;

1 0

Huw Davies : gdi32: Make the convert_bits and stretch_bits helpers external .
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: a01844b013c4163e76dcc8d9e76dfdd54537dae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01844b013c4163e76dcc8d9e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 17 15:46:06 2011 +0100 gdi32: Make the convert_bits and stretch_bits helpers external. --- dlls/gdi32/bitblt.c | 10 +++++----- dlls/gdi32/gdi_private.h | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index ea5ad41..486266a 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -166,8 +166,8 @@ void free_heap_bits( struct gdi_image_bits *bits ) HeapFree( GetProcessHeap(), 0, bits->ptr ); } -static DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, - BITMAPINFO *dst_info, struct gdi_image_bits *bits, BOOL add_alpha ) +DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, + BITMAPINFO *dst_info, struct gdi_image_bits *bits, BOOL add_alpha ) { void *ptr; DWORD err; @@ -184,9 +184,9 @@ static DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src return err; } -static DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, - BITMAPINFO *dst_info, struct bitblt_coords *dst, - struct gdi_image_bits *bits, int mode ) +DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, + BITMAPINFO *dst_info, struct bitblt_coords *dst, + struct gdi_image_bits *bits, int mode ) { void *ptr; DWORD err; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index bf1bc18..1fc8573 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -223,7 +223,12 @@ extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; /* bitblt.c */ +extern DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, + BITMAPINFO *dst_info, struct gdi_image_bits *bits, BOOL add_alpha ) DECLSPEC_HIDDEN; extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *src ) DECLSPEC_HIDDEN; +extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, + BITMAPINFO *dst_info, struct bitblt_coords *dst, + struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
79
Older →

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 October 2011