[PATCH 2/5] d3d8: Do not modify the "surface" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateDepthStencilSurface().
Henri Verbeet
hverbeet at codeweavers.com
Fri Feb 10 06:58:56 CST 2017
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/d3d8/device.c | 3 +++
dlls/d3d8/tests/device.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index f8eb7ee..9592342 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1010,6 +1010,9 @@ static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *if
TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, surface %p.\n",
iface, width, height, format, multisample_type, surface);
+ if (!format)
+ return D3DERR_INVALIDCALL;
+
*surface = NULL;
/* TODO: Verify that Discard is false */
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 2295300..45969fe 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -8218,7 +8218,7 @@ static void test_format_unknown(void)
hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 64, 64,
D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, (IDirect3DSurface8 **)&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);
iface = (void *)0xdeadbeef;
hr = IDirect3DDevice8_CreateImageSurface(device, 64, 64,
--
2.1.4
More information about the wine-patches
mailing list