July 2008 - Wine-commits - list.winehq.org

Philip Nilsson : d3dx9: Implement D3DXPlaneTransformArray.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: d36df763c79350ef1cb19c6e0af23b2cdddea88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36df763c79350ef1cb19c6e0… Author: Philip Nilsson <pnilsson(a)nullref.se> Date: Thu Jul 24 21:47:07 2008 +0200 d3dx9: Implement D3DXPlaneTransformArray. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 18 ++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 29 +++++++++++++++++++++++++++-- include/d3dx9math.h | 1 + 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 1619f16..3193033 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -235,7 +235,7 @@ @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) d3dx8.D3DXPlaneIntersectLine @ stdcall D3DXPlaneNormalize(ptr ptr) d3dx8.D3DXPlaneNormalize @ stdcall D3DXPlaneTransform(ptr ptr ptr) d3dx8.D3DXPlaneTransform -@ stub D3DXPlaneTransformArray +@ stdcall D3DXPlaneTransformArray(ptr long ptr long ptr long) @ stub D3DXPreprocessShader @ stub D3DXPreprocessShaderFromFileA @ stub D3DXPreprocessShaderFromFileW diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 3a95951..c151b6a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -27,6 +27,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /************************************************************************* + * D3DXPlaneTransformArray + */ +D3DXPLANE* WINAPI D3DXPlaneTransformArray( + D3DXPLANE* out, UINT outstride, CONST D3DXPLANE* in, UINT instride, + CONST D3DXMATRIX* matrix, UINT elements) +{ + UINT i; + TRACE("\n"); + for (i = 0; i < elements; ++i) { + D3DXPlaneTransform( + (D3DXPLANE*)((char*)out + outstride * i), + (CONST D3DXPLANE*)((const char*)in + instride * i), + matrix); + } + return out; +} + +/************************************************************************* * D3DXVec2TransformArray * * Transform an array of vectors by a matrix. diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8c760ed..511fc3b 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -34,6 +34,17 @@ exp[i].x, exp[i].y, exp[i].z, exp[i].w, \ i); \ } +#define compare_planes(exp, out) \ + for (i = 0; i < ARRAY_SIZE + 2; ++i) { \ + ok(relative_error(exp[i].a, out[i].a) < admitted_error && \ + relative_error(exp[i].b, out[i].b) < admitted_error && \ + relative_error(exp[i].c, out[i].c) < admitted_error && \ + relative_error(exp[i].d, out[i].d) < admitted_error, \ + "Got (%f, %f, %f, %f), expected (%f, %f, %f, %f) for index %d.\n", \ + out[i].a, out[i].b, out[i].c, out[i].d, \ + exp[i].a, exp[i].b, exp[i].c, exp[i].d, \ + i); \ + } /* The mathematical properties are checked in the d3dx8 testsuite. * @@ -56,6 +67,9 @@ static void test_D3DXVec_Array(void) D3DXVECTOR4 inp_vec[ARRAY_SIZE]; D3DXVECTOR4 out_vec[ARRAY_SIZE + 2]; D3DXVECTOR4 exp_vec[ARRAY_SIZE + 2]; + D3DXPLANE inp_plane[ARRAY_SIZE]; + D3DXPLANE out_plane[ARRAY_SIZE + 2]; + D3DXPLANE exp_plane[ARRAY_SIZE + 2]; viewport.Width = 800; viewport.MinZ = 0.2f; viewport.X = 10; viewport.Height = 680; viewport.MaxZ = 0.9f; viewport.Y = 5; @@ -63,11 +77,13 @@ static void test_D3DXVec_Array(void) for (i = 0; i < ARRAY_SIZE + 2; ++i) { out_vec[i].x = out_vec[i].y = out_vec[i].z = out_vec[i].w = 0.0f; exp_vec[i].x = exp_vec[i].y = exp_vec[i].z = exp_vec[i].w = 0.0f; + out_plane[i].a = out_plane[i].b = out_plane[i].c = out_plane[i].d = 0.0f; + exp_plane[i].a = exp_plane[i].b = exp_plane[i].c = exp_plane[i].d = 0.0f; } for (i = 0; i < ARRAY_SIZE; ++i) { - inp_vec[i].x = inp_vec[i].z = i; - inp_vec[i].y = inp_vec[i].w = ARRAY_SIZE - i; + inp_plane[i].a = inp_plane[i].c = inp_vec[i].x = inp_vec[i].z = i; + inp_plane[i].b = inp_plane[i].d = inp_vec[i].y = inp_vec[i].w = ARRAY_SIZE - i; } U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; @@ -169,6 +185,15 @@ static void test_D3DXVec_Array(void) exp_vec[5].x = 58.0f; exp_vec[5].y = 68.0f; exp_vec[5].z = 78.0f; exp_vec[5].w = 88.0f; D3DXVec4TransformArray(out_vec + 1, sizeof(D3DXVECTOR4), inp_vec, sizeof(D3DXVECTOR4), &mat, ARRAY_SIZE); compare_vectors(exp_vec, out_vec); + + /* D3DXPlaneTransformArray */ + exp_plane[1].a = 90.0f; exp_plane[1].b = 100.0f; exp_plane[1].c = 110.0f; exp_plane[1].d = 120.0f; + exp_plane[2].a = 82.0f; exp_plane[2].b = 92.0f; exp_plane[2].c = 102.0f; exp_plane[2].d = 112.0f; + exp_plane[3].a = 74.0f; exp_plane[3].b = 84.0f; exp_plane[3].c = 94.0f; exp_plane[3].d = 104.0f; + exp_plane[4].a = 66.0f; exp_plane[4].b = 76.0f; exp_plane[4].c = 86.0f; exp_plane[4].d = 96.0f; + exp_plane[5].a = 58.0f; exp_plane[5].b = 68.0f; exp_plane[5].c = 78.0f; exp_plane[5].d = 88.0f; + D3DXPlaneTransformArray(out_plane + 1, sizeof(D3DXPLANE), inp_plane, sizeof(D3DXPLANE), &mat, ARRAY_SIZE); + compare_planes(exp_plane, out_plane); } START_TEST(math) diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 63f2be7..9801504 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -302,6 +302,7 @@ D3DXPLANE* WINAPI D3DXPlaneFromPoints(D3DXPLANE *pout, CONST D3DXVECTOR3 *pv1, C D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2); D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp); D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, CONST D3DXMATRIX *pm); +D3DXPLANE* WINAPI D3DXPlaneTransformArray(D3DXPLANE *pout, UINT outstride, CONST D3DXPLANE *pplane, UINT pstride, CONST D3DXMATRIX *pm, UINT n); D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, FLOAT f, FLOAT g); D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);

1 0

Philip Nilsson : d3dx8: Allow input and output parameters pointing to the same place.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: ae45f70c575aaf06e9212de3c30d915279096e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae45f70c575aaf06e9212de3c… Author: Philip Nilsson <pnilsson(a)nullref.se> Date: Sat Mar 22 14:31:04 2008 +0100 d3dx8: Allow input and output parameters pointing to the same place. --- dlls/d3dx8/math.c | 70 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index a65a934..93a0b49 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -202,15 +202,17 @@ D3DXMATRIX* WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2) { + D3DXMATRIX out; int i,j; for (i=0; i<4; i++) { for (j=0; j<4; j++) { - pout->u.m[i][j] = pm1->u.m[i][0] * pm2->u.m[0][j] + pm1->u.m[i][1] * pm2->u.m[1][j] + pm1->u.m[i][2] * pm2->u.m[2][j] + pm1->u.m[i][3] * pm2->u.m[3][j]; + out.u.m[i][j] = pm1->u.m[i][0] * pm2->u.m[0][j] + pm1->u.m[i][1] * pm2->u.m[1][j] + pm1->u.m[i][2] * pm2->u.m[2][j] + pm1->u.m[i][3] * pm2->u.m[3][j]; } } + *pout = out; return pout; } @@ -566,13 +568,14 @@ D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLO D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) { + CONST D3DXMATRIX m = *pm; int i,j; for (i=0; i<4; i++) { for (j=0; j<4; j++) { - pout->u.m[i][j] = pm->u.m[j][i]; + pout->u.m[i][j] = m.u.m[j][i]; } } return pout; @@ -824,10 +827,11 @@ D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp) D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, CONST D3DXMATRIX *pm) { - pout->a = pm->u.m[0][0] * pplane->a + pm->u.m[1][0] * pplane->b + pm->u.m[2][0] * pplane->c + pm->u.m[3][0] * pplane->d; - pout->b = pm->u.m[0][1] * pplane->a + pm->u.m[1][1] * pplane->b + pm->u.m[2][1] * pplane->c + pm->u.m[3][1] * pplane->d; - pout->c = pm->u.m[0][2] * pplane->a + pm->u.m[1][2] * pplane->b + pm->u.m[2][2] * pplane->c + pm->u.m[3][2] * pplane->d; - pout->d = pm->u.m[0][3] * pplane->a + pm->u.m[1][3] * pplane->b + pm->u.m[2][3] * pplane->c + pm->u.m[3][3] * pplane->d; + CONST D3DXPLANE plane = *pplane; + pout->a = pm->u.m[0][0] * plane.a + pm->u.m[1][0] * plane.b + pm->u.m[2][0] * plane.c + pm->u.m[3][0] * plane.d; + pout->b = pm->u.m[0][1] * plane.a + pm->u.m[1][1] * plane.b + pm->u.m[2][1] * plane.c + pm->u.m[3][1] * plane.d; + pout->c = pm->u.m[0][2] * plane.a + pm->u.m[1][2] * plane.b + pm->u.m[2][2] * plane.c + pm->u.m[3][2] * plane.d; + pout->d = pm->u.m[0][3] * plane.a + pm->u.m[1][3] * plane.b + pm->u.m[2][3] * plane.c + pm->u.m[3][3] * plane.d; return pout; } @@ -921,10 +925,12 @@ D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, CONST D3DXQUATERNI D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2) { - pout->x = pq2->w * pq1->x + pq2->x * pq1->w + pq2->y * pq1->z - pq2->z * pq1->y; - pout->y = pq2->w * pq1->y - pq2->x * pq1->z + pq2->y * pq1->w + pq2->z * pq1->x; - pout->z = pq2->w * pq1->z + pq2->x * pq1->y - pq2->y * pq1->x + pq2->z * pq1->w; - pout->w = pq2->w * pq1->w - pq2->x * pq1->x - pq2->y * pq1->y - pq2->z * pq1->z; + D3DXQUATERNION out; + out.x = pq2->w * pq1->x + pq2->x * pq1->w + pq2->y * pq1->z - pq2->z * pq1->y; + out.y = pq2->w * pq1->y - pq2->x * pq1->z + pq2->y * pq1->w + pq2->z * pq1->x; + out.z = pq2->w * pq1->z + pq2->x * pq1->y - pq2->y * pq1->x + pq2->z * pq1->w; + out.w = pq2->w * pq1->w - pq2->x * pq1->x - pq2->y * pq1->y - pq2->z * pq1->z; + *pout = out; return pout; } @@ -1129,8 +1135,9 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 norm = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[3][3]; if ( norm ) { - pout->x = (pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[3][0]) / norm; - pout->y = (pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[3][1]) / norm; + CONST D3DXVECTOR2 v = *pv; + pout->x = (pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y + pm->u.m[3][0]) / norm; + pout->y = (pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y + pm->u.m[3][1]) / norm; } else { @@ -1142,8 +1149,9 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm) { - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y; + CONST D3DXVECTOR2 v = *pv; + pout->x = pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y; + pout->y = pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y; return pout; } @@ -1231,9 +1239,10 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 if ( norm ) { - pout->x = (pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]) / norm; - pout->y = (pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]) / norm; - pout->z = (pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]) / norm; + CONST D3DXVECTOR3 v = *pv; + pout->x = (pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y + pm->u.m[2][0] * v.z + pm->u.m[3][0]) / norm; + pout->y = (pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y + pm->u.m[2][1] * v.z + pm->u.m[3][1]) / norm; + pout->z = (pm->u.m[0][2] * v.x + pm->u.m[1][2] * v.y + pm->u.m[2][2] * v.z + pm->u.m[3][2]) / norm; } else { @@ -1246,9 +1255,10 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 D3DXVECTOR3* WINAPI D3DXVec3TransformNormal(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm) { - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z; - pout->z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z; + CONST D3DXVECTOR3 v = *pv; + pout->x = pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y + pm->u.m[2][0] * v.z; + pout->y = pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y + pm->u.m[2][1] * v.z; + pout->z = pm->u.m[0][2] * v.x + pm->u.m[1][2] * v.y + pm->u.m[2][2] * v.z; return pout; } @@ -1290,10 +1300,12 @@ D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0 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)); + D3DXVECTOR4 out; + out.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); + out.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)); + out.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); + out.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)); + *pout = out; return pout; } @@ -1337,9 +1349,11 @@ D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv) D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, CONST D3DXMATRIX *pm) { - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0] * pv->w; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1] * pv->w; - pout->z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2] * pv->w; - pout->w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3] * pv->w; + D3DXVECTOR4 out; + out.x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0] * pv->w; + out.y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1] * pv->w; + out.z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2] * pv->w; + out.w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3] * pv->w; + *pout = out; return pout; }

1 0

David Adam : d3dx8: Implement D3DXSphereBoundProbe.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 6629708081012fd4152beb492eb2a707b5c48dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=6629708081012fd4152beb492… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Jul 24 11:31:05 2008 +0200 d3dx8: Implement D3DXSphereBoundProbe. --- dlls/d3dx8/Makefile.in | 3 +- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/mesh.c | 39 ++++++++++++++++++++++++++++++++ dlls/d3dx8/tests/Makefile.in | 4 ++- dlls/d3dx8/tests/mesh.c | 51 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx8mesh.h | 3 +- 6 files changed, 98 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/Makefile.in b/dlls/d3dx8/Makefile.in index 4e45b53..0f61ee2 100644 --- a/dlls/d3dx8/Makefile.in +++ b/dlls/d3dx8/Makefile.in @@ -9,7 +9,8 @@ IMPORTS = dxguid uuid kernel32 C_SRCS = \ d3dx8_main.c \ d3dxbuffer.c \ - math.c + math.c \ + mesh.c @MAKE_DLL_RULES@ diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 0ccfdf2..b7c8577 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -108,7 +108,7 @@ @ stub D3DXFVFFromDeclarator @ stub D3DXWeldVertices @ stub D3DXIntersect -@ stub D3DXSphereBoundProbe +@ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) @ stub D3DXBoxBoundProbe @ stub D3DXCreatePolygon @ stub D3DXCreateBox diff --git a/dlls/d3dx8/mesh.c b/dlls/d3dx8/mesh.c new file mode 100644 index 0000000..db490d4 --- /dev/null +++ b/dlls/d3dx8/mesh.c @@ -0,0 +1,39 @@ +/* + * Copyright 2008 David Adam + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "wingdi.h" +#include "d3dx8.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection) +{ + D3DXVECTOR3 difference; + FLOAT a, b, c; + + a = D3DXVec3LengthSq(praydirection); + if (!D3DXVec3Subtract(&difference, prayposition, pcenter)) return FALSE; + b = D3DXVec3Dot(&difference, praydirection); + c = D3DXVec3LengthSq(&difference) - radius * radius; + + if ( b * b - a * c <= 0.0f ) return FALSE; + return TRUE; +} diff --git a/dlls/d3dx8/tests/Makefile.in b/dlls/d3dx8/tests/Makefile.in index 79dce65..8869d71 100644 --- a/dlls/d3dx8/tests/Makefile.in +++ b/dlls/d3dx8/tests/Makefile.in @@ -5,7 +5,9 @@ VPATH = @srcdir@ TESTDLL = d3dx8.dll IMPORTS = d3dx8 kernel32 -CTESTS = math.c +CTESTS = \ + math.c \ + mesh.c @MAKE_TEST_RULES@ diff --git a/dlls/d3dx8/tests/mesh.c b/dlls/d3dx8/tests/mesh.c new file mode 100644 index 0000000..8f07b07 --- /dev/null +++ b/dlls/d3dx8/tests/mesh.c @@ -0,0 +1,51 @@ +/* + * Copyright 2008 David Adam + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "d3dx8.h" + +#include "wine/test.h" + +static void D3DXBoundProbeTest(void) +{ +/*____________Test the Sphere case________________________*/ + + BOOL result; + D3DXVECTOR3 center, raydirection, rayposition; + FLOAT radius; + + radius = sqrt(77.0f); + center.x = 1.0f; center.y = 2.0f; center.z = 3.0f; + raydirection.x = 2.0f; raydirection.y = -4.0f; raydirection.z = 2.0f; + + rayposition.x = 5.0f; rayposition.y = 5.0f; rayposition.z = 9.0f; + result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); + ok(result == TRUE, "expected TRUE, received FALSE\n"); + + rayposition.x = 5.0f; rayposition.y = 7.0f; rayposition.z = 9.0f; + result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); + ok(result == FALSE, "expected FALSE, received TRUE\n"); + + rayposition.x = 5.0f; rayposition.y = 11.0f; rayposition.z = 9.0f; + result = D3DXSphereBoundProbe(&center, radius, &rayposition, &raydirection); + ok(result == FALSE, "expected FALSE, received TRUE\n"); +} + +START_TEST(mesh) +{ + D3DXBoundProbeTest(); +} diff --git a/include/d3dx8mesh.h b/include/d3dx8mesh.h index f1eab5c..d063f6d 100644 --- a/include/d3dx8mesh.h +++ b/include/d3dx8mesh.h @@ -19,7 +19,7 @@ #ifndef __WINE_D3DX8MESH_H #define __WINE_D3DX8MESH_H -#include <d3d8.h> +#include <d3dx8.h> #include <dxfile.h> #ifdef __cplusplus @@ -28,6 +28,7 @@ extern "C" { HRESULT WINAPI D3DXCreateBuffer(DWORD,LPD3DXBUFFER*); UINT WINAPI D3DXGetFVFVertexSize(DWORD); +BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); #ifdef __cplusplus }

1 0

Cesar Eduardo Barros : kernel32: Add stub for CreateHardLink.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: fee6b384e1f1ba401d1e3d82f4ebdde79560063a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee6b384e1f1ba401d1e3d82f… Author: Cesar Eduardo Barros <cesarb(a)cesarb.net> Date: Tue Jul 22 08:19:22 2008 -0300 kernel32: Add stub for CreateHardLink. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2816d5b..3f07845 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -224,8 +224,8 @@ @ stdcall CreateFileMappingA(long ptr long long long str) @ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) -# @ stub CreateHardLinkA -# @ stub CreateHardLinkW +@ stdcall CreateHardLinkA(str str ptr) +@ stdcall CreateHardLinkW(wstr wstr ptr) @ stdcall CreateIoCompletionPort(long long long long) @ stdcall CreateJobObjectA(ptr str) @ stdcall CreateJobObjectW(ptr wstr) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index aad260f..fca12cc 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1193,6 +1193,32 @@ BOOL WINAPI MoveFileA( LPCSTR source, LPCSTR dest ) } +/************************************************************************* + * CreateHardLinkW (KERNEL32.@) + */ +BOOL WINAPI CreateHardLinkW(LPCWSTR lpFileName, LPCWSTR lpExistingFileName, + LPSECURITY_ATTRIBUTES lpSecurityAttributes) +{ + FIXME("(%s, %s, %p): stub\n", debugstr_w(lpFileName), + debugstr_w(lpExistingFileName), lpSecurityAttributes); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/************************************************************************* + * CreateHardLinkA (KERNEL32.@) + */ +BOOL WINAPI CreateHardLinkA(LPCSTR lpFileName, LPCSTR lpExistingFileName, + LPSECURITY_ATTRIBUTES lpSecurityAttributes) +{ + FIXME("(%s, %s, %p): stub\n", debugstr_a(lpFileName), + debugstr_a(lpExistingFileName), lpSecurityAttributes); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + /*********************************************************************** * CreateDirectoryW (KERNEL32.@) * RETURNS:

1 0

Adam Petaccia : gdiplus: Stub GdipIsStyleAvailable.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: b4a77bcd5330170d0e21cc5daa02e8eea63fb43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a77bcd5330170d0e21cc5da… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 24 21:29:55 2008 -0400 gdiplus: Stub GdipIsStyleAvailable. --- dlls/gdiplus/font.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 65e379f..4e756e5 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -569,6 +569,17 @@ GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, return NotImplemented; } +GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, + INT style, BOOL* IsStyleAvailable) +{ + FIXME("%p %d %p stub!\n", family, style, IsStyleAvailable); + + if (!(family && IsStyleAvailable)) + return InvalidParameter; + + return NotImplemented; +} + /***************************************************************************** * GdipGetGenericFontFamilyMonospace [GDIPLUS.@] * diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a04e550..b55b4b1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -423,7 +423,7 @@ @ stdcall GdipIsMatrixInvertible(ptr ptr) @ stdcall GdipIsOutlineVisiblePathPoint(ptr long long ptr ptr ptr) @ stdcall GdipIsOutlineVisiblePathPointI(ptr long long ptr ptr ptr) -@ stub GdipIsStyleAvailable +@ stdcall GdipIsStyleAvailable(ptr long ptr) @ stub GdipIsVisibleClipEmpty @ stdcall GdipIsVisiblePathPoint(ptr long long ptr ptr) @ stdcall GdipIsVisiblePathPointI(ptr long long ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 22b6efc..c82b69d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -415,6 +415,7 @@ GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily*, INT, UINT16*); +GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily *, INT, BOOL*); GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily**); GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily**);

1 0

Adam Petaccia : gdiplus: Implement GdipGetRegionDataSize.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 430ce86ae965a9ef02b460481e6da5b0014dfd74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=430ce86ae965a9ef02b460481… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 24 19:01:45 2008 -0400 gdiplus: Implement GdipGetRegionDataSize. --- dlls/gdiplus/region.c | 10 ++++++++-- dlls/gdiplus/tests/region.c | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 501e81e..6c52623 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -267,9 +267,15 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) { - FIXME("(%p, %p): stub\n", region, needed); + if (!(region && needed)) + return InvalidParameter; - return NotImplemented; + TRACE("%p, %p\n", region, needed); + + /* header.size doesn't count header.size and header.checksum */ + *needed = region->header.size + sizeof(DWORD) * 2; + + return Ok; } GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HRGN *hrgn) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 554dab9..8c3bada 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -67,14 +67,17 @@ static void test_getregiondata(void) status = GdipCreateRegion(&region); ok(status == Ok, "status %08x\n", status); -todo_wine -{ status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed); +todo_wine +{ status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); +} expect(20, needed); +todo_wine +{ expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); expect_magic((DWORD*)(buf + 2)); @@ -87,11 +90,15 @@ todo_wine todo_wine { status = GdipGetRegionDataSize(region, &needed); +} ok(status == Ok, "status %08x\n", status); expect(20, needed); status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); +todo_wine ok(status == Ok, "status %08x\n", status); expect(20, needed); +todo_wine +{ expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); expect_magic((DWORD*)(buf + 2)); @@ -102,13 +109,14 @@ todo_wine status = GdipSetInfinite(region); ok(status == Ok, "status %08x\n", status); status = GdipGetRegionDataSize(region, &needed); -todo_wine -{ ok(status == Ok, "status %08x\n", status); expect(20, needed); status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); +todo_wine ok(status == Ok, "status %08x\n", status); expect(20, needed); +todo_wine +{ expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); expect_magic((DWORD*)(buf + 2));

1 0

Adam Petaccia : gdiplus: Implement GdipSetInfinite.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 2e0869984f462f68a0fc72825af26b4692d8cfcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0869984f462f68a0fc72825… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 24 19:01:41 2008 -0400 gdiplus: Implement GdipSetInfinite. --- dlls/gdiplus/region.c | 13 +++++++++---- dlls/gdiplus/tests/region.c | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 900d470..501e81e 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -319,12 +319,17 @@ GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *region) { - static int calls; + GpStatus stat; - if(!(calls++)) - FIXME("not implemented\n"); + if (!region) + return InvalidParameter; - return NotImplemented; + TRACE("%p", region); + + delete_element(&region->node); + stat = init_region(region, RegionDataInfiniteRect); + + return stat; } GpStatus WINGDIPAPI GdipTransformRegion(GpRegion *region, GpMatrix *matrix) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 41359d8..554dab9 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -97,10 +97,13 @@ todo_wine expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_EMPTY_RECT); +} status = GdipSetInfinite(region); ok(status == Ok, "status %08x\n", status); status = GdipGetRegionDataSize(region, &needed); +todo_wine +{ ok(status == Ok, "status %08x\n", status); expect(20, needed); status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed);

1 0

Adam Petaccia : gdiplus: Implement GdipSetEmpty.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: dd1f9a39cffbfd70132a7d403187378f2178559b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1f9a39cffbfd70132a7d403… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 24 19:01:37 2008 -0400 gdiplus: Implement GdipSetEmpty. --- dlls/gdiplus/region.c | 13 +++++++++---- dlls/gdiplus/tests/region.c | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 0e96550..900d470 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -304,12 +304,17 @@ GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *region, GpGraphics *graphics, GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) { - static int calls; + GpStatus stat; - if(!(calls++)) - FIXME("not implemented\n"); + TRACE("%p\n", region); - return NotImplemented; + if (!region) + return InvalidParameter; + + delete_element(&region->node); + stat = init_region(region, RegionDataEmptyRect); + + return stat; } GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *region) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index a5064d1..41359d8 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -82,7 +82,10 @@ todo_wine expect_dword(buf + 4, RGNDATA_INFINITE_RECT); status = GdipSetEmpty(region); +} ok(status == Ok, "status %08x\n", status); +todo_wine +{ status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed);

1 0

Adam Petaccia : gdiplus: Implement GdipDeleteRegion.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 8a9438d560c1a1cc4d0f001ed1bafb1d1b45b17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9438d560c1a1cc4d0f001ed… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 24 19:01:32 2008 -0400 gdiplus: Implement GdipDeleteRegion. --- dlls/gdiplus/region.c | 32 ++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/region.c | 4 +++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index d2997f4..0e96550 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -121,6 +121,27 @@ static inline GpStatus init_region(GpRegion* region, const RegionType type) return Ok; } +static inline void delete_element(region_element* element) +{ + switch(element->type) + { + case RegionDataRect: + break; + case RegionDataPath: + GdipDeletePath(element->elementdata.pathdata.path); + break; + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + break; + default: + delete_element(element->elementdata.combine.left); + delete_element(element->elementdata.combine.right); + GdipFree(element->elementdata.combine.left); + GdipFree(element->elementdata.combine.right); + break; + } +} + GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *region, GpRegion **clone) { FIXME("(%p %p): stub\n", region, clone); @@ -212,8 +233,15 @@ GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region) GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) { - FIXME("(%p): stub\n", region); - return NotImplemented; + TRACE("%p\n", region); + + if (!region) + return InvalidParameter; + + delete_element(&region->node); + GdipFree(region); + + return Ok; } GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, GpRectF *rect) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index e3ed8ec..a5064d1 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -108,6 +108,7 @@ todo_wine expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); +} status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); @@ -116,6 +117,8 @@ todo_wine rect.Y = 20; rect.Width = 100; rect.Height = 200; +todo_wine +{ status = GdipCreateRegionRectI(&rect, &region); ok(status == Ok, "status %08x\n", status); status = GdipGetRegionDataSize(region, &needed); @@ -216,7 +219,6 @@ todo_wine expect_float(buf + 37, 22.0); expect_float(buf + 38, 55.0); - status = GdipDeleteRegion(region2); ok(status == Ok, "status %08x\n", status); status = GdipDeleteRegion(region);

1 0

Adam Petaccia : gdiplus: Implement GdipCreateRegion and mark the tests todo_wine instead of skipping over them all .
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 889bc31197e3a4c4ea9da7ae0c311ac7f317fc6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=889bc31197e3a4c4ea9da7ae0… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 24 19:01:21 2008 -0400 gdiplus: Implement GdipCreateRegion and mark the tests todo_wine instead of skipping over them all. --- dlls/gdiplus/gdiplus_private.h | 38 +++++++++++++++++++++++ dlls/gdiplus/region.c | 60 ++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/region.c | 66 +++++++++++++++++++++++++--------------- 3 files changed, 136 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=889bc31197e3a4c4ea9da…

1 0