From 6c6668a9721359a491ea6c4e8f838b0e0f7c1788 Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Date: Mon, 5 May 2008 11:17:49 -0700
Subject: [PATCH] d3dx8: Dynamically import d3dx8 in the tests so the tests can be skipped if the dll is not found

---
 dlls/d3dx8/tests/Makefile.in |    2 +-
 dlls/d3dx8/tests/math.c      |  364 +++++++++++++++++++++++++++++++-----------
 2 files changed, 269 insertions(+), 97 deletions(-)

diff --git a/dlls/d3dx8/tests/Makefile.in b/dlls/d3dx8/tests/Makefile.in
index 5306634..55c705e 100644
--- a/dlls/d3dx8/tests/Makefile.in
+++ b/dlls/d3dx8/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3dx8.dll
-IMPORTS   = dxguid d3dx8 kernel32
+IMPORTS   = dxguid kernel32
 
 CTESTS = math.c
 
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index 6bec5e5..c196c27 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2007 David Adam
+ * Copyright 2008 Google (Maarten lankhorst)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,6 +22,166 @@
 
 #include "wine/test.h"
 
+/* Long live sed! */
+D3DXCOLOR* (WINAPI *pD3DXColorAdjustContrast)(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s);
+D3DXCOLOR* (WINAPI *pD3DXColorAdjustSaturation)(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s);
+D3DXMATRIX* (WINAPI *pD3DXMatrixAffineTransformation)(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR3 *rotationcenter, CONST D3DXQUATERNION *rotation, CONST D3DXVECTOR3 *translation);
+D3DXMATRIX* (WINAPI *pD3DXMatrixInverse)(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm);
+D3DXMATRIX* (WINAPI *pD3DXMatrixLookAtLH)(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);
+D3DXMATRIX* (WINAPI *pD3DXMatrixLookAtRH)(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);
+D3DXMATRIX* (WINAPI *pD3DXMatrixMultiply)(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2);
+D3DXMATRIX* (WINAPI *pD3DXMatrixMultiplyTranspose)(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2);
+D3DXMATRIX* (WINAPI *pD3DXMatrixMultiplyTranspose)(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2);
+D3DXMATRIX* (WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixOrthoOffCenterLH)(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixOrthoOffCenterRH)(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixOrthoRH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixPerspectiveFovLH)(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixPerspectiveFovRH)(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixPerspectiveLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixPerspectiveOffCenterLH)(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixPerspectiveOffCenterRH)(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixPerspectiveRH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
+D3DXMATRIX* (WINAPI *pD3DXMatrixReflect)(D3DXMATRIX *pout, CONST D3DXPLANE *pplane);
+D3DXMATRIX* (WINAPI *pD3DXMatrixRotationAxis)(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pv, FLOAT angle);
+D3DXMATRIX* (WINAPI *pD3DXMatrixRotationQuaternion)(D3DXMATRIX *pout, CONST D3DXQUATERNION *pq);
+D3DXMATRIX* (WINAPI *pD3DXMatrixRotationX)(D3DXMATRIX *pout, FLOAT angle);
+D3DXMATRIX* (WINAPI *pD3DXMatrixRotationY)(D3DXMATRIX *pout, FLOAT angle);
+D3DXMATRIX* (WINAPI *pD3DXMatrixRotationYawPitchRoll)(D3DXMATRIX *pout, FLOAT yaw, FLOAT pitch, FLOAT roll);
+D3DXMATRIX* (WINAPI *pD3DXMatrixRotationYawPitchRoll)(D3DXMATRIX *pout, FLOAT yaw, FLOAT pitch, FLOAT roll);
+D3DXMATRIX* (WINAPI *pD3DXMatrixRotationZ)(D3DXMATRIX *pout, FLOAT angle);
+D3DXMATRIX* (WINAPI *pD3DXMatrixScaling)(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT sz);
+D3DXMATRIX* (WINAPI *pD3DXMatrixShadow)(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, CONST D3DXPLANE *pPlane);
+D3DXMATRIX* (WINAPI *pD3DXMatrixTransformation)(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation);
+D3DXMATRIX* (WINAPI *pD3DXMatrixTranslation)(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z);
+D3DXMATRIX* (WINAPI *pD3DXMatrixTranspose)(D3DXMATRIX *pout, CONST D3DXMATRIX *pm);
+FLOAT (WINAPI *pD3DXMatrixfDeterminant)(CONST D3DXMATRIX *pm);
+D3DXPLANE* (WINAPI *pD3DXPlaneFromPointNormal)(D3DXPLANE *pout, CONST D3DXVECTOR3 *pvpoint, CONST D3DXVECTOR3 *pvnormal);
+D3DXPLANE* (WINAPI *pD3DXPlaneFromPoints)(D3DXPLANE *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3);
+D3DXVECTOR3* (WINAPI *pD3DXPlaneIntersectLine)(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2);
+D3DXPLANE* (WINAPI *pD3DXPlaneNormalize)(D3DXPLANE *pout, CONST D3DXPLANE *pp);
+D3DXPLANE* (WINAPI *pD3DXPlaneTransform)(D3DXPLANE *pout, CONST D3DXPLANE *pplane, CONST D3DXMATRIX *pm);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionBaryCentric)(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, FLOAT f, FLOAT g);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionExp)(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionInverse)(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionLn)(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionMultiply)(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionNormalize)(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionRotationAxis)(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionRotationMatrix)(D3DXQUATERNION *pout, CONST D3DXMATRIX *pm);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionRotationYawPitchRoll)(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionSlerp)(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t);
+D3DXQUATERNION* (WINAPI *pD3DXQuaternionSquad)(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, CONST D3DXQUATERNION *pq4, FLOAT t);
+void (WINAPI *pD3DXQuaternionToAxisAngle)(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle);
+D3DXVECTOR2* (WINAPI *pD3DXVec2BaryCentric)(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g);
+D3DXVECTOR2* (WINAPI *pD3DXVec2CatmullRom)(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv0, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT s);
+D3DXVECTOR2* (WINAPI *pD3DXVec2Hermite)(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pt1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pt2, FLOAT s);
+D3DXVECTOR2* (WINAPI *pD3DXVec2Normalize)(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv);
+D3DXVECTOR4* (WINAPI *pD3DXVec2Transform)(D3DXVECTOR4 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR2* (WINAPI *pD3DXVec2TransformCoord)(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR2* (WINAPI *pD3DXVec2TransformNormal)(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR2* (WINAPI *pD3DXVec2TransformCoord)(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR2* (WINAPI *pD3DXVec2TransformNormal)(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR3* (WINAPI *pD3DXVec3BaryCentric)(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g);
+D3DXVECTOR3* (WINAPI *pD3DXVec3CatmullRom)( D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv0, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT s);
+D3DXVECTOR3* (WINAPI *pD3DXVec3Hermite)(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pt1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pt2, FLOAT s);
+D3DXVECTOR3* (WINAPI *pD3DXVec3Normalize)(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv);
+D3DXVECTOR3* (WINAPI *pD3DXVec3Project)(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DVIEWPORT8 *pviewport, CONST D3DXMATRIX *pprojection, CONST D3DXMATRIX *pview, CONST D3DXMATRIX *pworld);
+D3DXVECTOR4* (WINAPI *pD3DXVec3Transform)(D3DXVECTOR4 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR3* (WINAPI *pD3DXVec3TransformCoord)(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR3* (WINAPI *pD3DXVec3TransformNormal)(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR3* (WINAPI *pD3DXVec3TransformCoord)(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR3* (WINAPI *pD3DXVec3TransformNormal)(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm);
+D3DXVECTOR3* (WINAPI *pD3DXVec3Unproject)(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DVIEWPORT8 *pviewport, CONST D3DXMATRIX *pprojection, CONST D3DXMATRIX *pview, CONST D3DXMATRIX *pworld);
+D3DXVECTOR4* (WINAPI *pD3DXVec4BaryCentric)(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g);
+D3DXVECTOR4* (WINAPI *pD3DXVec4CatmullRom)(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT s);
+D3DXVECTOR4* (WINAPI *pD3DXVec4Cross)(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3);
+D3DXVECTOR4* (WINAPI *pD3DXVec4Hermite)(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pt1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pt2, FLOAT s);
+D3DXVECTOR4* (WINAPI *pD3DXVec4Normalize)(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv);
+D3DXVECTOR4* (WINAPI *pD3DXVec4Transform)(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, CONST D3DXMATRIX *pm);
+
+static void D3DX8_Imports(HMODULE hD3DX8)
+{
+    pD3DXColorAdjustContrast = (void *)GetProcAddress(hD3DX8, "D3DXColorAdjustContrast");
+    pD3DXColorAdjustSaturation = (void *)GetProcAddress(hD3DX8, "D3DXColorAdjustSaturation");
+    pD3DXMatrixAffineTransformation = (void *)GetProcAddress(hD3DX8, "D3DXMatrixAffineTransformation");
+    pD3DXMatrixInverse = (void *)GetProcAddress(hD3DX8, "D3DXMatrixInverse");
+    pD3DXMatrixLookAtLH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixLookAtLH");
+    pD3DXMatrixLookAtRH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixLookAtRH");
+    pD3DXMatrixMultiply = (void *)GetProcAddress(hD3DX8, "D3DXMatrixMultiply");
+    pD3DXMatrixMultiplyTranspose = (void *)GetProcAddress(hD3DX8, "D3DXMatrixMultiplyTranspose");
+    pD3DXMatrixMultiplyTranspose = (void *)GetProcAddress(hD3DX8, "D3DXMatrixMultiplyTranspose");
+    pD3DXMatrixOrthoLH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixOrthoLH");
+    pD3DXMatrixOrthoLH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixOrthoLH");
+    pD3DXMatrixOrthoOffCenterLH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixOrthoOffCenterLH");
+    pD3DXMatrixOrthoOffCenterRH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixOrthoOffCenterRH");
+    pD3DXMatrixOrthoRH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixOrthoRH");
+    pD3DXMatrixPerspectiveFovLH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixPerspectiveFovLH");
+    pD3DXMatrixPerspectiveFovRH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixPerspectiveFovRH");
+    pD3DXMatrixPerspectiveLH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixPerspectiveLH");
+    pD3DXMatrixPerspectiveOffCenterLH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixPerspectiveOffCenterLH");
+    pD3DXMatrixPerspectiveOffCenterRH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixPerspectiveOffCenterRH");
+    pD3DXMatrixPerspectiveRH = (void *)GetProcAddress(hD3DX8, "D3DXMatrixPerspectiveRH");
+    pD3DXMatrixReflect = (void *)GetProcAddress(hD3DX8, "D3DXMatrixReflect");
+    pD3DXMatrixRotationAxis = (void *)GetProcAddress(hD3DX8, "D3DXMatrixRotationAxis");
+    pD3DXMatrixRotationQuaternion = (void *)GetProcAddress(hD3DX8, "D3DXMatrixRotationQuaternion");
+    pD3DXMatrixRotationX = (void *)GetProcAddress(hD3DX8, "D3DXMatrixRotationX");
+    pD3DXMatrixRotationY = (void *)GetProcAddress(hD3DX8, "D3DXMatrixRotationY");
+    pD3DXMatrixRotationYawPitchRoll = (void *)GetProcAddress(hD3DX8, "D3DXMatrixRotationYawPitchRoll");
+    pD3DXMatrixRotationYawPitchRoll = (void *)GetProcAddress(hD3DX8, "D3DXMatrixRotationYawPitchRoll");
+    pD3DXMatrixRotationZ = (void *)GetProcAddress(hD3DX8, "D3DXMatrixRotationZ");
+    pD3DXMatrixScaling = (void *)GetProcAddress(hD3DX8, "D3DXMatrixScaling");
+    pD3DXMatrixShadow = (void *)GetProcAddress(hD3DX8, "D3DXMatrixShadow");
+    pD3DXMatrixTransformation = (void *)GetProcAddress(hD3DX8, "D3DXMatrixTransformation");
+    pD3DXMatrixTranslation = (void *)GetProcAddress(hD3DX8, "D3DXMatrixTranslation");
+    pD3DXMatrixTranspose = (void *)GetProcAddress(hD3DX8, "D3DXMatrixTranspose");
+    pD3DXMatrixfDeterminant = (void *)GetProcAddress(hD3DX8, "D3DXMatrixfDeterminant");
+    pD3DXPlaneFromPointNormal = (void *)GetProcAddress(hD3DX8, "D3DXPlaneFromPointNormal");
+    pD3DXPlaneFromPoints = (void *)GetProcAddress(hD3DX8, "D3DXPlaneFromPoints");
+    pD3DXPlaneIntersectLine = (void *)GetProcAddress(hD3DX8, "D3DXPlaneIntersectLine");
+    pD3DXPlaneNormalize = (void *)GetProcAddress(hD3DX8, "D3DXPlaneNormalize");
+    pD3DXPlaneTransform = (void *)GetProcAddress(hD3DX8, "D3DXPlaneTransform");
+    pD3DXQuaternionBaryCentric = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionBaryCentric");
+    pD3DXQuaternionExp = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionExp");
+    pD3DXQuaternionInverse = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionInverse");
+    pD3DXQuaternionLn = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionLn");
+    pD3DXQuaternionMultiply = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionMultiply");
+    pD3DXQuaternionNormalize = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionNormalize");
+    pD3DXQuaternionRotationAxis = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionRotationAxis");
+    pD3DXQuaternionRotationMatrix = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionRotationMatrix");
+    pD3DXQuaternionRotationYawPitchRoll = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionRotationYawPitchRoll");
+    pD3DXQuaternionSlerp = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionSlerp");
+    pD3DXQuaternionSquad = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionSquad");
+    pD3DXQuaternionToAxisAngle = (void *)GetProcAddress(hD3DX8, "D3DXQuaternionToAxisAngle");
+    pD3DXVec2BaryCentric = (void *)GetProcAddress(hD3DX8, "D3DXVec2BaryCentric");
+    pD3DXVec2CatmullRom = (void *)GetProcAddress(hD3DX8, "D3DXVec2CatmullRom");
+    pD3DXVec2Hermite = (void *)GetProcAddress(hD3DX8, "D3DXVec2Hermite");
+    pD3DXVec2Normalize = (void *)GetProcAddress(hD3DX8, "D3DXVec2Normalize");
+    pD3DXVec2Transform = (void *)GetProcAddress(hD3DX8, "D3DXVec2Transform");
+    pD3DXVec2TransformCoord = (void *)GetProcAddress(hD3DX8, "D3DXVec2TransformCoord");
+    pD3DXVec2TransformNormal = (void *)GetProcAddress(hD3DX8, "D3DXVec2TransformNormal");
+    pD3DXVec2TransformCoord = (void *)GetProcAddress(hD3DX8, "D3DXVec2TransformCoord");
+    pD3DXVec2TransformNormal = (void *)GetProcAddress(hD3DX8, "D3DXVec2TransformNormal");
+    pD3DXVec3BaryCentric = (void *)GetProcAddress(hD3DX8, "D3DXVec3BaryCentric");
+    pD3DXVec3CatmullRom = (void *)GetProcAddress(hD3DX8, "D3DXVec3CatmullRom");
+    pD3DXVec3Hermite = (void *)GetProcAddress(hD3DX8, "D3DXVec3Hermite");
+    pD3DXVec3Normalize = (void *)GetProcAddress(hD3DX8, "D3DXVec3Normalize");
+    pD3DXVec3Project = (void *)GetProcAddress(hD3DX8, "D3DXVec3Project");
+    pD3DXVec3Transform = (void *)GetProcAddress(hD3DX8, "D3DXVec3Transform");
+    pD3DXVec3TransformCoord = (void *)GetProcAddress(hD3DX8, "D3DXVec3TransformCoord");
+    pD3DXVec3TransformNormal = (void *)GetProcAddress(hD3DX8, "D3DXVec3TransformNormal");
+    pD3DXVec3TransformCoord = (void *)GetProcAddress(hD3DX8, "D3DXVec3TransformCoord");
+    pD3DXVec3TransformNormal = (void *)GetProcAddress(hD3DX8, "D3DXVec3TransformNormal");
+    pD3DXVec3Unproject = (void *)GetProcAddress(hD3DX8, "D3DXVec3Unproject");
+    pD3DXVec4BaryCentric = (void *)GetProcAddress(hD3DX8, "D3DXVec4BaryCentric");
+    pD3DXVec4CatmullRom = (void *)GetProcAddress(hD3DX8, "D3DXVec4CatmullRom");
+    pD3DXVec4Cross = (void *)GetProcAddress(hD3DX8, "D3DXVec4Cross");
+    pD3DXVec4Hermite = (void *)GetProcAddress(hD3DX8, "D3DXVec4Hermite");
+    pD3DXVec4Normalize = (void *)GetProcAddress(hD3DX8, "D3DXVec4Normalize");
+    pD3DXVec4Transform = (void *)GetProcAddress(hD3DX8, "D3DXVec4Transform");
+}
+
 #define admitted_error 0.0001f
 
 #define expect_color(expectedcolor,gotcolor) ok((fabs(expectedcolor.r-gotcolor.r)<admitted_error)&&(fabs(expectedcolor.g-gotcolor.g)<admitted_error)&&(fabs(expectedcolor.b-gotcolor.b)<admitted_error)&&(fabs(expectedcolor.a-gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);
@@ -84,12 +245,12 @@ static void D3DXColorTest(void)
 
 /*_______________D3DXColorAdjustContrast______*/
     expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f, expected.a = 0.93f;
-    D3DXColorAdjustContrast(&got,&color,scale);
+    pD3DXColorAdjustContrast(&got,&color,scale);
     expect_color(expected,got);
 
 /*_______________D3DXColorAdjustSaturation______*/
     expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f, expected.a = 0.93f;
-    D3DXColorAdjustSaturation(&got,&color,scale);
+    pD3DXColorAdjustSaturation(&got,&color,scale);
     expect_color(expected,got);
 
 /*_______________D3DXColorLerp________________*/
@@ -204,19 +365,19 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = -1239.0f; U(expectedmat).m[3][1] = 667.0f; U(expectedmat).m[3][2] = 567.0f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixAffineTransformation(&gotmat,3.56f,&at,&q,&axis);
+    pD3DXMatrixAffineTransformation(&gotmat,3.56f,&at,&q,&axis);
     expect_mat(expectedmat,gotmat);
 /* Test the NULL case */
     U(expectedmat).m[0][0] = -459.239990f; U(expectedmat).m[0][1] = -576.719971f; U(expectedmat).m[0][2] = -263.440002f; U(expectedmat).m[0][3] = 0.0f;
     U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixAffineTransformation(&gotmat,3.56f,NULL,&q,&axis);
+    pD3DXMatrixAffineTransformation(&gotmat,3.56f,NULL,&q,&axis);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixfDeterminant_____________*/
     expectedfloat = -147888.0f;
-    gotfloat = D3DXMatrixfDeterminant(&mat);
+    gotfloat = pD3DXMatrixfDeterminant(&mat);
     ok(fabs( gotfloat - expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, gotfloat);
 
 /*____________D3DXMatrixInverse______________*/
@@ -225,10 +386,10 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[2][0] = -389.0f/2054.0f; U(expectedmat).m[2][1] = 337.0f/4108.0f; U(expectedmat).m[2][2] = 181.0f/4108.0f; U(expectedmat).m[2][3] = 317.0f/4108.0f;
     U(expectedmat).m[3][0] = 163.0f/5688.0f; U(expectedmat).m[3][1] = -101.0f/11376.0f; U(expectedmat).m[3][2] = -73.0f/11376.0f; U(expectedmat).m[3][3] = -127.0f/3792.0f;
     expectedfloat = -147888.0f;
-    D3DXMatrixInverse(&gotmat,&determinant,&mat);
+    pD3DXMatrixInverse(&gotmat,&determinant,&mat);
     expect_mat(expectedmat,gotmat);
     ok(fabs( determinant - expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, determinant);
-    funcpointer = D3DXMatrixInverse(&gotmat,NULL,&mat2);
+    funcpointer = pD3DXMatrixInverse(&gotmat,NULL,&mat2);
     ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
 
 /*____________D3DXMatrixIsIdentity______________*/
@@ -253,7 +414,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = -0.555856f; U(expectedmat).m[1][1] = 0.431286f; U(expectedmat).m[1][2] = 0.710645f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = -0.120729f; U(expectedmat).m[2][1] = 0.803935f; U(expectedmat).m[2][2] = -0.582335f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 4.494634f; U(expectedmat).m[3][1] = 0.809719f; U(expectedmat).m[3][2] = 10.060076f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixLookAtLH(&gotmat,&eye,&at,&axis);
+    pD3DXMatrixLookAtLH(&gotmat,&eye,&at,&axis);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixLookatRH_______________*/
@@ -261,7 +422,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.555856f; U(expectedmat).m[1][1] = 0.431286f; U(expectedmat).m[1][2] = -0.710645f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.120729f; U(expectedmat).m[2][1] = 0.803935f; U(expectedmat).m[2][2] = 0.582335f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = -4.494634f; U(expectedmat).m[3][1] = 0.809719f; U(expectedmat).m[3][2] = -10.060076f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixLookAtRH(&gotmat,&eye,&at,&axis);
+    pD3DXMatrixLookAtRH(&gotmat,&eye,&at,&axis);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixMultiply______________*/
@@ -269,7 +430,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 231.0f; U(expectedmat).m[1][1] = 551.0f; U(expectedmat).m[1][2] = -489.0f; U(expectedmat).m[1][3] = -169.0;
     U(expectedmat).m[2][0] = 239.0f; U(expectedmat).m[2][1] = 523.0f; U(expectedmat).m[2][2] = -400.0f; U(expectedmat).m[2][3] = -116.0f;
     U(expectedmat).m[3][0] = -164.0f; U(expectedmat).m[3][1] = -320.0f; U(expectedmat).m[3][2] = 187.0f; U(expectedmat).m[3][3] = 31.0f;
-    D3DXMatrixMultiply(&gotmat,&mat,&mat2);
+    pD3DXMatrixMultiply(&gotmat,&mat,&mat2);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixMultiplyTranspose____*/
@@ -277,7 +438,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 193.0f; U(expectedmat).m[1][1] = 551.0f; U(expectedmat).m[1][2] = 523.0f; U(expectedmat).m[1][3] = -320.0;
     U(expectedmat).m[2][0] = -197.0f; U(expectedmat).m[2][1] = -489.0f; U(expectedmat).m[2][2] = -400.0f; U(expectedmat).m[2][3] = 187.0f;
     U(expectedmat).m[3][0] = -77.0f; U(expectedmat).m[3][1] = -169.0f; U(expectedmat).m[3][2] = -116.0f; U(expectedmat).m[3][3] = 31.0f;
-    D3DXMatrixMultiplyTranspose(&gotmat,&mat,&mat2);
+    pD3DXMatrixMultiplyTranspose(&gotmat,&mat,&mat2);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixOrthoLH_______________*/
@@ -285,7 +446,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.270270f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.151515f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -0.484848f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixOrthoLH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f);
+    pD3DXMatrixOrthoLH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixOrthoOffCenterLH_______________*/
@@ -293,7 +454,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.180180f; U(expectedmat).m[1][2] = 0.0; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.045662f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = -1.727272f; U(expectedmat).m[3][1] = -0.567568f; U(expectedmat).m[3][2] = 0.424658f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixOrthoOffCenterLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 9.3, -12.6);
+    pD3DXMatrixOrthoOffCenterLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 9.3, -12.6);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixOrthoOffCenterRH_______________*/
@@ -301,7 +462,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.180180f; U(expectedmat).m[1][2] = 0.0; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.045662f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = -1.727272f; U(expectedmat).m[3][1] = -0.567568f; U(expectedmat).m[3][2] = 0.424658f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixOrthoOffCenterRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 9.3, -12.6);
+    pD3DXMatrixOrthoOffCenterRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 9.3, -12.6);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixOrthoRH_______________*/
@@ -309,7 +470,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.270270f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.151515f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -0.484848f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixOrthoRH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f);
+    pD3DXMatrixOrthoRH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixPerspectiveFovLH_______________*/
@@ -317,7 +478,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 9.966644f; U(expectedmat).m[1][2] = 0.0; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.783784f; U(expectedmat).m[2][3] = 1.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.881081f; U(expectedmat).m[3][3] = 0.0f;
-    D3DXMatrixPerspectiveFovLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f);
+    pD3DXMatrixPerspectiveFovLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixPerspectiveFovRH_______________*/
@@ -325,7 +486,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 9.966644f; U(expectedmat).m[1][2] = 0.0; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.783784f; U(expectedmat).m[2][3] = -1.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.881081f; U(expectedmat).m[3][3] = 0.0f;
-    D3DXMatrixPerspectiveFovRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f);
+    pD3DXMatrixPerspectiveFovRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixPerspectiveLH_______________*/
@@ -333,7 +494,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = -6.4f; U(expectedmat).m[1][2] = 0.0; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.783784f; U(expectedmat).m[2][3] = 1.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.881081f; U(expectedmat).m[3][3] = 0.0f;
-    D3DXMatrixPerspectiveLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f);
+    pD3DXMatrixPerspectiveLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixPerspectiveOffCenterLH_______________*/
@@ -341,7 +502,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.576577f; U(expectedmat).m[1][2] = 0.0; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = -1.727273f; U(expectedmat).m[2][1] = -0.567568f; U(expectedmat).m[2][2] = 0.840796f; U(expectedmat).m[2][3] = 1.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -2.690547f; U(expectedmat).m[3][3] = 0.0f;
-    D3DXMatrixPerspectiveOffCenterLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 3.2f, -16.9f);
+    pD3DXMatrixPerspectiveOffCenterLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 3.2f, -16.9f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixPerspectiveOffCenterRH_______________*/
@@ -349,7 +510,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.576577f; U(expectedmat).m[1][2] = 0.0; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 1.727273f; U(expectedmat).m[2][1] = 0.567568f; U(expectedmat).m[2][2] = -0.840796f; U(expectedmat).m[2][3] = -1.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -2.690547f; U(expectedmat).m[3][3] = 0.0f;
-    D3DXMatrixPerspectiveOffCenterRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 3.2f, -16.9f);
+    pD3DXMatrixPerspectiveOffCenterRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 3.2f, -16.9f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixPerspectiveRH_______________*/
@@ -357,7 +518,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = -6.4f; U(expectedmat).m[1][2] = 0.0; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.783784f; U(expectedmat).m[2][3] = -1.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.881081f; U(expectedmat).m[3][3] = 0.0f;
-    D3DXMatrixPerspectiveRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f);
+    pD3DXMatrixPerspectiveRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixReflect______________*/
@@ -365,7 +526,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = -0.230769; U(expectedmat).m[1][1] = 0.923077f; U(expectedmat).m[1][2] = 0.307693f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.923077f; U(expectedmat).m[2][1] = 0.307693f; U(expectedmat).m[2][2] = -0.230769f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 1.615385f; U(expectedmat).m[3][1] = 0.538462f; U(expectedmat).m[3][2] = -2.153846f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixReflect(&gotmat,&plane);
+    pD3DXMatrixReflect(&gotmat,&plane);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixRotationAxis_____*/
@@ -373,7 +534,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = -0.814652f; U(expectedmat).m[1][1] = 0.576271f; U(expectedmat).m[1][2] = -0.065219f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = -0.278919f; U(expectedmat).m[2][1] = -0.290713f; U(expectedmat).m[2][2] = 0.915254f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixRotationAxis(&gotmat,&axis,angle);
+    pD3DXMatrixRotationAxis(&gotmat,&axis,angle);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixRotationQuaternion______________*/
@@ -381,7 +542,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 146.0f; U(expectedmat).m[1][1] = -99.0f; U(expectedmat).m[1][2] = -78.0f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 102.0f; U(expectedmat).m[2][1] = -34.0f; U(expectedmat).m[2][2] = -33.0f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixRotationQuaternion(&gotmat,&q);
+    pD3DXMatrixRotationQuaternion(&gotmat,&q);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixRotationX______________*/
@@ -389,7 +550,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0; U(expectedmat).m[1][1] = 0.5f; U(expectedmat).m[1][2] = sqrt(3.0f)/2.0f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = -sqrt(3.0f)/2.0f; U(expectedmat).m[2][2] = 0.5f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixRotationX(&gotmat,angle);
+    pD3DXMatrixRotationX(&gotmat,angle);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixRotationY______________*/
@@ -397,7 +558,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0; U(expectedmat).m[1][1] = 1.0f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = sqrt(3.0f)/2.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.5f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixRotationY(&gotmat,angle);
+    pD3DXMatrixRotationY(&gotmat,angle);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixRotationYawPitchRoll____*/
@@ -405,7 +566,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.351713f; U(expectedmat).m[1][1] = 0.491487f; U(expectedmat).m[1][2] = 0.796705f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.293893f; U(expectedmat).m[2][1] = -0.866025f; U(expectedmat).m[2][2] = 0.404509f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixRotationYawPitchRoll(&gotmat, 3.0f*angle/5.0f, angle, 3.0f*angle/17.0f);
+    pD3DXMatrixRotationYawPitchRoll(&gotmat, 3.0f*angle/5.0f, angle, 3.0f*angle/17.0f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixRotationZ______________*/
@@ -413,7 +574,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = -sqrt(3.0f)/2.0f; U(expectedmat).m[1][1] = 0.5f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 1.0f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixRotationZ(&gotmat,angle);
+    pD3DXMatrixRotationZ(&gotmat,angle);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixScaling______________*/
@@ -421,7 +582,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0; U(expectedmat).m[1][1] = 0.53f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 4.11f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixScaling(&gotmat,0.69f,0.53f,4.11f);
+    pD3DXMatrixScaling(&gotmat,0.69f,0.53f,4.11f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixShadow______________*/
@@ -429,7 +590,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 1.882715; U(expectedmat).m[1][1] = 8.805615f; U(expectedmat).m[1][2] = 1.451259f; U(expectedmat).m[1][3] = 1.235532f;
     U(expectedmat).m[2][0] = -7.530860f; U(expectedmat).m[2][1] = -6.667949f; U(expectedmat).m[2][2] = 1.333590f; U(expectedmat).m[2][3] = -4.942127f;
     U(expectedmat).m[3][0] = -13.179006f; U(expectedmat).m[3][1] = -11.668910f; U(expectedmat).m[3][2] = -10.158816f; U(expectedmat).m[3][3] = -1.510094f;
-    D3DXMatrixShadow(&gotmat,&light,&plane);
+    pD3DXMatrixShadow(&gotmat,&light,&plane);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixTransformation______________*/
@@ -437,7 +598,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.9504f; U(expectedmat).m[1][1] = -0.8836f; U(expectedmat).m[1][2] = 0.9244f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 1.0212f; U(expectedmat).m[2][1] = 0.1936f; U(expectedmat).m[2][2] = -1.3588f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 18.2985f; U(expectedmat).m[3][1] = -29.624001f; U(expectedmat).m[3][2] = 15.683499f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixTransformation(&gotmat,&at,&q,NULL,&eye,&r,&last);
+    pD3DXMatrixTransformation(&gotmat,&at,&q,NULL,&eye,&r,&last);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixTranslation______________*/
@@ -445,7 +606,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 0.0; U(expectedmat).m[1][1] = 1.0f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f;
     U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 1.0f; U(expectedmat).m[2][3] = 0.0f;
     U(expectedmat).m[3][0] = 0.69f; U(expectedmat).m[3][1] = 0.53f; U(expectedmat).m[3][2] = 4.11f; U(expectedmat).m[3][3] = 1.0f;
-    D3DXMatrixTranslation(&gotmat,0.69f,0.53f,4.11f);
+    pD3DXMatrixTranslation(&gotmat,0.69f,0.53f,4.11f);
     expect_mat(expectedmat,gotmat);
 
 /*____________D3DXMatrixTranspose______________*/
@@ -453,7 +614,7 @@ static void D3DXMatrixTest(void)
     U(expectedmat).m[1][0] = 5.0; U(expectedmat).m[1][1] = 20.0f; U(expectedmat).m[1][2] = -21.0f; U(expectedmat).m[1][3] = 3.0f;
     U(expectedmat).m[2][0] = 7.0f; U(expectedmat).m[2][1] = 16.0f; U(expectedmat).m[2][2] = 30.f; U(expectedmat).m[2][3] = -4.0f;
     U(expectedmat).m[3][0] = 8.0f; U(expectedmat).m[3][1] = 33.0f; U(expectedmat).m[3][2] = 43.0f; U(expectedmat).m[3][3] = -40.0f;
-    D3DXMatrixTranspose(&gotmat,&mat);
+    pD3DXMatrixTranspose(&gotmat,&mat);
     expect_mat(expectedmat,gotmat);
 }
 
@@ -514,7 +675,7 @@ static void D3DXPlaneTest(void)
     vec1.x = 11.0f; vec1.y = 13.0f; vec1.z = 15.0f;
     vec2.x = 17.0f; vec2.y = 31.0f; vec2.z = 24.0f;
     expectedplane.a = 17.0f; expectedplane.b = 31.0f; expectedplane.c = 24.0f; expectedplane.d = -950.0f;
-    D3DXPlaneFromPointNormal(&gotplane,&vec1,&vec2);
+    pD3DXPlaneFromPointNormal(&gotplane,&vec1,&vec2);
     expect_plane(expectedplane, gotplane);
 
 /*_______________D3DXPlaneFromPoints_______*/
@@ -522,43 +683,43 @@ static void D3DXPlaneTest(void)
     vec2.x = 1.0f; vec2.y = -6.0f; vec2.z = -5.0f;
     vec3.x = 83.0f; vec3.y = 74.0f; vec3.z = 65.0f;
     expectedplane.a = 0.085914f; expectedplane.b = -0.704492f; expectedplane.c = 0.704492f; expectedplane.d = -0.790406f;
-    D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3);
+    pD3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3);
     expect_plane(expectedplane, gotplane);
     /* Test if 2 vectors are parallels */
     vec3.x = 1.0f; vec3.y = 1.0f; vec3.z = 2.0f;
     expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f;
-    D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3);
+    pD3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3);
     expect_plane(expectedplane, gotplane);
 
 /*_______________D3DXPlaneIntersectLine___________*/
     vec1.x = 9.0f; vec1.y = 6.0f; vec1.z = 3.0f;
     vec2.x = 2.0f; vec2.y = 5.0f; vec2.z = 8.0f;
     expectedvec.x = 20.0f/3.0f; expectedvec.y = 17.0f/3.0f; expectedvec.z = 14.0f/3.0f;
-    D3DXPlaneIntersectLine(&gotvec,&plane,&vec1,&vec2);
+    pD3DXPlaneIntersectLine(&gotvec,&plane,&vec1,&vec2);
     expect_vec3(expectedvec, gotvec);
     /* Test a parallel line */
     vec1.x = 11.0f; vec1.y = 13.0f; vec1.z = 15.0f;
     vec2.x = 17.0f; vec2.y = 31.0f; vec2.z = 24.0f;
     expectedvec.x = 20.0f/3.0f; expectedvec.y = 17.0f/3.0f; expectedvec.z = 14.0f/3.0f;
-    funcpointer = D3DXPlaneIntersectLine(&gotvec,&plane,&vec1,&vec2);
+    funcpointer = pD3DXPlaneIntersectLine(&gotvec,&plane,&vec1,&vec2);
     ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
 
 /*_______________D3DXPlaneNormalize______________*/
     expectedplane.a = -3.0f/sqrt(26.0f); expectedplane.b = -1.0f/sqrt(26.0f); expectedplane.c = 4.0f/sqrt(26.0f); expectedplane.d = 7.0/sqrt(26.0f);
-    D3DXPlaneNormalize(&gotplane, &plane);
+    pD3DXPlaneNormalize(&gotplane, &plane);
     expect_plane(expectedplane, gotplane);
     nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 0.0f;
     expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f;
-    D3DXPlaneNormalize(&gotplane, &nulplane);
+    pD3DXPlaneNormalize(&gotplane, &nulplane);
     expect_plane(expectedplane, gotplane);
     nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 4.3f;
     expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f;
-    D3DXPlaneNormalize(&gotplane, &nulplane);
+    pD3DXPlaneNormalize(&gotplane, &nulplane);
     expect_plane(expectedplane, gotplane);
 
 /*_______________D3DXPlaneTransform____________*/
     expectedplane.a = 49.0f; expectedplane.b = -98.0f; expectedplane.c = 55.0f; expectedplane.d = -165.0f;
-    D3DXPlaneTransform(&gotplane,&plane,&mat);
+    pD3DXPlaneTransform(&gotplane,&plane,&mat);
     expect_plane(expectedplane, gotplane);
 }
 
@@ -582,7 +743,7 @@ static void D3X8QuaternionTest(void)
 
 /*_______________D3DXQuaternionBaryCentric________________________*/
     expectedquat.x = -867.444458; expectedquat.y = 87.851111f; expectedquat.z = -9.937778f; expectedquat.w = 3.235555f;
-    D3DXQuaternionBaryCentric(&gotquat,&q,&r,&t,scale,scale2);
+    pD3DXQuaternionBaryCentric(&gotquat,&q,&r,&t,scale,scale2);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionConjugate________________*/
@@ -609,16 +770,16 @@ static void D3X8QuaternionTest(void)
 
 /*_______________D3DXQuaternionExp______________________________*/
     expectedquat.x = -0.216382f; expectedquat.y = -0.432764f; expectedquat.z = -0.8655270f; expectedquat.w = -0.129449f;
-    D3DXQuaternionExp(&gotquat,&q);
+    pD3DXQuaternionExp(&gotquat,&q);
     expect_vec4(expectedquat,gotquat);
     /* Test the null quaternion */
     expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 1.0f;
-    D3DXQuaternionExp(&gotquat,&nul);
+    pD3DXQuaternionExp(&gotquat,&nul);
     expect_vec4(expectedquat,gotquat);
     /* Test the case where the norm of the quaternion is <1 */
     Nq1.x = 0.2f; Nq1.y = 0.1f; Nq1.z = 0.3; Nq1.w= 0.9f;
     expectedquat.x = 0.195366; expectedquat.y = 0.097683f; expectedquat.z = 0.293049f; expectedquat.w = 0.930813f;
-    D3DXQuaternionExp(&gotquat,&Nq1);
+    pD3DXQuaternionExp(&gotquat,&Nq1);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionIdentity________________*/
@@ -631,11 +792,11 @@ static void D3X8QuaternionTest(void)
 
 /*_______________D3DXQuaternionInverse________________________*/
     expectedquat.x = -1.0f/121.0f; expectedquat.y = -2.0f/121.0f; expectedquat.z = -4.0f/121.0f; expectedquat.w = 10.0f/121.0f;
-    D3DXQuaternionInverse(&gotquat,&q);
+    pD3DXQuaternionInverse(&gotquat,&q);
     expect_vec4(expectedquat,gotquat);
     /* test the null quaternion */
     expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f;
-    D3DXQuaternionInverse(&gotquat,&nul);
+    pD3DXQuaternionInverse(&gotquat,&nul);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionIsIdentity________________*/
@@ -671,45 +832,45 @@ static void D3X8QuaternionTest(void)
 
 /*_______________D3DXQuaternionLn______________________________*/
     expectedquat.x = 1.0f; expectedquat.y = 2.0f; expectedquat.z = 4.0f; expectedquat.w = 0.0f;
-    D3DXQuaternionLn(&gotquat,&q);
+    pD3DXQuaternionLn(&gotquat,&q);
     expect_vec4(expectedquat,gotquat);
     expectedquat.x = -3.0f; expectedquat.y = 4.0f; expectedquat.z = -5.0f; expectedquat.w = 0.0f;
-    D3DXQuaternionLn(&gotquat,&r);
+    pD3DXQuaternionLn(&gotquat,&r);
     expect_vec4(expectedquat,gotquat);
     Nq.x = 1.0f/11.0f; Nq.y = 2.0f/11.0f; Nq.z = 4.0f/11.0f; Nq.w=10.0f/11.0f;
     expectedquat.x = 0.093768f; expectedquat.y = 0.187536f; expectedquat.z = 0.375073f; expectedquat.w = 0.0f;
-    D3DXQuaternionLn(&gotquat,&Nq);
+    pD3DXQuaternionLn(&gotquat,&Nq);
     expect_vec4(expectedquat,gotquat);
     /* Test the cas where the norm of the quaternion is <1 */
     Nq1.x = 0.2f; Nq1.y = 0.1f; Nq1.z = 0.3; Nq1.w= 0.9f;
     expectedquat.x = 0.206945f; expectedquat.y = 0.103473f; expectedquat.z = 0.310418f; expectedquat.w = 0.0f;
-    D3DXQuaternionLn(&gotquat,&Nq1);
+    pD3DXQuaternionLn(&gotquat,&Nq1);
     todo_wine{ expect_vec4(expectedquat,gotquat) };
 
 /*_______________D3DXQuaternionMultiply________________________*/
     expectedquat.x = 3.0f; expectedquat.y = 61.0f; expectedquat.z = -32.0f; expectedquat.w = 85.0f;
-    D3DXQuaternionMultiply(&gotquat,&q,&r);
+    pD3DXQuaternionMultiply(&gotquat,&q,&r);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionNormalize________________________*/
     expectedquat.x = 1.0f/11.0f; expectedquat.y = 2.0f/11.0f; expectedquat.z = 4.0f/11.0f; expectedquat.w = 10.0f/11.0f;
-    D3DXQuaternionNormalize(&gotquat,&q);
+    pD3DXQuaternionNormalize(&gotquat,&q);
     expect_vec4(expectedquat,gotquat);
     /* Test the nul quaternion */
     expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f;
-    D3DXQuaternionNormalize(&gotquat,&nul);
+    pD3DXQuaternionNormalize(&gotquat,&nul);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionRotationAxis___________________*/
     axis.x = 2.0f; axis.y = 7.0; axis.z = 13.0f;
     angle = D3DX_PI/3.0f;
     expectedquat.x = 0.067116; expectedquat.y = 0.234905f; expectedquat.z = 0.436251f; expectedquat.w = 0.866025f;
-    D3DXQuaternionRotationAxis(&gotquat,&axis,angle);
+    pD3DXQuaternionRotationAxis(&gotquat,&axis,angle);
     expect_vec4(expectedquat,gotquat);
  /* Test the nul quaternion */
     axis.x = 0.0f; axis.y = 0.0; axis.z = 0.0f;
     expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.866025f;
-    D3DXQuaternionRotationAxis(&gotquat,&axis,angle);
+    pD3DXQuaternionRotationAxis(&gotquat,&axis,angle);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionRotationMatrix___________________*/
@@ -721,7 +882,7 @@ static void D3X8QuaternionTest(void)
     U(mat).m[0][0] = 10.0f; U(mat).m[1][1] = 20.0f; U(mat).m[2][2] = 30.0f;
     U(mat).m[3][3] = 48.0f;
     expectedquat.x = 2.368682f; expectedquat.y = 0.768221f; expectedquat.z = -0.384111f; expectedquat.w = 3.905125f;
-    D3DXQuaternionRotationMatrix(&gotquat,&mat);
+    pD3DXQuaternionRotationMatrix(&gotquat,&mat);
     expect_vec4(expectedquat,gotquat);
     /* test the case when the greater element is (2,2) */
     U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f;
@@ -731,7 +892,7 @@ static void D3X8QuaternionTest(void)
     U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = -60.0f; U(mat).m[2][2] = 40.0f;
     U(mat).m[3][3] = 48.0f;
     expectedquat.x = 1.233905f; expectedquat.y = -0.237290f; expectedquat.z = 5.267827f; expectedquat.w = -0.284747f;
-    D3DXQuaternionRotationMatrix(&gotquat,&mat);
+    pD3DXQuaternionRotationMatrix(&gotquat,&mat);
     expect_vec4(expectedquat,gotquat);
     /* test the case when the greater element is (1,1) */
     U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f;
@@ -741,44 +902,44 @@ static void D3X8QuaternionTest(void)
     U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 60.0f; U(mat).m[2][2] = -80.0f;
     U(mat).m[3][3] = 48.0f;
     expectedquat.x = 0.651031f; expectedquat.y = 6.144103f; expectedquat.z = -0.203447f; expectedquat.w = 0.488273f;
-    D3DXQuaternionRotationMatrix(&gotquat,&mat);
+    pD3DXQuaternionRotationMatrix(&gotquat,&mat);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionRotationYawPitchRoll__________*/
     expectedquat.x = 0.303261f; expectedquat.y = 0.262299f; expectedquat.z = 0.410073f; expectedquat.w = 0.819190f;
-    D3DXQuaternionRotationYawPitchRoll(&gotquat,D3DX_PI/4.0f,D3DX_PI/11.0f,D3DX_PI/3.0f);
+    pD3DXQuaternionRotationYawPitchRoll(&gotquat,D3DX_PI/4.0f,D3DX_PI/11.0f,D3DX_PI/3.0f);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionSlerp________________________*/
     expectedquat.x = -0.2f; expectedquat.y = 2.6f; expectedquat.z = 1.3f; expectedquat.w = 9.1f;
-    D3DXQuaternionSlerp(&gotquat,&q,&r,scale);
+    pD3DXQuaternionSlerp(&gotquat,&q,&r,scale);
     expect_vec4(expectedquat,gotquat);
     expectedquat.x = 334.0f; expectedquat.y = -31.9f; expectedquat.z = 6.1f; expectedquat.w = 6.7f;
-    D3DXQuaternionSlerp(&gotquat,&q,&t,scale);
+    pD3DXQuaternionSlerp(&gotquat,&q,&t,scale);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionSquad________________________*/
     expectedquat.x = -156.296f; expectedquat.y = 30.242f; expectedquat.z = -2.5022f; expectedquat.w = 7.3576f;
-    D3DXQuaternionSquad(&gotquat,&q,&r,&t,&u,scale);
+    pD3DXQuaternionSquad(&gotquat,&q,&r,&t,&u,scale);
     expect_vec4(expectedquat,gotquat);
 
 /*_______________D3DXQuaternionToAxisAngle__________________*/
     Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f;
     expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f;
     expected = 2.197869f;
-    D3DXQuaternionToAxisAngle(&Nq,&axis,&angle);
+    pD3DXQuaternionToAxisAngle(&Nq,&axis,&angle);
     expect_vec3(expectedvec,axis);
     ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle);
     /* Test if |w|>1.0f */
     expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f;
     expected = 0.0f;
-    D3DXQuaternionToAxisAngle(&q,&axis,&angle);
+    pD3DXQuaternionToAxisAngle(&q,&axis,&angle);
     expect_vec3(expectedvec,axis);
     ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle);
     /* Test the null quaternion */
     expectedvec.x = 1.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f;
     expected = 0.0f;
-    D3DXQuaternionToAxisAngle(&nul,&axis,&angle);
+    pD3DXQuaternionToAxisAngle(&nul,&axis,&angle);
     expect_vec3(expectedvec,axis);
     ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle);
 }
@@ -817,12 +978,12 @@ static void D3X8Vector2Test(void)
 
 /*_______________D3DXVec2BaryCentric___________________*/
     expectedvec.x = -12.0f; expectedvec.y = -21.0f;
-    D3DXVec2BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2);
+    pD3DXVec2BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2);
     expect_vec(expectedvec,gotvec);
 
 /*_______________D3DXVec2CatmullRom____________________*/
     expectedvec.x = 5820.25f; expectedvec.y = -3654.5625f;
-    D3DXVec2CatmullRom(&gotvec,&u,&v,&w,&x,scale);
+    pD3DXVec2CatmullRom(&gotvec,&u,&v,&w,&x,scale);
     expect_vec(expectedvec,gotvec);
 
 /*_______________D3DXVec2CCW__________________________*/
@@ -851,7 +1012,7 @@ static void D3X8Vector2Test(void)
 
 /*_______________D3DXVec2Hermite__________________________*/
     expectedvec.x = 2604.625f; expectedvec.y = -4533.0f;
-    D3DXVec2Hermite(&gotvec,&u,&v,&w,&x,scale);
+    pD3DXVec2Hermite(&gotvec,&u,&v,&w,&x,scale);
     expect_vec(expectedvec,gotvec);
 
 /*_______________D3DXVec2Length__________________________*/
@@ -904,11 +1065,11 @@ static void D3X8Vector2Test(void)
 
 /*_______________D3DXVec2Normalize_________________________*/
     expectedvec.x = 0.6f; expectedvec.y = 0.8f;
-    D3DXVec2Normalize(&gotvec,&u);
+    pD3DXVec2Normalize(&gotvec,&u);
     expect_vec(expectedvec,gotvec);
     /* Test the nul vector */
     expectedvec.x = 0.0f; expectedvec.y = 0.0f;
-    D3DXVec2Normalize(&gotvec,&nul);
+    pD3DXVec2Normalize(&gotvec,&nul);
     expect_vec(expectedvec,gotvec);
 
 /*_______________D3DXVec2Scale____________________________*/
@@ -933,22 +1094,22 @@ static void D3X8Vector2Test(void)
 
 /*_______________D3DXVec2Transform_______________________*/
     expectedtrans.x = 36.0f; expectedtrans.y = 44.0f; expectedtrans.z = 52.0f; expectedtrans.w = 60.0f;
-    D3DXVec2Transform(&gottrans,&u,&mat);
+    pD3DXVec2Transform(&gottrans,&u,&mat);
     expect_vec4(expectedtrans,gottrans);
 
 /*_______________D3DXVec2TransformCoord_______________________*/
     expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f;
-    D3DXVec2TransformCoord(&gotvec,&u,&mat);
+    pD3DXVec2TransformCoord(&gotvec,&u,&mat);
     expect_vec(expectedvec,gotvec);
     /* Test the nul projected vector */
     nulproj.x = -2.0f; nulproj.y = -1.0f;
     expectedvec.x = 0.0f; expectedvec.y = 0.0f;
-    D3DXVec2TransformCoord(&gotvec,&nulproj,&mat);
+    pD3DXVec2TransformCoord(&gotvec,&nulproj,&mat);
     expect_vec(expectedvec,gotvec);
 
  /*_______________D3DXVec2TransformNormal______________________*/
     expectedvec.x = 23.0f; expectedvec.y = 30.0f;
-    D3DXVec2TransformNormal(&gotvec,&u,&mat);
+    pD3DXVec2TransformNormal(&gotvec,&u,&mat);
     expect_vec(expectedvec,gotvec);
 }
 
@@ -1002,13 +1163,13 @@ static void D3X8Vector3Test(void)
 
 /*_______________D3DXVec3BaryCentric___________________*/
     expectedvec.x = -35.0f; expectedvec.y = -67.0; expectedvec.z = 15.0f;
-    D3DXVec3BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2);
+    pD3DXVec3BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2);
 
     expect_vec3(expectedvec,gotvec);
 
 /*_______________D3DXVec3CatmullRom____________________*/
     expectedvec.x = 1458.0f; expectedvec.y = 22.1875f; expectedvec.z = 4141.375f;
-    D3DXVec3CatmullRom(&gotvec,&u,&v,&w,&x,scale);
+    pD3DXVec3CatmullRom(&gotvec,&u,&v,&w,&x,scale);
     expect_vec3(expectedvec,gotvec);
 
 /*_______________D3DXVec3Cross________________________*/
@@ -1035,7 +1196,7 @@ static void D3X8Vector3Test(void)
 
 /*_______________D3DXVec3Hermite__________________________*/
     expectedvec.x = -6045.75f; expectedvec.y = -6650.0f; expectedvec.z = 1358.875f;
-    D3DXVec3Hermite(&gotvec,&u,&v,&w,&x,scale);
+    pD3DXVec3Hermite(&gotvec,&u,&v,&w,&x,scale);
     expect_vec3(expectedvec,gotvec);
 
 /*_______________D3DXVec3Length__________________________*/
@@ -1088,17 +1249,17 @@ static void D3X8Vector3Test(void)
 
 /*_______________D3DXVec3Normalize_________________________*/
     expectedvec.x = 9.0f/11.0f; expectedvec.y = 6.0f/11.0f; expectedvec.z = 2.0f/11.0f;
-    D3DXVec3Normalize(&gotvec,&u);
+    pD3DXVec3Normalize(&gotvec,&u);
     expect_vec3(expectedvec,gotvec);
     /* Test the nul vector */
     expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f;
-    D3DXVec3Normalize(&gotvec,&nul);
+    pD3DXVec3Normalize(&gotvec,&nul);
     expect_vec3(expectedvec,gotvec);
 
 /*_______________D3DXVec3Project_________________________*/
     expectedvec.x = 1135.721924f; expectedvec.y = 147.086914f; expectedvec.z = 0.153412f;
-    D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f);
-    D3DXVec3Project(&gotvec,&u,&viewport,&projection,&view,&world);
+    pD3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f);
+    pD3DXVec3Project(&gotvec,&u,&viewport,&projection,&view,&world);
     expect_vec3(expectedvec,gotvec);
 
 /*_______________D3DXVec3Scale____________________________*/
@@ -1123,28 +1284,28 @@ static void D3X8Vector3Test(void)
 
 /*_______________D3DXVec3Transform_______________________*/
     expectedtrans.x = 70.0f; expectedtrans.y = 88.0f; expectedtrans.z = 106.0f; expectedtrans.w = 124.0f;
-    D3DXVec3Transform(&gottrans,&u,&mat);
+    pD3DXVec3Transform(&gottrans,&u,&mat);
     expect_vec4(expectedtrans,gottrans);
 
 /*_______________D3DXVec3TransformCoord_______________________*/
     expectedvec.x = 70.0f/124.0f; expectedvec.y = 88.0f/124.0f; expectedvec.z = 106.0f/124.0f;
-    D3DXVec3TransformCoord(&gotvec,&u,&mat);
+    pD3DXVec3TransformCoord(&gotvec,&u,&mat);
     expect_vec3(expectedvec,gotvec);
     /* Test the nul projected vector */
     nulproj.x = 1.0f; nulproj.y = -1.0f, nulproj.z = -1.0f;
     expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f;
-    D3DXVec3TransformCoord(&gotvec,&nulproj,&mat);
+    pD3DXVec3TransformCoord(&gotvec,&nulproj,&mat);
     expect_vec3(expectedvec,gotvec);
 
 /*_______________D3DXVec3TransformNormal______________________*/
     expectedvec.x = 57.0f; expectedvec.y = 74.0f; expectedvec.z = 91.0f;
-    D3DXVec3TransformNormal(&gotvec,&u,&mat);
+    pD3DXVec3TransformNormal(&gotvec,&u,&mat);
     expect_vec3(expectedvec,gotvec);
 
 /*_______________D3DXVec3Unproject_________________________*/
     expectedvec.x = -2.913411f; expectedvec.y = 1.593215f; expectedvec.z = 0.380724f;
-    D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f);
-    D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&view,&world);
+    pD3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f);
+    pD3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&view,&world);
     expect_vec3(expectedvec,gotvec);
 }
 
@@ -1182,17 +1343,17 @@ static void D3X8Vector4Test(void)
 
 /*_______________D3DXVec4BaryCentric____________________*/
     expectedvec.x = 8.0f; expectedvec.y = 26.0; expectedvec.z =  -44.0f; expectedvec.w = -41.0f;
-    D3DXVec4BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2);
+    pD3DXVec4BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2);
     expect_vec4(expectedvec,gotvec);
 
 /*_______________D3DXVec4CatmullRom____________________*/
     expectedvec.x = 2754.625f; expectedvec.y = 2367.5625f; expectedvec.z = 1060.1875f; expectedvec.w = 131.3125f;
-    D3DXVec4CatmullRom(&gotvec,&u,&v,&w,&x,scale);
+    pD3DXVec4CatmullRom(&gotvec,&u,&v,&w,&x,scale);
     expect_vec4(expectedvec,gotvec);
 
 /*_______________D3DXVec4Cross_________________________*/
     expectedvec.x = 390.0f; expectedvec.y = -393.0f; expectedvec.z = -316.0f; expectedvec.w = 166.0f;
-    D3DXVec4Cross(&gotvec,&u,&v,&w);
+    pD3DXVec4Cross(&gotvec,&u,&v,&w);
     expect_vec4(expectedvec,gotvec);
 
 /*_______________D3DXVec4Dot__________________________*/
@@ -1209,7 +1370,7 @@ static void D3X8Vector4Test(void)
 
 /*_______________D3DXVec4Hermite_________________________*/
     expectedvec.x = 1224.625f; expectedvec.y = 3461.625f; expectedvec.z = -4758.875f; expectedvec.w = -5781.5f;
-    D3DXVec4Hermite(&gotvec,&u,&v,&w,&x,scale);
+    pD3DXVec4Hermite(&gotvec,&u,&v,&w,&x,scale);
     expect_vec4(expectedvec,gotvec);
 
 /*_______________D3DXVec4Length__________________________*/
@@ -1262,11 +1423,11 @@ static void D3X8Vector4Test(void)
 
 /*_______________D3DXVec4Normalize_________________________*/
     expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; expectedvec.w = 10.0f/11.0f;
-    D3DXVec4Normalize(&gotvec,&u);
+    pD3DXVec4Normalize(&gotvec,&u);
     expect_vec4(expectedvec,gotvec);
     /* Test the nul vector */
     expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; expectedvec.w = 0.0f;
-    D3DXVec4Normalize(&gotvec,&nul);
+    pD3DXVec4Normalize(&gotvec,&nul);
     expect_vec4(expectedvec,gotvec);
 
 /*_______________D3DXVec4Scale____________________________*/
@@ -1291,12 +1452,21 @@ static void D3X8Vector4Test(void)
 
 /*_______________D3DXVec4Transform_______________________*/
     expectedtrans.x = 177.0f; expectedtrans.y = 194.0f; expectedtrans.z = 211.0f; expectedtrans.w = 228.0f;
-    D3DXVec4Transform(&gottrans,&u,&mat);
+    pD3DXVec4Transform(&gottrans,&u,&mat);
     expect_vec4(expectedtrans,gottrans);
 }
 
 START_TEST(math)
 {
+    HMODULE hD3DX8;
+    hD3DX8 = LoadLibrary("d3dx8.dll");
+    if (!hD3DX8)
+    {
+        skip("d3dx8 dll.not found\n");
+        return;
+    }
+    D3DX8_Imports(hD3DX8);
+
     D3DXColorTest();
     D3DXMatrixTest();
     D3DXPlaneTest();
@@ -1304,4 +1474,6 @@ START_TEST(math)
     D3X8Vector2Test();
     D3X8Vector3Test();
     D3X8Vector4Test();
+
+    FreeLibrary(hD3DX8);
 }
-- 
1.5.4.1