January 2017 - Wine-commits

André Hentschel : hlink/tests: Test skipped data.
by Alexandre Julliard 04 Jan '17

04 Jan '17

Module: wine Branch: master Commit: b5ad6a44801e39eb7e0b4a6056d93b68de68c8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ad6a44801e39eb7e0b4a605… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 4 16:49:43 2017 +0100 hlink/tests: Test skipped data. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 42fe6cb..22cfd10 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -404,7 +404,10 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, (expected_data_alt == expected_hlink_data2_ie7 && i == 109) /* Win10 */ || (expected_data_alt == expected_hlink_data3_ie7 && i == 109) /* Win10 */ || (expected_data_alt == expected_hlink_data5_ie7 && i == 107) /* Win10 */) + { + ok(data[i] == 0 || broken(data[i] == 1), "Expected 0 or 1, got %d", data[i]); continue; + } if ((expected_data_alt[i] != data[i]) && (((expected_data_alt != expected_hlink_data2) && (expected_data_alt != expected_hlink_data3)) ||

1 0

Julian Rüger : German translation for release 1.8.6
by Jeremy Newman 04 Jan '17

04 Jan '17

Module: website Branch: master Commit: 664afa3b686dc2751327bbc9ddcb23aaf473db9f URL: http://source.winehq.org/git/website.git/?a=commit;h=664afa3b686dc2751327bb… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 4 09:17:40 2017 +0100 German translation for release 1.8.6 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016121901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2016121901.xml b/news/de/2016121901.xml new file mode 100644 index 0000000..2a7b625 --- /dev/null +++ b/news/de/2016121901.xml @@ -0,0 +1,14 @@ +<news> +<date>19. Dezember 2016</date> +<title>Wine 1.8.6 freigegeben</title> +<body> + Die Wartungsversion 1.8.6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8.6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Korrektur einer Regression, die versehentlich in 1.8.5 eingeführt wurde. (#41627)</li> + <li>Diverse Fehlerkorrekturen.</li> + <li>Eine kleine Anzahl neuer Grafikkarten in der GPU-Beschreibungstabelle.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.6.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.0-rc2
by Jeremy Newman 04 Jan '17

04 Jan '17

Module: website Branch: master Commit: b18cdde55c4956ea1cf7f2e475aad4a0b1228329 URL: http://source.winehq.org/git/website.git/?a=commit;h=b18cdde55c4956ea1cf7f2… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 4 09:14:30 2017 +0100 German translation for release 2.0-rc2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016121601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2016121601.xml b/news/de/2016121601.xml new file mode 100644 index 0000000..4304b0a --- /dev/null +++ b/news/de/2016121601.xml @@ -0,0 +1,12 @@ +<news> +<date>16. Dezember 2016</date> +<title>Wine 2.0-rc2 freigegeben</title> +<body> + Die Entwicklungsversion 2.0-rc2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0-rc2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.0-rc3
by Jeremy Newman 04 Jan '17

04 Jan '17

Module: website Branch: master Commit: 4719238109237fdef2089511b34ac29be6faa415 URL: http://source.winehq.org/git/website.git/?a=commit;h=4719238109237fdef20895… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 4 09:18:31 2017 +0100 German translation for release 2.0-rc3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016122301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2016122301.xml b/news/de/2016122301.xml new file mode 100644 index 0000000..be64390 --- /dev/null +++ b/news/de/2016122301.xml @@ -0,0 +1,12 @@ +<news> +<date>23. Dezember 2016</date> +<title>Wine 2.0-rc3 freigegeben</title> +<body> + Die Entwicklungsversion 2.0-rc3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0-rc3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Józef Kucia : d3d11/tests: Add test for render target device mismatch.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: 9047fdff8596ebfdc7350c9cdf20552aa6d48454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9047fdff8596ebfdc7350c9cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:28 2017 +0100 d3d11/tests: Add test for render target device mismatch. 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/d3d11/tests/d3d11.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1957ad3..ac4393d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12664,6 +12664,40 @@ static void test_sm5_bufinfo_instruction(void) release_test_context(&test_context); } +static void test_render_target_device_mismatch(void) +{ + struct d3d11_test_context test_context; + struct device_desc device_desc = {0}; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Device *device; + ULONG refcount; + + if (!init_test_context(&test_context, NULL)) + return; + + device = create_device(&device_desc); + ok(!!device, "Failed to create device.\n"); + + ID3D11Device_GetImmediateContext(device, &context); + + rtv = (ID3D11RenderTargetView *)0xdeadbeef; + ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); + ok(!rtv, "Got unexpected render target view %p.\n", rtv); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); + ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D11RenderTargetView_Release(rtv); + + rtv = NULL; + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -12732,4 +12766,5 @@ START_TEST(d3d11) test_sm4_ret_instruction(); test_primitive_restart(); test_sm5_bufinfo_instruction(); + test_render_target_device_mismatch(); }

1 0

Józef Kucia : d3d10core/tests: Add test for render target device mismatch.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: 6c490d14689f0544db2b06a4d688c88c422f0864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c490d14689f0544db2b06a4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:29 2017 +0100 d3d10core/tests: Add test for render target device mismatch. 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/d3d10core/tests/device.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e3d170a..0b38265 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -10223,6 +10223,35 @@ static void test_primitive_restart(void) release_test_context(&test_context); } +static void test_render_target_device_mismatch(void) +{ + struct d3d10core_test_context test_context; + ID3D10RenderTargetView *rtv; + ID3D10Device *device; + ULONG refcount; + + if (!init_test_context(&test_context)) + return; + + device = create_device(); + ok(!!device, "Failed to create device.\n"); + + rtv = (ID3D10RenderTargetView *)0xdeadbeef; + ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); + ok(!rtv, "Got unexpected render target view %p.\n", rtv); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D10RenderTargetView_Release(rtv); + + rtv = NULL; + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -10281,4 +10310,5 @@ START_TEST(device) test_stencil_separate(); test_sm4_ret_instruction(); test_primitive_restart(); + test_render_target_device_mismatch(); }

1 0

Józef Kucia : d3d9/tests: Add test for render target device mismatch.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: 6e6b377c228e377f74fa4d0a57254ed0bb69b7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6b377c228e377f74fa4d0a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:30 2017 +0100 d3d9/tests: Add test for render target device mismatch. 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/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7513df6..fbae9d6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11343,6 +11343,64 @@ static void test_get_render_target_data(void) DestroyWindow(window); } +static void test_render_target_device_mismatch(void) +{ + IDirect3DDevice9 *device, *device2; + IDirect3DSurface9 *surface, *rt; + IDirect3D9 *d3d; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + device2 = create_device(d3d, window, NULL); + ok(!!device2, "Failed to create a D3D device.\n"); + + hr = IDirect3DDevice9_CreateRenderTarget(device2, 640, 480, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_GetRenderTarget(device2, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + todo_wine ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); + IDirect3DSurface9_Release(surface); + IDirect3DSurface9_Release(rt); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3DDevice9_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11459,6 +11517,7 @@ START_TEST(device) test_check_device_format(); test_miptree_layout(); test_get_render_target_data(); + test_render_target_device_mismatch(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : d3d8/tests: Add test for render target device mismatch.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: f93fbcad414a7975ee8814a7c34f46dba6e05743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93fbcad414a7975ee8814a7c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:31 2017 +0100 d3d8/tests: Add test for render target device mismatch. 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/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2b38f17..2dbf9d8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8083,6 +8083,64 @@ done: DestroyWindow(window); } +static void test_render_target_device_mismatch(void) +{ + IDirect3DDevice8 *device, *device2; + IDirect3DSurface8 *surface, *rt; + IDirect3D8 *d3d; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 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, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + device2 = create_device(d3d, window, NULL); + ok(!!device2, "Failed to create a D3D device.\n"); + + hr = IDirect3DDevice8_CreateRenderTarget(device2, 640, 480, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, FALSE, &surface); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, surface, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface); + + hr = IDirect3DDevice8_GetRenderTarget(device2, &surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, surface, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface); + + hr = IDirect3DDevice8_GetRenderTarget(device, &surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + todo_wine ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); + IDirect3DSurface8_Release(surface); + IDirect3DSurface8_Release(rt); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3DDevice8_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -8187,6 +8245,7 @@ START_TEST(device) test_swapchain_parameters(); test_check_device_format(); test_miptree_layout(); + test_render_target_device_mismatch(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : d3d9: Reject render target surfaces created for other devices.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: c1aba7cd8b35f100e594805956964b962dc30a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1aba7cd8b35f100e59480595… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:32 2017 +0100 d3d9: Reject render target surfaces created for other devices. 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 | 1 + dlls/d3d9/device.c | 10 ++++++++-- dlls/d3d9/surface.c | 7 +++++++ dlls/d3d9/tests/device.c | 6 +++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 3317e9c..20c4c5c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -230,6 +230,7 @@ struct d3d9_surface struct d3d9_texture *texture; }; +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 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; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dab19ab..d47c705 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1523,8 +1523,14 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO if (!idx && !surface_impl) { - WARN("Trying to set render target 0 to NULL.\n"); - return D3DERR_INVALIDCALL; + WARN("Trying to set render target 0 to NULL.\n"); + return D3DERR_INVALIDCALL; + } + + if (surface_impl && d3d9_surface_get_device(surface_impl) != device) + { + WARN("Render target surface does not match device.\n"); + return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index be68682..12e0f39 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -389,6 +389,13 @@ static const struct wined3d_parent_ops d3d9_view_wined3d_parent_ops = view_wined3d_object_destroyed, }; +struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) +{ + IDirect3DDevice9Ex *device; + device = surface->texture ? surface->texture->parent_device : surface->parent_device; + return impl_from_IDirect3DDevice9Ex(device); +} + struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9_surface *surface) { HRESULT hr; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fbae9d6..aa266a5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11375,7 +11375,7 @@ static void test_render_target_device_mismatch(void) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); IDirect3DSurface9_Release(surface); @@ -11383,13 +11383,13 @@ static void test_render_target_device_mismatch(void) ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - todo_wine ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); + ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(rt);

1 0

Józef Kucia : d3d8: Reject render target surfaces created for other devices.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: 176e60074b2b69d28d53adbe6606bf7c5eaf1fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176e60074b2b69d28d53adbe6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:33 2017 +0100 d3d8: Reject render target surfaces created for other devices. 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 | 1 + dlls/d3d8/device.c | 7 ++++++- dlls/d3d8/surface.c | 7 +++++++ dlls/d3d8/tests/device.c | 6 +++--- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f55d2c2..ffcd1cd 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -242,6 +242,7 @@ struct d3d8_surface struct d3d8_texture *texture; }; +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 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; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fae5610..5a5871f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1161,6 +1161,12 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, TRACE("iface %p, render_target %p, depth_stencil %p.\n", iface, render_target, depth_stencil); + if (rt_impl && d3d8_surface_get_device(rt_impl) != device) + { + WARN("Render target surface does not match device.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); if (ds_impl) @@ -1200,7 +1206,6 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, WARN("Multisample settings do not match, returning D3DERR_INVALIDCALL\n"); wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; - } } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 565f642..137033e 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -353,6 +353,13 @@ static const struct wined3d_parent_ops d3d8_view_wined3d_parent_ops = view_wined3d_object_destroyed, }; +struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface) +{ + IDirect3DDevice8 *device; + device = surface->texture ? surface->texture->parent_device : surface->parent_device; + return impl_from_IDirect3DDevice8(device); +} + struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) { HRESULT hr; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2dbf9d8..22667ec 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8115,7 +8115,7 @@ static void test_render_target_device_mismatch(void) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, surface, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); IDirect3DSurface8_Release(surface); @@ -8123,13 +8123,13 @@ static void test_render_target_device_mismatch(void) ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, surface, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); IDirect3DSurface8_Release(surface); hr = IDirect3DDevice8_GetRenderTarget(device, &surface); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - todo_wine ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); + ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); IDirect3DSurface8_Release(surface); IDirect3DSurface8_Release(rt);

1 0