October 2015 - Wine-Commits

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

Oct. 13, 2015

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

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

Oct. 13, 2015

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 : d3drm: Avoid HRESULT codes for BOOL retval methods ( PVS-Studio).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

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 : amstream/tests: Correct sizeof expression to actually get array size (PVS-Studio).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

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 : dwrite: Avoid HRESULT codes for BOOL retval methods ( PVS-Studio).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

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

Matteo Bruni : d3d8/tests: Add helpers to avoid multiple readbacks of the render target surface.
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 5cbf749eec5361febdadfa47f1bbac54eccbf6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbf749eec5361febdadfa47f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 12 23:17:06 2015 +0200 d3d8/tests: Add helpers to avoid multiple readbacks of the render target surface. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 113 ++++++++++++++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 41 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 318d3ca..772fd96 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -52,65 +52,96 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } -static DWORD getPixelColor(IDirect3DDevice8 *device, UINT x, UINT y) +struct surface_readback { - DWORD ret; + IDirect3DSurface8 *surface; + D3DLOCKED_RECT locked_rect; +}; + +static void get_rt_readback(IDirect3DSurface8 *surface, struct surface_readback *rb) +{ + IDirect3DDevice8 *device; IDirect3DTexture8 *tex = NULL; - IDirect3DSurface8 *surf = NULL, *backbuf = NULL; HRESULT hr; - D3DLOCKED_RECT lockedRect; - RECT rectToLock = {x, y, x+1, y+1}; - hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1 /* Levels */, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &tex); - if(FAILED(hr) || !tex ) /* This is not a test */ + memset(rb, 0, sizeof(*rb)); + IDirect3DSurface8_GetDevice(surface, &device); + hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &tex); + if (FAILED(hr) || !tex) { - trace("Can't create an offscreen plain surface to read the render target data, hr=%#08x\n", hr); - return 0xdeadbeef; + trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr); + goto error; } - hr = IDirect3DTexture8_GetSurfaceLevel(tex, 0, &surf); - if (FAILED(hr)) /* This is not a test */ + hr = IDirect3DTexture8_GetSurfaceLevel(tex, 0, &rb->surface); + if (FAILED(hr)) { - trace("Can't get surface from texture, hr=%#08x\n", hr); - ret = 0xdeadbeee; - goto out; + trace("Can't get surface from texture, hr %#x.\n", hr); + goto error; } - - hr = IDirect3DDevice8_GetRenderTarget(device, &backbuf); - if(FAILED(hr)) + hr = IDirect3DDevice8_CopyRects(device, surface, NULL, 0, rb->surface, NULL); + if (FAILED(hr)) { - trace("Can't get the render target, hr=%#08x\n", hr); - ret = 0xdeadbeed; - goto out; + trace("Can't read the render target, hr %#x.\n", hr); + goto error; } - hr = IDirect3DDevice8_CopyRects(device, backbuf, NULL, 0, surf, NULL); - if(FAILED(hr)) + hr = IDirect3DSurface8_LockRect(rb->surface, &rb->locked_rect, NULL, D3DLOCK_READONLY); + if (FAILED(hr)) { - trace("Can't read the render target, hr=%#08x\n", hr); - ret = 0xdeadbeec; - goto out; + trace("Can't lock the offscreen surface, hr %#x.\n", hr); + goto error; } + IDirect3DTexture8_Release(tex); + IDirect3DDevice8_Release(device); + return; + +error: + if (rb->surface) + IDirect3DSurface8_Release(rb->surface); + rb->surface = NULL; + if (tex) + IDirect3DTexture8_Release(tex); + IDirect3DDevice8_Release(device); +} + +static DWORD get_readback_color(struct surface_readback *rb, unsigned int x, unsigned int y) +{ + return rb->locked_rect.pBits + ? ((DWORD *)rb->locked_rect.pBits)[y * rb->locked_rect.Pitch / sizeof(DWORD) + x] : 0xdeadbeef; +} - hr = IDirect3DSurface8_LockRect(surf, &lockedRect, &rectToLock, D3DLOCK_READONLY); - if(FAILED(hr)) +static void release_surface_readback(struct surface_readback *rb) +{ + HRESULT hr; + + if (!rb->surface) + return; + if (rb->locked_rect.pBits && FAILED(hr = IDirect3DSurface8_UnlockRect(rb->surface))) + trace("Can't unlock the offscreen surface, hr %#x.\n", hr); + IDirect3DSurface8_Release(rb->surface); +} + +static DWORD getPixelColor(IDirect3DDevice8 *device, UINT x, UINT y) +{ + DWORD ret; + IDirect3DSurface8 *rt; + struct surface_readback rb; + HRESULT hr; + + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + if (FAILED(hr)) { - trace("Can't lock the offscreen surface, hr=%#08x\n", hr); - ret = 0xdeadbeeb; - goto out; + trace("Can't get the render target, hr %#x.\n", hr); + return 0xdeadbeef; } + + get_rt_readback(rt, &rb); /* Remove the X channel for now. DirectX and OpenGL have different ideas how to treat it apparently, and it isn't * really important for these tests */ - ret = ((DWORD *) lockedRect.pBits)[0] & 0x00ffffff; - hr = IDirect3DSurface8_UnlockRect(surf); - if(FAILED(hr)) - { - trace("Can't unlock the offscreen surface, hr=%#08x\n", hr); - } + ret = get_readback_color(&rb, x, y) & 0x00ffffff; + release_surface_readback(&rb); -out: - if(backbuf) IDirect3DSurface8_Release(backbuf); - if(surf) IDirect3DSurface8_Release(surf); - if(tex) IDirect3DTexture8_Release(tex); + IDirect3DSurface8_Release(rt); return ret; } @@ -6692,7 +6723,7 @@ static void test_updatetexture(void) color = getPixelColor(device, 320, 240); ok (color_match(color, 0x007f7f00, 2) || broken(tests[i].broken) - || broken(color == 0xdeadbeec), /* WARP device often just breaks down. */ + || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); }

1 0

Matteo Bruni : d3d9/tests: Uninitialized varyings tests.
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: f63386f43e72494dd3f70ca71a906651045e5665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63386f43e72494dd3f70ca71… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 12 23:17:05 2015 +0200 d3d9/tests: Uninitialized varyings tests. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 302 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 302 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63386f43e72494dd3f70…

1 0

Nikolay Sivov : msvcirt: Use proper printf format for pointers (PVS-Studio ).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 472f4acb06a35fc2985500deef3ee2c604a6d9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=472f4acb06a35fc2985500dee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 21:44:50 2015 +0300 msvcirt: Use proper printf format for pointers (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f590d0e..09f488a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -825,8 +825,8 @@ void __thiscall streambuf_dbp(streambuf *this) } else { printf("_fAlloc=%d\n", this->allocated); printf(" base()=%p, ebuf()=%p, blen()=%d\n", this->base, this->ebuf, streambuf_blen(this)); - printf("pbase()=%p, pptr()=%p, epptr()=%d\n", this->pbase, this->pptr, this->epptr); - printf("eback()=%p, gptr()=%p, egptr()=%d\n", this->eback, this->gptr, this->egptr); + printf("pbase()=%p, pptr()=%p, epptr()=%p\n", this->pbase, this->pptr, this->epptr); + printf("eback()=%p, gptr()=%p, egptr()=%p\n", this->eback, this->gptr, this->egptr); } }

1 0

André Hentschel : dbghelp: Initialize more basic types.
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

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

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

Oct. 13, 2015

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