Implements D3DRMVectorCrossProduct

[David.Adam at math.cnrs.fr]

-------------- next part --------------
>From 8ab90d7c73bd93b98f4c0a88e1fdc2dc75136f53 Mon Sep 17 00:00:00 2001
From: Adam <David.Adam at math.cnrs.fr>
Date: Sun, 15 Apr 2007 12:28:59 +0200
Subject: [PATCH] [4] Implement D3DRMVectorCrossProduct with test.

---
 dlls/d3drm/d3drm.spec     |    2 +-
 dlls/d3drm/math.c         |    9 +++++++++
 dlls/d3drm/tests/vector.c |    9 +++++++++
 3 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
index 0041265..4347160 100644
--- a/dlls/d3drm/d3drm.spec
+++ b/dlls/d3drm/d3drm.spec
@@ -9,7 +9,7 @@
 @ stub D3DRMQuaternionMultiply
 @ stub D3DRMQuaternionSlerp
 @ stdcall D3DRMVectorAdd(ptr ptr ptr)
-@ stub D3DRMVectorCrossProduct
+@ stdcall D3DRMVectorCrossProduct(ptr ptr ptr)
 @ stub D3DRMVectorDotProduct
 @ stub D3DRMVectorModulus
 @ stub D3DRMVectorNormalize
diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c
index a4e9da4..f15db68 100644
--- a/dlls/d3drm/math.c
+++ b/dlls/d3drm/math.c
@@ -40,6 +40,15 @@ LPD3DVECTOR D3DRMAPI D3DRMVectorAdd(LPD3
     return d;
 }
 
+/* Cross Product of Two Vectors */
+LPD3DVECTOR D3DRMAPI D3DRMVectorCrossProduct(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2)
+{
+    d->x=s1->y * s2->z - s1->z * s2->y;
+    d->y=s1->z * s2->x - s1->x * s2->z;
+    d->z=s1->x * s2->y - s1->y * s2->x;
+    return d;
+}
+
 /* Subtract Two Vectors */
 LPD3DVECTOR D3DRMAPI D3DRMVectorSubtract(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2)
 {
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index 505d122..fa7ff9d 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -28,6 +28,7 @@ #define expect_vec(expectedvec,gotvec) \
   expectedvec.x,expectedvec.y,expectedvec.z, gotvec.x, gotvec.y, gotvec.z);
 
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorAdd)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
+static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorCrossProduct)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorSubtract)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
 
 static void init_function_pointers(void)
@@ -41,6 +42,7 @@ static void init_function_pointers(void)
     }
 
     pD3DRMVectorAdd = (void*)GetProcAddress(hmod, "D3DRMVectorAdd");
+    pD3DRMVectorCrossProduct = (void*)GetProcAddress(hmod, "D3DRMVectorCrossProduct");
     pD3DRMVectorSubtract = (void*)GetProcAddress(hmod, "D3DRMVectorSubtract");
 }
 
@@ -58,6 +60,13 @@ static void VectorTest(void)
     expect_vec(e,r);
               }
 
+/*_______________________VectorCrossProduct_______________________*/
+    pD3DRMVectorCrossProduct(&r,&u,&v);
+    e.x=-4.0;e.y=4.0;e.z=0.0;
+    todo_wine {
+    expect_vec(e,r);
+              }
+
 /*_______________________VectorSubtract__________________________*/
     pD3DRMVectorSubtract(&r,&u,&v);
     e.x=-2.0;e.y=-2.0;e.z=1.0;
-- 
1.4.2