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

Vincent Povirk : windowscodecs: Implement GetDecoderInfo for all the decoders.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: e9fba4fc07c012433c1fd189e967fadb380dfb18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fba4fc07c012433c1fd189e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 27 16:03:09 2011 -0500 windowscodecs: Implement GetDecoderInfo for all the decoders. --- dlls/windowscodecs/icoformat.c | 16 ++++++++++++++-- dlls/windowscodecs/jpegformat.c | 16 ++++++++++++++-- dlls/windowscodecs/pngformat.c | 16 ++++++++++++++-- dlls/windowscodecs/tgaformat.c | 16 ++++++++++++++-- dlls/windowscodecs/tiffformat.c | 16 ++++++++++++++-- 5 files changed, 70 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index a49683a..fcb5d49 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -534,8 +534,20 @@ static HRESULT WINAPI IcoDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI IcoDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); - return E_NOTIMPL; + HRESULT hr; + IWICComponentInfo *compinfo; + + TRACE("(%p,%p)\n", iface, ppIDecoderInfo); + + hr = CreateComponentInfo(&CLSID_WICIcoDecoder, &compinfo); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void**)ppIDecoderInfo); + + IWICComponentInfo_Release(compinfo); + + return hr; } static HRESULT WINAPI IcoDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ab21fbf..083a352 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -362,8 +362,20 @@ static HRESULT WINAPI JpegDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI JpegDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); - return E_NOTIMPL; + HRESULT hr; + IWICComponentInfo *compinfo; + + TRACE("(%p,%p)\n", iface, ppIDecoderInfo); + + hr = CreateComponentInfo(&CLSID_WICJpegDecoder, &compinfo); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void**)ppIDecoderInfo); + + IWICComponentInfo_Release(compinfo); + + return hr; } static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index f1c0e3c..f5f6fdb 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -475,8 +475,20 @@ static HRESULT WINAPI PngDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); - return E_NOTIMPL; + HRESULT hr; + IWICComponentInfo *compinfo; + + TRACE("(%p,%p)\n", iface, ppIDecoderInfo); + + hr = CreateComponentInfo(&CLSID_WICPngDecoder, &compinfo); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void**)ppIDecoderInfo); + + IWICComponentInfo_Release(compinfo); + + return hr; } static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 8db1cf1..0a12056 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -351,8 +351,20 @@ static HRESULT WINAPI TgaDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI TgaDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); - return E_NOTIMPL; + HRESULT hr; + IWICComponentInfo *compinfo; + + TRACE("(%p,%p)\n", iface, ppIDecoderInfo); + + hr = CreateComponentInfo(&CLSID_WineTgaDecoder, &compinfo); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void**)ppIDecoderInfo); + + IWICComponentInfo_Release(compinfo); + + return hr; } static HRESULT WINAPI TgaDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index fb4f65c..6422b62 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -590,8 +590,20 @@ static HRESULT WINAPI TiffDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI TiffDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); - return E_NOTIMPL; + HRESULT hr; + IWICComponentInfo *compinfo; + + TRACE("(%p,%p)\n", iface, ppIDecoderInfo); + + hr = CreateComponentInfo(&CLSID_WICTiffDecoder, &compinfo); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void**)ppIDecoderInfo); + + IWICComponentInfo_Release(compinfo); + + return hr; } static HRESULT WINAPI TiffDecoder_CopyPalette(IWICBitmapDecoder *iface,

1 0

Vincent Povirk : windowscodecs: Implement FlipRotator_CopyPalette.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: b031b619c7ff60a72be1b9e888332823dbb86fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b031b619c7ff60a72be1b9e88… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 27 16:09:10 2011 -0500 windowscodecs: Implement FlipRotator_CopyPalette. --- dlls/windowscodecs/fliprotate.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 26062cd..ee2a9c2 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -143,8 +143,13 @@ static HRESULT WINAPI FlipRotator_GetResolution(IWICBitmapFlipRotator *iface, static HRESULT WINAPI FlipRotator_CopyPalette(IWICBitmapFlipRotator *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); + TRACE("(%p,%p)\n", iface, pIPalette); + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + else + return IWICBitmapSource_CopyPalette(This->source, pIPalette); } static HRESULT WINAPI FlipRotator_CopyPixels(IWICBitmapFlipRotator *iface,

1 0

Bernhard Loos : msi: MsiDatabaseCommit also succeeds for a a readonly database.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 20bdf059ab0e00c3b0a5db8003b1e8d87afdfd0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bdf059ab0e00c3b0a5db800… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Jul 27 22:04:26 2011 +0200 msi: MsiDatabaseCommit also succeeds for a a readonly database. --- dlls/msi/msiquery.c | 6 ++++++ dlls/msi/tests/db.c | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 08a87a9..0f2e377 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -831,6 +831,12 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb ) return ERROR_SUCCESS; } + if (db->mode == MSIDBOPEN_READONLY) + { + msiobj_release( &db->hdr ); + return ERROR_SUCCESS; + } + /* FIXME: lock the database */ r = MSI_CommitTables( db ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d97a8cb..28a2ff2 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -96,6 +96,9 @@ static void test_msidatabase(void) res = MsiOpenDatabase( msifile, MSIDBOPEN_READONLY, &hdb ); ok( res == ERROR_SUCCESS , "Failed to open database\n" ); + res = MsiDatabaseCommit( hdb ); + ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); + res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" );

1 0

Vincent Povirk : windowscodecs: Implement GetContainerFormat for more components.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 5a45076d1dfc2b0a437226854b60096bf0f9e56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a45076d1dfc2b0a437226854… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 27 15:54:07 2011 -0500 windowscodecs: Implement GetContainerFormat for more components. --- dlls/windowscodecs/bmpencode.c | 4 ++-- dlls/windowscodecs/icoformat.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 69148af..d9931d6 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -489,8 +489,8 @@ static HRESULT WINAPI BmpEncoder_Initialize(IWICBitmapEncoder *iface, static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *pguidContainerFormat) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); - return E_NOTIMPL; + memcpy(pguidContainerFormat, &GUID_ContainerFormatBmp, sizeof(GUID)); + return S_OK; } static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index b4abac5..a49683a 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -527,8 +527,8 @@ end: static HRESULT WINAPI IcoDecoder_GetContainerFormat(IWICBitmapDecoder *iface, GUID *pguidContainerFormat) { - FIXME("(%p,%p): stub\n", iface, pguidContainerFormat); - return E_NOTIMPL; + memcpy(pguidContainerFormat, &GUID_ContainerFormatIco, sizeof(GUID)); + return S_OK; } static HRESULT WINAPI IcoDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 65de4ff..fb4f65c 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1650,8 +1650,8 @@ exit: static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *pguidContainerFormat) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); - return E_NOTIMPL; + memcpy(pguidContainerFormat, &GUID_ContainerFormatTiff, sizeof(GUID)); + return S_OK; } static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface,

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in wined3d_device_set_cursor_properties ().
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: cc2dc5b0c8dcaa17e6900fa7a6e4ebcac821d6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2dc5b0c8dcaa17e6900fa7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:36 2011 +0200 wined3d: Only invalidate state for the current context in wined3d_device_set_cursor_properties(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e3e6848..16327e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5263,7 +5263,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device checkGLcall("glActiveTextureARB"); sampler = device->rev_tex_unit_map[0]; if (sampler != WINED3D_UNMAPPED_STAGE) - device_invalidate_state(device, STATE_SAMPLER(sampler)); + context_invalidate_state(context, STATE_SAMPLER(sampler)); /* Create a new cursor texture */ glGenTextures(1, &device->cursorTexture); checkGLcall("glGenTextures");

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in surface_blt_fbo().
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 2bf020e26fcee9f09dbb167f4db8c1126053ae1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf020e26fcee9f09dbb167f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:33 2011 +0200 wined3d: Only invalidate state for the current context in surface_blt_fbo(). --- dlls/wined3d/surface.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d34bcd5..3d9bfb7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5105,16 +5105,16 @@ static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREF context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); } context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); - device_invalidate_state(device, STATE_FRAMEBUFFER); + context_invalidate_state(context, STATE_FRAMEBUFFER); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); glDisable(GL_SCISSOR_TEST); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); gl_info->fbo_ops.glBlitFramebuffer(src_rect.left, src_rect.top, src_rect.right, src_rect.bottom, dst_rect.left, dst_rect.top, dst_rect.right, dst_rect.bottom, GL_COLOR_BUFFER_BIT, gl_filter);

1 0

Stefan Dösinger : wined3d: Restore the call to context_validate_onscreen_formats.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 41f9ca2abfe7ca253d25e7184113da56c67ee815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f9ca2abfe7ca253d25e7184… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 27 23:22:49 2011 +0200 wined3d: Restore the call to context_validate_onscreen_formats. This got lost accidentally in d321959dd7ba21b555f27d32937c911fa61117a6. --- dlls/wined3d/context.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b83dab5..fbfb843 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2247,6 +2247,11 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de fb->render_targets, fb->depth_stencil)) return FALSE; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && isStateDirty(context, STATE_FRAMEBUFFER)) + { + context_validate_onscreen_formats(context, fb->depth_stencil); + } + /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in device_clear_render_targets ().
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: a1ba5b5131b7b13ff718bd3b2677b7e2e727f232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ba5b5131b7b13ff718bd3b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:35 2011 +0200 wined3d: Only invalidate state for the current context in device_clear_render_targets(). --- dlls/wined3d/device.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f1901bf..e3e6848 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -707,10 +707,10 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count if (context->gl_info->supported[EXT_STENCIL_TWO_SIDE]) { glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); } glStencilMask(~0U); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); glClearStencil(stencil); checkGLcall("glClearStencil"); clear_mask = clear_mask | GL_STENCIL_BUFFER_BIT; @@ -730,7 +730,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count surface_modify_location(fb->depth_stencil, SFLAG_INDRAWABLE, TRUE); glDepthMask(GL_TRUE); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); glClearDepth(depth); checkGLcall("glClearDepth"); clear_mask = clear_mask | GL_DEPTH_BUFFER_BIT; @@ -744,10 +744,10 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count } glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); glClearColor(color->r, color->g, color->b, color->a); checkGLcall("glClearColor"); clear_mask = clear_mask | GL_COLOR_BUFFER_BIT;

1 0

Michael Stefaniuc : dpnet: COM cleanup for the IDirectPlay8Address iface.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 2ddf1c38c70994a697229675115b16b1193d9c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddf1c38c70994a6972296751… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 27 23:32:47 2011 +0200 dpnet: COM cleanup for the IDirectPlay8Address iface. --- dlls/dpnet/address.c | 149 ++++++++++++++++++++++++++++---------------- dlls/dpnet/dpnet_private.h | 5 +- 2 files changed, 98 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ddf1c38c70994a697229…

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in wined3d_buffer_map().
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 487cc9729b19fcb14b1cd753801e505f3d713182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=487cc9729b19fcb14b1cd7538… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:37 2011 +0200 wined3d: Only invalidate state for the current context in wined3d_buffer_map(). --- dlls/wined3d/buffer.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 807579e..9b20d87 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1016,12 +1016,13 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN struct wined3d_context *context; const struct wined3d_gl_info *gl_info; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(device, STATE_INDEXBUFFER); - context = context_acquire(device, NULL); gl_info = context->gl_info; + ENTER_GL(); + + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + context_invalidate_state(context, STATE_INDEXBUFFER); GL_EXTCALL(glBindBufferARB(buffer->buffer_type_hint, buffer->buffer_object)); if (gl_info->supported[ARB_MAP_BUFFER_RANGE])

1 0