August 2013 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Store the current GLSL program per-context.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: 74faebd68d738ef44cc5990e883091329f72d7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74faebd68d738ef44cc5990e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 23 10:18:14 2013 +0200 wined3d: Store the current GLSL program per-context. --- dlls/wined3d/arb_program_shader.c | 18 +++++- dlls/wined3d/context.c | 11 +++- dlls/wined3d/glsl_shader.c | 112 ++++++++++++++++++++++++------------- dlls/wined3d/shader.c | 16 ++++- dlls/wined3d/wined3d_private.h | 7 ++- 5 files changed, 112 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74faebd68d738ef44cc59…

1 0

Stefan Dösinger : wined3d: Store the mipmap level in the volume.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: ac871305f8e646e0eacdae855396755e3a909637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac871305f8e646e0eacdae855… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:54 2013 +0200 wined3d: Store the mipmap level in the volume. --- dlls/d3d10core/device.c | 8 +++++--- dlls/d3d8/d3d8_private.h | 3 ++- dlls/d3d8/device.c | 6 +++--- dlls/d3d8/volume.c | 4 ++-- dlls/d3d9/d3d9_private.h | 3 ++- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/volume.c | 7 ++++--- dlls/ddraw/ddraw.c | 5 +++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/volume.c | 21 +++++++++++++-------- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 6 +++--- 12 files changed, 45 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac871305f8e646e0eacda…

1 0

Nikolay Sivov : oleaut32/tests: Some tests for LoadRegTypeLib() with activated context.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: 0473a072ddf5522b85eb46fc6d3279d58167a356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0473a072ddf5522b85eb46fc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 16:50:34 2013 +0400 oleaut32/tests: Some tests for LoadRegTypeLib() with activated context. --- dlls/oleaut32/tests/tmarshal.c | 8 +- dlls/oleaut32/tests/tmarshal.idl | 2 +- dlls/oleaut32/tests/typelib.c | 199 +++++++++++++++++++++++++++++++++++++- 3 files changed, 199 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0473a072ddf5522b85eb4…

1 0

Jacek Caban : mshtml: Added better IHTMLCurrentStyle2::get_hasLayout stub.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: b095b1f67e0d2f1729320e2b9d8e9c3d9bf0047c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b095b1f67e0d2f1729320e2b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 15:58:47 2013 +0200 mshtml: Added better IHTMLCurrentStyle2::get_hasLayout stub. --- dlls/mshtml/htmlcurstyle.c | 7 +++++-- dlls/mshtml/tests/style.c | 26 +++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index f773605..71d57a1 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -979,8 +979,11 @@ static HRESULT WINAPI HTMLCurrentStyle2_get_textUnderlinePosition(IHTMLCurrentSt static HRESULT WINAPI HTMLCurrentStyle2_get_hasLayout(IHTMLCurrentStyle2 *iface, VARIANT_BOOL *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p) returning true\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI HTMLCurrentStyle2_get_scrollbarBaseColor(IHTMLCurrentStyle2 *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 3e2ef89..a32991b 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -73,6 +73,17 @@ static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) return elem; } +#define get_current_style2_iface(u) _get_current_style2_iface(__LINE__,u) +static IHTMLCurrentStyle2 *_get_current_style2_iface(unsigned line, IUnknown *unk) +{ + IHTMLCurrentStyle2 *current_style2; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLCurrentStyle2, (void**)&current_style2); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); + return current_style2; +} + static IHTMLElement *get_element_by_id(IHTMLDocument2 *doc, const char *id) { HRESULT hres; @@ -2100,9 +2111,7 @@ static void test_style_filters(IHTMLElement *elem) hres = IHTMLElement2_get_currentStyle(elem2, &current_style); ok(hres == S_OK, "get_style failed: %08x\n", hres); - hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle2, (void**)&current_style2); - IHTMLCurrentStyle_Release(current_style); - ok(hres == S_OK, "Could not get IHTMLCurrentStyle2 iface: %08x\n", hres); + current_style2 = get_current_style2_iface((IUnknown*)current_style); test_style_filter(style, NULL); test_current_style_filter(current_style2, NULL); @@ -2131,6 +2140,8 @@ static void test_style_filters(IHTMLElement *elem) static void test_current_style(IHTMLCurrentStyle *current_style) { + IHTMLCurrentStyle2 *current_style2; + VARIANT_BOOL b; BSTR str; HRESULT hres; VARIANT v; @@ -2390,6 +2401,15 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + current_style2 = get_current_style2_iface((IUnknown*)current_style); + + b = 100; + hres = IHTMLCurrentStyle2_get_hasLayout(current_style2, &b); + ok(hres == S_OK, "get_hasLayout failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "hasLayout = %x\n", b); + + IHTMLCurrentStyle2_Release(current_style2); } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>";

1 0

Michael Stefaniuc : windowscodecs: Silence a warning due to an API change in libpng 1.5.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: 4a5bc1375ee446a9aec04cc3f39ee6ac2ee7f39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5bc1375ee446a9aec04cc3f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 22 14:35:34 2013 +0200 windowscodecs: Silence a warning due to an API change in libpng 1.5. --- dlls/windowscodecs/pngformat.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 065b5b8..b79d839 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -866,7 +866,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_charp name, profile; + png_charp name; + BYTE *profile; png_uint_32 len; int compression_type; HRESULT hr; @@ -877,11 +878,11 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i EnterCriticalSection(&This->lock); - if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, &profile, &len)) + if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, (void *)&profile, &len)) { if (cCount && ppIColorContexts) { - hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, (const BYTE *)profile, len); + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); if (FAILED(hr)) { LeaveCriticalSection(&This->lock);

1 0

Nikolay Sivov : oledb32: Report IRowPositionChange as supported sink type.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: 2139a402c74ad3e338fce343e621c65fc0365152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2139a402c74ad3e338fce343e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 14:23:21 2013 +0400 oledb32: Report IRowPositionChange as supported sink type. --- dlls/oledb32/rowpos.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 96a36a5..3461842 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -21,6 +21,7 @@ #include "windef.h" #include "ole2.h" +#include "olectl.h" #include "oledb.h" #include "oledberr.h" @@ -194,8 +195,20 @@ static HRESULT WINAPI cpc_EnumConnectionPoints(IConnectionPointContainer *iface, static HRESULT WINAPI cpc_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, IConnectionPoint **point) { rowpos *This = impl_from_IConnectionPointContainer(iface); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), point); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), point); + + if (IsEqualIID(riid, &IID_IRowPositionChange)) + { + *point = &This->cp.IConnectionPoint_iface; + IConnectionPoint_AddRef(*point); + return S_OK; + } + else + { + FIXME("unsupported riid %s\n", debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; + } } static const struct IConnectionPointContainerVtbl rowpos_cpc_vtbl =

1 0

Stefan Dösinger : wined3d: Move volume data uploading into a separate function.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: 518ac4c275b5fe3a83681e1dc7d9472412a111bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=518ac4c275b5fe3a83681e1dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:56 2013 +0200 wined3d: Move volume data uploading into a separate function. --- dlls/wined3d/volume.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a452e0b..14a5d5d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -91,15 +91,39 @@ static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, } /* Context activation is done by the caller. */ -void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) +static void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, + const struct wined3d_bo_address *data) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; - TRACE("volume %p, context %p, level %u, srgb %#x, format %s (%#x).\n", - volume, context, volume->texture_level, srgb_mode, debug_d3dformat(format->id), + TRACE("volume %p, context %p, level %u, format %s (%#x).\n", + volume, context, volume->texture_level, debug_d3dformat(format->id), format->id); + + if (data->buffer_object) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, data->buffer_object)); + checkGLcall("glBindBufferARB"); + } + + GL_EXTCALL(glTexSubImage3DEXT(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, + volume->resource.width, volume->resource.height, volume->resource.depth, + format->glFormat, format->glType, data->addr)); + checkGLcall("glTexSubImage3D"); + + if (data->buffer_object) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); + } +} + +/* Context activation is done by the caller. */ +void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) +{ + struct wined3d_bo_address data = {0, volume->resource.allocatedMemory}; volume_bind_and_dirtify(volume, context); if (!(volume->flags & WINED3D_VFLAG_ALLOCATED)) @@ -108,10 +132,7 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * volume->flags |= WINED3D_VFLAG_ALLOCATED; } - GL_EXTCALL(glTexSubImage3DEXT(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, - volume->resource.width, volume->resource.height, volume->resource.depth, - format->glFormat, format->glType, volume->resource.allocatedMemory)); - checkGLcall("glTexSubImage3D"); + wined3d_volume_upload_data(volume, context, &data); } /* Do not call while under the GL lock. */

1 0

Jacek Caban : mshtml/tests: Added IHTMLLabelElement::htmlFor property tests .
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: e5ba71ab7cb68fd193315128ca3ab9afa33fac9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ba71ab7cb68fd193315128c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 17:14:06 2013 +0200 mshtml/tests: Added IHTMLLabelElement::htmlFor property tests. --- dlls/mshtml/tests/dom.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7abd19b..f4d30579 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -935,6 +935,17 @@ static IHTMLButtonElement *_get_button_iface(unsigned line, IUnknown *unk) return ret; } +#define get_label_iface(u) _get_label_iface(__LINE__,u) +static IHTMLLabelElement *_get_label_iface(unsigned line, IUnknown *unk) +{ + IHTMLLabelElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLLabelElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLabelElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -5513,6 +5524,44 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLTableRow_Release(row); } +static void test_label_elem(IHTMLElement *elem) +{ + IHTMLLabelElement *label; + BSTR str; + HRESULT hres; + + label = get_label_iface((IUnknown*)elem); + + str = NULL; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, "in"), "htmlFor = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr(""); + hres = IHTMLLabelElement_put_htmlFor(label, str); + ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, ""), "htmlFor = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("abc"); + hres = IHTMLLabelElement_put_htmlFor(label, str); + ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, "abc"), "htmlFor = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLLabelElement_Release(label); +} + #define test_table_cell_spacing(a,b) _test_table_cell_spacing(__LINE__,a,b) static void _test_table_cell_spacing(unsigned line, IHTMLTable *table, const char *exstr) { @@ -6268,6 +6317,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "labelid"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_label_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) {

1 0

Stefan Dösinger : wined3d: Remove WINED3D_RESOURCE_ACCESS_SCRATCH.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: bcb651ca802f0c64949abb0d662f0bee5165cb2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb651ca802f0c64949abb0d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:58 2013 +0200 wined3d: Remove WINED3D_RESOURCE_ACCESS_SCRATCH. --- dlls/wined3d/resource.c | 4 +--- dlls/wined3d/wined3d_private.h | 3 --- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index eb1dcd0..59fced9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -53,12 +53,10 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool) case WINED3D_POOL_MANAGED: return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU; + case WINED3D_POOL_SCRATCH: case WINED3D_POOL_SYSTEM_MEM: return WINED3D_RESOURCE_ACCESS_CPU; - case WINED3D_POOL_SCRATCH: - return WINED3D_RESOURCE_ACCESS_SCRATCH; - default: FIXME("Unhandled pool %#x.\n", pool); return 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e19a61e..c9be67e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1917,9 +1917,6 @@ static inline void invalidate_active_texture(const struct wined3d_device *device #define WINED3D_RESOURCE_ACCESS_GPU 0x1 #define WINED3D_RESOURCE_ACCESS_CPU 0x2 -/* SCRATCH is mostly the same as CPU, but can't be used by the GPU at all, - * not even for resource uploads. */ -#define WINED3D_RESOURCE_ACCESS_SCRATCH 0x4 struct wined3d_resource_ops {

1 0

Stefan Dösinger : wined3d: Separate volume allocation and loading.
by Alexandre Julliard Aug. 22, 2013

Aug. 22, 2013

Module: wine Branch: master Commit: e08e2b2ade0eccd0a0e3db76eaeb071c4e61accb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08e2b2ade0eccd0a0e3db76e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:55 2013 +0200 wined3d: Separate volume allocation and loading. --- dlls/wined3d/volume.c | 30 ++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index d88282f..a452e0b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -78,7 +78,20 @@ void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture } /* Context activation is done by the caller. */ -void wined3d_volume_load(const struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) +static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, + const struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_format *format = volume->resource.format; + + GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, volume->texture_level, format->glInternal, + volume->resource.width, volume->resource.height, volume->resource.depth, + 0, format->glFormat, format->glType, NULL)); + checkGLcall("glTexImage3D"); +} + +/* Context activation is done by the caller. */ +void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; @@ -89,19 +102,28 @@ void wined3d_volume_load(const struct wined3d_volume *volume, struct wined3d_con volume_bind_and_dirtify(volume, context); - GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, volume->texture_level, format->glInternal, + if (!(volume->flags & WINED3D_VFLAG_ALLOCATED)) + { + wined3d_volume_allocate_texture(volume, context); + volume->flags |= WINED3D_VFLAG_ALLOCATED; + } + + GL_EXTCALL(glTexSubImage3DEXT(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, volume->resource.width, volume->resource.height, volume->resource.depth, - 0, format->glFormat, format->glType, volume->resource.allocatedMemory)); - checkGLcall("glTexImage3D"); + format->glFormat, format->glType, volume->resource.allocatedMemory)); + checkGLcall("glTexSubImage3D"); } /* Do not call while under the GL lock. */ static void volume_unload(struct wined3d_resource *resource) { + struct wined3d_volume *volume = volume_from_resource(resource); + TRACE("texture %p.\n", resource); /* The whole content is shadowed on This->resource.allocatedMemory, and * the texture name is managed by the VolumeTexture container. */ + volume->flags &= ~WINED3D_VFLAG_ALLOCATED; resource_unload(resource); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba7f03f..564ab67 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2051,6 +2051,7 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_LOCKED 0x00000001 +#define WINED3D_VFLAG_ALLOCATED 0x00000002 struct wined3d_volume { @@ -2070,7 +2071,7 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc } void volume_add_dirty_box(struct wined3d_volume *volume, const struct wined3d_box *dirty_box) DECLSPEC_HIDDEN; -void wined3d_volume_load(const struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; +void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; struct wined3d_surface_dib

1 0