October 2015 - Wine-commits

Nikolay Sivov : msvcrt/tests: Use matching type to get array element count (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: d8623f82419327583a917a6769102854cc32da5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8623f82419327583a917a676… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 22:07:19 2015 +0300 msvcrt/tests: Use matching type to get array element count (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7733a7c..4144d17 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1108,7 +1108,7 @@ static void test__wcslwr_s(void) /* Test NULL input string and valid size. */ errno = EBADF; - ret = p_wcslwr_s(NULL, sizeof(buffer)/sizeof(wchar_t)); + ret = p_wcslwr_s(NULL, sizeof(buffer)/sizeof(buffer[0])); ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); ok(errno == EINVAL, "expected errno EINVAL, got %d\n", errno);

1 0

Nikolay Sivov : amstream/tests: Correct sizeof expression to actually get array size (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: b752d3d44b05fd6d02b03d73ef488bf85b08c3bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b752d3d44b05fd6d02b03d73e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 22:15:56 2015 +0300 amstream/tests: Correct sizeof expression to actually get array size (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 909a738..1fcffea 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -425,9 +425,9 @@ static void test_media_streams(void) ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); - hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(AM_MEDIA_TYPE), media_types, &nb_media_types); + hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(media_types[0]), media_types, &nb_media_types); ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); - ok(nb_media_types == 0, "nb_media_types should be 0 instead of %u\n", nb_media_types); + ok(nb_media_types > 0, "nb_media_types should be >0\n"); IEnumMediaTypes_Release(enum_media_types); IPin_Release(pins[i]); }

1 0

Nikolay Sivov : d3drm: Avoid HRESULT codes for BOOL retval methods ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: f6689b6ce2ca5268b9c58ae2ea6b4e201ab05589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6689b6ce2ca5268b9c58ae2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 22:25:28 2015 +0300 d3drm: Avoid HRESULT codes for BOOL retval methods (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 4f9d952..f20040b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1073,7 +1073,7 @@ static BOOL WINAPI d3drm_frame2_GetBoxEnable(IDirect3DRMFrame2 *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI d3drm_frame2_GetAxes(IDirect3DRMFrame2 *iface, D3DVECTOR *dir, D3DVECTOR *up) @@ -1094,7 +1094,7 @@ static BOOL WINAPI d3drm_frame2_GetInheritAxes(IDirect3DRMFrame2 *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI d3drm_frame2_GetHierarchyBox(IDirect3DRMFrame2 *iface, D3DRMBOX *box) @@ -2014,7 +2014,7 @@ static BOOL WINAPI d3drm_frame3_GetBoxEnable(IDirect3DRMFrame3 *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI d3drm_frame3_GetAxes(IDirect3DRMFrame3 *iface, D3DVECTOR *dir, D3DVECTOR *up) @@ -2035,7 +2035,7 @@ static BOOL WINAPI d3drm_frame3_GetInheritAxes(IDirect3DRMFrame3 *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI d3drm_frame3_GetHierarchyBox(IDirect3DRMFrame3 *iface, D3DRMBOX *box)

1 0

Nikolay Sivov : d3drm: Avoid HRESULT codes for BOOL retval methods ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 175e68fe053fa7c74c8cf8b35ed1de49f13af6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175e68fe053fa7c74c8cf8b35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 22:25:29 2015 +0300 d3drm: Avoid HRESULT codes for BOOL retval methods (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/viewport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 498b764..58de085 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -307,7 +307,7 @@ static BOOL WINAPI d3drm_viewport1_GetUniformScaling(IDirect3DRMViewport *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static LONG WINAPI d3drm_viewport1_GetX(IDirect3DRMViewport *iface) @@ -672,7 +672,7 @@ static BOOL WINAPI d3drm_viewport2_GetUniformScaling(IDirect3DRMViewport2 *iface { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static LONG WINAPI d3drm_viewport2_GetX(IDirect3DRMViewport2 *iface)

1 0

Nikolay Sivov : dwrite: Avoid HRESULT codes for BOOL retval methods ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 4b6a7e78e989e676560bea0d93d5d69cbef5c34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6a7e78e989e676560bea0d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 22:30:51 2015 +0300 dwrite: Avoid HRESULT codes for BOOL retval methods (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e98dc15..bb01ccf 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1250,7 +1250,7 @@ static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont2 *iface) hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) - return hr; + return FALSE; return IDWriteFontFace2_IsSymbolFont(fontface); } @@ -1401,7 +1401,7 @@ static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) - return hr; + return FALSE; return IDWriteFontFace2_IsMonospacedFont(fontface); }

1 0

Nikolay Sivov : dwrite: Return strictly 0/1 for BOOL return type ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 83d484834d045388b16cc2652ea37d07f654c765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d484834d045388b16cc2652… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 23:06:32 2015 +0300 dwrite: Return strictly 0/1 for BOOL return type (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index cfae1af..87ccc7c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -641,7 +641,7 @@ INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol) if (os2->version == 0) *is_symbol = pFT_Get_First_Char(face, &dummy) >= 0x100; else - *is_symbol = os2->ulCodePageRange1 & FS_SYMBOL; + *is_symbol = !!(os2->ulCodePageRange1 & FS_SYMBOL); } for (i = 0; i < face->num_charmaps; i++)

1 0

André Hentschel : dbghelp: Initialize more basic types.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: ee88d4ed99e81e3e3cb5c86a4fab3fb0029b9040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee88d4ed99e81e3e3cb5c86a4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 12 22:40:45 2015 +0200 dbghelp: Initialize more basic types. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1554414..b9aebe1 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -228,6 +228,31 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_64PINT8] = &symt_new_pointer(module, cv_basic_types[T_INT8], 8)->symt; cv_basic_types[T_64PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8], 8)->symt; cv_basic_types[T_64PHRESULT]= &symt_new_pointer(module, cv_basic_types[T_HRESULT], 8)->symt; + + cv_basic_types[T_PVOID] = &symt_new_pointer(module, cv_basic_types[T_VOID], sizeof(void*))->symt; + cv_basic_types[T_PCHAR] = &symt_new_pointer(module, cv_basic_types[T_CHAR], sizeof(void*))->symt; + cv_basic_types[T_PSHORT] = &symt_new_pointer(module, cv_basic_types[T_SHORT], sizeof(void*))->symt; + cv_basic_types[T_PLONG] = &symt_new_pointer(module, cv_basic_types[T_LONG], sizeof(void*))->symt; + cv_basic_types[T_PQUAD] = &symt_new_pointer(module, cv_basic_types[T_QUAD], sizeof(void*))->symt; + cv_basic_types[T_PUCHAR] = &symt_new_pointer(module, cv_basic_types[T_UCHAR], sizeof(void*))->symt; + cv_basic_types[T_PUSHORT] = &symt_new_pointer(module, cv_basic_types[T_USHORT], sizeof(void*))->symt; + cv_basic_types[T_PULONG] = &symt_new_pointer(module, cv_basic_types[T_ULONG], sizeof(void*))->symt; + cv_basic_types[T_PUQUAD] = &symt_new_pointer(module, cv_basic_types[T_UQUAD], sizeof(void*))->symt; + cv_basic_types[T_PBOOL08] = &symt_new_pointer(module, cv_basic_types[T_BOOL08], sizeof(void*))->symt; + cv_basic_types[T_PBOOL16] = &symt_new_pointer(module, cv_basic_types[T_BOOL16], sizeof(void*))->symt; + cv_basic_types[T_PBOOL32] = &symt_new_pointer(module, cv_basic_types[T_BOOL32], sizeof(void*))->symt; + cv_basic_types[T_PBOOL64] = &symt_new_pointer(module, cv_basic_types[T_BOOL64], sizeof(void*))->symt; + cv_basic_types[T_PREAL32] = &symt_new_pointer(module, cv_basic_types[T_REAL32], sizeof(void*))->symt; + cv_basic_types[T_PREAL64] = &symt_new_pointer(module, cv_basic_types[T_REAL64], sizeof(void*))->symt; + cv_basic_types[T_PREAL80] = &symt_new_pointer(module, cv_basic_types[T_REAL80], sizeof(void*))->symt; + cv_basic_types[T_PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], sizeof(void*))->symt; + cv_basic_types[T_PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], sizeof(void*))->symt; + cv_basic_types[T_PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], sizeof(void*))->symt; + cv_basic_types[T_PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], sizeof(void*))->symt; + cv_basic_types[T_PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], sizeof(void*))->symt; + cv_basic_types[T_PUINT4] = &symt_new_pointer(module, cv_basic_types[T_UINT4], sizeof(void*))->symt; + cv_basic_types[T_PINT8] = &symt_new_pointer(module, cv_basic_types[T_INT8], sizeof(void*))->symt; + cv_basic_types[T_PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8], sizeof(void*))->symt; } static int leaf_as_variant(VARIANT* v, const unsigned short int* leaf)

1 0

Riccardo Bortolato : d3d8: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in device.c.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: a996804a0d057fa842df17e57fa7568f2905e490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a996804a0d057fa842df17e57… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 17:23:32 2015 +0200 d3d8: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in device.c. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 51aae17..0648f51 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1058,7 +1058,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, * destination texture is in WINED3D_POOL_DEFAULT. */ wined3d_mutex_lock(); - wined3d_resource = wined3d_surface_get_resource(src->wined3d_surface); + wined3d_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { @@ -1070,7 +1070,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, src_w = wined3d_desc.width; src_h = wined3d_desc.height; - wined3d_resource = wined3d_surface_get_resource(dst->wined3d_surface); + wined3d_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { @@ -1202,13 +1202,13 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, return D3DERR_NOTFOUND; } original_surface = wined3d_rendertarget_view_get_sub_resource_parent(original_rtv); - wined3d_resource = wined3d_surface_get_resource(original_surface->wined3d_surface); + wined3d_resource = wined3d_texture_get_sub_resource(original_surface->wined3d_texture, original_surface->sub_resource_idx); } else - wined3d_resource = wined3d_surface_get_resource(rt_impl->wined3d_surface); + wined3d_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, rt_impl->sub_resource_idx); wined3d_resource_get_desc(wined3d_resource, &rt_desc); - wined3d_resource = wined3d_surface_get_resource(ds_impl->wined3d_surface); + wined3d_resource = wined3d_texture_get_sub_resource(ds_impl->wined3d_texture, ds_impl->sub_resource_idx); wined3d_resource_get_desc(wined3d_resource, &ds_desc); if (ds_desc.width < rt_desc.width || ds_desc.height < rt_desc.height)

1 0

Riccardo Bortolato : d3d8: Replace surface refcounting with parent texture refcounting.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 2a51e695a1cb95f8a8a43248d7d9155e40fd7f0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a51e695a1cb95f8a8a43248d… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 17:23:36 2015 +0200 d3d8: Replace surface refcounting with parent texture refcounting. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 165e048..cce8b87 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -70,7 +70,7 @@ static ULONG WINAPI d3d8_surface_AddRef(IDirect3DSurface8 *iface) wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_incref(surface->wined3d_rtv); - wined3d_surface_incref(surface->wined3d_surface); + wined3d_texture_incref(surface->wined3d_texture); wined3d_mutex_unlock(); } @@ -100,7 +100,7 @@ static ULONG WINAPI d3d8_surface_Release(IDirect3DSurface8 *iface) wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); - wined3d_surface_decref(surface->wined3d_surface); + wined3d_texture_decref(surface->wined3d_texture); wined3d_mutex_unlock(); if (parent_device)

1 0

Stefan Dösinger : wined3d: Pass a context to surface_load_sysmem.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: a385c9ea3ead9438f591c3777a6ff6a21abdfc42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a385c9ea3ead9438f591c3777… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 12 22:34:38 2015 +0200 wined3d: Pass a context to surface_load_sysmem. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 061da54..c911d35 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3797,9 +3797,12 @@ static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD memcpy(dst.addr, src.addr, size); } +/* Context activation is done by the caller. */ static void surface_load_sysmem(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, DWORD dst_location) + struct wined3d_context *context, DWORD dst_location) { + const struct wined3d_gl_info *gl_info = context->gl_info; + if (surface->locations & surface_simple_locations) { surface_copy_simple_location(surface, dst_location); @@ -3812,18 +3815,10 @@ static void surface_load_sysmem(struct wined3d_surface *surface, /* Download the surface to system memory. */ if (surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { - struct wined3d_device *device = surface->resource.device; - struct wined3d_context *context; - - /* TODO: Use already acquired context when possible. */ - context = context_acquire(device, NULL); - wined3d_texture_bind_and_dirtify(surface->container, context, !(surface->locations & WINED3D_LOCATION_TEXTURE_RGB)); surface_download_data(surface, gl_info, dst_location); - context_release(context); - return; } @@ -4046,6 +4041,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; HRESULT hr; + struct wined3d_context *context = NULL; TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); @@ -4054,7 +4050,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) if (location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) { - struct wined3d_context *context = context_acquire(device, NULL); + context = context_acquire(device, NULL); surface_load_ds_location(surface, context, location); context_release(context); return WINED3D_OK; @@ -4100,7 +4096,11 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: - surface_load_sysmem(surface, gl_info, location); + if (device->d3d_initialized) + context = context_acquire(device, NULL); + surface_load_sysmem(surface, context, location); + if (context) + context_release(context); break; case WINED3D_LOCATION_DRAWABLE:

1 0