David Adam : d3dx9: Fix D3DXMatrixStack_LoadMatrix to make tests pass in Windows.
Alexandre Julliard
julliard at winehq.org
Mon Jul 20 07:36:46 CDT 2009
Module: wine
Branch: master
Commit: c88860a221b3d7aa7b2d8b72ea0b43acc5423d96
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88860a221b3d7aa7b2d8b72ea0b43acc5423d96
Author: David Adam <david.adam.cnrs at gmail.com>
Date: Fri Jul 17 17:51:50 2009 +0200
d3dx9: Fix D3DXMatrixStack_LoadMatrix to make tests pass in Windows.
---
dlls/d3dx9_36/math.c | 1 -
dlls/d3dx9_36/tests/math.c | 3 ---
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c
index ff19369..941f205 100644
--- a/dlls/d3dx9_36/math.c
+++ b/dlls/d3dx9_36/math.c
@@ -844,7 +844,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, C
TRACE("iface %p\n", iface);
- if (!pm) return D3DERR_INVALIDCALL;
This->stack[This->current] = *pm;
return D3D_OK;
diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c
index d2bdac0..7b513da 100644
--- a/dlls/d3dx9_36/tests/math.c
+++ b/dlls/d3dx9_36/tests/math.c
@@ -1483,9 +1483,6 @@ static void test_matrix_stack(void)
hr = ID3DXMatrixStack_Push(stack);
ok(SUCCEEDED(hr), "Push failed, hr %#x\n", hr);
- hr = ID3DXMatrixStack_LoadMatrix(stack, NULL);
- ok(hr == D3DERR_INVALIDCALL, "LoadMatrix returned %#x, expected D3DERR_INVALIDCALL\n", hr);
-
hr = ID3DXMatrixStack_LoadMatrix(stack, &mat1);
ok(SUCCEEDED(hr), "LoadMatrix failed, hr %#x\n", hr);
expect_mat(&mat1, ID3DXMatrixStack_GetTop(stack));
More information about the wine-cvs
mailing list