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

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DExecuteBuffer iface .
by Alexandre Julliard July 8, 2011

July 8, 2011

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 : d3d8: COM cleanup for the IDirect3DVertexBuffer8 iface.
by Alexandre Julliard July 8, 2011

July 8, 2011

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

Alexandre Julliard : winex11: Pass a generic PHYSDEV to all graphics entry points.
by Alexandre Julliard July 8, 2011

July 8, 2011

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 : msvcp90/tests: Fix the calling convention of some function pointers.
by Alexandre Julliard July 8, 2011

July 8, 2011

Module: wine Branch: master Commit: 23dd500a64ebc160fdea787e983b8bbebc1917d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dd500a64ebc160fdea787e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 14:40:10 2011 +0200 msvcp90/tests: Fix the calling convention of some function pointers. --- dlls/msvcp90/tests/misc.c | 21 ++++------ dlls/msvcp90/tests/string.c | 91 +++++++++++++++--------------------------- 2 files changed, 42 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23dd500a64ebc160fdea7…

1 0

Alexandre Julliard : winex11: Use the HDC from the gdi_physdev structure.
by Alexandre Julliard July 8, 2011

July 8, 2011

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

Vincent Povirk : gdiplus: Implement GdipPlayMetafileRecord for EMF records.
by Alexandre Julliard July 8, 2011

July 8, 2011

Module: wine Branch: master Commit: fda2fc7684bc73a1dc89cad53e0a05bfee5c2826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda2fc7684bc73a1dc89cad53… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 16:25:25 2011 -0500 gdiplus: Implement GdipPlayMetafileRecord for EMF records. --- dlls/gdiplus/gdiplus_private.h | 11 ++++- dlls/gdiplus/metafile.c | 113 ++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 44 ++++++++-------- 3 files changed, 141 insertions(+), 27 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d6888d9..9afe15b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -274,12 +274,21 @@ struct GpMetafile{ GpRectF bounds; GpUnit unit; MetafileType metafile_type; + HENHMETAFILE hemf; + + /* recording */ HDC record_dc; GpGraphics *record_graphics; BYTE *comment_data; DWORD comment_data_size; DWORD comment_data_length; - HENHMETAFILE hemf; + + /* playback */ + GpGraphics *playback_graphics; + HDC playback_dc; + GpPointF playback_points[3]; + HANDLETABLE *handle_table; + int handle_count; }; struct GpBitmap{ diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3e79eb7..38923a0 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -357,18 +357,100 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } +static GpStatus METAFILE_PlaybackGetDC(GpMetafile *metafile) +{ + GpStatus stat = Ok; + + stat = GdipGetDC(metafile->playback_graphics, &metafile->playback_dc); + + if (stat == Ok) + { + /* The result of GdipGetDC always expects device co-ordinates, but the + * device co-ordinates of the source metafile do not correspond to + * device co-ordinates of the destination. Therefore, we set up the DC + * so that the metafile's bounds map to the destination points where we + * are drawing this metafile. */ + SetMapMode(metafile->playback_dc, MM_ANISOTROPIC); + + SetWindowOrgEx(metafile->playback_dc, metafile->bounds.X, metafile->bounds.Y, NULL); + SetWindowExtEx(metafile->playback_dc, metafile->bounds.Width, metafile->bounds.Height, NULL); + + SetViewportOrgEx(metafile->playback_dc, metafile->playback_points[0].X, metafile->playback_points[0].Y, NULL); + SetViewportExtEx(metafile->playback_dc, + metafile->playback_points[1].X - metafile->playback_points[0].X, + metafile->playback_points[2].Y - metafile->playback_points[0].Y, NULL); + } + + return stat; +} + +static void METAFILE_PlaybackReleaseDC(GpMetafile *metafile) +{ + if (metafile->playback_dc) + { + GdipReleaseDC(metafile->playback_graphics, metafile->playback_dc); + metafile->playback_dc = NULL; + } +} + GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) { - FIXME("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); + TRACE("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); + + if (!metafile || (dataSize && !data) || !metafile->playback_graphics) + return InvalidParameter; + + if (recordType >= 1 && recordType <= 0x7a) + { + /* regular EMF record */ + if (metafile->playback_dc) + { + ENHMETARECORD *record; + + record = GdipAlloc(dataSize + 8); + + if (record) + { + record->iType = recordType; + record->nSize = dataSize; + memcpy(record->dParm, data, dataSize); - return NotImplemented; + PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, + record, metafile->handle_count); + + GdipFree(record); + } + else + return OutOfMemory; + } + } + else + { + METAFILE_PlaybackReleaseDC((GpMetafile*)metafile); + + switch(recordType) + { + case EmfPlusRecordTypeHeader: + case EmfPlusRecordTypeEndOfFile: + break; + case EmfPlusRecordTypeGetDC: + METAFILE_PlaybackGetDC((GpMetafile*)metafile); + break; + default: + FIXME("Not implemented for record type %x\n", recordType); + return NotImplemented; + } + } + + return Ok; } struct enum_metafile_data { EnumerateMetafileProc callback; void *callback_data; + GpMetafile *metafile; }; static int CALLBACK enum_metafile_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, @@ -378,6 +460,9 @@ static int CALLBACK enum_metafile_proc(HDC hDC, HANDLETABLE *lpHTable, const ENH struct enum_metafile_data *data = (struct enum_metafile_data*)lpData; const BYTE* pStr; + data->metafile->handle_table = lpHTable; + data->metafile->handle_count = nObj; + /* First check for an EMF+ record. */ if (lpEMFR->iType == EMR_GDICOMMENT) { @@ -424,6 +509,8 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes) { struct enum_metafile_data data; + GpStatus stat; + GpMetafile *real_metafile = (GpMetafile*)metafile; /* whoever made this const was joking */ TRACE("(%p,%p,%p,%i,%p,%i,%p,%p,%p)\n", graphics, metafile, destPoints, count, srcRect, srcUnit, callback, callbackData, @@ -435,14 +522,32 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, if (!metafile->hemf) return InvalidParameter; + if (metafile->playback_graphics) + return ObjectBusy; + TRACE("%s %i -> %s %s %s\n", debugstr_rectf(srcRect), srcUnit, debugstr_pointf(&destPoints[0]), debugstr_pointf(&destPoints[1]), debugstr_pointf(&destPoints[2])); data.callback = callback; data.callback_data = callbackData; + data.metafile = real_metafile; - EnumEnhMetaFile(0, metafile->hemf, enum_metafile_proc, &data, NULL); + real_metafile->playback_graphics = graphics; + real_metafile->playback_dc = NULL; - return Ok; + memcpy(real_metafile->playback_points, destPoints, sizeof(PointF) * 3); + stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, real_metafile->playback_points, 3); + + if (stat == Ok && metafile->metafile_type == MetafileTypeEmf) + stat = METAFILE_PlaybackGetDC((GpMetafile*)metafile); + + if (stat == Ok) + EnumEnhMetaFile(0, metafile->hemf, enum_metafile_proc, &data, NULL); + + METAFILE_PlaybackReleaseDC((GpMetafile*)metafile); + + real_metafile->playback_graphics = NULL; + + return stat; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 5323751..9530b0c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -212,9 +212,9 @@ static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned if (state->expected[state->count].record_type) { if (state->expected[state->count].playback_todo) - todo_wine ok(stat == Ok, "%s: GdipPlayMetafileRecord failed with stat %i\n", state->desc, stat); + todo_wine ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); else - ok(stat == Ok, "%s: GdipPlayMetafileRecord failed with stat %i\n", state->desc, stat); + ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); state->count++; } else @@ -324,16 +324,16 @@ static void test_empty(void) } static const emfplus_record getdc_records[] = { - {0, EMR_HEADER, 1}, - {0, EmfPlusRecordTypeHeader, 1}, - {0, EmfPlusRecordTypeGetDC, 1}, - {0, EMR_CREATEBRUSHINDIRECT, 1}, - {0, EMR_SELECTOBJECT, 1}, - {0, EMR_RECTANGLE, 1}, - {0, EMR_SELECTOBJECT, 1}, - {0, EMR_DELETEOBJECT, 1}, - {0, EmfPlusRecordTypeEndOfFile, 1}, - {0, EMR_EOF, 1}, + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeGetDC}, + {0, EMR_CREATEBRUSHINDIRECT}, + {0, EMR_SELECTOBJECT}, + {0, EMR_RECTANGLE}, + {0, EMR_SELECTOBJECT}, + {0, EMR_DELETEOBJECT}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, {0} }; @@ -411,7 +411,7 @@ static void test_getdc(void) stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); expect(Ok, stat); @@ -420,7 +420,7 @@ static void test_getdc(void) stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); @@ -445,13 +445,13 @@ static void test_getdc(void) } static const emfplus_record emfonly_records[] = { - {0, EMR_HEADER, 1}, - {0, EMR_CREATEBRUSHINDIRECT, 1}, - {0, EMR_SELECTOBJECT, 1}, - {0, EMR_RECTANGLE, 1}, - {0, EMR_SELECTOBJECT, 1}, - {0, EMR_DELETEOBJECT, 1}, - {0, EMR_EOF, 1}, + {0, EMR_HEADER}, + {0, EMR_CREATEBRUSHINDIRECT}, + {0, EMR_SELECTOBJECT}, + {0, EMR_RECTANGLE}, + {0, EMR_SELECTOBJECT}, + {0, EMR_DELETEOBJECT}, + {0, EMR_EOF}, {0} }; @@ -528,7 +528,7 @@ static void test_emfonly(void) stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Henri Verbeet : wined3d: Make the rt parameter to surface_set_compatible_renderbuffer() const.
by Alexandre Julliard July 8, 2011

July 8, 2011

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 src_surface parameter to draw_textured_quad() const.
by Alexandre Julliard July 8, 2011

July 8, 2011

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

Vincent Povirk : gdiplus: Stub GdipPlayMetafileRecord.
by Alexandre Julliard July 8, 2011

July 8, 2011

Module: wine Branch: master Commit: fd7475546b46648234870d2ecd8959c8c26c367d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7475546b46648234870d2ec… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 11:02:33 2011 -0500 gdiplus: Stub GdipPlayMetafileRecord. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 8 ++++++++ include/gdiplusflat.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 533bf0f..9398658 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -443,7 +443,7 @@ 443 stdcall GdipPathIterNextSubpath(ptr ptr ptr ptr ptr) 444 stdcall GdipPathIterNextSubpathPath(ptr ptr ptr ptr) 445 stdcall GdipPathIterRewind(ptr) -446 stub GdipPlayMetafileRecord +446 stdcall GdipPlayMetafileRecord(ptr long long long ptr) 447 stdcall GdipPrivateAddFontFile(ptr wstr) 448 stdcall GdipPrivateAddMemoryFont(ptr ptr long) 449 stdcall GdipRecordMetafile(long long ptr long wstr ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 322aecf..3d26b5c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -327,6 +327,14 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } +GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, + EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) +{ + FIXME("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); + + return NotImplemented; +} + struct enum_metafile_data { EnumerateMetafileProc callback; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 676a78e..6792004 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -527,6 +527,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST Wm GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**); GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*); +GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);

1 0

Vincent Povirk : gdiplus: Add test showing scaling does not affect returned HDC objects.
by Alexandre Julliard July 8, 2011

July 8, 2011

Module: wine Branch: master Commit: 3a6ba940115519472dda94aae19f71e9361617d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6ba940115519472dda94aae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 14:51:35 2011 -0500 gdiplus: Add test showing scaling does not affect returned HDC objects. --- dlls/gdiplus/tests/graphics.c | 49 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index bbca69f..3df57f1 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3251,6 +3251,54 @@ static void test_get_set_textrenderinghint(void) ReleaseDC(hwnd, hdc); } +static void test_getdc_scaled(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpBitmap *bitmap = NULL; + HDC hdc=NULL; + HBRUSH hbrush, holdbrush; + ARGB color; + + status = GdipCreateBitmapFromScan0(10, 10, 12, PixelFormat24bppRGB, NULL, &bitmap); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, status); + + status = GdipGetDC(graphics, &hdc); + expect(Ok, status); + ok(hdc != NULL, "got NULL hdc\n"); + + hbrush = CreateSolidBrush(RGB(255, 0, 0)); + + holdbrush = SelectObject(hdc, hbrush); + + Rectangle(hdc, 2, 2, 6, 6); + + SelectObject(hdc, holdbrush); + + DeleteObject(hbrush); + + status = GdipReleaseDC(graphics, hdc); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + status = GdipBitmapGetPixel(bitmap, 3, 3, &color); + expect(Ok, status); + expect(0xffff0000, color); + + status = GdipBitmapGetPixel(bitmap, 8, 8, &color); + expect(Ok, status); + expect(0xff000000, color); + + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3311,6 +3359,7 @@ START_TEST(graphics) test_string_functions(); test_get_set_interpolation(); test_get_set_textrenderinghint(); + test_getdc_scaled(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0