wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Henri Verbeet : ddraw: Keep an explicit reference to the wined3d device in surfaces.
by Alexandre Julliard 04 Jan '17

04 Jan '17

Module: wine Branch: master Commit: c7c0415689c69f355605f50f6547cbcf198c58df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c0415689c69f355605f50f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 00:04:47 2017 +0100 ddraw: Keep an explicit reference to the wined3d device in surfaces. Version 1 and version 2 surfaces don't keep references to the ddraw interface that created them, so such surfaces may get destroyed after the corresponding ddraw object was destroyed. Wined3d requires that the device is destroyed after all its resources are destroyed. In principle this issue always existed, but it was probably made worse by changes in the texture cleanup code. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 7 +++++++ dlls/wined3d/device.c | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 731d441..1133bbd 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -206,6 +206,7 @@ struct ddraw_texture DDSURFACEDESC2 surface_desc; struct ddraw_surface *root; + struct wined3d_device *wined3d_device; }; HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2989988..4b53ac3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -543,6 +543,8 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) if (iface_count == 0) { + struct ddraw_texture *texture = wined3d_texture_get_parent(This->wined3d_texture); + struct wined3d_device *wined3d_device = texture->wined3d_device; IUnknown *release_iface = This->ifaceToRelease; /* Complex attached surfaces are destroyed implicitly when the root is released */ @@ -558,6 +560,9 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) if (release_iface) IUnknown_Release(release_iface); + /* Release the device only after anything that may reference it (the + * wined3d texture and rendertarget view in particular) is released. */ + wined3d_device_decref(wined3d_device); } return iface_count; @@ -6142,6 +6147,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_texture_decref(wined3d_texture); root->is_complex_root = TRUE; texture->root = root; + wined3d_device_incref(texture->wined3d_device = ddraw->wined3d_device); if (desc->dwFlags & DDSD_CKDESTOVERLAY) wined3d_texture_set_color_key(wined3d_texture, DDCKEY_DESTOVERLAY, @@ -6260,6 +6266,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ last = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); wined3d_texture_decref(wined3d_texture); texture->root = last; + wined3d_device_incref(texture->wined3d_device = ddraw->wined3d_device); if (desc->dwFlags & DDSD_CKDESTOVERLAY) wined3d_texture_set_color_key(wined3d_texture, DDCKEY_DESTOVERLAY, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a8de282..785ea6b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -547,7 +547,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) wined3d_cs_destroy(device->cs); if (device->recording && wined3d_stateblock_decref(device->recording)) - FIXME("Something's still holding the recording stateblock.\n"); + ERR("Something's still holding the recording stateblock.\n"); device->recording = NULL; state_cleanup(&device->state); @@ -562,11 +562,11 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { struct wined3d_resource *resource; - FIXME("Device released with resources still bound, acceptable but unexpected.\n"); + ERR("Device released with resources still bound.\n"); LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) { - FIXME("Leftover resource %p with type %s (%#x).\n", + ERR("Leftover resource %p with type %s (%#x).\n", resource, debug_d3dresourcetype(resource->type), resource->type); } }

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

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 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

Andrew Eikum : dsound: Don' t write more than three periods to IAudioClient.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: 0190c50a8ca14e21355befc212b60f6409594aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0190c50a8ca14e21355befc21… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 3 11:08:10 2017 -0600 dsound: Don't write more than three periods to IAudioClient. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f9720f8..f5a1020 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -296,12 +296,12 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { HRESULT hres; REFERENCE_TIME period; - UINT32 frames; + UINT32 acbuf_frames, aclen_frames; DWORD period_ms; IAudioClient *client = NULL; IAudioRenderClient *render = NULL; IAudioStreamVolume *volume = NULL; - DWORD fraglen; + DWORD frag_frames; WAVEFORMATEX *wfx = NULL; DWORD oldspeakerconfig = device->speaker_config; @@ -350,17 +350,20 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) WARN("GetStreamLatency failed with %08x\n", hres); goto err; } - hres = IAudioClient_GetBufferSize(client, &frames); + hres = IAudioClient_GetBufferSize(client, &acbuf_frames); if (FAILED(hres)) { WARN("GetBufferSize failed with %08x\n", hres); goto err; } period_ms = (period + 9999) / 10000; - fraglen = MulDiv(wfx->nSamplesPerSec, period, 10000000) * wfx->nBlockAlign; - TRACE("period %u ms fraglen %u buflen %u\n", period_ms, fraglen, frames * wfx->nBlockAlign); + frag_frames = MulDiv(wfx->nSamplesPerSec, period, 10000000); - hres = DSOUND_PrimaryOpen(device, wfx, frames, forcewave); + aclen_frames = min(acbuf_frames, 3 * frag_frames); + + TRACE("period %u ms fraglen %u buflen %u\n", period_ms, frag_frames * wfx->nBlockAlign, aclen_frames * wfx->nBlockAlign); + + hres = DSOUND_PrimaryOpen(device, wfx, aclen_frames, forcewave); if(FAILED(hres)) goto err; @@ -368,8 +371,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) device->client = client; device->render = render; device->volume = volume; - device->fraglen = fraglen; - device->aclen = frames * wfx->nBlockAlign; + device->fraglen = frag_frames * wfx->nBlockAlign; + device->aclen = aclen_frames * wfx->nBlockAlign; if (period_ms < 3) device->sleeptime = 5;

1 0

Alex Henrie : gdiplus: Fix memory leak in format_string_callback error path.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: 046fc19cd1ce053ad3f1b08312aa97a447b158f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046fc19cd1ce053ad3f1b0831… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 23 01:18:42 2016 -0700 gdiplus: Fix memory leak in format_string_callback error path. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index b6ec88d..5a3356a 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -881,6 +881,7 @@ static GpStatus format_string_callback(HDC dc, start = (char *)ph; if (!ph || !lengthen_path(path, len / sizeof(POINTFX))) { + heap_free(ph); status = OutOfMemory; break; }

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

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/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/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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017