David Adam : d3dx9: Fix D3DXMatrixStack_MultMatrixLocal to make tests pass in Windows.
Alexandre Julliard
julliard at winehq.org
Mon Jul 20 07:36:48 CDT 2009
Module: wine
Branch: master
Commit: 0729e91e2119d8b51d0e03e2c39597798acea277
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0729e91e2119d8b51d0e03e2c39597798acea277
Author: David Adam <david.adam.cnrs at gmail.com>
Date: Fri Jul 17 17:56:30 2009 +0200
d3dx9: Fix D3DXMatrixStack_MultMatrixLocal 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 c540b21..a4135da 100644
--- a/dlls/d3dx9_36/math.c
+++ b/dlls/d3dx9_36/math.c
@@ -866,7 +866,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *ifa
TRACE("iface %p\n", iface);
- if (!pm) return D3DERR_INVALIDCALL;
D3DXMatrixMultiply(&This->stack[This->current], pm, &This->stack[This->current]);
return D3D_OK;
diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c
index fa2f857..bfeed05 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_MultMatrixLocal(stack, NULL);
- ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);
-
hr = ID3DXMatrixStack_RotateAxis(stack, NULL, 2.0f);
ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);
More information about the wine-cvs
mailing list