November 2007 - Wine-Commits

Juan Lang : iphlpapi: Default to a default gateway when choosing the best route.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: 00c97a61bf2c4d47d012b5205d2a1589671d6ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c97a61bf2c4d47d012b5205… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 15 09:38:12 2007 -0800 iphlpapi: Default to a default gateway when choosing the best route. --- dlls/iphlpapi/iphlpapi_main.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 74fa938..24307d6 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -853,7 +853,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO return ERROR_INVALID_PARAMETER; ret = AllocateAndGetIpForwardTableFromStack(&table, FALSE, GetProcessHeap(), 0); - if (table && !ret) { + if (!ret) { DWORD ndx, matchedBits, matchedNdx = table->dwNumEntries; for (ndx = 0, matchedBits = 0; ndx < table->dwNumEntries; ndx++) { @@ -869,6 +869,11 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO matchedBits = numShifts; matchedNdx = ndx; } + else if (!matchedBits && table->table[ndx].dwForwardType == + MIB_IPROUTE_TYPE_INDIRECT) { + /* default to a default gateway */ + matchedNdx = ndx; + } } } if (matchedNdx < table->dwNumEntries) { @@ -881,8 +886,6 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO } HeapFree(GetProcessHeap(), 0, table); } - else if (!ret) - ret = ERROR_OUTOFMEMORY; TRACE("returning %d\n", ret); return ret; }

1 0

David Adam : d3dx8: Implement D3DXMatrixReflect.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: 5cc527d30d83f317b7937ec02ec868004d98a0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc527d30d83f317b7937ec02… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Nov 15 13:09:38 2007 +0100 d3dx8: Implement D3DXMatrixReflect. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 21 +++++++++++++++++++++ dlls/d3dx8/tests/math.c | 7 +++++++ include/d3dx8math.h | 1 + 4 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index dae4570..9dca39b 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -48,7 +48,7 @@ @ stdcall D3DXMatrixOrthoOffCenterRH(ptr long long long long long long) @ stdcall D3DXMatrixOrthoOffCenterLH(ptr long long long long long long) @ stdcall D3DXMatrixShadow(ptr ptr ptr) -@ stub D3DXMatrixReflect +@ stdcall D3DXMatrixReflect(ptr ptr) @ stub D3DXQuaternionToAxisAngle @ stub D3DXQuaternionRotationMatrix @ stub D3DXQuaternionRotationAxis diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 990aa55..cb6789a 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -325,6 +325,27 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, F return pout; } +D3DXMATRIX* WINAPI D3DXMatrixReflect(D3DXMATRIX *pout, CONST D3DXPLANE *pplane) +{ + D3DXPLANE Nplane; + + D3DXPlaneNormalize(&Nplane, pplane); + D3DXMatrixIdentity(pout); + pout->u.m[0][0] = 1.0f - 2.0f * Nplane.a * Nplane.a; + pout->u.m[0][1] = -2.0f * Nplane.a * Nplane.b; + pout->u.m[0][2] = -2.0f * Nplane.a * Nplane.c; + pout->u.m[1][0] = -2.0f * Nplane.a * Nplane.b; + pout->u.m[1][1] = 1.0f - 2.0f * Nplane.b * Nplane.b; + pout->u.m[1][2] = -2.0f * Nplane.b * Nplane.c; + pout->u.m[2][0] = -2.0f * Nplane.c * Nplane.a; + pout->u.m[2][1] = -2.0f * Nplane.c * Nplane.b; + pout->u.m[2][2] = 1.0f - 2.0f * Nplane.c * Nplane.c; + pout->u.m[3][0] = -2.0f * Nplane.d * Nplane.a; + pout->u.m[3][1] = -2.0f * Nplane.d * Nplane.b; + pout->u.m[3][2] = -2.0f * Nplane.d * Nplane.c; + return pout; +} + D3DXMATRIX* WINAPI D3DXMatrixRotationAxis(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pv, FLOAT angle) { D3DXVECTOR3 v; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index abc3a98..05a72e9 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -346,6 +346,13 @@ static void D3DXMatrixTest(void) D3DXMatrixPerspectiveRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); expect_mat(expectedmat,gotmat); +/*____________D3DXMatrixReflect______________*/ + U(expectedmat).m[0][0] = 0.307692f; U(expectedmat).m[0][1] = -0.230769f; U(expectedmat).m[0][2] = 0.923077f; U(expectedmat).m[0][3] = 0.0f; + U(expectedmat).m[1][0] = -0.230769; U(expectedmat).m[1][1] = 0.923077f; U(expectedmat).m[1][2] = 0.307693f; U(expectedmat).m[1][3] = 0.0f; + U(expectedmat).m[2][0] = 0.923077f; U(expectedmat).m[2][1] = 0.307693f; U(expectedmat).m[2][2] = -0.230769f; U(expectedmat).m[2][3] = 0.0f; + U(expectedmat).m[3][0] = 1.615385f; U(expectedmat).m[3][1] = 0.538462f; U(expectedmat).m[3][2] = -2.153846f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixReflect(&gotmat,&plane); + expect_mat(expectedmat,gotmat); /*____________D3DXMatrixRotationAxis_____*/ U(expectedmat).m[0][0] = 0.508475f; U(expectedmat).m[0][1] = 0.763805f; U(expectedmat).m[0][2] = 0.397563f; U(expectedmat).m[0][3] = 0.0f; U(expectedmat).m[1][0] = -0.814652f; U(expectedmat).m[1][1] = 0.576271f; U(expectedmat).m[1][2] = -0.065219f; U(expectedmat).m[1][3] = 0.0f; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 195badd..930c417 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -281,6 +281,7 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, F D3DXMATRIX* WINAPI D3DXMatrixPerspectiveOffCenterLH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixPerspectiveOffCenterRH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixPerspectiveRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); +D3DXMATRIX* WINAPI D3DXMatrixReflect(D3DXMATRIX *pout, CONST D3DXPLANE *pplane); D3DXMATRIX* WINAPI D3DXMatrixRotationAxis(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pv, FLOAT angle); D3DXMATRIX* WINAPI D3DXMatrixRotationQuaternion(D3DXMATRIX *pout, CONST D3DXQUATERNION *pq); D3DXMATRIX* WINAPI D3DXMatrixRotationX(D3DXMATRIX *pout, FLOAT angle);

1 0

David Adam : d3dx8: Implement D3DXMatrixShadow.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: a1010e6c9437878138e2a3280351496eb0a16989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1010e6c9437878138e2a3280… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Nov 15 12:53:10 2007 +0100 d3dx8: Implement D3DXMatrixShadow. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 26 ++++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 14 ++++++++++++++ include/d3dx8math.h | 1 + 4 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 71c55ac..dae4570 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -47,7 +47,7 @@ @ stdcall D3DXMatrixOrthoLH(ptr long long long long) @ stdcall D3DXMatrixOrthoOffCenterRH(ptr long long long long long long) @ stdcall D3DXMatrixOrthoOffCenterLH(ptr long long long long long long) -@ stub D3DXMatrixShadow +@ stdcall D3DXMatrixShadow(ptr ptr ptr) @ stub D3DXMatrixReflect @ stub D3DXQuaternionToAxisAngle @ stub D3DXQuaternionRotationMatrix diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 032d2db..990aa55 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -410,6 +410,32 @@ D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT return pout; } +D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, CONST D3DXPLANE *pplane) +{ + D3DXPLANE Nplane; + FLOAT dot; + + D3DXPlaneNormalize(&Nplane, pplane); + dot = D3DXPlaneDot(&Nplane, plight); + pout->u.m[0][0] = dot - Nplane.a * plight->x; + pout->u.m[0][1] = -Nplane.a * plight->y; + pout->u.m[0][2] = -Nplane.a * plight->z; + pout->u.m[0][3] = -Nplane.a * plight->w; + pout->u.m[1][0] = -Nplane.b * plight->x; + pout->u.m[1][1] = dot - Nplane.b * plight->y; + pout->u.m[1][2] = -Nplane.b * plight->z; + pout->u.m[1][3] = -Nplane.b * plight->w; + pout->u.m[2][0] = -Nplane.c * plight->x; + pout->u.m[2][1] = -Nplane.c * plight->y; + pout->u.m[2][2] = dot - Nplane.c * plight->z; + pout->u.m[2][3] = -Nplane.c * plight->w; + pout->u.m[3][0] = -Nplane.d * plight->x; + pout->u.m[3][1] = -Nplane.d * plight->y; + pout->u.m[3][2] = -Nplane.d * plight->z; + pout->u.m[3][3] = dot - Nplane.d * plight->w; + return pout; +} + D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z) { D3DXMatrixIdentity(pout); diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 526fc00..abc3a98 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -152,8 +152,10 @@ static void D3DXMatrixTest(void) { D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3; LPD3DXMATRIX funcpointer; + D3DXPLANE plane; D3DXQUATERNION q; D3DXVECTOR3 at, axis, eye; + D3DXVECTOR4 light; BOOL expected, got; FLOAT angle, determinant, expectedfloat, gotfloat; @@ -171,12 +173,16 @@ static void D3DXMatrixTest(void) U(mat2).m[0][3] = -4.0f; U(mat2).m[1][3] = -3.0f; U(mat2).m[2][3] = -2.0f; U(mat2).m[3][3] = -1.0f; + plane.a = -3.0f; plane.b = -1.0f; plane.c = 4.0f; plane.d = 7.0f; + q.x = 1.0f; q.y = -4.0f; q.z =7.0f; q.w = -11.0f; at.x = -2.0f; at.y = 13.0f; at.z = -9.0f; axis.x = 1.0f; axis.y = -3.0f; axis.z = 7.0f; eye.x = 8.0f; eye.y = -5.0f; eye.z = 5.75f; + light.x = 9.6f; light.y = 8.5f; light.z = 7.4; light.w = 6.3; + angle = D3DX_PI/3.0f; /*____________D3DXMatrixAffineTransformation______*/ @@ -396,6 +402,14 @@ static void D3DXMatrixTest(void) D3DXMatrixScaling(&gotmat,0.69f,0.53f,4.11f); expect_mat(expectedmat,gotmat); +/*____________D3DXMatrixShadow______________*/ + U(expectedmat).m[0][0] = 12.786773f; U(expectedmat).m[0][1] = 5.000961f; U(expectedmat).m[0][2] = 4.353778f; U(expectedmat).m[0][3] = 3.706595f; + U(expectedmat).m[1][0] = 1.882715; U(expectedmat).m[1][1] = 8.805615f; U(expectedmat).m[1][2] = 1.451259f; U(expectedmat).m[1][3] = 1.235532f; + U(expectedmat).m[2][0] = -7.530860f; U(expectedmat).m[2][1] = -6.667949f; U(expectedmat).m[2][2] = 1.333590f; U(expectedmat).m[2][3] = -4.942127f; + U(expectedmat).m[3][0] = -13.179006f; U(expectedmat).m[3][1] = -11.668910f; U(expectedmat).m[3][2] = -10.158816f; U(expectedmat).m[3][3] = -1.510094f; + D3DXMatrixShadow(&gotmat,&light,&plane); + expect_mat(expectedmat,gotmat); + /*____________D3DXMatrixTranslation______________*/ U(expectedmat).m[0][0] = 1.0f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; U(expectedmat).m[1][0] = 0.0; U(expectedmat).m[1][1] = 1.0f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 7660b21..195badd 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -288,6 +288,7 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle); D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, FLOAT pitch, FLOAT roll); D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle); D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT sz); +D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, CONST D3DXPLANE *pPlane); D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z); D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm);

1 0

David Adam : d3dx8: Implement D3DXPlaneIntersectLine.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: c432b48a51d9449fa0b718510a76b6e622957176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c432b48a51d9449fa0b718510… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Nov 15 12:15:58 2007 +0100 d3dx8: Implement D3DXPlaneIntersectLine. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 20 ++++++++++++++++++++ dlls/d3dx8/tests/math.c | 17 ++++++++++++++++- include/d3dx8math.h | 1 + 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 3759513..71c55ac 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -62,7 +62,7 @@ @ stub D3DXQuaternionSquad @ stub D3DXQuaternionBaryCentric @ stdcall D3DXPlaneNormalize(ptr ptr) -@ stub D3DXPlaneIntersectLine +@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @ stub D3DXPlaneFromPointNormal @ stub D3DXPlaneFromPoints @ stub D3DXPlaneTransform diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 9a9def9..032d2db 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -435,6 +435,26 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) /*_________________D3DXPLANE________________*/ +D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) +{ + D3DXVECTOR3 direction, normal; + FLOAT dot, temp; + + normal.x = pp->a; + normal.y = pp->b; + normal.z = pp->c; + direction.x = pv2->x - pv1->x; + direction.y = pv2->y - pv1->y; + direction.z = pv2->z - pv1->z; + dot = D3DXVec3Dot(&normal, &direction); + if ( !dot ) return NULL; + temp = ( pp->d + D3DXVec3Dot(&normal, pv1) ) / dot; + pout->x = pv1->x - temp * direction.x; + pout->y = pv1->y - temp * direction.y; + pout->z = pv1->z - temp * direction.z; + return pout; +} + D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp) { FLOAT norm; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index e3dc060..526fc00 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -416,6 +416,8 @@ static void D3DXMatrixTest(void) static void D3DXPlaneTest(void) { D3DXPLANE expectedplane, gotplane, nulplane, plane; + D3DXVECTOR3 expectedvec, gotvec, vec1, vec2; + LPD3DXVECTOR3 funcpointer; D3DXVECTOR4 vec; FLOAT expected, got; @@ -455,7 +457,20 @@ static void D3DXPlaneTest(void) got = D3DXPlaneDotNormal(NULL,NULL), ok( expected == got, "Expected : %f, Got : %f\n",expected, got); -/*_______________D3DXPlaneDotNormalize______________*/ +/*_______________D3DXPlaneIntersectLine___________*/ + vec1.x = 9.0f; vec1.y = 6.0f; vec1.z = 3.0f; + vec2.x = 2.0f; vec2.y = 5.0f; vec2.z = 8.0f; + expectedvec.x = 20.0f/3.0f; expectedvec.y = 17.0f/3.0f; expectedvec.z = 14.0f/3.0f; + D3DXPlaneIntersectLine(&gotvec,&plane,&vec1,&vec2); + expect_vec3(expectedvec, gotvec); + /* Test a parallele line */ + vec1.x = 11.0f; vec1.y = 13.0f; vec1.z = 15.0f; + vec2.x = 17.0f; vec2.y = 31.0f; vec2.z = 24.0f; + expectedvec.x = 20.0f/3.0f; expectedvec.y = 17.0f/3.0f; expectedvec.z = 14.0f/3.0f; + funcpointer = D3DXPlaneIntersectLine(&gotvec,&plane,&vec1,&vec2); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + +/*_______________D3DXPlaneNormalize______________*/ expectedplane.a = -3.0f/sqrt(26.0f); expectedplane.b = -1.0f/sqrt(26.0f); expectedplane.c = 4.0f/sqrt(26.0f); expectedplane.d = 7.0/sqrt(26.0f); D3DXPlaneNormalize(&gotplane, &plane); expect_plane(expectedplane, gotplane); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index c92535e..7660b21 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -291,6 +291,7 @@ D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z); D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm); +D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2); D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp); D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);

1 0

David Adam : d3dx8: Implement D3DXPlaneNormalize.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: 8abfaa04cc31763c5b048fdeace3934df0bfbfb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abfaa04cc31763c5b048fdea… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Nov 15 11:27:19 2007 +0100 d3dx8: Implement D3DXPlaneNormalize. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 24 ++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 17 ++++++++++++++++- include/d3dx8math.h | 2 ++ 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 7578597..3759513 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -61,7 +61,7 @@ @ stub D3DXQuaternionSlerp @ stub D3DXQuaternionSquad @ stub D3DXQuaternionBaryCentric -@ stub D3DXPlaneNormalize +@ stdcall D3DXPlaneNormalize(ptr ptr) @ stub D3DXPlaneIntersectLine @ stub D3DXPlaneFromPointNormal @ stub D3DXPlaneFromPoints diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 15276fa..9a9def9 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -433,6 +433,30 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) return pout; } +/*_________________D3DXPLANE________________*/ + +D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp) +{ + FLOAT norm; + + norm = sqrt(pp->a * pp->a + pp->b * pp->b + pp->c * pp->c); + if ( norm ) + { + pout->a = pp->a / norm; + pout->b = pp->b / norm; + pout->c = pp->c / norm; + pout->d = pp->d / norm; + } + else + { + pout->a = 0.0f; + pout->b = 0.0f; + pout->c = 0.0f; + pout->d = 0.0f; + } + return pout; +} + /*_________________D3DXQUATERNION________________*/ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 9e862ab..e3dc060 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -50,6 +50,8 @@ U(gotmat).m[3][0],U(gotmat).m[3][1],U(gotmat).m[3][2],U(gotmat).m[3][3]); \ } +#define expect_plane(expectedplane,gotplane) ok((fabs(expectedplane.a-gotplane.a)<admitted_error)&&(fabs(expectedplane.b-gotplane.b)<admitted_error)&&(fabs(expectedplane.c-gotplane.c)<admitted_error)&&(fabs(expectedplane.d-gotplane.d)<admitted_error),"Expected Plane= (%f, %f, %f, %f)\n , Got Plane= (%f, %f, %f, %f)\n", expectedplane.a, expectedplane.b, expectedplane.c, expectedplane.d, gotplane.a, gotplane.b, gotplane.c, gotplane.d); + #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); @@ -413,7 +415,7 @@ static void D3DXMatrixTest(void) static void D3DXPlaneTest(void) { - D3DXPLANE plane; + D3DXPLANE expectedplane, gotplane, nulplane, plane; D3DXVECTOR4 vec; FLOAT expected, got; @@ -452,6 +454,19 @@ static void D3DXPlaneTest(void) expected = 0.0f; got = D3DXPlaneDotNormal(NULL,NULL), ok( expected == got, "Expected : %f, Got : %f\n",expected, got); + +/*_______________D3DXPlaneDotNormalize______________*/ + expectedplane.a = -3.0f/sqrt(26.0f); expectedplane.b = -1.0f/sqrt(26.0f); expectedplane.c = 4.0f/sqrt(26.0f); expectedplane.d = 7.0/sqrt(26.0f); + D3DXPlaneNormalize(&gotplane, &plane); + expect_plane(expectedplane, gotplane); + nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 0.0f; + expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; + D3DXPlaneNormalize(&gotplane, &nulplane); + expect_plane(expectedplane, gotplane); + nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 4.3f; + expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; + D3DXPlaneNormalize(&gotplane, &nulplane); + expect_plane(expectedplane, gotplane); } static void D3X8QuaternionTest(void) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index cfe4845..c92535e 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -291,6 +291,8 @@ D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z); D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm); +D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp); + 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);

1 0

Dmitry Timoshkov : kernel32: Mask out FILE_ATTRIBUTE_NOT_CONTENT_INDEXED to prevent a test failure under Windows .
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: d1a3025826735ca023d1c3ef4dfd7c0e0de2ec97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a3025826735ca023d1c3ef4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 15 13:35:27 2007 +0800 kernel32: Mask out FILE_ATTRIBUTE_NOT_CONTENT_INDEXED to prevent a test failure under Windows. --- dlls/kernel32/tests/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index cb3fc35..0786964 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -318,6 +318,7 @@ static void test__lcreat( void ) ok ( 0 != ret, "FindClose complains (%d)\n", GetLastError ()); ok (!strcmp (filename, search_results.cFileName), "found unexpected name \"%s\"\n", search_results.cFileName); + search_results.dwFileAttributes &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; ok (FILE_ATTRIBUTE_ARCHIVE==search_results.dwFileAttributes, "attributes of file \"%s\" are 0x%04x\n", search_results.cFileName, search_results.dwFileAttributes);

1 0

Dmitry Timoshkov : kernel32: Set last error to ERROR_ALREADY_EXISTS if CreateFile succeeds and file existed before for CREATE_ALWAYS and OPEN_ALWAYS .
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: 07efb2740b6feace5ae1b6c01b655b03a44560bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=07efb2740b6feace5ae1b6c01… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 15 13:36:42 2007 +0800 kernel32: Set last error to ERROR_ALREADY_EXISTS if CreateFile succeeds and file existed before for CREATE_ALWAYS and OPEN_ALWAYS. --- dlls/kernel32/file.c | 9 ++++++- dlls/kernel32/tests/file.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index ed97c51..4e05c28 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1428,7 +1428,14 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, else SetLastError( RtlNtStatusToDosError(status) ); } - else SetLastError(0); + else + { + if ((creation == CREATE_ALWAYS && io.Information == FILE_OVERWRITTEN) || + (creation == OPEN_ALWAYS && io.Information == FILE_OPENED)) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( 0 ); + } RtlFreeUnicodeString( &nameW ); done: diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index d115a57..cb3fc35 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -658,11 +658,39 @@ static void test_CreateFileA(void) ret = GetTempFileNameA(temp_path, prefix, 0, filename); ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + SetLastError(0xdeadbeef); hFile = CreateFileA(filename, GENERIC_READ, 0, NULL, CREATE_NEW, FILE_FLAG_RANDOM_ACCESS, 0); ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_EXISTS, "CREATE_NEW should fail if file exists and last error value should be ERROR_FILE_EXISTS\n"); + SetLastError(0xdeadbeef); + hFile = CreateFileA(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS, 0); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_ALREADY_EXISTS, + "hFile %p, last error %u\n", hFile, GetLastError()); + + CloseHandle(hFile); + + SetLastError(0xdeadbeef); + hFile = CreateFileA(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, 0); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_ALREADY_EXISTS, + "hFile %p, last error %u\n", hFile, GetLastError()); + + CloseHandle(hFile); + + ret = DeleteFileA(filename); + ok(ret, "DeleteFileA: error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hFile = CreateFileA(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, 0); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == 0, + "hFile %p, last error %u\n", hFile, GetLastError()); + + CloseHandle(hFile); + ret = DeleteFileA(filename); ok(ret, "DeleteFileA: error %d\n", GetLastError()); } @@ -686,11 +714,39 @@ static void test_CreateFileW(void) ret = GetTempFileNameW(temp_path, prefix, 0, filename); ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError()); + SetLastError(0xdeadbeef); hFile = CreateFileW(filename, GENERIC_READ, 0, NULL, CREATE_NEW, FILE_FLAG_RANDOM_ACCESS, 0); ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_EXISTS, "CREATE_NEW should fail if file exists and last error value should be ERROR_FILE_EXISTS\n"); + SetLastError(0xdeadbeef); + hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS, 0); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_ALREADY_EXISTS, + "hFile %p, last error %u\n", hFile, GetLastError()); + + CloseHandle(hFile); + + SetLastError(0xdeadbeef); + hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, 0); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_ALREADY_EXISTS, + "hFile %p, last error %u\n", hFile, GetLastError()); + + CloseHandle(hFile); + + ret = DeleteFileW(filename); + ok(ret, "DeleteFileW: error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, 0); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == 0, + "hFile %p, last error %u\n", hFile, GetLastError()); + + CloseHandle(hFile); + ret = DeleteFileW(filename); ok(ret, "DeleteFileW: error %d\n", GetLastError());

1 0

Huw Davies : msxml3: Don't leak an interface on failure.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: 02be3e260abb53807b85d79f0431828545597633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02be3e260abb53807b85d79f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 15 10:25:15 2007 +0000 msxml3: Don't leak an interface on failure. --- dlls/msxml3/factory.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 334906f..67ed747 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -109,8 +109,6 @@ static HRESULT WINAPI xmlcf_CreateInstance( return r; r = IUnknown_QueryInterface( punk, riid, ppobj ); - if (FAILED(r)) - return r; IUnknown_Release( punk ); return r; }

1 0

Gerald Pfeifer : taskmgr: Move out-of-domain checking into PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage().
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: a9742b3210c4cec67aca3c0012f3b9504a4368cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9742b3210c4cec67aca3c001… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 15 14:06:59 2007 +0100 taskmgr: Move out-of-domain checking into PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage(). --- programs/taskmgr/perfdata.c | 8 ++++++++ programs/taskmgr/perfpage.c | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 611990f..3a32fa2 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -332,11 +332,19 @@ ULONG PerfDataGetProcessCount(void) ULONG PerfDataGetProcessorUsage(void) { + if( dbIdleTime < 0.0 ) + return 0; + if( dbIdleTime > 100.0 ) + return 100; return (ULONG)dbIdleTime; } ULONG PerfDataGetProcessorSystemUsage(void) { + if( dbKernelTime < 0.0 ) + return 0; + if( dbKernelTime > 100.0 ) + return 100; return (ULONG)dbKernelTime; } diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 7b30994..11220e6 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -234,10 +234,6 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) */ CpuUsage = PerfDataGetProcessorUsage(); CpuKernelUsage = PerfDataGetProcessorSystemUsage(); - if (CpuUsage < 0 ) CpuUsage = 0; - if (CpuUsage > 100) CpuUsage = 100; - if (CpuKernelUsage < 0) CpuKernelUsage = 0; - if (CpuKernelUsage > 100) CpuKernelUsage = 100; /* * Get the memory usage

1 0

Chris Morgan : Remove advertising asking for users to sign up to be maintainers.
by Chris Morgan Nov. 16, 2007

Nov. 16, 2007

Module: appdb Branch: master Commit: 30c5b93d6f8f2e024c39470138507519f8b5f8a1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=30c5b93d6f8f2e024c394701… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Thu Nov 15 23:29:25 2007 -0500 Remove advertising asking for users to sign up to be maintainers. --- index.php | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-) diff --git a/index.php b/index.php index 8c71860..58161aa 100644 --- a/index.php +++ b/index.php @@ -55,32 +55,6 @@ if(!$_SESSION['current']->isLoggedIn()) } -echo "<div style='clear:both; border: 2px solid; background-color: #d7d7d7; font-weight: bold; padding:4px;'>"; -echo "<p style='font-size:large;'>Do you use Wine regularly? Interested in helping other users and". - " keeping information about your favorite applications up-to-date?</p>"; -echo "<p style='font-size: medium;'>Consider". - " becoming an <a href=\"".BASE."help/?sTopic=maintainer_guidelines\"". - " title=\"information about application maintainers\" style=\"cursor: help\">application maintainer</a>". - " for the applications that you use under Wine.</p>"; -echo "<p style='font-size:medium;'>As an application maintainer you'll get to post HOWTOs to help other users". - " run the application. You'll be able to review and process user submitted screenshots". - " and test results.</p>"; -echo "<p style='font-size:medium;'>Dozens of new test results and screenshots are submitted each day and we can". - " use your help to keep user contributed information reviewed and processed in a timely fashion.". - " Please consider becoming an application maintainer."; -echo "<p style='font-size:medium;'>- The Appdb Admins<br/> <a href=\"mailto:".APPDB_OWNER_EMAIL."\">".APPDB_OWNER_EMAIL."</a></p>"; - -if(!$_SESSION['current']->isLoggedIn()) -{ - echo "<p style='font-size: medium;'>To become a maintainer, [<a href=\"".login_url()."\">log in</a>]". - " or [<a href=\"account.php?sCmd=new\">register</a>] and on the application or version page". - ", depending on whether you want to maintain all versions of an application or a specific version,". - " click on the <i>'Become a super maintainer of this app'</i> or <i>'Be a maintainer for this version'</i>". - " button. We'll process your request within a day or so.</p>"; -} - -echo "</div>"; - ?> <?php

1 0