marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateVolumeTexture(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Henri Verbeet 2017-02-09 12:52:40 +01:00 committed by Alexandre Julliard
parent 9e16f478c1
commit bb8f4d7a88
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3d8/device.c
View File

@ -824,6 +824,9 @@ static HRESULT WINAPI d3d8_device_CreateVolumeTexture(IDirect3DDevice8 *iface,
TRACE("iface %p, width %u, height %u, depth %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n",
iface, width, height, depth, levels, usage, format, pool, texture);
if (!format)
return D3DERR_INVALIDCALL;
*texture = NULL;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)

2
dlls/d3d8/tests/device.c
View File

@ -8242,7 +8242,7 @@ static void test_format_unknown(void)
hr = IDirect3DDevice8_CreateVolumeTexture(device, 64, 64, 1, 1, 0,
D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture8 **)&iface);
ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface);
ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface);
refcount = IDirect3DDevice8_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);