January 2017 - Wine-commits

Józef Kucia : d3d9: Do not create render target view while surface refcount is equal to 0.
by Alexandre Julliard 06 Jan '17

06 Jan '17

Module: wine Branch: master Commit: e8360b8eaa802c8854cf357479f33b7e3d4b4dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8360b8eaa802c8854cf35747… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 6 10:33:54 2017 +0100 d3d9: Do not create render target view while surface refcount is equal to 0. This fixes a regression introduced by commit b005ad6f905dc0051b17ea45b3690e0662e48481. A render target view has to be created when a surface is referenced. Otherwise the render target view reference count would be inconsistent with the surface reference count. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 4 +++- dlls/d3d9/device.c | 18 ++++++++++++------ dlls/d3d9/surface.c | 15 ++++++++++++++- dlls/d3d9/tests/visual.c | 9 ++++----- 4 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 20c4c5c..fef0133 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -230,8 +230,10 @@ struct d3d9_surface struct d3d9_texture *texture; }; +struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) DECLSPEC_HIDDEN; -struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; +void d3d9_surface_release_rendertarget_view(struct d3d9_surface *surface, + struct wined3d_rendertarget_view *rtv) DECLSPEC_HIDDEN; void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d47c705..e6ddaf4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1421,6 +1421,7 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *surface_impl = unsafe_impl_from_IDirect3DSurface9(surface); struct wined3d_sub_resource_desc desc; + struct wined3d_rendertarget_view *rtv; HRESULT hr; TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, surface, rect, color); @@ -1453,9 +1454,10 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + rtv = d3d9_surface_acquire_rendertarget_view(surface_impl); hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, - d3d9_surface_get_rendertarget_view(surface_impl), rect, - WINED3DCLEAR_TARGET, &c, 0.0f, 0); + rtv, rect, WINED3DCLEAR_TARGET, &c, 0.0f, 0); + d3d9_surface_release_rendertarget_view(surface_impl, rtv); wined3d_mutex_unlock(); @@ -1511,6 +1513,7 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *surface_impl = unsafe_impl_from_IDirect3DSurface9(surface); + struct wined3d_rendertarget_view *rtv; HRESULT hr; TRACE("iface %p, idx %u, surface %p.\n", iface, idx, surface); @@ -1534,8 +1537,9 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO } wined3d_mutex_lock(); - hr = wined3d_device_set_rendertarget_view(device->wined3d_device, idx, - surface_impl ? d3d9_surface_get_rendertarget_view(surface_impl) : NULL, TRUE); + rtv = surface_impl ? d3d9_surface_acquire_rendertarget_view(surface_impl) : NULL; + hr = wined3d_device_set_rendertarget_view(device->wined3d_device, idx, rtv, TRUE); + d3d9_surface_release_rendertarget_view(surface_impl, rtv); wined3d_mutex_unlock(); return hr; @@ -1582,12 +1586,14 @@ static HRESULT WINAPI d3d9_device_SetDepthStencilSurface(IDirect3DDevice9Ex *ifa { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *ds_impl = unsafe_impl_from_IDirect3DSurface9(depth_stencil); + struct wined3d_rendertarget_view *rtv; TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); wined3d_mutex_lock(); - wined3d_device_set_depth_stencil_view(device->wined3d_device, - ds_impl ? d3d9_surface_get_rendertarget_view(ds_impl) : NULL); + rtv = ds_impl ? d3d9_surface_acquire_rendertarget_view(ds_impl) : NULL; + wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + d3d9_surface_release_rendertarget_view(ds_impl, rtv); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 12e0f39..2f8d447 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -396,10 +396,15 @@ struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) return impl_from_IDirect3DDevice9Ex(device); } -struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9_surface *surface) +struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface) { HRESULT hr; + /* The surface reference count can be equal to 0 when this function is + * called. In order to properly manage the render target view reference + * count, we temporarily increment the surface reference count. */ + d3d9_surface_AddRef(&surface->IDirect3DSurface9_iface); + if (surface->wined3d_rtv) return surface->wined3d_rtv; @@ -407,6 +412,7 @@ struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9 surface->sub_resource_idx, surface, &d3d9_view_wined3d_parent_ops, &surface->wined3d_rtv))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); + d3d9_surface_Release(&surface->IDirect3DSurface9_iface); return NULL; } @@ -416,6 +422,13 @@ struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9 return surface->wined3d_rtv; } +void d3d9_surface_release_rendertarget_view(struct d3d9_surface *surface, + struct wined3d_rendertarget_view *rtv) +{ + if (rtv) + d3d9_surface_Release(&surface->IDirect3DSurface9_iface); +} + struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) { if (!iface) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d23be17..43c0cbc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22223,7 +22223,6 @@ static void test_max_index16(void) DestroyWindow(window); } -/* This test exercises a regression in Wine d3d9 implementation. */ static void test_backbuffer_resize(void) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -22257,8 +22256,8 @@ static void test_backbuffer_resize(void) goto done; } - /* In order to exercise the regression the backbuffer surface has to be - * unreferenced when SetRenderTarget() is called. */ + /* Wine d3d9 implementation had a bug which was triggered by a + * SetRenderTarget() call with an unreferenced surface. */ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); refcount = IDirect3DSurface9_Release(backbuffer); @@ -22304,7 +22303,7 @@ static void test_backbuffer_resize(void) color = getPixelColor(device, 1, 1); ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 700, 500); - todo_wine ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -22315,7 +22314,7 @@ static void test_backbuffer_resize(void) color = getPixelColor(device, 1, 1); ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 700, 500); - todo_wine ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : d3d8: Do not create render target view while surface refcount is equal to 0.
by Alexandre Julliard 06 Jan '17

06 Jan '17

Module: wine Branch: master Commit: 62f43eeb0211da68249ff588d2c3bb1f0a5815c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f43eeb0211da68249ff588d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 6 10:33:55 2017 +0100 d3d8: Do not create render target view while surface refcount is equal to 0. This fixes a regression introduced by commit b005ad6f905dc0051b17ea45b3690e0662e48481. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 4 +++- dlls/d3d8/device.c | 13 +++++++------ dlls/d3d8/surface.c | 15 ++++++++++++++- dlls/d3d8/tests/visual.c | 9 ++++----- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index ffcd1cd..8177b5e 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -242,8 +242,10 @@ struct d3d8_surface struct d3d8_texture *texture; }; +struct wined3d_rendertarget_view *d3d8_surface_acquire_rendertarget_view(struct d3d8_surface *surface) DECLSPEC_HIDDEN; struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface) DECLSPEC_HIDDEN; -struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) DECLSPEC_HIDDEN; +void d3d8_surface_release_rendertarget_view(struct d3d8_surface *surface, + struct wined3d_rendertarget_view *rtv) DECLSPEC_HIDDEN; void surface_init(struct d3d8_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5a5871f..43b8e2b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1156,7 +1156,7 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_surface *rt_impl = unsafe_impl_from_IDirect3DSurface8(render_target); struct d3d8_surface *ds_impl = unsafe_impl_from_IDirect3DSurface8(depth_stencil); - struct wined3d_rendertarget_view *original_dsv; + struct wined3d_rendertarget_view *original_dsv, *rtv; HRESULT hr = D3D_OK; TRACE("iface %p, render_target %p, depth_stencil %p.\n", iface, render_target, depth_stencil); @@ -1178,7 +1178,6 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, /* If no render target is passed in check the size against the current RT */ if (!render_target) { - if (!(original_rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) { wined3d_mutex_unlock(); @@ -1210,11 +1209,13 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, } original_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device); - wined3d_device_set_depth_stencil_view(device->wined3d_device, - ds_impl ? d3d8_surface_get_rendertarget_view(ds_impl) : NULL); - if (render_target && FAILED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, - d3d8_surface_get_rendertarget_view(rt_impl), TRUE))) + rtv = ds_impl ? d3d8_surface_acquire_rendertarget_view(ds_impl) : NULL; + wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + d3d8_surface_release_rendertarget_view(ds_impl, rtv); + rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; + if (render_target && FAILED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + d3d8_surface_release_rendertarget_view(rt_impl, rtv); wined3d_mutex_unlock(); diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 137033e..81ddd8f 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -360,10 +360,15 @@ struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface) return impl_from_IDirect3DDevice8(device); } -struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) +struct wined3d_rendertarget_view *d3d8_surface_acquire_rendertarget_view(struct d3d8_surface *surface) { HRESULT hr; + /* The surface reference count can be equal to 0 when this function is + * called. In order to properly manage the render target view reference + * count, we temporarily increment the surface reference count. */ + d3d8_surface_AddRef(&surface->IDirect3DSurface8_iface); + if (surface->wined3d_rtv) return surface->wined3d_rtv; @@ -371,6 +376,7 @@ struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8 surface->sub_resource_idx, surface, &d3d8_view_wined3d_parent_ops, &surface->wined3d_rtv))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); + d3d8_surface_Release(&surface->IDirect3DSurface8_iface); return NULL; } @@ -380,6 +386,13 @@ struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8 return surface->wined3d_rtv; } +void d3d8_surface_release_rendertarget_view(struct d3d8_surface *surface, + struct wined3d_rendertarget_view *rtv) +{ + if (rtv) + d3d8_surface_Release(&surface->IDirect3DSurface8_iface); +} + struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) { if (!iface) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 0fb85d3..83b4b7e 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9684,7 +9684,6 @@ static void test_max_index16(void) DestroyWindow(window); } -/* This test exercises a regression in Wine d3d8 implementation. */ static void test_backbuffer_resize(void) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -9719,8 +9718,8 @@ static void test_backbuffer_resize(void) goto done; } - /* In order to exercise the regression the backbuffer surface has to be - * unreferenced when SetRenderTarget() is called. */ + /* Wine d3d8 implementation had a bug which was triggered by a + * SetRenderTarget() call with an unreferenced surface. */ hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); refcount = IDirect3DSurface8_Release(backbuffer); @@ -9766,7 +9765,7 @@ static void test_backbuffer_resize(void) color = getPixelColor(device, 1, 1); ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 700, 500); - todo_wine ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -9777,7 +9776,7 @@ static void test_backbuffer_resize(void) color = getPixelColor(device, 1, 1); ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 700, 500); - todo_wine ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Alistair Leslie-Hughes : include: Add LLONG_MIN, LLONG_MAX, ULLONG_MAX defines.
by Alexandre Julliard 06 Jan '17

06 Jan '17

Module: wine Branch: master Commit: b0bc08b345ac9145c4daf0a4823af8d039698f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0bc08b345ac9145c4daf0a48… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 6 07:15:00 2017 +0000 include: Add LLONG_MIN, LLONG_MAX, ULLONG_MAX defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/limits.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index 1eb1561..13bab86 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -30,6 +30,10 @@ #define LONG_MAX 0x7fffffffL #define ULONG_MAX 0xffffffffUL +#define LLONG_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) +#define LLONG_MIN (-LLONG_MAX-1) +#define ULLONG_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) + #define _I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define _I64_MIN (-_I64_MAX-1) #define _UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff)

1 0

Olivier F. R. Dierick : xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition.
by Alexandre Julliard 06 Jan '17

06 Jan '17

Module: wine Branch: master Commit: 1640c9ce623ba00e52c197a31650d4dfa9d7bde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1640c9ce623ba00e52c197a31… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Fri Jan 6 18:17:55 2017 +0100 xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition. Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 5f88ca1..6c559de 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -50,7 +50,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return TRUE; } -void WINAPI XInputEnable(BOOL enable) +void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) { /* Setting to false will stop messages from XInputSetState being sent to the controllers. Setting to true will send the last vibration

1 0

Alexandre Julliard : Release 2.0-rc4.
by Alexandre Julliard 06 Jan '17

06 Jan '17

Module: wine Branch: master Commit: 1576dc3dd26c7bbb2ed8eb68f11799f1f1d8b6a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1576dc3dd26c7bbb2ed8eb68f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 20:52:23 2017 +0100 Release 2.0-rc4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 189 +++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +++--- 3 files changed, 110 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1576dc3dd26c7bbb2ed8e…

1 0

Tag wine-2.0-rc4 : Alexandre Julliard : Release 2.0-rc4
by Alexandre Julliard 06 Jan '17

06 Jan '17

Module: wine Branch: refs/tags/wine-2.0-rc4 Tag: 6c3c47f982bccfe3391e063359e202fd352bda04 URL: http://source.winehq.org/git/wine.git/?a=tag;h=6c3c47f982bccfe3391e063359e2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 20:52:23 2017 +0100 Release 2.0-rc4

1 0

Józef Kucia : d3d9/tests: Do not assume surface size and format in get_rt_readback().
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: c6795afcddb8dc6f0e310a242525b6dbd649bd88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6795afcddb8dc6f0e310a242… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:50 2017 +0100 d3d9/tests: Do not assume surface size and format in get_rt_readback(). Signed-off-by: Józef Kucia <jkucia(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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b1916c4..4d65649 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -129,12 +129,16 @@ struct surface_readback static void get_rt_readback(IDirect3DSurface9 *surface, struct surface_readback *rb) { IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; HRESULT hr; memset(rb, 0, sizeof(*rb)); - IDirect3DSurface9_GetDevice(surface, &device); - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 640, 480, - D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); + hr = IDirect3DSurface9_GetDevice(surface, &device); + ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + desc.Format, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); if (FAILED(hr) || !rb->surface) { trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr);

1 0

Józef Kucia : d3d9/tests: Add test for stale render target views regression.
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: a7918817d408eaacea8e5810d170e3f8e9f6cfab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7918817d408eaacea8e5810d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:51 2017 +0100 d3d9/tests: Add test for stale render target views regression. This test exercises a regression introduced by commit b005ad6f905dc0051b17ea45b3690e0662e48481. Signed-off-by: Józef Kucia <jkucia(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 | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4d65649..d23be17 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22223,6 +22223,107 @@ static void test_max_index16(void) DestroyWindow(window); } +/* This test exercises a regression in Wine d3d9 implementation. */ +static void test_backbuffer_resize(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DSurface9 *backbuffer; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + goto done; + } + + /* In order to exercise the regression the backbuffer surface has to be + * unreferenced when SetRenderTarget() is called. */ + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + refcount = IDirect3DSurface9_Release(backbuffer); + ok(!refcount, "Surface has %u references left.\n", refcount); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + present_parameters.BackBufferWidth = 800; + present_parameters.BackBufferHeight = 600; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = NULL; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3DDevice9_Reset(device, &present_parameters); + ok(SUCCEEDED(hr), "Failed to reset, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + IDirect3DSurface9_Release(backbuffer); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 700, 500); + todo_wine ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 700, 500); + todo_wine ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22350,4 +22451,5 @@ START_TEST(visual) test_dsy(); test_evict_bound_resources(); test_max_index16(); + test_backbuffer_resize(); }

1 0

Józef Kucia : d3d8/tests: Do not assume surface size and format in get_rt_readback().
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: 73cb1b01d51667cf8767c3df5266c2ba0dfb658c URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cb1b01d51667cf8767c3df5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:52 2017 +0100 d3d8/tests: Do not assume surface size and format in get_rt_readback(). Signed-off-by: Józef Kucia <jkucia(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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index bf7058c..fa3d4f3 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -65,13 +65,17 @@ struct surface_readback static void get_rt_readback(IDirect3DSurface8 *surface, struct surface_readback *rb) { - IDirect3DDevice8 *device; IDirect3DTexture8 *tex = NULL; + IDirect3DDevice8 *device; + D3DSURFACE_DESC desc; HRESULT hr; memset(rb, 0, sizeof(*rb)); - IDirect3DSurface8_GetDevice(surface, &device); - hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &tex); + hr = IDirect3DSurface8_GetDevice(surface, &device); + ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, desc.Width, desc.Height, 1, 0, desc.Format, D3DPOOL_SYSTEMMEM, &tex); if (FAILED(hr) || !tex) { trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr);

1 0

Józef Kucia : d3d8/tests: Add test for stale render target views regression.
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: 6b1fe5f6d2641ae391ebd9a1d3f82e2fa1b21c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1fe5f6d2641ae391ebd9a1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:53 2017 +0100 d3d8/tests: Add test for stale render target views regression. This test exercises a regression introduced by commit b005ad6f905dc0051b17ea45b3690e0662e48481. Signed-off-by: Józef Kucia <jkucia(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 | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index fa3d4f3..0fb85d3 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9684,6 +9684,108 @@ static void test_max_index16(void) DestroyWindow(window); } +/* This test exercises a regression in Wine d3d8 implementation. */ +static void test_backbuffer_resize(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DSurface8 *backbuffer; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + goto done; + } + + /* In order to exercise the regression the backbuffer surface has to be + * unreferenced when SetRenderTarget() is called. */ + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + refcount = IDirect3DSurface8_Release(backbuffer); + ok(!refcount, "Surface has %u references left.\n", refcount); + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + present_parameters.BackBufferWidth = 800; + present_parameters.BackBufferHeight = 600; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = NULL; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3DDevice8_Reset(device, &present_parameters); + ok(SUCCEEDED(hr), "Failed to reset, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + IDirect3DSurface8_Release(backbuffer); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 700, 500); + todo_wine ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 700, 500); + todo_wine ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9753,4 +9855,5 @@ START_TEST(visual) test_color_clamping(); test_edge_antialiasing_blending(); test_max_index16(); + test_backbuffer_resize(); }

1 0