Stefan Dösinger : d3d9: Remove the double unlock test.
Alexandre Julliard
julliard at winehq.org
Wed Mar 17 12:19:07 CDT 2010
Module: wine
Branch: master
Commit: 25c6dbfc2a62e43672d3fc7b75ea80c565d50ae8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c6dbfc2a62e43672d3fc7b75ea80c565d50ae8
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Mon Mar 15 13:42:57 2010 +0100
d3d9: Remove the double unlock test.
---
dlls/d3d9/tests/surface.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c
index 4427cc0..967c608 100644
--- a/dlls/d3d9/tests/surface.c
+++ b/dlls/d3d9/tests/surface.c
@@ -169,8 +169,9 @@ static void test_surface_alignment(IDirect3DDevice9 *device_ptr)
ok(SUCCEEDED(hr), "IDirect3DTexture9_LockRect: %08x\n", hr);
hr = IDirect3DTexture9_UnlockRect(pTexture, j);
ok(SUCCEEDED(hr), "IDirect3DTexture9_UnLockRect: %08x\n", hr);
- hr = IDirect3DTexture9_UnlockRect(pTexture, j);
-todo_wine ok(SUCCEEDED(hr), "Double IDirect3DTexture9_UnLockRect failed with %08x\n", hr);
+ /* Windows XP returns D3D_OK when calling UnlockRect on an unlocked surface,
+ * windows 7 returns an error.
+ */
pitch = ((descr.Width + 3) >> 2) << 3;
if (i > 0) pitch <<= 1;
More information about the wine-cvs
mailing list