October 2007 - Wine-commits

David Adam : d3dx8: Implement D3DX*Vec4Cross.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 0af358b52b5daf1528b26f75d714fe5dc1d9e567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af358b52b5daf1528b26f75d… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sat Oct 27 14:23:25 2007 +0200 d3dx8: Implement D3DX*Vec4Cross. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 9 +++++++++ dlls/d3dx8/tests/math.c | 5 +++++ include/d3dx8math.h | 1 + 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 7607d10..a64e1e4 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -14,7 +14,7 @@ @ stdcall D3DXVec3TransformNormal(ptr ptr ptr) @ stub D3DXVec3Project @ stub D3DXVec3Unproject -@ stub D3DXVec4Cross +@ stdcall D3DXVec4Cross(ptr ptr ptr) @ stdcall D3DXVec4Normalize(ptr ptr) @ stdcall D3DXVec4Hermite(ptr ptr ptr ptr ptr long) @ stdcall D3DXVec4CatmullRom(ptr ptr ptr ptr long) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 98488c9..ff1b493 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -246,6 +246,15 @@ D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0 return pout; } +D3DXVECTOR4* WINAPI D3DXVec4Cross(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3) +{ + pout->x = pv1->y * (pv2->z * pv3->w - pv3->z * pv2->w) - pv1->z * (pv2->y * pv3->w - pv3->y * pv2->w) + pv1->w * (pv2->y * pv3->z - pv2->z *pv3->y); + pout->y = -(pv1->x * (pv2->z * pv3->w - pv3->z * pv2->w) - pv1->z * (pv2->x * pv3->w - pv3->x * pv2->w) + pv1->w * (pv2->x * pv3->z - pv3->x * pv2->z)); + pout->z = pv1->x * (pv2->y * pv3->w - pv3->y * pv2->w) - pv1->y * (pv2->x *pv3->w - pv3->x * pv2->w) + pv1->w * (pv2->x * pv3->y - pv3->x * pv2->y); + pout->w = -(pv1->x * (pv2->y * pv3->z - pv3->y * pv2->z) - pv1->y * (pv2->x * pv3->z - pv3->x *pv2->z) + pv1->z * (pv2->x * pv3->y - pv3->x * pv2->y)); + return pout; +} + D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pt1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pt2, FLOAT s) { FLOAT h1, h2, h3, h4; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 0675c46..021dfe4 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -650,6 +650,11 @@ static void D3X8Vector4Test(void) D3DXVec4CatmullRom(&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); + expect_vec4(expectedvec,gotvec); + /*_______________D3DXVec4Dot__________________________*/ expected = 55.0f; got = D3DXVec4Dot(&u,&v); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 9a28a54..a5fc09e 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -78,6 +78,7 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformNormal(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g); D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT s); +D3DXVECTOR4* WINAPI D3DXVec4Cross(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3); D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pt1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pt2, FLOAT s); D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv); D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, CONST D3DXMATRIX *pm);

1 0

David Adam : d3dx8: Implement D3DX*TransformCoord.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 90c4757b8dbcf65759619fdebbeac731a854f167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c4757b8dbcf65759619fdeb… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sat Oct 27 11:54:25 2007 +0200 d3dx8: Implement D3DX*TransformCoord. --- dlls/d3dx8/d3dx8.spec | 4 ++-- dlls/d3dx8/math.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 24 ++++++++++++++++++++++-- include/d3dx8math.h | 2 ++ 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index d52c4f9..5daf16d 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -3,14 +3,14 @@ @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec2Transform(ptr ptr ptr) -@ stub D3DXVec2TransformCoord +@ stdcall D3DXVec2TransformCoord(ptr ptr ptr) @ stub D3DXVec2TransformNormal @ stdcall D3DXVec3Normalize(ptr ptr) @ stdcall D3DXVec3Hermite(ptr ptr ptr ptr ptr long) @ stdcall D3DXVec3CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec3BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec3Transform(ptr ptr ptr) -@ stub D3DXVec3TransformCoord +@ stdcall D3DXVec3TransformCoord(ptr ptr ptr) @ stub D3DXVec3TransformNormal @ stub D3DXVec3Project @ stub D3DXVec3Unproject diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 6351da5..57adce0 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -109,6 +109,24 @@ D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR2 *pv, return pout; } +D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm) +{ + FLOAT norm; + + norm = pm->m[0][3] * pv->x + pm->m[1][3] * pv->y + pm->m[3][3]; + if ( norm ) + { + pout->x = (pm->m[0][0] * pv->x + pm->m[1][0] * pv->y + pm->m[3][0]) / norm; + pout->y = (pm->m[0][1] * pv->x + pm->m[1][1] * pv->y + pm->m[3][1]) / norm; + } + else + { + pout->x = 0.0f; + pout->y = 0.0f; + } + return pout; +} + /*_________________D3DXVec3_____________________*/ D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g) @@ -171,6 +189,27 @@ D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR3 *pv, return pout; } +D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm) +{ + FLOAT norm; + + norm = pm->m[0][3] * pv->x + pm->m[1][3] * pv->y + pm->m[2][3] *pv->z + pm->m[3][3]; + + if ( norm ) + { + pout->x = (pm->m[0][0] * pv->x + pm->m[1][0] * pv->y + pm->m[2][0] * pv->z + pm->m[3][0]) / norm; + pout->y = (pm->m[0][1] * pv->x + pm->m[1][1] * pv->y + pm->m[2][1] * pv->z + pm->m[3][1]) / norm; + pout->z = (pm->m[0][2] * pv->x + pm->m[1][2] * pv->y + pm->m[2][2] * pv->z + pm->m[3][2]) / norm; + } + else + { + pout->x = 0.0f; + pout->y = 0.0f; + pout->z = 0.0f; + } + return pout; +} + /*_________________D3DXVec4_____________________*/ D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index aad36b8..ccddd89 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -273,7 +273,7 @@ static void D3X8QuaternionTest(void) static void D3X8Vector2Test(void) { - D3DXVECTOR2 expectedvec, gotvec, nul, u, v, w, x; + D3DXVECTOR2 expectedvec, gotvec, nul, nulproj, u, v, w, x; LPD3DXVECTOR2 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat; @@ -423,11 +423,21 @@ static void D3X8Vector2Test(void) expectedtrans.x = 36.0f; expectedtrans.y = 44.0f; expectedtrans.z = 52.0f; expectedtrans.w = 60.0f; D3DXVec2Transform(&gottrans,&u,&mat); expect_vec4(expectedtrans,gottrans); + +/*_______________D3DXVec2TransformCoord_______________________*/ + expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; + D3DXVec2TransformCoord(&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); + expect_vec(expectedvec,gotvec); } static void D3X8Vector3Test(void) { - D3DXVECTOR3 expectedvec, gotvec, nul, u, v, w, x; + D3DXVECTOR3 expectedvec, gotvec, nul, nulproj, u, v, w, x; LPD3DXVECTOR3 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat; @@ -576,6 +586,16 @@ static void D3X8Vector3Test(void) expectedtrans.x = 70.0f; expectedtrans.y = 88.0f; expectedtrans.z = 106.0f; expectedtrans.w = 124.0f; D3DXVec3Transform(&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); + 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); + expect_vec3(expectedvec,gotvec); } static void D3X8Vector4Test(void) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 3bdb55c..9e599b5 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -65,12 +65,14 @@ D3DXVECTOR2* WINAPI D3DXVec2CatmullRom(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv0 D3DXVECTOR2* WINAPI D3DXVec2Hermite(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pt1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pt2, FLOAT s); D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv); D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm); +D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm); D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g); D3DXVECTOR3* WINAPI D3DXVec3CatmullRom( D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv0, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT s); D3DXVECTOR3* WINAPI D3DXVec3Hermite(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pt1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pt2, FLOAT s); D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv); D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm); +D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm); D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g); D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT s);

1 0

David Adam : d3dx8: Implement D3DXTransformNormal.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: cc22eac10e55270a7787a57463adac4ee98c6803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc22eac10e55270a7787a5746… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sat Oct 27 12:21:47 2007 +0200 d3dx8: Implement D3DXTransformNormal. --- dlls/d3dx8/d3dx8.spec | 4 ++-- dlls/d3dx8/math.c | 16 ++++++++++++++++ dlls/d3dx8/tests/math.c | 10 ++++++++++ include/d3dx8math.h | 2 ++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 5daf16d..7607d10 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -4,14 +4,14 @@ @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec2Transform(ptr ptr ptr) @ stdcall D3DXVec2TransformCoord(ptr ptr ptr) -@ stub D3DXVec2TransformNormal +@ stdcall D3DXVec2TransformNormal(ptr ptr ptr) @ stdcall D3DXVec3Normalize(ptr ptr) @ stdcall D3DXVec3Hermite(ptr ptr ptr ptr ptr long) @ stdcall D3DXVec3CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec3BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec3Transform(ptr ptr ptr) @ stdcall D3DXVec3TransformCoord(ptr ptr ptr) -@ stub D3DXVec3TransformNormal +@ stdcall D3DXVec3TransformNormal(ptr ptr ptr) @ stub D3DXVec3Project @ stub D3DXVec3Unproject @ stub D3DXVec4Cross diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 57adce0..98488c9 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -127,6 +127,13 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 return pout; } +D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm) +{ + pout->x = pm->m[0][0] * pv->x + pm->m[1][0] * pv->y; + pout->y = pm->m[0][1] * pv->x + pm->m[1][1] * pv->y; + return pout; +} + /*_________________D3DXVec3_____________________*/ D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g) @@ -210,6 +217,15 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 return pout; } +D3DXVECTOR3* WINAPI D3DXVec3TransformNormal(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm) +{ + pout->x = pm->m[0][0] * pv->x + pm->m[1][0] * pv->y + pm->m[2][0] * pv->z; + pout->y = pm->m[0][1] * pv->x + pm->m[1][1] * pv->y + pm->m[2][1] * pv->z; + pout->z = pm->m[0][2] * pv->x + pm->m[1][2] * pv->y + pm->m[2][2] * pv->z; + return pout; + +} + /*_________________D3DXVec4_____________________*/ D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index ccddd89..0675c46 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -433,6 +433,11 @@ static void D3X8Vector2Test(void) expectedvec.x = 0.0f; expectedvec.y = 0.0f; D3DXVec2TransformCoord(&gotvec,&nulproj,&mat); expect_vec(expectedvec,gotvec); + + /*_______________D3DXVec2TransformNormal______________________*/ + expectedvec.x = 23.0f; expectedvec.y = 30.0f; + D3DXVec2TransformNormal(&gotvec,&u,&mat); + expect_vec(expectedvec,gotvec); } static void D3X8Vector3Test(void) @@ -596,6 +601,11 @@ static void D3X8Vector3Test(void) expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; D3DXVec3TransformCoord(&gotvec,&nulproj,&mat); expect_vec3(expectedvec,gotvec); + +/*_______________D3DXVec3TransformNormal______________________*/ + expectedvec.x = 57.0f; expectedvec.y = 74.0f; expectedvec.z = 91.0f; + D3DXVec3TransformNormal(&gotvec,&u,&mat); + expect_vec3(expectedvec,gotvec); } static void D3X8Vector4Test(void) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 9e599b5..9a28a54 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -66,6 +66,7 @@ D3DXVECTOR2* WINAPI D3DXVec2Hermite(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, C D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv); D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm); D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm); +D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm); D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g); D3DXVECTOR3* WINAPI D3DXVec3CatmullRom( D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv0, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT s); @@ -73,6 +74,7 @@ D3DXVECTOR3* WINAPI D3DXVec3Hermite(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, C D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv); D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm); D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm); +D3DXVECTOR3* WINAPI D3DXVec3TransformNormal(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm); D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g); D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT s);

1 0

David Adam : d3dx8: Implement D3DX*Transform.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: fa58dcee8d8da1f8275fb521c65ff2c4af3b7302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa58dcee8d8da1f8275fb521c… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sat Oct 27 11:00:07 2007 +0200 d3dx8: Implement D3DX*Transform. --- dlls/d3dx8/d3dx8.spec | 6 +++--- dlls/d3dx8/math.c | 27 +++++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 35 +++++++++++++++++++++++++++++++++++ include/d3dx8math.h | 3 +++ 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 8d20c5d..d52c4f9 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -2,14 +2,14 @@ @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr long) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) -@ stub D3DXVec2Transform +@ stdcall D3DXVec2Transform(ptr ptr ptr) @ stub D3DXVec2TransformCoord @ stub D3DXVec2TransformNormal @ stdcall D3DXVec3Normalize(ptr ptr) @ stdcall D3DXVec3Hermite(ptr ptr ptr ptr ptr long) @ stdcall D3DXVec3CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec3BaryCentric(ptr ptr ptr ptr long long) -@ stub D3DXVec3Transform +@ stdcall D3DXVec3Transform(ptr ptr ptr) @ stub D3DXVec3TransformCoord @ stub D3DXVec3TransformNormal @ stub D3DXVec3Project @@ -19,7 +19,7 @@ @ stdcall D3DXVec4Hermite(ptr ptr ptr ptr ptr long) @ stdcall D3DXVec4CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec4BaryCentric(ptr ptr ptr ptr long long) -@ stub D3DXVec4Transform +@ stdcall D3DXVec4Transform(ptr ptr ptr) @ stub D3DXMatrixfDeterminant @ stub D3DXMatrixMultiply @ stub D3DXMatrixTranspose diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 636bca8..6351da5 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -100,6 +100,15 @@ D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv) return pout; } +D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm) +{ + pout->x = pm->m[0][0] * pv->x + pm->m[1][0] * pv->y + pm->m[3][0]; + pout->y = pm->m[0][1] * pv->x + pm->m[1][1] * pv->y + pm->m[3][1]; + pout->z = pm->m[0][2] * pv->x + pm->m[1][2] * pv->y + pm->m[3][2]; + pout->w = pm->m[0][3] * pv->x + pm->m[1][3] * pv->y + pm->m[3][3]; + return pout; +} + /*_________________D3DXVec3_____________________*/ D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g) @@ -153,6 +162,15 @@ D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv) return pout; } +D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm) +{ + pout->x = pm->m[0][0] * pv->x + pm->m[1][0] * pv->y + pm->m[2][0] * pv->z + pm->m[3][0]; + pout->y = pm->m[0][1] * pv->x + pm->m[1][1] * pv->y + pm->m[2][1] * pv->z + pm->m[3][1]; + pout->z = pm->m[0][2] * pv->x + pm->m[1][2] * pv->y + pm->m[2][2] * pv->z + pm->m[3][2]; + pout->w = pm->m[0][3] * pv->x + pm->m[1][3] * pv->y + pm->m[2][3] * pv->z + pm->m[3][3]; + return pout; +} + /*_________________D3DXVec4_____________________*/ D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g) @@ -210,3 +228,12 @@ D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv) } return pout; } + +D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, CONST D3DXMATRIX *pm) +{ + pout->x = pm->m[0][0] * pv->x + pm->m[1][0] * pv->y + pm->m[2][0] * pv->z + pm->m[3][0] * pv->w; + pout->y = pm->m[0][1] * pv->x + pm->m[1][1] * pv->y + pm->m[2][1] * pv->z + pm->m[3][1] * pv->w; + pout->z = pm->m[0][2] * pv->x + pm->m[1][2] * pv->y + pm->m[2][2] * pv->z + pm->m[3][2] * pv->w; + pout->w = pm->m[0][3] * pv->x + pm->m[1][3] * pv->y + pm->m[2][3] * pv->z + pm->m[3][3] * pv->w; + return pout; +} diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index f410b64..aad36b8 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -275,6 +275,8 @@ static void D3X8Vector2Test(void) { D3DXVECTOR2 expectedvec, gotvec, nul, u, v, w, x; LPD3DXVECTOR2 funcpointer; + D3DXVECTOR4 expectedtrans, gottrans; + D3DXMATRIX mat; FLOAT coeff1, coeff2, expected, got, scale; nul.x = 0.0f; nul.y = 0.0f; @@ -283,6 +285,11 @@ static void D3X8Vector2Test(void) w.x = 4.0f; w.y = -3.0f; x.x = 2.0f; x.y = -11.0f; + mat.m[0][0] = 1.0f; mat.m[0][1] = 2.0f; mat.m[0][2] = 3.0f; mat.m[0][3] = 4.0f; + mat.m[1][0] = 5.0f; mat.m[1][1] = 6.0f; mat.m[1][2] = 7.0f; mat.m[1][3] = 8.0f; + mat.m[2][0] = 9.0f; mat.m[2][1] = 10.0f; mat.m[2][2] = 11.0f; mat.m[2][3] = 12.0f; + mat.m[3][0] = 13.0f; mat.m[3][1] = 14.0f; mat.m[3][2] = 15.0f; mat.m[3][3] = 16.0f; + coeff1 = 2.0f; coeff2 = 5.0f; scale = -6.5f; @@ -412,12 +419,18 @@ static void D3X8Vector2Test(void) funcpointer = D3DXVec2Subtract(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec2Transform_______________________*/ + expectedtrans.x = 36.0f; expectedtrans.y = 44.0f; expectedtrans.z = 52.0f; expectedtrans.w = 60.0f; + D3DXVec2Transform(&gottrans,&u,&mat); + expect_vec4(expectedtrans,gottrans); } static void D3X8Vector3Test(void) { D3DXVECTOR3 expectedvec, gotvec, nul, u, v, w, x; LPD3DXVECTOR3 funcpointer; + D3DXVECTOR4 expectedtrans, gottrans; + D3DXMATRIX mat; FLOAT coeff1, coeff2, expected, got, scale; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; @@ -426,6 +439,11 @@ static void D3X8Vector3Test(void) w.x = 3.0f; w.y = -5.0f; w.z = 7.0f; x.x = 4.0f; x.y = 1.0f; x.z = 11.0f; + mat.m[0][0] = 1.0f; mat.m[0][1] = 2.0f; mat.m[0][2] = 3.0f; mat.m[0][3] = 4.0f; + mat.m[1][0] = 5.0f; mat.m[1][1] = 6.0f; mat.m[1][2] = 7.0f; mat.m[1][3] = 8.0f; + mat.m[2][0] = 9.0f; mat.m[2][1] = 10.0f; mat.m[2][2] = 11.0f; mat.m[2][3] = 12.0f; + mat.m[3][0] = 13.0f; mat.m[3][1] = 14.0f; mat.m[3][2] = 15.0f; mat.m[3][3] = 16.0f; + coeff1 = 2.0f; coeff2 = 5.0f; scale = -6.5f; @@ -554,12 +572,18 @@ static void D3X8Vector3Test(void) funcpointer = D3DXVec3Subtract(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec3Transform_______________________*/ + expectedtrans.x = 70.0f; expectedtrans.y = 88.0f; expectedtrans.z = 106.0f; expectedtrans.w = 124.0f; + D3DXVec3Transform(&gottrans,&u,&mat); + expect_vec4(expectedtrans,gottrans); } static void D3X8Vector4Test(void) { D3DXVECTOR4 expectedvec, gotvec, nul, u, v, w, x; LPD3DXVECTOR4 funcpointer; + D3DXVECTOR4 expectedtrans, gottrans; + D3DXMATRIX mat; FLOAT coeff1, coeff2, expected, got, scale; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; @@ -567,6 +591,12 @@ static void D3X8Vector4Test(void) v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; w.x = 4.0f; w.y =6.0f; w.z = -2.0f; w.w = 1.0f; x.x = 6.0f; x.y = -7.0f; x.z =8.0f; x.w = -9.0f; + + mat.m[0][0] = 1.0f; mat.m[0][1] = 2.0f; mat.m[0][2] = 3.0f; mat.m[0][3] = 4.0f; + mat.m[1][0] = 5.0f; mat.m[1][1] = 6.0f; mat.m[1][2] = 7.0f; mat.m[1][3] = 8.0f; + mat.m[2][0] = 9.0f; mat.m[2][1] = 10.0f; mat.m[2][2] = 11.0f; mat.m[2][3] = 12.0f; + mat.m[3][0] = 13.0f; mat.m[3][1] = 14.0f; mat.m[3][2] = 15.0f; mat.m[3][3] = 16.0f; + coeff1 = 2.0f; coeff2 = 5.0; scale = -6.5f; @@ -683,6 +713,11 @@ static void D3X8Vector4Test(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec4Subtract(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + +/*_______________D3DXVec4Transform_______________________*/ + expectedtrans.x = 177.0f; expectedtrans.y = 194.0f; expectedtrans.z = 211.0f; expectedtrans.w = 228.0f; + D3DXVec4Transform(&gottrans,&u,&mat); + expect_vec4(expectedtrans,gottrans); } START_TEST(math) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 5db652e..3bdb55c 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -64,16 +64,19 @@ D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv D3DXVECTOR2* WINAPI D3DXVec2CatmullRom(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv0, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT s); D3DXVECTOR2* WINAPI D3DXVec2Hermite(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pt1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pt2, FLOAT s); D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv); +D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm); D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g); D3DXVECTOR3* WINAPI D3DXVec3CatmullRom( D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv0, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT s); D3DXVECTOR3* WINAPI D3DXVec3Hermite(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pt1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pt2, FLOAT s); D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv); +D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm); D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g); D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT s); D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pt1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pt2, FLOAT s); D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv); +D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, CONST D3DXMATRIX *pm); #include <d3dx8math.inl>

1 0

David Adam : d3dx8: Implement D3DX*CatmullRom.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 7d0f15f9646e16f000e2ddb6c3324b1b2cb99151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0f15f9646e16f000e2ddb6c… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Fri Oct 26 21:43:46 2007 +0200 d3dx8: Implement D3DX*CatmullRom. --- dlls/d3dx8/d3dx8.spec | 6 +++--- dlls/d3dx8/math.c | 24 ++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 16 ++++++++++++++++ include/d3dx8math.h | 3 +++ 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index f29d601..8d20c5d 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -1,13 +1,13 @@ @ stdcall D3DXVec2Normalize(ptr ptr) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr long) -@ stub D3DXVec2CatmullRom +@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) @ stub D3DXVec2Transform @ stub D3DXVec2TransformCoord @ stub D3DXVec2TransformNormal @ stdcall D3DXVec3Normalize(ptr ptr) @ stdcall D3DXVec3Hermite(ptr ptr ptr ptr ptr long) -@ stub D3DXVec3CatmullRom +@ stdcall D3DXVec3CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec3BaryCentric(ptr ptr ptr ptr long long) @ stub D3DXVec3Transform @ stub D3DXVec3TransformCoord @@ -17,7 +17,7 @@ @ stub D3DXVec4Cross @ stdcall D3DXVec4Normalize(ptr ptr) @ stdcall D3DXVec4Hermite(ptr ptr ptr ptr ptr long) -@ stub D3DXVec4CatmullRom +@ stdcall D3DXVec4CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec4BaryCentric(ptr ptr ptr ptr long long) @ stub D3DXVec4Transform @ stub D3DXMatrixfDeterminant diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 780c25f..636bca8 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -61,6 +61,13 @@ D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv return pout; } +D3DXVECTOR2* WINAPI D3DXVec2CatmullRom(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv0, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT s) +{ + pout->x = 0.5f * (2.0f * pv1->x + (pv2->x - pv0->x) *s + (2.0f *pv0->x - 5.0f * pv1->x + 4.0f * pv2->x - pv3->x) * s * s + (pv3->x -3.0f * pv2->x + 3.0f * pv1->x - pv0->x) * s * s * s); + pout->y = 0.5f * (2.0f * pv1->y + (pv2->y - pv0->y) *s + (2.0f *pv0->y - 5.0f * pv1->y + 4.0f * pv2->y - pv3->y) * s * s + (pv3->y -3.0f * pv2->y + 3.0f * pv1->y - pv0->y) * s * s * s); + return pout; +} + D3DXVECTOR2* WINAPI D3DXVec2Hermite(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pt1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pt2, FLOAT s) { FLOAT h1, h2, h3, h4; @@ -103,6 +110,14 @@ D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv return pout; } +D3DXVECTOR3* WINAPI D3DXVec3CatmullRom( D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv0, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT s) +{ + pout->x = 0.5f * (2.0f * pv1->x + (pv2->x - pv0->x) *s + (2.0f *pv0->x - 5.0f * pv1->x + 4.0f * pv2->x - pv3->x) * s * s + (pv3->x -3.0f * pv2->x + 3.0f * pv1->x - pv0->x) * s * s * s); + pout->y = 0.5f * (2.0f * pv1->y + (pv2->y - pv0->y) *s + (2.0f *pv0->y - 5.0f * pv1->y + 4.0f * pv2->y - pv3->y) * s * s + (pv3->y -3.0f * pv2->y + 3.0f * pv1->y - pv0->y) * s * s * s); + pout->z = 0.5f * (2.0f * pv1->z + (pv2->z - pv0->z) *s + (2.0f *pv0->z - 5.0f * pv1->z + 4.0f * pv2->z - pv3->z) * s * s + (pv3->z -3.0f * pv2->z + 3.0f * pv1->z - pv0->z) * s * s * s); + return pout; +} + D3DXVECTOR3* WINAPI D3DXVec3Hermite(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pt1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pt2, FLOAT s) { FLOAT h1, h2, h3, h4; @@ -149,6 +164,15 @@ D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv return pout; } +D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT s) +{ + pout->x = 0.5f * (2.0f * pv1->x + (pv2->x - pv0->x) *s + (2.0f *pv0->x - 5.0f * pv1->x + 4.0f * pv2->x - pv3->x) * s * s + (pv3->x -3.0f * pv2->x + 3.0f * pv1->x - pv0->x) * s * s * s); + pout->y = 0.5f * (2.0f * pv1->y + (pv2->y - pv0->y) *s + (2.0f *pv0->y - 5.0f * pv1->y + 4.0f * pv2->y - pv3->y) * s * s + (pv3->y -3.0f * pv2->y + 3.0f * pv1->y - pv0->y) * s * s * s); + pout->z = 0.5f * (2.0f * pv1->z + (pv2->z - pv0->z) *s + (2.0f *pv0->z - 5.0f * pv1->z + 4.0f * pv2->z - pv3->z) * s * s + (pv3->z -3.0f * pv2->z + 3.0f * pv1->z - pv0->z) * s * s * s); + pout->w = 0.5f * (2.0f * pv1->w + (pv2->w - pv0->w) *s + (2.0f *pv0->w - 5.0f * pv1->w + 4.0f * pv2->w - pv3->w) * s * s + (pv3->w -3.0f * pv2->w + 3.0f * pv1->w - pv0->w) * s * s * s); + return pout; +} + D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pt1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pt2, FLOAT s) { FLOAT h1, h2, h3, h4; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 1902531..258222d 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -301,6 +301,11 @@ static void D3X8Vector2Test(void) D3DXVec2BaryCentric(&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); + expect_vec(expectedvec,gotvec); + /*_______________D3DXVec2CCW__________________________*/ expected = 55.0f; got = D3DXVec2CCW(&u,&v); @@ -437,6 +442,12 @@ static void D3X8Vector3Test(void) /*_______________D3DXVec3BaryCentric___________________*/ expectedvec.x = -35.0f; expectedvec.y = -67.0; expectedvec.z = 15.0f; D3DXVec3BaryCentric(&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); expect_vec3(expectedvec,gotvec); /*_______________D3DXVec3Cross________________________*/ @@ -573,6 +584,11 @@ static void D3X8Vector4Test(void) D3DXVec4BaryCentric(&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); + expect_vec4(expectedvec,gotvec); + /*_______________D3DXVec4Dot__________________________*/ expected = 55.0f; got = D3DXVec4Dot(&u,&v); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index d3f0ac0..5db652e 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -61,14 +61,17 @@ typedef struct D3DXCOLOR D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g); +D3DXVECTOR2* WINAPI D3DXVec2CatmullRom(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv0, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT s); D3DXVECTOR2* WINAPI D3DXVec2Hermite(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pt1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pt2, FLOAT s); D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv); D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g); +D3DXVECTOR3* WINAPI D3DXVec3CatmullRom( D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv0, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT s); D3DXVECTOR3* WINAPI D3DXVec3Hermite(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pt1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pt2, FLOAT s); D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv); D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g); +D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT s); D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pt1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pt2, FLOAT s); D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv);

1 0

David Adam : d3dx8: Test the function D3DXVec3Cross really.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 145264efa691b0f065c3859570772e22f6624e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145264efa691b0f065c385957… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Fri Oct 26 21:46:32 2007 +0200 d3dx8: Test the function D3DXVec3Cross really. --- dlls/d3dx8/tests/math.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 258222d..f410b64 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -451,8 +451,9 @@ static void D3X8Vector3Test(void) expect_vec3(expectedvec,gotvec); /*_______________D3DXVec3Cross________________________*/ - expectedvec.x = -18.0f; expectedvec.y = 40.0f; expectedvec.z = -30.0f; + expectedvec.x = -18.0f; expectedvec.y = 40.0f; expectedvec.z = -39.0f; D3DXVec3Cross(&gotvec,&u,&v); + expect_vec3(expectedvec,gotvec); /* Tests the case NULL */ funcpointer = D3DXVec3Cross(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);

1 0

David Adam : d3dx8: Implement D3DX*Normalize.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 50ae1e3623b168bb9950ab76a39e4d2daecfaea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ae1e3623b168bb9950ab76a… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Fri Oct 26 18:01:49 2007 +0200 d3dx8: Implement D3DX*Normalize. --- dlls/d3dx8/Makefile.in | 3 +- dlls/d3dx8/d3dx8.spec | 8 ++-- dlls/d3dx8/math.c | 119 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx8/tests/Makefile.in | 2 +- dlls/d3dx8/tests/math.c | 63 ++++++++++++++++++----- include/d3dx8math.h | 8 +++ 6 files changed, 184 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50ae1e3623b168bb9950a…

1 0

David Adam : d3dx8: Implement D3DX*BaryCentric.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: ea8e7ce42d0e03ffdeb747c95470d9b93af8ad95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8e7ce42d0e03ffdeb747c95… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Fri Oct 26 18:58:28 2007 +0200 d3dx8: Implement D3DX*BaryCentric. --- dlls/d3dx8/d3dx8.spec | 6 ++-- dlls/d3dx8/math.c | 23 ++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 48 +++++++++++++++++++++++++++++++++++----------- include/d3dx8math.h | 3 ++ 4 files changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 6620454..362b76c 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -1,14 +1,14 @@ @ stdcall D3DXVec2Normalize(ptr ptr) @ stub D3DXVec2Hermite @ stub D3DXVec2CatmullRom -@ stub D3DXVec2BaryCentric +@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) @ stub D3DXVec2Transform @ stub D3DXVec2TransformCoord @ stub D3DXVec2TransformNormal @ stdcall D3DXVec3Normalize(ptr ptr) @ stub D3DXVec3Hermite @ stub D3DXVec3CatmullRom -@ stub D3DXVec3BaryCentric +@ stdcall D3DXVec3BaryCentric(ptr ptr ptr ptr long long) @ stub D3DXVec3Transform @ stub D3DXVec3TransformCoord @ stub D3DXVec3TransformNormal @@ -18,7 +18,7 @@ @ stdcall D3DXVec4Normalize(ptr ptr) @ stub D3DXVec4Hermite @ stub D3DXVec4CatmullRom -@ stub D3DXVec4BaryCentric +@ stdcall D3DXVec4BaryCentric(ptr ptr ptr ptr long long) @ stub D3DXVec4Transform @ stub D3DXMatrixfDeterminant @ stub D3DXMatrixMultiply diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 8cec297..e10229c 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -54,6 +54,13 @@ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQ } /*_________________D3DXVec2_____________________*/ +D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g) +{ + pout->x = (1.0f-f-g) * (pv1->x) + f * (pv2->x) + g * (pv3->x); + pout->y = (1.0f-f-g) * (pv1->y) + f * (pv2->y) + g * (pv3->y); + return pout; +} + D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv) { FLOAT norm; @@ -74,6 +81,14 @@ D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv) /*_________________D3DXVec3_____________________*/ +D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g) +{ + pout->x = (1.0f-f-g) * (pv1->x) + f * (pv2->x) + g * (pv3->x); + pout->y = (1.0f-f-g) * (pv1->y) + f * (pv2->y) + g * (pv3->y); + pout->z = (1.0f-f-g) * (pv1->z) + f * (pv2->z) + g * (pv3->z); + return pout; +} + D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv) { FLOAT norm; @@ -96,6 +111,14 @@ D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv) /*_________________D3DXVec4_____________________*/ +D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g) +{ + pout->x = (1.0f-f-g) * (pv1->x) + f * (pv2->x) + g * (pv3->x); + pout->y = (1.0f-f-g) * (pv1->y) + f * (pv2->y) + g * (pv3->y); + pout->z = (1.0f-f-g) * (pv1->z) + f * (pv2->z) + g * (pv3->z); + pout->w = (1.0f-f-g) * (pv1->w) + f * (pv2->w) + g * (pv3->w); + return pout; +} D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv) { FLOAT norm; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 675e620..ea206ba 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -273,25 +273,33 @@ static void D3X8QuaternionTest(void) static void D3X8Vector2Test(void) { - D3DXVECTOR2 expectedvec, gotvec, nul, u, v; + D3DXVECTOR2 expectedvec, gotvec, nul, u, v, w; LPD3DXVECTOR2 funcpointer; - FLOAT expected, got, scale; + FLOAT coeff1, coeff2, expected, got, scale; nul.x = 0.0f; nul.y = 0.0f; - u.x=3.0f; u.y=4.0f; - v.x=-7.0f; v.y=9.0f; + u.x = 3.0f; u.y = 4.0f; + v.x = -7.0f; v.y = 9.0f; + w.x = 4.0f; w.y = -3.0f; + + coeff1 = 2.0f; coeff2 = 5.0f; scale = -6.5f; /*_______________D3DXVec2Add__________________________*/ - expectedvec.x = -4.0f; expectedvec.y = 13.0f; - D3DXVec2Add(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + 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); +/*_______________D3DXVec2BaryCentric___________________*/ + expectedvec.x = -12.0f; expectedvec.y = -21.0f; + D3DXVec2BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2); + expect_vec(expectedvec,gotvec); + /*_______________D3DXVec2CCW__________________________*/ expected = 55.0f; got = D3DXVec2CCW(&u,&v); @@ -397,13 +405,16 @@ static void D3X8Vector2Test(void) static void D3X8Vector3Test(void) { - D3DXVECTOR3 expectedvec, gotvec, nul, u, v; + D3DXVECTOR3 expectedvec, gotvec, nul, u, v, w; LPD3DXVECTOR3 funcpointer; - FLOAT expected, got, scale; + FLOAT coeff1, coeff2, expected, got, scale; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; u.x = 9.0f; u.y = 6.0f; u.z = 2.0f; v.x = 2.0f; v.y = -3.0f; v.z = -4.0; + w.x = 3.0f; w.y = -5.0f; w.z = 7.0f; + + coeff1 = 2.0f; coeff2 = 5.0f; scale = -6.5f; /*_______________D3DXVec3Add__________________________*/ @@ -416,6 +427,11 @@ static void D3X8Vector3Test(void) funcpointer = D3DXVec3Add(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec3BaryCentric___________________*/ + expectedvec.x = -35.0f; expectedvec.y = -67.0; expectedvec.z = 15.0f; + D3DXVec3BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2); + expect_vec3(expectedvec,gotvec); + /*_______________D3DXVec3Cross________________________*/ expectedvec.x = -18.0f; expectedvec.y = 40.0f; expectedvec.z = -30.0f; D3DXVec3Cross(&gotvec,&u,&v); @@ -518,13 +534,16 @@ static void D3X8Vector3Test(void) static void D3X8Vector4Test(void) { - D3DXVECTOR4 expectedvec, gotvec, nul, u, v; + D3DXVECTOR4 expectedvec, gotvec, nul, u, v, w; LPD3DXVECTOR4 funcpointer; - FLOAT expected, got, scale; + FLOAT coeff1, coeff2, expected, got, scale; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; u.x = 1.0f; u.y = 2.0f; u.z = 4.0f; u.w = 10.0; v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; + w.x = 4.0f; w.y =6.0f; w.z = -2.0f; w.w = 1.0f; + + coeff1 = 2.0f; coeff2 = 5.0; scale = -6.5f; /*_______________D3DXVec4Add__________________________*/ @@ -537,6 +556,11 @@ static void D3X8Vector4Test(void) funcpointer = D3DXVec4Add(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec4BaryCentric____________________*/ + expectedvec.x = 8.0f; expectedvec.y = 26.0; expectedvec.z = -44.0f; expectedvec.w = -41.0f; + D3DXVec4BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2); + expect_vec4(expectedvec,gotvec); + /*_______________D3DXVec4Dot__________________________*/ expected = 55.0f; got = D3DXVec4Dot(&u,&v); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index e173ac5..c510031 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -60,10 +60,13 @@ typedef struct D3DXCOLOR D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); +D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g); D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv); +D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g); D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv); +D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g); D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv); #include <d3dx8math.inl>

1 0

David Adam : d3dx8: Implement D3DX*Hermite.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 4ff191a7eb93fbca94bfe4651131cdb204c2082c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff191a7eb93fbca94bfe4651… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Fri Oct 26 21:02:30 2007 +0200 d3dx8: Implement D3DX*Hermite. --- dlls/d3dx8/d3dx8.spec | 6 +++--- dlls/d3dx8/math.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 35 ++++++++++++++++++++++++++--------- include/d3dx8math.h | 3 +++ 4 files changed, 78 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ff191a7eb93fbca94bfe…

1 0

Tom Brus : ntdll: Serial/COM code misinterpreted XON/XOFF direction.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: fa4304f06eebc98af35c03569c4bc28f9d881d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4304f06eebc98af35c03569… Author: Tom Brus <tombrus(a)gmail.com> Date: Sun Oct 28 21:24:40 2007 +0100 ntdll: Serial/COM code misinterpreted XON/XOFF direction. --- dlls/ntdll/serial.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index bd6f9ca..be398a5 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -227,9 +227,9 @@ static NTSTATUS get_hand_flow(int fd, SERIAL_HANDFLOW* shf) #endif shf->ControlHandShake |= SERIAL_RTS_CONTROL; } - if (port.c_iflag & IXON) - shf->FlowReplace |= SERIAL_AUTO_RECEIVE; if (port.c_iflag & IXOFF) + shf->FlowReplace |= SERIAL_AUTO_RECEIVE; + if (port.c_iflag & IXON) shf->FlowReplace |= SERIAL_AUTO_TRANSMIT; shf->XonLimit = 10; @@ -611,13 +611,13 @@ static NTSTATUS set_handflow(int fd, const SERIAL_HANDFLOW* shf) #endif if (shf->FlowReplace & SERIAL_AUTO_RECEIVE) - port.c_iflag |= IXON; - else - port.c_iflag &= ~IXON; - if (shf->FlowReplace & SERIAL_AUTO_TRANSMIT) port.c_iflag |= IXOFF; else port.c_iflag &= ~IXOFF; + if (shf->FlowReplace & SERIAL_AUTO_TRANSMIT) + port.c_iflag |= IXON; + else + port.c_iflag &= ~IXON; if (tcsetattr(fd, TCSANOW, &port) == -1) { ERR("tcsetattr error '%s'\n", strerror(errno));

1 0