October 2007 - Wine-commits

Andrew Talbot : winedbg: Fix a memory leak.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: d275a4d3af6435af39ff7bb192f4621c20334565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d275a4d3af6435af39ff7bb19… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 23 18:06:30 2007 +0100 winedbg: Fix a memory leak. --- programs/winedbg/source.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index c1fb2eb..eb9576d 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -70,9 +70,9 @@ void source_add_path(const char* path) size = strlen(path) + 1; if (search_path) { - unsigned pos = HeapSize(GetProcessHeap(), 0, search_path); + unsigned pos = strlen(search_path) + 1; new = HeapReAlloc(GetProcessHeap(), 0, search_path, pos + size); - if (!new || !pos) return; + if (!new) return; new[pos - 1] = ';'; strcpy(&new[pos], path); }

1 0

David Adam : d3dx8: Implement D3DXPlaneColorSubtract.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 5b685e6ad73c79fa21ad57f88490bbcfe0eb11ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b685e6ad73c79fa21ad57f88… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 13:19:27 2007 +0200 d3dx8: Implement D3DXPlaneColorSubtract. --- dlls/d3dx8/tests/math.c | 12 ++++++++++++ include/d3dx8math.inl | 10 ++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 2f6633f..7b80988 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -108,6 +108,18 @@ static void D3DXColorTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXColorScale(NULL,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + +/*_______________D3DXColorSubtract_______________*/ + expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f, expected.a = 0.82f; + D3DXColorSubtract(&got,&color,&color2); + expect_color(expected,got); + /* Test the NULL case */ + funcpointer = D3DXColorSubtract(&got,NULL,&color2); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorSubtract(NULL,NULL,&color2); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorSubtract(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); } static void D3DXPlaneTest(void) diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 78ef7c5..d9f0b3d 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -71,6 +71,16 @@ static inline D3DXCOLOR* D3DXColorScale(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FL return pout; } +static inline D3DXCOLOR* D3DXColorSubtract(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1, CONST D3DXCOLOR *pc2) +{ + if ( !pout || !pc1 || !pc2 ) return NULL; + pout->r = (pc1->r) - (pc2->r); + pout->g = (pc1->g) - (pc2->g); + pout->b = (pc1->b) - (pc2->b); + pout->a = (pc1->a) - (pc2->a); + return pout; +} + /*_______________D3DXVECTOR2________________________*/ static inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2)

1 0

David Adam : d3dx8: Implement D3DXPlaneMatrixIdentity.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 73f59692ced971a65f2d60bf61f7a2e0f1c39c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f59692ced971a65f2d60bf6… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 13:28:52 2007 +0200 d3dx8: Implement D3DXPlaneMatrixIdentity. --- include/d3dx8math.inl | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index d9f0b3d..59d0012 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -318,7 +318,32 @@ static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 return pout; } -/*__________________D3DXQUATERNION____________________*/ +/*__________________D3DXMatrix____________________*/ + +static inline D3DXMATRIX* D3DXMatrixIdentity(D3DXMATRIX *pout ) +{ + if ( !pout ) return NULL; + pout->m[0][1] = 0.0f; + pout->m[0][2] = 0.0f; + pout->m[0][3] = 0.0f; + pout->m[1][0] = 0.0f; + pout->m[1][2] = 0.0f; + pout->m[1][3] = 0.0f; + pout->m[2][0] = 0.0f; + pout->m[2][1] = 0.0f; + pout->m[2][3] = 0.0f; + pout->m[3][0] = 0.0f; + pout->m[3][1] = 0.0f; + pout->m[3][2] = 0.0f; + pout->m[0][0] = 1.0f; + pout->m[1][1] = 1.0f; + pout->m[2][2] = 1.0f; + pout->m[3][3] = 1.0f; + return pout; +} + + +/*__________________D3DXPLANE____________________*/ static inline FLOAT D3DXPlaneDot(CONST D3DXPLANE *pp, CONST D3DXVECTOR4 *pv) {

1 0

David Adam : d3dx8: Implement D3DXPlaneMatrixIsIdentity.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 5edd2cfaa7d0be682f31d4f827523351e4ed41d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5edd2cfaa7d0be682f31d4f82… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 14:12:25 2007 +0200 d3dx8: Implement D3DXPlaneMatrixIsIdentity. --- dlls/d3dx8/tests/math.c | 28 ++++++++++++++++++++++++++++ include/d3dx8math.inl | 19 ++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 7b80988..0e70183 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -122,6 +122,33 @@ static void D3DXColorTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); } +static void D3DXMatrixTest(void) +{ + D3DXMATRIX mat; + BOOL expected, got; + +/*____________D3DXMatrixIsIdentity______________*/ + mat.m[0][1] = 0.0f; mat.m[0][2] = 7.0f; mat.m[0][3] = 8.0f; + mat.m[1][0] = 11.0f; mat.m[1][2] = 0.0f; mat.m[1][3] = 0.0f; + mat.m[2][0] = 0.0f; mat.m[2][1] = 0.0f; mat.m[2][3] = 0.0f; + mat.m[3][0] = 0.0f; mat.m[3][1] = 0.0f; mat.m[3][2] = 0.0f; + mat.m[0][0] = 1.0f; mat.m[1][1] = 1.0f; mat.m[2][2] = 1.0f; + mat.m[3][3] = 1.0f; + expected = FALSE; + got = D3DXMatrixIsIdentity(&mat); + ok(expected == got, "Expected : %d, Got : %d\n", expected, got); + D3DXMatrixIdentity(&mat); + expected = TRUE; + got = D3DXMatrixIsIdentity(&mat); + ok(expected == got, "Expected : %d, Got : %d\n", expected, got); + /* Test the NULL case */ + expected = FALSE; + got = D3DXMatrixIsIdentity(NULL); + ok(expected == got, "Expected : %d, Got : %d\n", expected, got); +} + + + static void D3DXPlaneTest(void) { D3DXPLANE plane; @@ -566,6 +593,7 @@ static void D3X8Vector4Test(void) START_TEST(math) { D3DXColorTest(); + D3DXMatrixTest(); D3DXPlaneTest(); D3X8QuaternionTest(); D3X8Vector2Test(); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 59d0012..4df1f9e 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -320,7 +320,7 @@ static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 /*__________________D3DXMatrix____________________*/ -static inline D3DXMATRIX* D3DXMatrixIdentity(D3DXMATRIX *pout ) +static inline D3DXMATRIX* D3DXMatrixIdentity(D3DXMATRIX *pout) { if ( !pout ) return NULL; pout->m[0][1] = 0.0f; @@ -342,6 +342,23 @@ static inline D3DXMATRIX* D3DXMatrixIdentity(D3DXMATRIX *pout ) return pout; } +static inline BOOL D3DXMatrixIsIdentity(D3DXMATRIX *pm) +{ + int i,j; + D3DXMATRIX testmatrix; + BOOL equal=TRUE; + + if ( !pm ) return FALSE; + D3DXMatrixIdentity(&testmatrix); + for (i=0; i<4; i++) + { + for (j=0; j<4; j++) + { + if ( fabs(pm->m[i][j] - testmatrix.m[i][j]) > 0.0001 ) equal = FALSE; + } + } + return equal; +} /*__________________D3DXPLANE____________________*/

1 0

Alexander Dorofeyev : gdi32: Fix unchecked NULL ptr in BIDI_Reorder.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 3ac3a5dcb5f03fcab06797f31c72eb50734e6ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac3a5dcb5f03fcab06797f31… Author: Alexander Dorofeyev <alexd14(a)hushmail.com> Date: Wed Oct 24 00:05:32 2007 -0700 gdi32: Fix unchecked NULL ptr in BIDI_Reorder. --- dlls/gdi32/bidi.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 1b7b856..7505a91 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -831,7 +831,7 @@ static void resolveImplicit(const WORD * pcls, WORD *plevel, int cch) occurs after the character in pszInput[n]. Breaks before the first character are not allowed. ------------------------------------------------------------------------*/ -static int resolveLines(WCHAR * pszInput, BOOL * pbrk, int cch) +static int resolveLines(LPCWSTR pszInput, BOOL * pbrk, int cch) { /* skip characters not of type LS */ int ich = 0; @@ -1012,7 +1012,8 @@ static void mirror(LPWSTR pszInput, const WORD* plevel, int cch) Array of levels ------------------------------------------------------------------------*/ -static void BidiLines(int baselevel, WCHAR * pszLine, WORD * pclsLine, WORD * plevelLine, int cchPara, int fMirror, BOOL * pbrk) +static void BidiLines(int baselevel, LPWSTR pszOutLine, LPCWSTR pszLine, WORD * pclsLine, + WORD * plevelLine, int cchPara, int fMirror, BOOL * pbrk) { int cchLine = 0; @@ -1024,11 +1025,14 @@ static void BidiLines(int baselevel, WCHAR * pszLine, WORD * pclsLine, WORD * pl /* resolve whitespace */ resolveWhitespace(baselevel, pclsLine, plevelLine, cchLine); - if (fMirror) - mirror(pszLine, plevelLine, cchLine); + if (pszOutLine) + { + if (fMirror) + mirror(pszOutLine, plevelLine, cchLine); - /* reorder each line in place */ - reorder(baselevel, pszLine, plevelLine, cchLine); + /* reorder each line in place */ + reorder(baselevel, pszOutLine, plevelLine, cchLine); + } pszLine += cchLine; plevelLine += cchLine; @@ -1079,7 +1083,8 @@ BOOL BIDI_Reorder( return FALSE; } - memcpy(lpOutString, lpString, uCount * sizeof(WCHAR)); + if (lpOutString) + memcpy(lpOutString, lpString, uCount * sizeof(WCHAR)); if (WINE_GCPW_FORCE_RTL == (dwWineGCP_Flags&WINE_GCPW_DIR_MASK)) baselevel = 1; @@ -1088,7 +1093,7 @@ BOOL BIDI_Reorder( while (done < uCount) { unsigned j; - classify(lpOutString + done, chartype, uCount - done); + classify(lpString + done, chartype, uCount - done); /* limit text to first block */ i = resolveParagraphs(chartype, uCount - done); for (j = 0; j < i; ++j) @@ -1134,9 +1139,10 @@ BOOL BIDI_Reorder( resolveImplicit(chartype, levels, i); /* assign directional types again, but for WS, S this time */ - classify(lpOutString + done, chartype, i); + classify(lpString + done, chartype, i); - BidiLines(baselevel, lpOutString + done, chartype, levels, i, !(dwFlags & GCP_SYMSWAPOFF), 0); + BidiLines(baselevel, lpOutString ? lpOutString + done : NULL, lpString + done, + chartype, levels, i, !(dwFlags & GCP_SYMSWAPOFF), 0); if (lpOrder) {

1 0

David Adam : d3dx8: Implement D3DXPlaneColorNegative.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 6ebc5cefdf6bfb625d20b57ddc67827f9288ceeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ebc5cefdf6bfb625d20b57dd… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 11:30:55 2007 +0200 d3dx8: Implement D3DXPlaneColorNegative. --- dlls/d3dx8/tests/math.c | 31 +++++++++++++++++++++++++++++++ include/d3dx8math.inl | 10 ++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index e73a619..7c74b65 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -24,12 +24,42 @@ #define admitted_error 0.00001f +#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); + #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); #define expect_vec3(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error)&&(fabs(expectedvec.z-gotvec.z)<admitted_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); #define expect_vec4(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error)&&(fabs(expectedvec.z-gotvec.z)<admitted_error)&&(fabs(expectedvec.w-gotvec.w)<admitted_error),"Expected Vector= (%f, %f, %f, %f)\n , Got Vector= (%f, %f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, expectedvec.w, gotvec.x, gotvec.y, gotvec.z, gotvec.w); +static void D3DXColorTest(void) +{ + D3DXCOLOR color, color1, expected, got; + LPD3DXCOLOR funcpointer; + + color.r = 0.2f; color.g = 0.75f; color.b = 0.41f; color.a = 0.93f; + +/*_______________D3DXColorNegative________________*/ + expected.r = 0.8f; expected.g = 0.25f; expected.b = 0.59f; expected.a = 0.93f; + D3DXColorNegative(&got,&color); + expect_color(got,expected); + /* Test the greater than 1 case */ + color1.r = 0.2f; color1.g = 1.75f; color1.b = 0.41f; color1.a = 0.93f; + expected.r = 0.8f; expected.g = -0.75f; expected.b = 0.59f; expected.a = 0.93f; + D3DXColorNegative(&got,&color1); + expect_color(got,expected); + /* Test the negative case */ + color1.r = 0.2f; color1.g = -0.75f; color1.b = 0.41f; color1.a = 0.93f; + expected.r = 0.8f; expected.g = 1.75f; expected.b = 0.59f; expected.a = 0.93f; + D3DXColorNegative(&got,&color1); + expect_color(got,expected); + /* Test the NULL case */ + funcpointer = D3DXColorNegative(&got,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorNegative(NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +} + static void D3DXPlaneTest(void) { D3DXPLANE plane; @@ -473,6 +503,7 @@ static void D3X8Vector4Test(void) START_TEST(math) { + D3DXColorTest(); D3DXPlaneTest(); D3X8QuaternionTest(); D3X8Vector2Test(); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 71f9641..d4ddb14 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -19,6 +19,16 @@ #ifndef __D3DX8MATH_INL__ #define __D3DX8MATH_INL__ +static inline D3DXCOLOR* D3DXColorNegative(D3DXCOLOR *pout, CONST D3DXCOLOR *pc) +{ + if ( !pout || !pc ) return NULL; + pout->r = 1.0f - pc->r; + pout->g = 1.0f - pc->g; + pout->b = 1.0f - pc->b; + pout->a = pc->a; + return pout; +} + /*_______________D3DXVECTOR2________________________*/ static inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2)

1 0

David Adam : d3dx8: Implement D3DXPlaneColorLerp.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 2f3702043e255cce9e2ac6db8239925ef7e908c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3702043e255cce9e2ac6db8… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 11:54:32 2007 +0200 d3dx8: Implement D3DXPlaneColorLerp. --- dlls/d3dx8/tests/math.c | 15 +++++++++++++++ include/d3dx8math.inl | 12 ++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 7c74b65..fbb8ab3 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -36,8 +36,23 @@ static void D3DXColorTest(void) { D3DXCOLOR color, color1, expected, got; LPD3DXCOLOR funcpointer; + FLOAT scale; color.r = 0.2f; color.g = 0.75f; color.b = 0.41f; color.a = 0.93f; + scale = 0.3f; + +/*_______________D3DXColorLerp________________*/ + color1.r = 0.6f; color1.g = 0.55f; color1.b = 0.23f; color1.a = 0.82f; + expected.r = 0.32f; expected.g = 0.69f; expected.b = 0.356f; expected.a = 0.897f; + D3DXColorLerp(&got,&color,&color1,scale); + expect_color(expected,got); + /* Test the NULL case */ + funcpointer = D3DXColorLerp(&got,NULL,&color1,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorLerp(NULL,NULL,&color1,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorLerp(NULL,NULL,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXColorNegative________________*/ expected.r = 0.8f; expected.g = 0.25f; expected.b = 0.59f; expected.a = 0.93f; diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index d4ddb14..da11f31 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -19,6 +19,18 @@ #ifndef __D3DX8MATH_INL__ #define __D3DX8MATH_INL__ +/*_______________D3DXCOLOR_____________________*/ + +static inline D3DXCOLOR* D3DXColorLerp(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1, CONST D3DXCOLOR *pc2, FLOAT s) +{ + if ( !pout || !pc1 || !pc2 ) return NULL; + pout->r = (1-s) * (pc1->r) + s *(pc2->r); + pout->g = (1-s) * (pc1->g) + s *(pc2->g); + pout->b = (1-s) * (pc1->b) + s *(pc2->b); + pout->a = (1-s) * (pc1->a) + s *(pc2->a); + return pout; +} + static inline D3DXCOLOR* D3DXColorNegative(D3DXCOLOR *pout, CONST D3DXCOLOR *pc) { if ( !pout || !pc ) return NULL;

1 0

David Adam : d3dx8: Implement D3DXPlaneColorModulate.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 03e92443d7b6cd7ac414f62bd7eb4078fdbe3552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e92443d7b6cd7ac414f62bd… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 12:09:02 2007 +0200 d3dx8: Implement D3DXPlaneColorModulate. --- dlls/d3dx8/tests/math.c | 17 +++++++++++++++-- include/d3dx8math.inl | 10 ++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index fbb8ab3..c00eb4c 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -34,15 +34,16 @@ static void D3DXColorTest(void) { - D3DXCOLOR color, color1, expected, got; + D3DXCOLOR color, color1, color2, expected, got; LPD3DXCOLOR funcpointer; FLOAT scale; color.r = 0.2f; color.g = 0.75f; color.b = 0.41f; color.a = 0.93f; + color1.r = 0.6f; color1.g = 0.55f; color1.b = 0.23f; color1.a = 0.82f; + color2.r = 0.3f; color2.g = 0.5f; color2.b = 0.76f; color2.a = 0.11f; scale = 0.3f; /*_______________D3DXColorLerp________________*/ - color1.r = 0.6f; color1.g = 0.55f; color1.b = 0.23f; color1.a = 0.82f; expected.r = 0.32f; expected.g = 0.69f; expected.b = 0.356f; expected.a = 0.897f; D3DXColorLerp(&got,&color,&color1,scale); expect_color(expected,got); @@ -54,6 +55,18 @@ static void D3DXColorTest(void) funcpointer = D3DXColorLerp(NULL,NULL,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXColorModulate________________*/ + expected.r = 0.18f; expected.g = 0.275f; expected.b = 0.1748f; expected.a = 0.0902f; + D3DXColorModulate(&got,&color1,&color2); + expect_color(expected,got); + /* Test the NULL case */ + funcpointer = D3DXColorModulate(&got,NULL,&color2); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorModulate(NULL,NULL,&color2); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorModulate(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXColorNegative________________*/ expected.r = 0.8f; expected.g = 0.25f; expected.b = 0.59f; expected.a = 0.93f; D3DXColorNegative(&got,&color); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index da11f31..21e8fc8 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -31,6 +31,16 @@ static inline D3DXCOLOR* D3DXColorLerp(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1, CO return pout; } +static inline D3DXCOLOR* D3DXColorModulate(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1, CONST D3DXCOLOR *pc2) +{ + if ( !pout || !pc1 || !pc2 ) return NULL; + pout->r = (pc1->r) * (pc2->r); + pout->g = (pc1->g) * (pc2->g); + pout->b = (pc1->b) * (pc2->b); + pout->a = (pc1->a) * (pc2->a); + return pout; +} + static inline D3DXCOLOR* D3DXColorNegative(D3DXCOLOR *pout, CONST D3DXCOLOR *pc) { if ( !pout || !pc ) return NULL;

1 0

David Adam : d3dx8: Implement D3DXPlaneColorScale.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 0dc3208cf6d18c788f7e7fc476881f98456cdfb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc3208cf6d18c788f7e7fc47… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 13:06:51 2007 +0200 d3dx8: Implement D3DXPlaneColorScale. --- dlls/d3dx8/tests/math.c | 10 ++++++++++ include/d3dx8math.inl | 10 ++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index c00eb4c..0d091ce 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -86,6 +86,16 @@ static void D3DXColorTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXColorNegative(NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + +/*_______________D3DXColorScale________________*/ + expected.r = 0.06f; expected.g = 0.225f; expected.b = 0.123f; expected.a = 0.279f; + D3DXColorScale(&got,&color,scale); + expect_color(expected,got); + /* Test the NULL case */ + funcpointer = D3DXColorScale(&got,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorScale(NULL,NULL,scale); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); } static void D3DXPlaneTest(void) diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 21e8fc8..50a1144 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -51,6 +51,16 @@ static inline D3DXCOLOR* D3DXColorNegative(D3DXCOLOR *pout, CONST D3DXCOLOR *pc) return pout; } +static inline D3DXCOLOR* D3DXColorScale(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s) +{ + if ( !pout || !pc ) return NULL; + pout->r = s* (pc->r); + pout->g = s* (pc->g); + pout->b = s* (pc->b); + pout->a = s* (pc->a); + return pout; +} + /*_______________D3DXVECTOR2________________________*/ static inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2)

1 0

David Adam : d3dx8: Implement D3DXPlaneColorAdd.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 2567bd8a98a2b776fc275d2a61c24ed91ff1e5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2567bd8a98a2b776fc275d2a6… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 23 13:14:19 2007 +0200 d3dx8: Implement D3DXPlaneColorAdd. --- dlls/d3dx8/tests/math.c | 12 ++++++++++++ include/d3dx8math.inl | 10 ++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 0d091ce..2f6633f 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -43,6 +43,18 @@ static void D3DXColorTest(void) color2.r = 0.3f; color2.g = 0.5f; color2.b = 0.76f; color2.a = 0.11f; scale = 0.3f; +/*_______________D3DXColorAdd________________*/ + expected.r = 0.9f; expected.g = 1.05f; expected.b = 0.99f, expected.a = 0.93f; + D3DXColorAdd(&got,&color1,&color2); + expect_color(expected,got); + /* Test the NULL case */ + funcpointer = D3DXColorAdd(&got,NULL,&color2); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorAdd(NULL,NULL,&color2); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXColorAdd(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXColorLerp________________*/ expected.r = 0.32f; expected.g = 0.69f; expected.b = 0.356f; expected.a = 0.897f; D3DXColorLerp(&got,&color,&color1,scale); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 50a1144..78ef7c5 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -21,6 +21,16 @@ /*_______________D3DXCOLOR_____________________*/ +static inline D3DXCOLOR* D3DXColorAdd(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1, CONST D3DXCOLOR *pc2) +{ + if ( !pout || !pc1 || !pc2 ) return NULL; + pout->r = (pc1->r) + (pc2->r); + pout->g = (pc1->g) + (pc2->g); + pout->b = (pc1->b) + (pc2->b); + pout->a = (pc1->a) + (pc2->a); + return pout; +} + static inline D3DXCOLOR* D3DXColorLerp(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1, CONST D3DXCOLOR *pc2, FLOAT s) { if ( !pout || !pc1 || !pc2 ) return NULL;

1 0