From e84e2e8c9acfdfc665e84bb3bf49376320cf3530 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Thu, 24 Jan 2013 11:37:37 +0100
Subject: [PATCH] d3drm: Avoid LPD3DRMQUATERNION.

---
 dlls/d3drm/math.c         | 7 ++++---
 dlls/d3drm/tests/vector.c | 5 +++--
 include/d3drmdef.h        | 9 +++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c
index 2b23c8f8f9..a1ad727e94 100644
--- a/dlls/d3drm/math.c
+++ b/dlls/d3drm/math.c
@@ -75,7 +75,7 @@ D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR color)
 }
 
 /* Product of 2 quaternions */
-LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b)
+D3DRMQUATERNION * WINAPI D3DRMQuaternionMultiply(D3DRMQUATERNION *q, D3DRMQUATERNION *a, D3DRMQUATERNION *b)
 {
     D3DRMQUATERNION temp;
     D3DVECTOR cross_product;
@@ -91,7 +91,7 @@ LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUA
 }
 
 /* Matrix for the Rotation that a unit quaternion represents */
-void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, LPD3DRMQUATERNION q)
+void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, D3DRMQUATERNION *q)
 {
     D3DVALUE w,x,y,z;
     w = q->s;
@@ -125,7 +125,8 @@ D3DRMQUATERNION * WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *q, D3DVECT
 }
 
 /* Interpolation between two quaternions */
-LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b, D3DVALUE alpha)
+D3DRMQUATERNION * WINAPI D3DRMQuaternionSlerp(D3DRMQUATERNION *q,
+        D3DRMQUATERNION *a, D3DRMQUATERNION *b, D3DVALUE alpha)
 {
     D3DVALUE dot, epsilon, temp, theta, u;
     D3DVECTOR v1, v2;
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index 5be6369b33..c9e40feb88 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -67,7 +67,7 @@
 
 static HMODULE d3drm_handle = 0;
 
-static void (WINAPI * pD3DRMMatrixFromQuaternion)(D3DRMMATRIX4D, LPD3DRMQUATERNION);
+static void (WINAPI * pD3DRMMatrixFromQuaternion)(D3DRMMATRIX4D, D3DRMQUATERNION *);
 static D3DVECTOR *(WINAPI *pD3DRMVectorAdd)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *);
 static D3DVECTOR *(WINAPI *pD3DRMVectorCrossProduct)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *);
 static D3DVALUE (WINAPI *pD3DRMVectorDotProduct)(D3DVECTOR *, D3DVECTOR *);
@@ -78,7 +78,8 @@ static D3DVECTOR *(WINAPI *pD3DRMVectorRotate)(D3DVECTOR *, D3DVECTOR *, D3DVECT
 static D3DVECTOR *(WINAPI *pD3DRMVectorScale)(D3DVECTOR *, D3DVECTOR *, D3DVALUE);
 static D3DVECTOR *(WINAPI *pD3DRMVectorSubtract)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *);
 static D3DRMQUATERNION *(WINAPI *pD3DRMQuaternionFromRotation)(D3DRMQUATERNION*, D3DVECTOR *, D3DVALUE);
-static LPD3DRMQUATERNION (WINAPI * pD3DRMQuaternionSlerp)(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE);
+static D3DRMQUATERNION *(WINAPI * pD3DRMQuaternionSlerp)(D3DRMQUATERNION *,
+        D3DRMQUATERNION *, D3DRMQUATERNION *, D3DVALUE);
 static D3DCOLOR (WINAPI * pD3DRMCreateColorRGB)(D3DVALUE, D3DVALUE, D3DVALUE);
 static D3DCOLOR (WINAPI * pD3DRMCreateColorRGBA)(D3DVALUE, D3DVALUE, D3DVALUE, D3DVALUE);
 static D3DVALUE (WINAPI * pD3DRMColorGetAlpha)(D3DCOLOR);
diff --git a/include/d3drmdef.h b/include/d3drmdef.h
index f763cf351e..89d2db95d3 100644
--- a/include/d3drmdef.h
+++ b/include/d3drmdef.h
@@ -429,11 +429,12 @@ typedef struct _D3DRMVERTEX {
 typedef LONG D3DRMGROUPINDEX;
 static const D3DRMGROUPINDEX D3DRMGROUP_ALLGROUPS = -1;
 
-void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D, LPD3DRMQUATERNION);
+void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, D3DRMQUATERNION *q);
 
-LPD3DRMQUATERNION WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *x, D3DVECTOR *axis, D3DVALUE theta);
-LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION);
-LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE);
+D3DRMQUATERNION * WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *x, D3DVECTOR *axis, D3DVALUE theta);
+D3DRMQUATERNION * WINAPI D3DRMQuaternionMultiply(D3DRMQUATERNION *ret, D3DRMQUATERNION *x, D3DRMQUATERNION *y);
+D3DRMQUATERNION * WINAPI D3DRMQuaternionSlerp(D3DRMQUATERNION *ret,
+        D3DRMQUATERNION *x, D3DRMQUATERNION *y, D3DVALUE alpha);
 
 D3DVECTOR * WINAPI D3DRMVectorAdd(D3DVECTOR *ret, D3DVECTOR *x, D3DVECTOR *y);
 D3DVECTOR * WINAPI D3DRMVectorCrossProduct(D3DVECTOR *ret, D3DVECTOR *x, D3DVECTOR *y);
-- 
2.32.0.93.g670b81a890