[PATCH] Implement D3DXColorSubtract with a test

[David Adam]

---
 dlls/d3dx8/tests/math.c |   12 ++++++++++++
 include/d3dx8math.inl   |   10 ++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index c32920e..97d8562 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -108,6 +108,18 @@ static void D3DXColorTest(void)
     ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
     funcpointer =3D D3DXColorScale(NULL,NULL,scale);
     ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+
+/*_______________D3DXColorSubtract_______________*/
+    expected.r =3D -0.1f; expected.g =3D 0.25f; expected.b =3D -0.35f, expe=
cted.a =3D 0.82f;
+    D3DXColorSubtract(&got,&color,&color2);
+    expect_color(expected,got);
+    /* Test the NULL case */
+    funcpointer =3D D3DXColorSubtract(&got,NULL,&color2);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXColorSubtract(NULL,NULL,&color2);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXColorSubtract(NULL,NULL,NULL);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
 }
=20
 static void D3DXPlaneTest(void)
diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl
index 78ef7c5..d9f0b3d 100644
--- a/include/d3dx8math.inl
+++ b/include/d3dx8math.inl
@@ -71,6 +71,16 @@ static inline D3DXCOLOR* D3DXColorScale(D3DXCOLOR *pout, =
CONST D3DXCOLOR *pc, FL
     return pout;
 }
=20
+static inline D3DXCOLOR* D3DXColorSubtract(D3DXCOLOR *pout, CONST D3DXCOLOR=
 *pc1, CONST D3DXCOLOR *pc2)
+{
+    if ( !pout || !pc1 || !pc2 ) return NULL;
+    pout->r =3D (pc1->r) - (pc2->r);
+    pout->g =3D (pc1->g) - (pc2->g);
+    pout->b =3D (pc1->b) - (pc2->b);
+    pout->a =3D (pc1->a) - (pc2->a);
+    return pout;
+}
+
 /*_______________D3DXVECTOR2________________________*/
=20
 static inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2=
 *pv1, CONST D3DXVECTOR2 *pv2)
--=20
1.5.3.2


--=_66oxghhv5hgk--