http://git.etersoft.ru/projects
/
wine
/
eterwine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5ddd6f
)
d3d9: Remove the double unlock test.
author
Stefan Dösinger
<stefan@codeweavers.com>
Mon, 15 Mar 2010 12:42:57 +0000
(13:42 +0100)
committer
Alexandre Julliard
<julliard@winehq.org>
Wed, 17 Mar 2010 15:09:16 +0000
(16:09 +0100)
dlls/d3d9/tests/surface.c
patch
|
blob
|
blame
|
history
diff --git
a/dlls/d3d9/tests/surface.c
b/dlls/d3d9/tests/surface.c
index 4427cc0b7655f1e0ded3a8d2468d171cf7494630..967c6086fed222c714187f25f97ddd3ea1f28681 100644
(file)
--- 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;