April 2007 - Wine-commits - list.winehq.org

David Adam : d3drm: Implement D3DRMVectorRotate.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 9fa78fd4d7a4259a0575e21d26e1216792ecd2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa78fd4d7a4259a0575e21d2… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:12:00 2007 +0200 d3drm: Implement D3DRMVectorRotate. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 19 +++++++++++++++++++ dlls/d3drm/tests/vector.c | 18 ++++++++++++++++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 1cb0ff7..c907bab 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -15,7 +15,7 @@ @ stdcall D3DRMVectorNormalize(ptr) @ stdcall D3DRMVectorRandom(ptr) @ stdcall D3DRMVectorReflect(ptr ptr ptr) -@ stub D3DRMVectorRotate +@ stdcall D3DRMVectorRotate(ptr ptr ptr long) @ stdcall D3DRMVectorScale(ptr ptr long) @ stdcall D3DRMVectorSubtract(ptr ptr ptr) @ stub Direct3DRMCreate diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 1dbff45..02dd965 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -122,6 +122,25 @@ LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR r, LPD3DVECTOR ray, LPD3DVECTO return r; } +/* Rotation of a vector */ +LPD3DVECTOR WINAPI D3DRMVectorRotate(LPD3DVECTOR r, LPD3DVECTOR v, LPD3DVECTOR axis, D3DVALUE theta) +{ + D3DRMQUATERNION quaternion,quaternion1, quaternion2, quaternion3, resultq; + D3DVECTOR NORM; + + quaternion1.s = cos(theta*.5); + quaternion2.s = cos(theta*.5); + NORM = *D3DRMVectorNormalize(axis); + D3DRMVectorScale(&quaternion1.v, &NORM, sin(theta * .5)); + D3DRMVectorScale(&quaternion2.v, &NORM, -sin(theta * .5)); + quaternion3.s = 0.0; + quaternion3.v = *v; + D3DRMQuaternionMultiply(&quaternion, &quaternion1, &quaternion3); + D3DRMQuaternionMultiply(&resultq, &quaternion, &quaternion2); + *r = *D3DRMVectorNormalize(&resultq.v); + return r; +} + /* Scale a vector */ LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR d, LPD3DVECTOR s, D3DVALUE factor) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 88fbaf7..9f89893 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -32,8 +32,8 @@ void VectorTest(void) { - D3DVALUE mod,par; - D3DVECTOR e,r,u,v,casnul,norm,ray; + D3DVALUE mod,par,theta; + D3DVECTOR e,r,u,v,w,axis,casnul,norm,ray; u.x=2.0;u.y=2.0;u.z=1.0; v.x=4.0;v.y=4.0;v.z=0.0; @@ -80,6 +80,20 @@ void VectorTest(void) D3DRMVectorReflect(&r,&ray,&norm); expect_vec(e,r); +/*_______________________VectorRotate_______________________________*/ + w.x=3.0;w.y=4.0;w.z=0.0; + axis.x=0.0;axis.y=0.0;axis.z=1.0; + theta=2.0*PI/3.0; + D3DRMVectorRotate(&r,&w,&axis,theta); + e.x=-0.3-0.4*sqrt(3.0); e.y=0.3*sqrt(3.0)-0.4; e.z=0.0; + expect_vec(e,r); + +/* The same formula gives D3DRMVectorRotate, for theta in [-PI/2;+PI/2] or not. The following test proves this fact.*/ + theta=-PI/4.0; + D3DRMVectorRotate(&r,&w,&axis,-PI/4); + e.x=1.4/sqrt(2.0); e.y=0.2/sqrt(2.0); e.z=0.0; + expect_vec(e,r); + /*_______________________VectorScale__________________________*/ par=2.5; D3DRMVectorScale(&r,&v,par);

1 0

David Adam : d3drm: Implement D3DRMVectorModulus.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: d882ee27464060c6ff212c80ed00e99a42e55617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d882ee27464060c6ff212c80e… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:08:56 2007 +0200 d3drm: Implement D3DRMVectorModulus. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 8 ++++++++ dlls/d3drm/tests/vector.c | 4 ++++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 59c1e03..b736405 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -11,7 +11,7 @@ @ stdcall D3DRMVectorAdd(ptr ptr ptr) @ stdcall D3DRMVectorCrossProduct(ptr ptr ptr) @ stdcall D3DRMVectorDotProduct(ptr ptr) -@ stub D3DRMVectorModulus +@ stdcall D3DRMVectorModulus(ptr) @ stub D3DRMVectorNormalize @ stub D3DRMVectorRandom @ stub D3DRMVectorReflect diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index d9078fe..5b31171 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -66,3 +66,11 @@ D3DVALUE WINAPI D3DRMVectorDotProduct(LPD3DVECTOR s1, LPD3DVECTOR s2) dot_product=s1->x * s2->x + s1->y * s2->y + s1->z * s2->z; return dot_product; } + +/* Norm of a vector */ +D3DVALUE WINAPI D3DRMVectorModulus(LPD3DVECTOR v) +{ + D3DVALUE result; + result=sqrt(v->x * v->x + v->y * v->y + v->z * v->z); + return result; +} diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 4b76ba2..83f6446 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -56,6 +56,10 @@ void VectorTest(void) /*_______________________VectorDotProduct__________________________*/ mod=D3DRMVectorDotProduct(&u,&v); ok((mod == 16.0), "Expected 16.0, Got %f",mod); + +/*_______________________VectorModulus_____________________________*/ + mod=D3DRMVectorModulus(&u); + ok((mod == 3.0), "Expected 3.0, Got %f",mod); } START_TEST(vector)

1 0

David Adam : d3drm: Implement D3DRMVectorDotProduct.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: de77d8e9fc73aae40e4f7301a4c721a4544469c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de77d8e9fc73aae40e4f7301a… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:07:54 2007 +0200 d3drm: Implement D3DRMVectorDotProduct. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 8 ++++++++ dlls/d3drm/tests/vector.c | 5 +++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 4347160..59c1e03 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -10,7 +10,7 @@ @ stub D3DRMQuaternionSlerp @ stdcall D3DRMVectorAdd(ptr ptr ptr) @ stdcall D3DRMVectorCrossProduct(ptr ptr ptr) -@ stub D3DRMVectorDotProduct +@ stdcall D3DRMVectorDotProduct(ptr ptr) @ stub D3DRMVectorModulus @ stub D3DRMVectorNormalize @ stub D3DRMVectorRandom diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 39b96d0..d9078fe 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -58,3 +58,11 @@ LPD3DVECTOR WINAPI D3DRMVectorCrossProduct(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DV d->z=s1->x * s2->y - s1->y * s2->x; return d; } + +/* Dot Product of Two vectors */ +D3DVALUE WINAPI D3DRMVectorDotProduct(LPD3DVECTOR s1, LPD3DVECTOR s2) +{ + D3DVALUE dot_product; + dot_product=s1->x * s2->x + s1->y * s2->y + s1->z * s2->z; + return dot_product; +} diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 52c81e8..4b76ba2 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -32,6 +32,7 @@ void VectorTest(void) { + D3DVALUE mod; D3DVECTOR e,r,u,v; u.x=2.0;u.y=2.0;u.z=1.0; @@ -51,6 +52,10 @@ void VectorTest(void) D3DRMVectorCrossProduct(&r,&u,&v); e.x=-4.0;e.y=4.0;e.z=0.0; expect_vec(e,r); + +/*_______________________VectorDotProduct__________________________*/ + mod=D3DRMVectorDotProduct(&u,&v); + ok((mod == 16.0), "Expected 16.0, Got %f",mod); } START_TEST(vector)

1 0

David Adam : d3drm: Implement D3DRMVectorCrossProduct.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: d152211e21846a0db29da5e5ef92634f25d7be0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d152211e21846a0db29da5e5e… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:06:54 2007 +0200 d3drm: Implement D3DRMVectorCrossProduct. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 9 +++++++++ dlls/d3drm/tests/vector.c | 5 +++++ 3 files changed, 15 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 fd5b490..39b96d0 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -49,3 +49,12 @@ LPD3DVECTOR WINAPI D3DRMVectorSubtract(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTO d->z=s1->z - s2->z; return d; } + +/* Cross Product of Two Vectors */ +LPD3DVECTOR WINAPI 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; +} diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 68deea4..52c81e8 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -46,6 +46,11 @@ void VectorTest(void) D3DRMVectorSubtract(&r,&u,&v); e.x=-2.0;e.y=-2.0;e.z=1.0; expect_vec(e,r); + +/*_______________________VectorCrossProduct_______________________*/ + D3DRMVectorCrossProduct(&r,&u,&v); + e.x=-4.0;e.y=4.0;e.z=0.0; + expect_vec(e,r); } START_TEST(vector)

1 0

David Adam : d3drm: Implement D3DVectorSubtract.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 70a1cef5e43c8a84fed051b21458e11b8a0415b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a1cef5e43c8a84fed051b21… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:05:56 2007 +0200 d3drm: Implement D3DVectorSubtract. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 9 +++++++++ dlls/d3drm/tests/vector.c | 5 +++++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index f0aa67f..0041265 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -17,7 +17,7 @@ @ stub D3DRMVectorReflect @ stub D3DRMVectorRotate @ stub D3DRMVectorScale -@ stub D3DRMVectorSubtract +@ stdcall D3DRMVectorSubtract(ptr ptr ptr) @ stub Direct3DRMCreate @ stub DllCanUnloadNow @ stub DllGetClassObject diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 969e9d4..fd5b490 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -40,3 +40,12 @@ LPD3DVECTOR WINAPI D3DRMVectorAdd(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2) d->z=s1->z + s2->z; return d; } + +/* Subtract Two Vectors */ +LPD3DVECTOR WINAPI D3DRMVectorSubtract(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2) +{ + d->x=s1->x - s2->x; + d->y=s1->y - s2->y; + d->z=s1->z - s2->z; + return d; +} diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 2278d84..68deea4 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -41,6 +41,11 @@ void VectorTest(void) D3DRMVectorAdd(&r,&u,&v); e.x=6.0;e.y=6.0;e.z=1.0; expect_vec(e,r); + +/*_______________________VectorSubtract__________________________*/ + D3DRMVectorSubtract(&r,&u,&v); + e.x=-2.0;e.y=-2.0;e.z=1.0; + expect_vec(e,r); } START_TEST(vector)

1 0

David Adam : d3drm: Implement D3DRMVectorAdd.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: f50800b25d44c62848b8aa56e3c61a6308f51a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50800b25d44c62848b8aa56e… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:03:53 2007 +0200 d3drm: Implement D3DRMVectorAdd. --- .gitignore | 4 +++ Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/d3drm/Makefile.in | 4 ++- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 42 +++++++++++++++++++++++++++++++++++ dlls/d3drm/tests/Makefile.in | 13 +++++++++++ dlls/d3drm/tests/vector.c | 49 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 12 files changed, 123 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b4298a7..0de124f 100644 --- a/.gitignore +++ b/.gitignore @@ -175,6 +175,9 @@ dlls/d3d9/version.res dlls/d3dim/libd3dim.def dlls/d3dim/version.res dlls/d3drm/libd3drm.def +dlls/d3drm/tests/*.ok +dlls/d3drm/tests/d3drm_crosstest.exe +dlls/d3drm/tests/testlist.c dlls/d3drm/version.res dlls/d3dx8/libd3dx8.def dlls/d3dxof/libd3dxof.def @@ -819,6 +822,7 @@ programs/winetest/comdlg32_test.exe programs/winetest/crypt32_test.exe programs/winetest/d3d8_test.exe programs/winetest/d3d9_test.exe +programs/winetest/d3drm_test.exe programs/winetest/ddraw_test.exe programs/winetest/dinput_test.exe programs/winetest/dnsapi_test.exe diff --git a/Makefile.in b/Makefile.in index 565871c..bd31162 100644 --- a/Makefile.in +++ b/Makefile.in @@ -195,6 +195,7 @@ ALL_MAKEFILES = \ dlls/d3d9/tests/Makefile \ dlls/d3dim/Makefile \ dlls/d3drm/Makefile \ + dlls/d3drm/tests/Makefile \ dlls/d3dx8/Makefile \ dlls/d3dxof/Makefile \ dlls/dbghelp/Makefile \ @@ -538,6 +539,7 @@ dlls/d3d9/Makefile: dlls/d3d9/Makefile.in dlls/Makedll.rules dlls/d3d9/tests/Makefile: dlls/d3d9/tests/Makefile.in dlls/Maketest.rules dlls/d3dim/Makefile: dlls/d3dim/Makefile.in dlls/Makedll.rules dlls/d3drm/Makefile: dlls/d3drm/Makefile.in dlls/Makedll.rules +dlls/d3drm/tests/Makefile: dlls/d3drm/tests/Makefile.in dlls/Maketest.rules dlls/d3dx8/Makefile: dlls/d3dx8/Makefile.in dlls/Makedll.rules dlls/d3dxof/Makefile: dlls/d3dxof/Makefile.in dlls/Makedll.rules dlls/dbghelp/Makefile: dlls/dbghelp/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 1d26cb6..3e550ea 100755 --- a/configure +++ b/configure @@ -20395,6 +20395,8 @@ ac_config_files="$ac_config_files dlls/d3dim/Makefile" ac_config_files="$ac_config_files dlls/d3drm/Makefile" +ac_config_files="$ac_config_files dlls/d3drm/tests/Makefile" + ac_config_files="$ac_config_files dlls/d3dx8/Makefile" ac_config_files="$ac_config_files dlls/d3dxof/Makefile" @@ -21580,6 +21582,7 @@ do "dlls/d3d9/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d9/tests/Makefile" ;; "dlls/d3dim/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dim/Makefile" ;; "dlls/d3drm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3drm/Makefile" ;; + "dlls/d3drm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3drm/tests/Makefile" ;; "dlls/d3dx8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx8/Makefile" ;; "dlls/d3dxof/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dxof/Makefile" ;; "dlls/dbghelp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dbghelp/Makefile" ;; diff --git a/configure.ac b/configure.ac index 4fd97f3..1ea3ad2 100644 --- a/configure.ac +++ b/configure.ac @@ -1522,6 +1522,7 @@ AC_CONFIG_FILES([dlls/d3d9/Makefile]) AC_CONFIG_FILES([dlls/d3d9/tests/Makefile]) AC_CONFIG_FILES([dlls/d3dim/Makefile]) AC_CONFIG_FILES([dlls/d3drm/Makefile]) +AC_CONFIG_FILES([dlls/d3drm/tests/Makefile]) AC_CONFIG_FILES([dlls/d3dx8/Makefile]) AC_CONFIG_FILES([dlls/d3dxof/Makefile]) AC_CONFIG_FILES([dlls/dbghelp/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 6594762..1a07abf 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -234,6 +234,7 @@ TESTSUBDIRS = \ crypt32/tests \ d3d8/tests \ d3d9/tests \ + d3drm/tests \ ddraw/tests \ dinput/tests \ dnsapi/tests \ diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index 2883af1..f070c1d 100644 --- a/dlls/d3drm/Makefile.in +++ b/dlls/d3drm/Makefile.in @@ -6,7 +6,9 @@ MODULE = d3drm.dll IMPORTLIB = libd3drm.$(IMPLIBEXT) IMPORTS = kernel32 -C_SRCS = d3drm_main.c +C_SRCS = \ + d3drm_main.c \ + math.c RC_SRCS = version.rc diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 9964085..f0aa67f 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -8,7 +8,7 @@ @ stub D3DRMQuaternionFromRotation @ stub D3DRMQuaternionMultiply @ stub D3DRMQuaternionSlerp -@ stub D3DRMVectorAdd +@ stdcall D3DRMVectorAdd(ptr ptr ptr) @ stub D3DRMVectorCrossProduct @ stub D3DRMVectorDotProduct @ stub D3DRMVectorModulus diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c new file mode 100644 index 0000000..969e9d4 --- /dev/null +++ b/dlls/d3drm/math.c @@ -0,0 +1,42 @@ +/* + * Copyright 2007 David Adam + * Copyright 2007 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <assert.h> +#include <math.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "d3drmdef.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3drm); + +/* Add Two Vectors */ +LPD3DVECTOR WINAPI D3DRMVectorAdd(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2) +{ + d->x=s1->x + s2->x; + d->y=s1->y + s2->y; + d->z=s1->z + s2->z; + return d; +} diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in new file mode 100644 index 0000000..1e682e7 --- /dev/null +++ b/dlls/d3drm/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = d3drm.dll +IMPORTS = d3drm kernel32 +EXTRALIBS = -ldxguid + +CTESTS = vector.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c new file mode 100644 index 0000000..2278d84 --- /dev/null +++ b/dlls/d3drm/tests/vector.c @@ -0,0 +1,49 @@ +/* + * Copyright 2007 Vijay Kiran Kamuju + * Copyright 2007 David Adam + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include "wine/test.h" +#include "d3drmdef.h" +#include <math.h> + +#define PI (4*atan(1.0)) +#define admit_error 0.000001 + +#define expect_vec(expectedvec,gotvec) \ + ok( ((fabs(expectedvec.x-gotvec.x)<admit_error)&&(fabs(expectedvec.y-gotvec.y)<admit_error)&&(fabs(expectedvec.z-gotvec.z)<admit_error)), \ + "Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", \ + expectedvec.x,expectedvec.y,expectedvec.z, gotvec.x, gotvec.y, gotvec.z); + +void VectorTest(void) +{ + D3DVECTOR e,r,u,v; + + u.x=2.0;u.y=2.0;u.z=1.0; + v.x=4.0;v.y=4.0;v.z=0.0; + +/*______________________VectorAdd_________________________________*/ + D3DRMVectorAdd(&r,&u,&v); + e.x=6.0;e.y=6.0;e.z=1.0; + expect_vec(e,r); +} + +START_TEST(vector) +{ + VectorTest(); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index d9e6d22..a15819c 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -33,6 +33,7 @@ TESTBINS = \ crypt32_test.exe \ d3d8_test.exe \ d3d9_test.exe \ + d3drm_test.exe \ ddraw_test.exe \ dinput_test.exe \ dnsapi_test.exe \ @@ -105,6 +106,8 @@ d3d8_test.exe: $(DLLDIR)/d3d8/tests/d3d8_test.exe$(DLLEXT) cp $(DLLDIR)/d3d8/tests/d3d8_test.exe$(DLLEXT) $@ && $(STRIP) $@ d3d9_test.exe: $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) cp $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) $@ && $(STRIP) $@ +d3drm_test.exe: $(DLLDIR)/d3drm/tests/d3drm_test.exe$(DLLEXT) + cp $(DLLDIR)/d3drm/tests/d3drm_test.exe$(DLLEXT) $@ && $(STRIP) $@ ddraw_test.exe: $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) cp $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) $@ && $(STRIP) $@ dinput_test.exe: $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 0e62589..3e7d002 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -156,6 +156,7 @@ comdlg32_test.exe TESTRES "comdlg32_test.exe" crypt32_test.exe TESTRES "crypt32_test.exe" d3d8_test.exe TESTRES "d3d8_test.exe" d3d9_test.exe TESTRES "d3d9_test.exe" +d3drm_test.exe TESTRES "d3drm_test.exe" ddraw_test.exe TESTRES "ddraw_test.exe" dinput_test.exe TESTRES "dinput_test.exe" dnsapi_test.exe TESTRES "dnsapi_test.exe"

1 0

Andrew Talbot : avifil32: Exclude unused headers.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 9261e30801c9ea6a33509b4ff705e77a2e30dd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9261e30801c9ea6a33509b4ff… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:53:57 2007 +0100 avifil32: Exclude unused headers. --- dlls/avifil32/acmstream.c | 1 - dlls/avifil32/api.c | 1 - dlls/avifil32/editstream.c | 1 - dlls/avifil32/factory.c | 2 -- dlls/avifil32/getframe.c | 2 -- dlls/avifil32/icmstream.c | 2 -- dlls/avifil32/regsvr.c | 1 - dlls/avifil32/tmpfile.c | 3 --- 8 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 6cda8c9..1501f41 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -23,7 +23,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "winerror.h" #include "mmsystem.h" #include "vfw.h" diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 92c6774..592bac3 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #define COBJMACROS diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index d275390..14d361e 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -23,7 +23,6 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" -#include "winnls.h" #include "winerror.h" #include "mmsystem.h" #include "vfw.h" diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 8b0faac..ae717c8 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #define COBJMACROS @@ -25,7 +24,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "winerror.h" #include "ole2.h" diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 558ff4a..d342b12 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -16,12 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "wingdi.h" #include "winuser.h" #include "vfw.h" diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 5e9af16..8253605 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -23,11 +23,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "winerror.h" #include "mmsystem.h" #include "vfw.h" -#include "msacm.h" #include "avifile_private.h" diff --git a/dlls/avifil32/regsvr.c b/dlls/avifil32/regsvr.c index ce81151..c98de1b 100644 --- a/dlls/avifil32/regsvr.c +++ b/dlls/avifil32/regsvr.c @@ -28,7 +28,6 @@ #include "winreg.h" #include "winerror.h" -#include "mmsystem.h" #include "vfw.h" #include "avifile_private.h" diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 424990e..27d9e4f 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -16,16 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "winerror.h" -#include "mmsystem.h" #include "vfw.h" #include "avifile_private.h"

1 0

Andrew Talbot : amstream: Exclude unused headers.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 505c97d79542bf568d085293a35a236d1579180a URL: http://source.winehq.org/git/wine.git/?a=commit;h=505c97d79542bf568d085293a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:52:28 2007 +0100 amstream: Exclude unused headers. --- dlls/amstream/amstream.c | 1 - dlls/amstream/main.c | 2 -- dlls/amstream/mediastream.c | 1 - dlls/amstream/regsvr.c | 1 - 4 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index f251475..422239c 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -22,7 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "wine/debug.h" #define COBJMACROS diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 774a8ee..080fc17 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -29,11 +29,9 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" #include "winerror.h" #include "ole2.h" -#include "uuids.h" #include "amstream_private.h" #include "amstream.h" diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 891c7a3..2cb7ce6 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "wine/debug.h" #define COBJMACROS diff --git a/dlls/amstream/regsvr.c b/dlls/amstream/regsvr.c index cf005ff..d2869d3 100644 --- a/dlls/amstream/regsvr.c +++ b/dlls/amstream/regsvr.c @@ -29,7 +29,6 @@ #include "winerror.h" #include "ole2.h" -#include "uuids.h" #include "amstream.h"

1 0

David Adam : include: Add d3drmdef.h header.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 0fb6b8e79f1c31754270b809b731b0d10b2cf77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb6b8e79f1c31754270b809b… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:02:09 2007 +0200 include: Add d3drmdef.h header. --- include/Makefile.in | 1 + include/d3drmdef.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 0b23e97..2577872 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -92,6 +92,7 @@ SRCDIR_INCLUDES = \ d3dcaps.h \ d3dhal.h \ d3drm.h \ + d3drmdef.h \ d3dtypes.h \ d3dvec.inl \ d3dx8core.h \ diff --git a/include/d3drmdef.h b/include/d3drmdef.h new file mode 100644 index 0000000..1bd65dd --- /dev/null +++ b/include/d3drmdef.h @@ -0,0 +1,61 @@ +/* + * Copyright 2007 Vijay Kiran Kamuju + * Copyright 2007 David ADAM + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DRMDEFS_H__ +#define __D3DRMDEFS_H__ + +#include <stddef.h> +#include <d3dtypes.h> + +#if defined(__cplusplus) +extern "C" { +#endif + +typedef D3DVALUE D3DRMMATRIX4D[4][4]; +typedef struct _D3DRMQUATERNION +{ + D3DVALUE s; + D3DVECTOR v; +} D3DRMQUATERNION, *LPD3DRMQUATERNION; + +void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D, LPD3DRMQUATERNION); + +LPD3DRMQUATERNION WINAPI D3DRMQuaternionFromRotation(LPD3DRMQUATERNION ,LPD3DVECTOR,D3DVALUE); +LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION); +LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE); + +LPD3DVECTOR WINAPI D3DRMVectorAdd(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +LPD3DVECTOR WINAPI D3DRMVectorCrossProduct(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +D3DVALUE WINAPI D3DRMVectorDotProduct(LPD3DVECTOR, LPD3DVECTOR); +LPD3DVECTOR WINAPI D3DRMVectorNormalize(LPD3DVECTOR); + +#define D3DRMVectorNormalise D3DRMVectorNormalize + +D3DVALUE WINAPI D3DRMVectorModulus(LPD3DVECTOR); +LPD3DVECTOR WINAPI D3DRMVectorRandom(LPD3DVECTOR); +LPD3DVECTOR WINAPI D3DRMVectorRotate(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); +LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); +LPD3DVECTOR WINAPI D3DRMVectorSubtract(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); + +#if defined(__cplusplus) +} +#endif + +#endif

1 0

Ben Taylor : configure: Fix to properly recognize functions on Solaris.
by Alexandre Julliard 23 Apr '07

23 Apr '07

Module: wine Branch: master Commit: 41c599646fb9750abfd3794bd47ae45be8be1731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c599646fb9750abfd3794bd… Author: Ben Taylor <sol11x86(a)comcast.net> Date: Mon Apr 23 13:41:42 2007 +0000 configure: Fix to properly recognize functions on Solaris. --- configure | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++------- configure.ac | 20 +++++---- 2 files changed, 123 insertions(+), 24 deletions(-) diff --git a/configure b/configure index e0790fc..435de9c 100755 --- a/configure +++ b/configure @@ -15755,14 +15755,6 @@ fi - - - - - - - - for ac_func in \ _pclose \ _popen \ @@ -15786,22 +15778,15 @@ for ac_func in \ ftruncate \ futimes \ futimesat \ - getaddrinfo \ getdirentries \ gethostbyname \ - getnameinfo \ - getnetbyname \ getopt_long \ getpagesize \ - getprotobyname \ - getprotobynumber \ getpwuid \ - getservbyport \ gettid \ gettimeofday \ getuid \ inet_aton \ - inet_network \ kqueue \ lstat \ memmove \ @@ -15816,7 +15801,6 @@ for ac_func in \ rfork \ sched_yield \ select \ - sendmsg \ setrlimit \ settimeofday \ sigaltstack \ @@ -16398,6 +16382,117 @@ fi fi + + + + + + + +for ac_func in \ + getaddrinfo \ + getnameinfo \ + getnetbyname \ + getprotobyname \ + getprotobynumber \ + getservbyport \ + inet_network \ + sendmsg \ + +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } if test "${ac_cv_c_const+set}" = set; then diff --git a/configure.ac b/configure.ac index 6fd21b4..7757427 100644 --- a/configure.ac +++ b/configure.ac @@ -1165,22 +1165,15 @@ AC_CHECK_FUNCS(\ ftruncate \ futimes \ futimesat \ - getaddrinfo \ getdirentries \ gethostbyname \ - getnameinfo \ - getnetbyname \ getopt_long \ getpagesize \ - getprotobyname \ - getprotobynumber \ getpwuid \ - getservbyport \ gettid \ gettimeofday \ getuid \ inet_aton \ - inet_network \ kqueue \ lstat \ memmove \ @@ -1195,7 +1188,6 @@ AC_CHECK_FUNCS(\ rfork \ sched_yield \ select \ - sendmsg \ setrlimit \ settimeofday \ sigaltstack \ @@ -1247,6 +1239,18 @@ then AC_CHECK_LIB(resolv,inet_aton) fi +dnl **** Check for functions which may rely on -lsocket on Solaris. +AC_CHECK_FUNCS(\ + getaddrinfo \ + getnameinfo \ + getnetbyname \ + getprotobyname \ + getprotobynumber \ + getservbyport \ + inet_network \ + sendmsg \ +) + dnl **** Check for types **** AC_C_CONST

1 0