David Adam : d3dx9: Fix D3DXMatrixStack_MultMatrix to make tests pass in Windows.
Alexandre Julliard
julliard at winehq.org
Mon Jul 20 07:36:47 CDT 2009
Module: wine
Branch: master
Commit: 3b6cbaeb038e59b9b7d7fc705bbb401c00d1ec7b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6cbaeb038e59b9b7d7fc705bbb401c00d1ec7b
Author: David Adam <david.adam.cnrs at gmail.com>
Date: Fri Jul 17 17:54:22 2009 +0200
d3dx9: Fix D3DXMatrixStack_MultMatrix 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 941f205..c540b21 100644
--- a/dlls/d3dx9_36/math.c
+++ b/dlls/d3dx9_36/math.c
@@ -855,7 +855,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, C
TRACE("iface %p\n", iface);
- if (!pm) return D3DERR_INVALIDCALL;
D3DXMatrixMultiply(&This->stack[This->current], &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 7b513da..fa2f857 100644
--- a/dlls/d3dx9_36/tests/math.c
+++ b/dlls/d3dx9_36/tests/math.c
@@ -1519,9 +1519,6 @@ static void test_matrix_stack(void)
ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr);
ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n");
- hr = ID3DXMatrixStack_MultMatrix(stack, NULL);
- ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);
-
hr = ID3DXMatrixStack_MultMatrixLocal(stack, NULL);
ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);
More information about the wine-cvs
mailing list