Henri Verbeet : d3d9: Translate E_INVALIDARG to D3DERR_INVALIDCALL in d3d9_surface_LockRect().
Alexandre Julliard
julliard at winehq.org
Thu Nov 8 14:47:26 CST 2018
Module: wine
Branch: master
Commit: 6b86019a9664483f3c09195a91142cb7ec5c1b60
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b86019a9664483f3c09195a91142cb7ec5c1b60
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Nov 8 21:47:05 2018 +0330
d3d9: Translate E_INVALIDARG to D3DERR_INVALIDCALL in d3d9_surface_LockRect().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/surface.c | 2 ++
dlls/d3d9/tests/device.c | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 50c035d..7d4d93b5e8 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -258,6 +258,8 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface,
locked_rect->pBits = map_desc.data;
}
+ if (hr == E_INVALIDARG)
+ return D3DERR_INVALIDCALL;
return hr;
}
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 56f7a43..aba083c 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -12103,7 +12103,6 @@ static void test_lockable_backbuffer(void)
ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr);
hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD);
-todo_wine
ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
dc = (void *)0xdeadbeef;
More information about the wine-cvs
mailing list