October 2007 - Wine-commits

David Adam : d3dx8: Implement D3DXVec2Maximize with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: f453d737a115945bcc44e390638f5b61ccef06c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f453d737a115945bcc44e3906… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 20:04:59 2007 +0200 d3dx8: Implement D3DXVec2Maximize with a test. --- dlls/d3dx8/tests/math.c | 11 +++++++++++ include/d3dx8math.h | 1 + include/d3dx8math.inl | 8 ++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 37d8cdb..aefb55c 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -87,6 +87,17 @@ static void D3X8Vector2Test(void) got = D3DXVec2LengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +/*_______________D3DXVec2Maximize__________________________*/ + expectedvec.x = 3.0f; expectedvec.y = 9.0f; + /*gotvec.x=0.0f; gotvec.y=0.0f;*/ + D3DXVec2Maximize(&gotvec,&u,&v); + expect_vec(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec2Maximize(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec2Maximize(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec2Minimize__________________________*/ expectedvec.x = -7.0f; expectedvec.y = 4.0f; /*vecgot.x=0.0f; vecgot.y=0.0f;*/ diff --git a/include/d3dx8math.h b/include/d3dx8math.h index d71c015..04528e9 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -63,6 +63,7 @@ FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv); +D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 0c39d91..4852f5f 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -51,6 +51,14 @@ extern inline FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv) return( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); } +extern inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = max(pv1->x , pv2->x); + pout->y = max(pv1->y , pv2->y); + return pout; +} + extern inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL;

1 0

David Adam : d3dx8: Implement D3DXVecScale with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 18123a93644a9025b16edb01d35d2a36b2323ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18123a93644a9025b16edb01d… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 20:20:01 2007 +0200 d3dx8: Implement D3DXVecScale with a test. --- dlls/d3dx8/tests/math.c | 15 ++++++++++++--- include/d3dx8math.h | 1 + include/d3dx8math.inl | 7 +++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index aefb55c..95452b3 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -30,10 +30,11 @@ static void D3X8Vector2Test(void) { D3DXVECTOR2 expectedvec, gotvec, u, v; LPD3DXVECTOR2 funcpointer; - FLOAT expected, got; + FLOAT expected, got, scale; u.x=3.0f; u.y=4.0f; v.x=-7.0f; v.y=9.0f; + scale = -6.5f; /*_______________D3DXVec2Add__________________________*/ expectedvec.x = -4.0f; expectedvec.y = 13.0f; @@ -89,7 +90,6 @@ static void D3X8Vector2Test(void) /*_______________D3DXVec2Maximize__________________________*/ expectedvec.x = 3.0f; expectedvec.y = 9.0f; - /*gotvec.x=0.0f; gotvec.y=0.0f;*/ D3DXVec2Maximize(&gotvec,&u,&v); expect_vec(expectedvec,gotvec); /* Tests the case NULL */ @@ -100,7 +100,6 @@ static void D3X8Vector2Test(void) /*_______________D3DXVec2Minimize__________________________*/ expectedvec.x = -7.0f; expectedvec.y = 4.0f; - /*vecgot.x=0.0f; vecgot.y=0.0f;*/ D3DXVec2Minimize(&gotvec,&u,&v); expect_vec(expectedvec,gotvec); /* Tests the case NULL */ @@ -109,6 +108,16 @@ static void D3X8Vector2Test(void) funcpointer = D3DXVec2Minimize(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec2Scale____________________________*/ + expectedvec.x = -19.5f; expectedvec.y = -26.0f; + D3DXVec2Scale(&gotvec,&u,scale); + expect_vec(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec2Scale(&gotvec,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec2Scale(NULL,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec2Subtract__________________________*/ expectedvec.x = 10.0f; expectedvec.y = -5.0f; D3DXVec2Subtract(&gotvec,&u,&v); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 04528e9..d39563c 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -65,6 +65,7 @@ FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv); D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); +D3DXVECTOR2* D3DXVec2Scale(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, FLOAT s); D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); #endif /* __D3DX8MATH_H__ */ diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 4852f5f..81543c1 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -66,6 +66,13 @@ extern inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 pout->y = min(pv1->y , pv2->y); return pout; } +extern inline D3DXVECTOR2* D3DXVec2Scale(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, FLOAT s) +{ + if ( !pout || !pv) return NULL; + pout->x = s * (pv->x); + pout->y = s * (pv->y); + return pout; +} extern inline D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) {

1 0

David Adam : d3dx8: Implement D3DXVec2Lerp with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 8d8a5f06c2862080cc74fe923465643b40417a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8a5f06c2862080cc74fe923… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 20:31:58 2007 +0200 d3dx8: Implement D3DXVec2Lerp with a test. --- dlls/d3dx8/tests/math.c | 10 ++++++++++ include/d3dx8math.h | 1 + include/d3dx8math.inl | 9 +++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 95452b3..9ae9018 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -88,6 +88,16 @@ static void D3X8Vector2Test(void) got = D3DXVec2LengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +/*_______________D3DXVec2Lerp__________________________*/ + expectedvec.x = 68.0f; expectedvec.y = -28.5f; + D3DXVec2Lerp(&gotvec,&u,&v,scale); + expect_vec(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec2Lerp(&gotvec,NULL,&v,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec2Lerp(NULL,NULL,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec2Maximize__________________________*/ expectedvec.x = 3.0f; expectedvec.y = 9.0f; D3DXVec2Maximize(&gotvec,&u,&v); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index d39563c..cb1753b 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -63,6 +63,7 @@ FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv); +D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, FLOAT s); D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); D3DXVECTOR2* D3DXVec2Scale(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, FLOAT s); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 81543c1..336ef5a 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -51,6 +51,14 @@ extern inline FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv) return( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); } +extern inline D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, FLOAT s) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = (1-s) * (pv1->x) + s * (pv2->x); + pout->y = (1-s) * (pv1->y) + s * (pv2->y); + return pout; +} + extern inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; @@ -66,6 +74,7 @@ extern inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 pout->y = min(pv1->y , pv2->y); return pout; } + extern inline D3DXVECTOR2* D3DXVec2Scale(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, FLOAT s) { if ( !pout || !pv) return NULL;

1 0

Alexandre Julliard : d3dx8: The inline functions should be static instead of extern.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 9dcd0f5fd4a72b6733a99b45014e590103f2ea26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcd0f5fd4a72b6733a99b450… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 14:09:43 2007 +0200 d3dx8: The inline functions should be static instead of extern. --- include/d3dx8math.h | 11 +---------- include/d3dx8math.inl | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index cb1753b..0d9416a 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -58,15 +58,6 @@ typedef struct D3DXCOLOR FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; -D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); -FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); -FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); -FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); -FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv); -D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, FLOAT s); -D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); -D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); -D3DXVECTOR2* D3DXVec2Scale(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, FLOAT s); -D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); +#include <d3dx8math.inl> #endif /* __D3DX8MATH_H__ */ diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 336ef5a..24ff812 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -19,7 +19,7 @@ #ifndef __D3DX8MATH_INL__ #define __D3DX8MATH_INL__ -extern inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +static inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; pout->x = pv1->x + pv2->x; @@ -27,31 +27,31 @@ extern inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1 return pout; } -extern inline FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +static inline FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pv1 || !pv2) return 0.0f; return ( (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x) ); } -extern inline FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +static inline FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pv1 || !pv2) return 0.0f; return ( (pv1->x * pv2->x + pv1->y * pv2->y) ); } -extern inline FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv) +static inline FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv) { if (!pv) return 0.0f; return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); } -extern inline FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv) +static inline FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv) { if (!pv) return 0.0f; return( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); } -extern inline D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, FLOAT s) +static inline D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, FLOAT s) { if ( !pout || !pv1 || !pv2) return NULL; pout->x = (1-s) * (pv1->x) + s * (pv2->x); @@ -59,7 +59,7 @@ extern inline D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv return pout; } -extern inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +static inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; pout->x = max(pv1->x , pv2->x); @@ -67,7 +67,7 @@ extern inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 return pout; } -extern inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +static inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; pout->x = min(pv1->x , pv2->x); @@ -75,7 +75,7 @@ extern inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 return pout; } -extern inline D3DXVECTOR2* D3DXVec2Scale(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, FLOAT s) +static inline D3DXVECTOR2* D3DXVec2Scale(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, FLOAT s) { if ( !pout || !pv) return NULL; pout->x = s * (pv->x); @@ -83,7 +83,7 @@ extern inline D3DXVECTOR2* D3DXVec2Scale(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *p return pout; } -extern inline D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +static inline D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; pout->x = pv1->x - pv2->x;

1 0

David Adam : d3dx8: Implement D3DXVec2Add with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: adf4580bf17764089614da4497ec31507dbcb442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf4580bf17764089614da449… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 19:06:20 2007 +0200 d3dx8: Implement D3DXVec2Add with a test. --- dlls/d3dx8/tests/math.c | 15 ++++++++++++++- include/d3dx8math.h | 1 + include/d3dx8math.inl | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index d47d8a4..01e8edb 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -24,14 +24,27 @@ #define admitted_error 0.00001f +#define expect_vec(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); + static void D3X8Vector2Test(void) { - D3DXVECTOR2 u,v; + D3DXVECTOR2 expectedvec, gotvec, u, v; + LPD3DXVECTOR2 funcpointer; FLOAT expected, got; u.x=3.0f; u.y=4.0f; v.x=-7.0f; v.y=9.0f; +/*_______________D3DXVec2Add__________________________*/ + expectedvec.x = -4.0f; expectedvec.y = 13.0f; + D3DXVec2Add(&gotvec,&u,&v); + expect_vec(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec2Add(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec2Add(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec2CCW__________________________*/ expected = 55.0f; got = D3DXVec2CCW(&u,&v); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index e088760..5dfb0fd 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -58,6 +58,7 @@ typedef struct D3DXCOLOR FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 8112488..4579db2 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -19,6 +19,14 @@ #ifndef __D3DX8MATH_INL__ #define __D3DX8MATH_INL__ +extern inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = pv1->x + pv2->x; + pout->y = pv1->y + pv2->y; + return pout; +} + extern inline FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pv1 || !pv2) return 0.0f;

1 0

David Adam : d3dx8: Implement D3DXVec2Subtract with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 43d13935d8e5cb2b2b774b94a0fcf2da9cf25cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d13935d8e5cb2b2b774b94a… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 19:22:17 2007 +0200 d3dx8: Implement D3DXVec2Subtract with a test. --- dlls/d3dx8/tests/math.c | 10 ++++++++++ include/d3dx8math.h | 1 + include/d3dx8math.inl | 8 ++++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 01e8edb..85a1cb7 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -87,6 +87,16 @@ static void D3X8Vector2Test(void) got = D3DXVec2LengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +/*_______________D3DXVec2Subtract__________________________*/ + expectedvec.x = 10.0f; expectedvec.y = -5.0f; + D3DXVec2Subtract(&gotvec,&u,&v); + expect_vec(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec2Subtract(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec2Subtract(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + } START_TEST(math) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 5dfb0fd..e1c25a1 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -63,5 +63,6 @@ FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv); +D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); #endif /* __D3DX8MATH_H__ */ diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 4579db2..bafee45 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -51,4 +51,12 @@ extern inline FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv) return( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); } +extern inline D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = pv1->x - pv2->x; + pout->y = pv1->y - pv2->y; + return pout; +} + #endif

1 0

David Adam : d3dx8: Implement D3DXVec2Minimize with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 28276e8fb180d55dc6d941010bc2549a61031d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=28276e8fb180d55dc6d941010… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 19:28:03 2007 +0200 d3dx8: Implement D3DXVec2Minimize with a test. --- dlls/d3dx8/tests/math.c | 11 +++++++++++ include/d3dx8math.h | 1 + include/d3dx8math.inl | 8 ++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 85a1cb7..37d8cdb 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -87,6 +87,17 @@ static void D3X8Vector2Test(void) got = D3DXVec2LengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +/*_______________D3DXVec2Minimize__________________________*/ + expectedvec.x = -7.0f; expectedvec.y = 4.0f; + /*vecgot.x=0.0f; vecgot.y=0.0f;*/ + D3DXVec2Minimize(&gotvec,&u,&v); + expect_vec(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec2Minimize(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec2Minimize(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec2Subtract__________________________*/ expectedvec.x = 10.0f; expectedvec.y = -5.0f; D3DXVec2Subtract(&gotvec,&u,&v); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index e1c25a1..d71c015 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -63,6 +63,7 @@ FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv); +D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); #endif /* __D3DX8MATH_H__ */ diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index bafee45..0c39d91 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -51,6 +51,14 @@ extern inline FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv) return( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); } +extern inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = min(pv1->x , pv2->x); + pout->y = min(pv1->y , pv2->y); + return pout; +} + extern inline D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL;

1 0

David Adam : d3dx8: Implement D3DXVec2Dot with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 1fa3abe7ccb1f25500348a09999be0fa69a9e8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa3abe7ccb1f25500348a099… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 18:24:33 2007 +0200 d3dx8: Implement D3DXVec2Dot with a test. --- dlls/d3dx8/tests/math.c | 20 ++++++++++++++++---- include/d3dx8math.h | 1 + include/d3dx8math.inl | 6 ++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index a8d80a3..ea51bf5 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -26,10 +26,23 @@ static void D3X8Vector2Test(void) { - D3DXVECTOR2 u; + D3DXVECTOR2 u,v; FLOAT expected, got; u.x=3.0f; u.y=4.0f; + v.x=-7.0f; v.y=9.0f; + +/*_______________D3DXVec2Dot__________________________*/ + expected = 15.0f; + got = D3DXVec2Dot(&u,&v); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXVec2Dot(NULL,&v); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + expected=0.0f; + got = D3DXVec2Dot(NULL,NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /*_______________D3DXVec2Length__________________________*/ expected = 5.0f; @@ -37,17 +50,16 @@ static void D3X8Vector2Test(void) ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /* Tests the case NULL */ expected=0.0f; - got= D3DXVec2Length(NULL); + got = D3DXVec2Length(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /*_______________D3DXVec2LengthSq________________________*/ expected = 25.0f; got = D3DXVec2LengthSq(&u); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /* Tests the case NULL */ expected=0.0f; - got= D3DXVec2LengthSq(NULL); + got = D3DXVec2LengthSq(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); } diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 2a98e00..db75b72 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -58,6 +58,7 @@ typedef struct D3DXCOLOR FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index e5ced8d..5c29484 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -19,6 +19,12 @@ #ifndef __D3DX8MATH_INL__ #define __D3DX8MATH_INL__ +extern inline FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +{ + if ( !pv1 || !pv2) return 0.0f; + return ( (pv1->x * pv2->x + pv1->y * pv2->y) ); +} + extern inline FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv) { if (!pv) return 0.0f;

1 0

David Adam : d3dx8: Implement D3DXVec2CCW with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: a0ddecf77814888dd35ae4ce26d68160b6bdb67a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ddecf77814888dd35ae4ce2… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 18:33:25 2007 +0200 d3dx8: Implement D3DXVec2CCW with a test. --- dlls/d3dx8/tests/math.c | 12 ++++++++++++ include/d3dx8math.h | 1 + include/d3dx8math.inl | 6 ++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index ea51bf5..d47d8a4 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -32,6 +32,18 @@ static void D3X8Vector2Test(void) u.x=3.0f; u.y=4.0f; v.x=-7.0f; v.y=9.0f; +/*_______________D3DXVec2CCW__________________________*/ + expected = 55.0f; + got = D3DXVec2CCW(&u,&v); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXVec2CCW(NULL,&v); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + expected=0.0f; + got = D3DXVec2CCW(NULL,NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /*_______________D3DXVec2Dot__________________________*/ expected = 15.0f; got = D3DXVec2Dot(&u,&v); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index db75b72..e088760 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -58,6 +58,7 @@ typedef struct D3DXCOLOR FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2); FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 5c29484..8112488 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -19,6 +19,12 @@ #ifndef __D3DX8MATH_INL__ #define __D3DX8MATH_INL__ +extern inline FLOAT D3DXVec2CCW(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) +{ + if ( !pv1 || !pv2) return 0.0f; + return ( (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x) ); +} + extern inline FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pv1 || !pv2) return 0.0f;

1 0

Alexandre Julliard : shlwapi/tests: Make local variables static and const.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 6d6b9a381a13639eabb5c8720468ec0e3aab9005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6b9a381a13639eabb5c8720… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 13:58:09 2007 +0200 shlwapi/tests: Make local variables static and const. --- dlls/shlwapi/tests/url.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b73b872..ebce1e5 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -32,11 +32,11 @@ static HMODULE hShlwapi; static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); -const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; -const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; -const char* TEST_URL_3 = "http://foo:bar(a)localhost:21/internal.php?query=x&return=y"; -const WCHAR winehqW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; -const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; +static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; +static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; +static const char* TEST_URL_3 = "http://foo:bar(a)localhost:21/internal.php?query=x&return=y"; +static const WCHAR winehqW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; +static const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; /* ################ */ @@ -47,7 +47,7 @@ typedef struct _TEST_URL_CANONICALIZE { const char *expecturl; } TEST_URL_CANONICALIZE; -const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { +static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { /*FIXME {"http://www.winehq.org/tests/../tests/../..", 0, S_OK, "http://www.winehq.org/"},*/ {"http://www.winehq.org/tests/../tests", 0, S_OK, "http://www.winehq.org/tests"}, {"http://www.winehq.org/tests\n", URL_WININET_COMPATIBILITY|URL_ESCAPE_SPACES_ONLY|URL_ESCAPE_UNSAFE, S_OK, "http://www.winehq.org/tests"}, @@ -100,7 +100,7 @@ typedef struct _TEST_URL_ESCAPE { const char *expecturl; } TEST_URL_ESCAPE; -const TEST_URL_ESCAPE TEST_ESCAPE[] = { +static const TEST_URL_ESCAPE TEST_ESCAPE[] = { {"http://www.winehq.org/tests0", 0, 0, S_OK, "http://www.winehq.org/tests0"}, {"http://www.winehq.org/tests1\n", 0, 0, S_OK, "http://www.winehq.org/tests1%0A"}, {"http://www.winehq.org/tests2\r", 0, 0, S_OK, "http://www.winehq.org/tests2%0D"}, @@ -191,7 +191,7 @@ typedef struct _TEST_URL_COMBINE { const char *expecturl; } TEST_URL_COMBINE; -const TEST_URL_COMBINE TEST_COMBINE[] = { +static const TEST_URL_COMBINE TEST_COMBINE[] = { {"http://www.winehq.org/tests", "tests1", 0, S_OK, "http://www.winehq.org/tests1"}, {"http://www.%77inehq.org/tests", "tests1", 0, S_OK, "http://www.%77inehq.org/tests1"}, /*FIXME {"http://www.winehq.org/tests", "../tests2", 0, S_OK, "http://www.winehq.org/tests2"},*/ @@ -220,7 +220,7 @@ const TEST_URL_COMBINE TEST_COMBINE[] = { /* ################ */ -struct { +static const struct { const char *path; const char *url; DWORD ret; @@ -242,7 +242,7 @@ struct { /* ################ */ -struct { +static const struct { char url[30]; const char *expect; } TEST_URL_UNESCAPE[] = { @@ -252,7 +252,7 @@ struct { /* ################ */ -static struct { +static const struct { const char *path; BOOL expect; } TEST_PATH_IS_URL[] = { @@ -267,7 +267,7 @@ static struct { /* ################ */ -struct { +static const struct { const char *url; BOOL expectOpaque; BOOL expectFile;

1 0