January 2010 - Wine-commits

Stefan Dösinger : wined3d: Add GL_APPLE_flush_buffer_range.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: ccc26a9e01ff0714aa3b151fc267dedd10c7eb07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc26a9e01ff0714aa3b151fc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 2 14:20:59 2010 +0100 wined3d: Add GL_APPLE_flush_buffer_range. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c4c272a..0267443 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -46,6 +46,7 @@ static const struct { {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER, 0 }, {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422, 0 }, {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS, 0 }, + {"GL_APPLE_flush_buffer_range", APPLE_FLUSH_BUFFER_RANGE, 0 }, /* ATI */ {"GL_ATI_separate_stencil", ATI_SEPARATE_STENCIL, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index dfc8c74..d6d9794 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3263,6 +3263,15 @@ typedef void (WINE_GLAPI *PGLFNSETFRAGMENTSHADERCONSTANTATI) (GLuint dst, const #define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 #endif +/* GL_APPLE_flush_buffer_range */ +#ifndef GL_APPLE_flush_buffer_range +#define GL_APPLE_flush_buffer_range +#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 +#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 +typedef void (WINE_GLAPI *PGLFNBUFFERPARAMETERIAPPLE) (GLenum target, GLenum pname, GLint param); +typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE) (GLenum target, GLintptr offset, GLsizeiptr size); +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3572,6 +3581,7 @@ typedef enum _GL_SupportedExt { APPLE_FLUSH_RENDER, APPLE_YCBCR_422, APPLE_FLOAT_PIXELS, + APPLE_FLUSH_BUFFER_RANGE, /* SGI */ SGI_VIDEO_SYNC, SGIS_GENERATE_MIPMAP, @@ -3920,7 +3930,11 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNALPHAFRAGMENTOP1ATI, glAlphaFragmentOp1ATI, ATI_FRAGMENT_SHADER, NULL )\ USE_GL_FUNC(PGLFNALPHAFRAGMENTOP2ATI, glAlphaFragmentOp2ATI, ATI_FRAGMENT_SHADER, NULL )\ USE_GL_FUNC(PGLFNALPHAFRAGMENTOP3ATI, glAlphaFragmentOp3ATI, ATI_FRAGMENT_SHADER, NULL )\ - USE_GL_FUNC(PGLFNSETFRAGMENTSHADERCONSTANTATI, glSetFragmentShaderConstantATI, ATI_FRAGMENT_SHADER, NULL ) + USE_GL_FUNC(PGLFNSETFRAGMENTSHADERCONSTANTATI, glSetFragmentShaderConstantATI, ATI_FRAGMENT_SHADER, NULL )\ + /* GL_APPLE_flush_buffer_range */ \ + USE_GL_FUNC(PGLFNBUFFERPARAMETERIAPPLE, glBufferParameteriAPPLE, APPLE_FLUSH_BUFFER_RANGE,NULL)\ + USE_GL_FUNC(PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE, glFlushMappedBufferRangeAPPLE, APPLE_FLUSH_BUFFER_RANGE,NULL) + /**************************************************** * OpenGL WGL defines and functions pointer

1 0

Stefan Dösinger : wined3d: Prepare for dynamic vertex buffers.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 5296d5b0168aaa3de7efbdbb9a946acaf392d7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5296d5b0168aaa3de7efbdbb9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 28 00:36:17 2009 +0100 wined3d: Prepare for dynamic vertex buffers. --- dlls/wined3d/buffer.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 020d0b4..57dca35 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -805,9 +805,10 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) ++This->decl_change_count; This->draw_count = 0; - if (This->decl_change_count > VB_MAXDECLCHANGES) + if (This->decl_change_count > VB_MAXDECLCHANGES || + (This->conversion_map && (This->resource.usage & WINED3DUSAGE_DYNAMIC))) { - FIXME("Too many declaration changes, stopping converting\n"); + FIXME("Too many declaration changes or converting dynamic buffer, stopping converting\n"); IWineD3DBuffer_UnLoad(iface); This->flags &= ~WINED3D_BUFFER_CREATEBO; @@ -1152,6 +1153,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, &device->adapter->gl_info); HRESULT hr; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + BOOL dynamic_buffer_ok; if (!size) { @@ -1173,6 +1175,8 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format_desc->format), buffer->resource.allocatedMemory, buffer); + dynamic_buffer_ok = FALSE; /* TODO: GL_APPLE_map_buffer_range, GL_ARB_map_buffer_range */ + /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others). * @@ -1188,9 +1192,9 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, { TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); } - else if(buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + else if(!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) { - TRACE("Not creating a vbo because the buffer has dynamic usage\n"); + TRACE("Not creating a vbo because the buffer has dynamic usage and no GL support\n"); } else {

1 0

Stefan Dösinger : wined3d: Implement subrange flushing with GL_APPLE_flush_buffer_range.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: a756caac0ca3dcd80019b56422779c59394fdfd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a756caac0ca3dcd80019b5642… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 17 22:44:07 2009 +0100 wined3d: Implement subrange flushing with GL_APPLE_flush_buffer_range. --- dlls/wined3d/buffer.c | 24 +++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 57dca35..20201b1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -95,6 +95,7 @@ static inline BOOL buffer_is_fully_dirty(struct wined3d_buffer *This) static void buffer_create_buffer_object(struct wined3d_buffer *This) { GLenum error, gl_usage; + const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; TRACE("Creating an OpenGL vertex buffer object for IWineD3DVertexBuffer %p Usage(%s)\n", This, debug_d3dusage(This->resource.usage)); @@ -149,6 +150,13 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) { TRACE("Gl usage = GL_DYNAMIC_DRAW_ARB\n"); gl_usage = GL_DYNAMIC_DRAW_ARB; + + if(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + { + GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); + This->flags |= WINED3D_BUFFER_FLUSH; + } } /* Reserve memory for the buffer. The amount of data won't change @@ -1061,6 +1069,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; + ULONG i; TRACE("(%p)\n", This); @@ -1094,6 +1103,18 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); + + if(This->flags & WINED3D_BUFFER_FLUSH) + { + for(i = 0; i < This->modified_areas; i++) + { + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(This->buffer_type_hint, + This->maps[i].offset, + This->maps[i].size)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); + } + } + GL_EXTCALL(glUnmapBufferARB(This->buffer_type_hint)); LEAVE_GL(); context_release(context); @@ -1175,7 +1196,8 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format_desc->format), buffer->resource.allocatedMemory, buffer); - dynamic_buffer_ok = FALSE; /* TODO: GL_APPLE_map_buffer_range, GL_ARB_map_buffer_range */ + /* TODO: GL_ARB_map_buffer_range */ + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others). diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f0e0fd3..de0bcdc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2368,6 +2368,7 @@ struct wined3d_map_range #define WINED3D_BUFFER_HASDESC 0x02 /* A vertex description has been found */ #define WINED3D_BUFFER_CREATEBO 0x04 /* Attempt to create a buffer object next PreLoad */ #define WINED3D_BUFFER_DOUBLEBUFFER 0x08 /* Use a vbo and local allocated memory */ +#define WINED3D_BUFFER_FLUSH 0x10 /* Manual unmap flushing */ struct wined3d_buffer {

1 0

Christian Costa : d3drm: Add some definitions.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 3ac5064ba797e683312ce6f7c4ab41edbb95f98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac5064ba797e683312ce6f7c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 1 12:55:04 2010 +0100 d3drm: Add some definitions. --- include/d3drm.h | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/d3drmdef.h | 53 ++++++++++++++++++++- include/d3drmobj.h | 18 +++++++ 3 files changed, 203 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ac5064ba797e683312ce…

1 0

Nikolay Sivov : comctl32/comboex: Fix a leak for text string stored for edit item.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: acec38873f13abb19febbee2717272a6ff63ec79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acec38873f13abb19febbee27… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 1 17:40:50 2010 +0300 comctl32/comboex: Fix a leak for text string stored for edit item. --- dlls/comctl32/comboex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index e1d2cd4..4b5e079 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1583,6 +1583,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) if (infoPtr->hwndEdit) RemoveWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID); + COMBOEX_FreeText (infoPtr->edit); Free (infoPtr->edit); infoPtr->edit = 0;

1 0

Vincent Povirk : gdiplus: Add traces to unimplemented functions in customlinecap.c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: e1f55929da7346a9c958c5de6d628b6e9a316f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f55929da7346a9c958c5de6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:59:06 2009 -0600 gdiplus: Add traces to unimplemented functions in customlinecap.c. --- dlls/gdiplus/customlinecap.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index e8ad968..00c228b 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -157,6 +157,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap* custom, { static int calls; + TRACE("(%p,%u,%u)\n", custom, start, end); + if(!custom) return InvalidParameter; @@ -171,6 +173,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, { static int calls; + TRACE("(%p,%u)\n", custom, base); + if(!(calls++)) FIXME("not implemented\n"); @@ -195,6 +199,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, { static int calls; + TRACE("(%p,%0.2f)\n", custom, inset); + if(!(calls++)) FIXME("not implemented\n"); @@ -220,6 +226,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, { static int calls; + TRACE("(%p,%0.2f)\n", custom, width); + if(!(calls++)) FIXME("not implemented\n"); @@ -243,6 +251,8 @@ GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL f { static int calls; + TRACE("(%0.2f,%0.2f,%i,%p)\n", height, width, fill, cap); + if(!(calls++)) FIXME("not implemented\n"); @@ -253,6 +263,8 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap { static int calls; + TRACE("(%p,%p)\n", cap, fill); + if(!(calls++)) FIXME("not implemented\n"); @@ -263,6 +275,8 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, R { static int calls; + TRACE("(%p,%p)\n", cap, height); + if(!(calls++)) FIXME("not implemented\n"); @@ -273,6 +287,8 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap* c { static int calls; + TRACE("(%p,%p)\n", cap, middle); + if(!(calls++)) FIXME("not implemented\n"); @@ -283,6 +299,8 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapWidth(GpAdjustableArrowCap* cap, RE { static int calls; + TRACE("(%p,%p)\n", cap, width); + if(!(calls++)) FIXME("not implemented\n"); @@ -293,6 +311,8 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap { static int calls; + TRACE("(%p,%i)\n", cap, fill); + if(!(calls++)) FIXME("not implemented\n"); @@ -303,6 +323,8 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, R { static int calls; + TRACE("(%p,%0.2f)\n", cap, height); + if(!(calls++)) FIXME("not implemented\n"); @@ -313,6 +335,8 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap* c { static int calls; + TRACE("(%p,%0.2f)\n", cap, middle); + if(!(calls++)) FIXME("not implemented\n"); @@ -323,6 +347,8 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap* cap, RE { static int calls; + TRACE("(%p,%0.2f)\n", cap, width); + if(!(calls++)) FIXME("not implemented\n");

1 0

Vincent Povirk : gdiplus: Add traces to unimplemented functions in graphics .c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 2005fe9881e7f83a131a74f6f66bd567d09dcf62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2005fe9881e7f83a131a74f6f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:04:20 2009 -0600 gdiplus: Add traces to unimplemented functions in graphics.c. --- dlls/gdiplus/graphics.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a4f1158..67b0ff9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1201,6 +1201,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, { static int calls; + TRACE("(%p,%i,%p)\n", hemf, delete, metafile); + if(!hemf || !metafile) return InvalidParameter; @@ -3064,6 +3066,8 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) { static int calls; + TRACE("(%p,%u)\n", graphics, intention); + if(!graphics) return InvalidParameter; @@ -3161,14 +3165,14 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) { + FIXME("(%p, %p): stub\n", graphics, argb); + if(!graphics || !argb) return InvalidParameter; if(graphics->busy) return ObjectBusy; - FIXME("(%p, %p): stub\n", graphics, argb); - return NotImplemented; } @@ -3455,12 +3459,12 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, INT regionCount, GpRegion** regions) { - if (!(graphics && string && font && layoutRect && stringFormat && regions)) - return InvalidParameter; - FIXME("stub: %p %s %d %p %p %p %d %p\n", graphics, debugstr_w(string), length, font, layoutRect, stringFormat, regionCount, regions); + if (!(graphics && string && font && layoutRect && stringFormat && regions)) + return InvalidParameter; + return NotImplemented; } @@ -4013,6 +4017,8 @@ GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metaf { static int calls; + TRACE("(%p,%u)\n", metafile, limitDpi); + if(!(calls++)) FIXME("not implemented\n");

1 0

Vincent Povirk : gdiplus: Add trace to unimplemented function in graphicspath.c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 221bde44de2d815f2180d3e8b34582719de9737a URL: http://source.winehq.org/git/wine.git/?a=commit;h=221bde44de2d815f2180d3e8b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:05:36 2009 -0600 gdiplus: Add trace to unimplemented function in graphicspath.c. --- dlls/gdiplus/graphicspath.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 94e17dd..60ddda1 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1380,6 +1380,8 @@ GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath* path, REAL x, REAL y, { static int calls; + TRACE("(%p,%0.2f,%0.2f,%p,%p,%p)\n", path, x, y, pen, graphics, result); + if(!path || !pen) return InvalidParameter;

1 0

Vincent Povirk : gdiplus: Add trace to GdipBitmapUnlockBits.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: d694679ab6c279bcca085880ba57d93b41a789f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d694679ab6c279bcca085880b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:07:12 2009 -0600 gdiplus: Add trace to GdipBitmapUnlockBits. --- dlls/gdiplus/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 78801fd..4fd1a4f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -554,6 +554,8 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, BOOL bm_is_selected; BITMAPINFO *pbmi; + TRACE("(%p,%p)\n", bitmap, lockeddata); + if(!bitmap || !lockeddata) return InvalidParameter;

1 0

Vincent Povirk : gdiplus: Add traces to unimplemented functions in image.c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 495c42b617dd78d78ef2d5b5279d8441fd72885c URL: http://source.winehq.org/git/wine.git/?a=commit;h=495c42b617dd78d78ef2d5b52… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:12:51 2009 -0600 gdiplus: Add traces to unimplemented functions in image.c. --- dlls/gdiplus/image.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4fd1a4f..41030ed 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -945,6 +945,9 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, { static int calls; + TRACE("(%p,%p,%p,%u,%s,%p)\n", ref, metafile, succ, emfType, + debugstr_w(description), out_metafile); + if(!ref || !metafile || !out_metafile) return InvalidParameter; @@ -1429,9 +1432,16 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage *image, ImageItemData* item) { + static int calls; + + TRACE("(%p,%p)\n", image, item); + if(!image || !item) return InvalidParameter; + if (!(calls++)) + FIXME("not implemented\n"); + return NotImplemented; } @@ -1729,6 +1739,8 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT* size, UINT* num) { static int calls; + TRACE("(%p,%p,%p)\n", image, size, num); + if(!(calls++)) FIXME("not implemented\n"); @@ -1753,6 +1765,8 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, { static int calls; + TRACE("(%p,%s,%p)\n", image, debugstr_guid(dimensionID), count); + if(!image || !dimensionID || !count) return InvalidParameter; @@ -2142,6 +2156,8 @@ GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage *image, PROPID propId) { static int calls; + TRACE("(%p,%u)\n", image, propId); + if(!image) return InvalidParameter; @@ -2155,6 +2171,8 @@ GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage *image, GDIPCONST PropertyItem* { static int calls; + TRACE("(%p,%p)\n", image, item); + if(!(calls++)) FIXME("not implemented\n"); @@ -2848,6 +2866,8 @@ GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect *effect, { static int calls; + TRACE("(%p,%p,%u)\n", effect, params, size); + if(!(calls++)) FIXME("not implemented\n");

1 0