January 2010 - Wine-Commits

Stefan Dösinger : wined3d: Prepare for dynamic vertex buffers.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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: Add GL_APPLE_flush_buffer_range.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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: Set WINED3D_BUFFER_CREATEBO in buffer_init().
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 1bd98719e6bcf02185b34ba6246d0aad4570236e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd98719e6bcf02185b34ba62… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 28 00:31:12 2009 +0100 wined3d: Set WINED3D_BUFFER_CREATEBO in buffer_init(). --- dlls/wined3d/buffer.c | 25 +++++++++++++++++++++++++ dlls/wined3d/device.c | 26 ++------------------------ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c5b8b44..ceeede0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1098,6 +1098,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; if (!size) { @@ -1119,6 +1120,30 @@ 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); + /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + + * drawStridedFast (half-life 2 and others). + * + * Basically converting the vertices in the buffer is quite expensive, and observations + * show that drawStridedSlow is faster than converting + uploading + drawStridedFast. + * Therefore do not create a VBO for WINED3DUSAGE_DYNAMIC buffers. + */ + if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) + { + TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); + } + else if(buffer->resource.pool == WINED3DPOOL_SYSTEMMEM) + { + TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); + } + else if(buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + { + TRACE("Not creating a vbo because the buffer has dynamic usage\n"); + } + else + { + buffer->flags |= WINED3D_BUFFER_CREATEBO; + } + if (data) { BYTE *ptr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 78db960..34495d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -520,23 +520,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("Created buffer %p.\n", object); *ppVertexBuffer = (IWineD3DBuffer *)object; - /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + - * drawStridedFast (half-life 2). - * - * Basically converting the vertices in the buffer is quite expensive, and observations - * show that drawStridedSlow is faster than converting + uploading + drawStridedFast. - * Therefore do not create a VBO for WINED3DUSAGE_DYNAMIC buffers. - */ - if (!This->adapter->gl_info.supported[ARB_VERTEX_BUFFER_OBJECT]) - { - TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); - } else if(Pool == WINED3DPOOL_SYSTEMMEM) { - TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); - } else if(Usage & WINED3DUSAGE_DYNAMIC) { - TRACE("Not creating a vbo because the buffer has dynamic usage\n"); - } else { - object->flags |= WINED3D_BUFFER_CREATEBO; - } return WINED3D_OK; } @@ -560,7 +543,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface } hr = buffer_init(object, This, Length, Usage | WINED3DUSAGE_STATICDECL, - WINED3DFMT_UNKNOWN, Pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, parent, parent_ops); + WINED3DFMT_UNKNOWN, Pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, + parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize buffer, hr %#x\n", hr); @@ -570,12 +554,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface TRACE("Created buffer %p.\n", object); - if (Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) - && This->adapter->gl_info.supported[ARB_VERTEX_BUFFER_OBJECT]) - { - object->flags |= WINED3D_BUFFER_CREATEBO; - } - *ppIndexBuffer = (IWineD3DBuffer *) object; return WINED3D_OK;

1 0

Gerald Pfeifer : wined3d: Introduce WINED3DFMT_INST and use it in CheckTextureCapability().
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 0cf44ae02ef4f6169d28dd23beaf76719e8cc247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf44ae02ef4f6169d28dd23b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 3 17:23:43 2010 +0100 wined3d: Introduce WINED3DFMT_INST and use it in CheckTextureCapability(). --- dlls/wined3d/directx.c | 2 +- include/wine/wined3d.idl | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0e6880..c4c272a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3124,7 +3124,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, * * With Shader Model 3.0 capable cards Instancing 'just works' in Windows. */ - case WINEMAKEFOURCC('I','N','S','T'): + case WINED3DFMT_INST: TRACE("ATI Instancing check hack\n"); if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_VERTEX_SHADER]) { diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 16ae443..c91437a 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -266,6 +266,7 @@ typedef enum _WINED3DFORMAT WINED3DFMT_G8R8_G8B8 = 0x42475247, /* GRGB */ WINED3DFMT_R8G8_B8G8 = 0x47424752, /* RGBG */ WINED3DFMT_ATI2N = 0x32495441, /* ATI2 */ + WINED3DFMT_INST = 0x54534e49, /* INST */ WINED3DFMT_NVHU = 0x5548564e, /* NVHU */ WINED3DFMT_NVHS = 0x5348564e, /* NVHS */

1 0

Marcus Meissner : kernel32: Check if buffer is NULL before derefencing it ( Coverity).
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: a55399f5b65942a4959b1b5aeab34a47192be7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55399f5b65942a4959b1b5ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 3 14:46:07 2010 +0100 kernel32: Check if buffer is NULL before derefencing it (Coverity). --- dlls/kernel32/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index b5f7c0f..26c6736 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1171,7 +1171,7 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, retW = GetPrivateProfileStringW( sectionW.Buffer, entryW.Buffer, def_valW.Buffer, bufferW, len, filenameW.Buffer); - if (len) + if (len && buffer) { if (retW) {

1 0

Marcus Meissner : krnl386.exe: Removed unused owner_exists variable ( Coverity).
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: b53b7f1ec3f5286c3e855baccb25e3d48030a2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53b7f1ec3f5286c3e855bacc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 3 13:33:56 2010 +0100 krnl386.exe: Removed unused owner_exists variable (Coverity). --- dlls/krnl386.exe16/ne_module.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 08ed94c..15d43bf 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -967,7 +967,6 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ const char *file_name = NULL; char dllname[32], *p; const char *basename, *main_module; - int owner_exists = FALSE; /* strip path information */ @@ -1042,7 +1041,6 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ TRACE("Trying native dll '%s'\n", libname); hinst = NE_LoadModule(libname, lib_only); if (hinst > 32) TRACE_(loaddll)("Loaded module %s : native\n", debugstr_a(libname)); - if (hinst == ERROR_FILE_NOT_FOUND && owner_exists) hinst = 21; /* win32 module */ } if (hinst > 32 && !implicit)

1 0

Vincent Povirk : gdiplus: Add traces to unimplemented functions in graphics .c.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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

Christian Costa : d3drm: Add some definitions.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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 Jan. 4, 2010

Jan. 4, 2010

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 trace to GdipBitmapUnlockBits.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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