September 2012 - Wine-commits

Nozomi Kodama : d3dx9: Simplify D3DXComputeBoundingSphere.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 10d125397134e20fd2d5b4f59d5809d154466cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d125397134e20fd2d5b4f59… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Sep 21 23:19:29 2012 +0800 d3dx9: Simplify D3DXComputeBoundingSphere. --- dlls/d3dx9_36/mesh.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index de4049a..ded0848 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1991,7 +1991,7 @@ HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *pfirstposition, DWORD n */ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWORD numvertices, DWORD dwstride, D3DXVECTOR3 *pcenter, FLOAT *pradius) { - D3DXVECTOR3 temp, temp1; + D3DXVECTOR3 temp; FLOAT d; unsigned int i; @@ -2000,16 +2000,12 @@ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWOR temp.x = 0.0f; temp.y = 0.0f; temp.z = 0.0f; - temp1 = temp; *pradius = 0.0f; for(i=0; i<numvertices; i++) - { - D3DXVec3Add(&temp1, &temp, (const D3DXVECTOR3*)((const char*)pfirstposition + dwstride * i)); - temp = temp1; - } + D3DXVec3Add(&temp, &temp, (const D3DXVECTOR3*)((const char*)pfirstposition + dwstride * i)); - D3DXVec3Scale(pcenter, &temp, 1.0f/((FLOAT)numvertices)); + D3DXVec3Scale(pcenter, &temp, 1.0f / numvertices); for(i=0; i<numvertices; i++) {

1 0

Nozomi Kodama : d3dx9: Simplify D3DXVector*Normalize.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 7c5d93b5048bed70f7bdef9fac9639b7bd2132ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5d93b5048bed70f7bdef9fa… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Sep 21 23:41:02 2012 +0800 d3dx9: Simplify D3DXVector*Normalize. --- dlls/d3dx9_36/math.c | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 4a477ec..cf9df29 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1588,7 +1588,6 @@ D3DXVECTOR2* WINAPI D3DXVec2Hermite(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, C D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv) { - D3DXVECTOR2 out; FLOAT norm; TRACE("(%p, %p)\n", pout, pv); @@ -1596,15 +1595,15 @@ D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv) norm = D3DXVec2Length(pv); if ( !norm ) { - out.x = 0.0f; - out.y = 0.0f; + pout->x = 0.0f; + pout->y = 0.0f; } else { - out.x = pv->x / norm; - out.y = pv->y / norm; + pout->x = pv->x / norm; + pout->y = pv->y / norm; } - *pout=out; + return pout; } @@ -1729,7 +1728,6 @@ D3DXVECTOR3* WINAPI D3DXVec3Hermite(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, C D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv) { - D3DXVECTOR3 out; FLOAT norm; TRACE("(%p, %p)\n", pout, pv); @@ -1737,17 +1735,17 @@ D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv) norm = D3DXVec3Length(pv); if ( !norm ) { - out.x = 0.0f; - out.y = 0.0f; - out.z = 0.0f; + pout->x = 0.0f; + pout->y = 0.0f; + pout->z = 0.0f; } else { - out.x = pv->x / norm; - out.y = pv->y / norm; - out.z = pv->z / norm; + pout->x = pv->x / norm; + pout->y = pv->y / norm; + pout->z = pv->z / norm; } - *pout = out; + return pout; } @@ -1965,19 +1963,17 @@ D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, C D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv) { - D3DXVECTOR4 out; FLOAT norm; TRACE("(%p, %p)\n", pout, pv); norm = D3DXVec4Length(pv); - out.x = pv->x / norm; - out.y = pv->y / norm; - out.z = pv->z / norm; - out.w = pv->w / norm; + pout->x = pv->x / norm; + pout->y = pv->y / norm; + pout->z = pv->z / norm; + pout->w = pv->w / norm; - *pout = out; return pout; }

1 0

Nozomi Kodama : d3dx9: Implement D3DXSHEvalDirectionalLight.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: c69a49646117335c7984a8667436b1a62b3a0aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69a49646117335c7984a8667… Author: Nozomi Kodama <Nozomi.kodama(a)yahoo.com> Date: Mon Sep 17 19:19:23 2012 +0800 d3dx9: Implement D3DXSHEvalDirectionalLight. --- dlls/d3dx9_24/d3dx9_24.spec | 4 +- dlls/d3dx9_25/d3dx9_25.spec | 4 +- dlls/d3dx9_26/d3dx9_26.spec | 4 +- dlls/d3dx9_27/d3dx9_27.spec | 4 +- dlls/d3dx9_28/d3dx9_28.spec | 4 +- dlls/d3dx9_29/d3dx9_29.spec | 4 +- dlls/d3dx9_30/d3dx9_30.spec | 4 +- dlls/d3dx9_31/d3dx9_31.spec | 4 +- dlls/d3dx9_32/d3dx9_32.spec | 4 +- dlls/d3dx9_33/d3dx9_33.spec | 4 +- dlls/d3dx9_34/d3dx9_34.spec | 4 +- dlls/d3dx9_35/d3dx9_35.spec | 4 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 29 +++++++++ dlls/d3dx9_36/tests/math.c | 139 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 4 +- dlls/d3dx9_38/d3dx9_38.spec | 4 +- dlls/d3dx9_39/d3dx9_39.spec | 4 +- dlls/d3dx9_40/d3dx9_40.spec | 4 +- dlls/d3dx9_41/d3dx9_41.spec | 4 +- dlls/d3dx9_42/d3dx9_42.spec | 4 +- dlls/d3dx9_43/d3dx9_43.spec | 4 +- include/d3dx9math.h | 1 + 23 files changed, 208 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c69a49646117335c7984a…

1 0

Nozomi Kodama : d3dx9: Implement D3DXSHRotate.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 1f85d64b1933924650d7c95db05d30b04acc5355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f85d64b1933924650d7c95db… Author: Nozomi Kodama <Nozomi.kodama(a)yahoo.com> Date: Mon Sep 17 19:20:45 2012 +0800 d3dx9: Implement D3DXSHRotate. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 94 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 67 ++++++++++++++++++++++++++++++ include/d3dx9math.h | 1 + 4 files changed, 163 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 6e3268d..44956b8 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -287,7 +287,7 @@ @ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHRotate(ptr long ptr ptr) +@ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 4285c2a..00cf9c3 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2372,6 +2372,100 @@ FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) return out; } +static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in) +{ + out[0] = in[0]; + if ( order < 2 ) + return; + + out[1] = a * in[2]; + out[2] = -a * in[1]; + out[3] = in[3]; + if ( order == 2 ) + return; + + out[4] = a * in[7]; + out[5] = -in[5]; + out[6] = -0.5f * in[6] - 0.8660253882f * in[8]; + out[7] = -a * in[4]; + out[8] = -0.8660253882f * in[6] + 0.5f * in[8]; + out[9] = -a * 0.7905694842f * in[12] + a * 0.6123724580f * in[14]; + if ( order == 3 ) + return; + + out[10] = -in[10]; + out[11] = -a * 0.6123724580f * in[12] - a * 0.7905694842f * in[14]; + out[12] = a * 0.7905694842f * in[9] + a * 0.6123724580f * in[11]; + out[13] = -0.25f * in[13] - 0.9682458639f * in[15]; + out[14] = -a * 0.6123724580f * in[9] + a * 0.7905694842f * in[11]; + out[15] = -0.9682458639f * in[13] + 0.25f * in[15]; + if ( order == 4 ) + return; + + out[16] = -a * 0.9354143739f * in[21] + a * 0.3535533845f * in[23]; + out[17] = -0.75f * in[17] + 0.6614378095f * in[19]; + out[18] = -a * 0.3535533845f * in[21] - a * 0.9354143739f * in[23]; + out[19] = 0.6614378095f * in[17] + 0.75f * in[19]; + out[20] = 0.375f * in[20] + 0.5590170026f * in[22] + 0.7395099998f * in[24]; + out[21] = a * 0.9354143739f * in[16] + a * 0.3535533845f * in[18]; + out[22] = 0.5590170026f * in[20] + 0.5f * in[22] - 0.6614378691f * in[24]; + out[23] = -a * 0.3535533845f * in[16] + a * 0.9354143739f * in[18]; + out[24] = 0.7395099998f * in[20] - 0.6614378691f * in[22] + 0.125f * in[24]; + if ( order == 5 ) + return; + + out[25] = a * 0.7015607357f * in[30] - a * 0.6846531630f * in[32] + a * 0.1976423711f * in[34]; + out[26] = -0.5f * in[26] + 0.8660253882f * in[28]; + out[27] = a * 0.5229125023f * in[30] + a * 0.3061861992f * in[32] - a * 0.7954951525 * in[34]; + out[28] = 0.8660253882f * in[26] + 0.5f * in[28]; + out[29] = a * 0.4841229022f * in[30] + a * 0.6614378691f * in[32] + a * 0.5728219748f * in[34]; + out[30] = -a * 0.7015607357f * in[25] - a * 0.5229125023f * in[27] - a * 0.4841229022f * in[29]; + out[31] = 0.125f * in[31] + 0.4050463140f * in[33] + 0.9057110548f * in[35]; + out[32] = a * 0.6846531630f * in[25] - a * 0.3061861992f * in[27] - a * 0.6614378691f * in[29]; + out[33] = 0.4050463140f * in[31] + 0.8125f * in[33] - 0.4192627370f * in[35]; + out[34] = -a * 0.1976423711f * in[25] + a * 0.7954951525f * in[27] - a * 0.5728219748f * in[29]; + out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35]; + +} + +FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, CONST D3DXMATRIX *matrix, CONST FLOAT *in) +{ + FLOAT alpha, beta, gamma, sinb, temp[36]; + + TRACE("out %p, order %u, matrix %p, in %p\n", out, order, matrix, in); + + out[0] = in[0]; + + if ( ( order > D3DXSH_MAXORDER ) || ( order < D3DXSH_MINORDER ) ) + return out; + + /* TODO: Implement handy computations for order <= 3. They are faster than the general algorithm. */ + if ( order < 4 ) + WARN("Using general algorithm for order = %u\n", order); + + if ( fabsf( matrix->u.m[2][2] ) != 1.0f ) + { + sinb = sqrtf( 1.0f - matrix->u.m[2][2] * matrix->u.m[2][2] ); + alpha = atan2f(matrix->u.m[2][1] / sinb, matrix->u.m[2][0] / sinb ); + beta = atan2f( sinb, matrix->u.m[2][2] ); + gamma = atan2f( matrix->u.m[1][2] / sinb, -matrix->u.m[0][2] / sinb ); + } + else + { + alpha = atan2f( matrix->u.m[0][1], matrix->u.m[0][0] ); + beta = 0.0f; + gamma = 0.0f; + } + + D3DXSHRotateZ(out, order, gamma, in); + rotate_X(temp, order, 1.0f, out); + D3DXSHRotateZ(out, order, beta, temp); + rotate_X(temp, order, -1.0f, out); + D3DXSHRotateZ(out, order, alpha, temp); + + return out; +} + FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) { FLOAT c1a, c2a, c3a, c4a, c5a, s1a, s2a, s3a, s4a, s5a; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2cb9c52..2cb6a7a 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2640,6 +2640,72 @@ static void test_D3DXSHMultiply3(void) ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); } +static void test_D3DXSHRotate(void) +{ + D3DXMATRIX m[4]; + FLOAT expected, in[49], out[49], *received_ptr; + static const FLOAT table[]= + { /* Rotation around X-axis Pi/2 */ + 1.01f, -3.01f, 2.01f, 4.01f, -8.01f, -6.01f, + -11.307890f, 5.01f, -1.565839f, 1.093598f, -11.01f, 19.833414f, + -15.268191f, -19.004118f, -3.364889f, -9.562627f, 12.099654f, -0.272131f, + 30.241013f, 26.919991f, 39.236877f, -22.632446f, 6.707388f, -11.768282f, + 3.443672f, -6.07445f, 11.61839f, 1.527561f, 37.89633f, -56.9012f, + 47.42289f, 50.39153f, 10.61819f, 25.50101f, 0.049241f, 16.98330f, + /* Rotation around X-axis -Pi/2 */ + 1.01f, 3.01f, -2.01f, 4.01f, 8.01f, -6.01f, + -11.307890f, -5.01f, -1.565839f, -1.093598f, -11.01f, -19.833414f, + 15.268191f, -19.004118f, 3.364889f, -9.562627f, -12.099654f, -0.272131f, + -30.241013f, 26.919991f, 39.236877f, 22.632446f, 6.707388f, 11.768282f, + 3.443672f, 6.07445f, 11.61839f, -1.527561f, 37.89633f, 56.9012f, + -47.42289f, 50.39153f, -10.61819f, 25.50101f, -0.049248f, 16.98330f, + /* Yaw Pi/3, Pitch Pi/4, Roll Pi/5 */ + 1.01f, 4.944899f, 1.442301f, 1.627281f, 0.219220f, 10.540824f, + -9.136903f, 2.763750f, -7.30904f, -5.875721f, 5.303124f, -8.682154f, + -25.683384f, 1.680279f, -18.808388f, 7.653656f, 16.939133f, -17.328018f, + 14.629795f, -54.467102f, -12.231035f, -4.089857f, -9.444222f, 3.056035f, + 0.179257f, -10.041875f, 23.090092f, -23.188709f, 11.727098f, -65.183090f, + 48.671577f, -15.073209f, 38.793171f, -26.039536f, 6.192769f, -17.672247f, + /* Rotation around Z-axis Pi/6 */ + 1.01f, 3.745711f, 3.01f, 2.467762f, 10.307889f, 9.209813f, + 7.01f, 3.931864f, 0.166212f, 16.01f, 18.504042f, 17.405966f, + 13.01f, 6.128016f, -2.029941f, -10.01f, 13.154292f, 24.01f, + 29.432245f, 28.334167f, 21.01f, 9.056221f, -4.958143f, -18.01f, + -27.236094f, -4.520332f, 16.814543f, 34.01f, 43.092495f, 41.994423f, + 31.01f, 12.716471f, -8.618400f, -28.01f, -40.896347f, -44.190571,}; + unsigned int i, j, order; + + D3DXMatrixRotationX(&m[0], -D3DX_PI / 2.0f); + D3DXMatrixRotationX(&m[1], D3DX_PI / 2.0f); + D3DXMatrixRotationYawPitchRoll(&m[2], D3DX_PI / 3.0f, D3DX_PI / 4.0f, D3DX_PI / 5.0f); + D3DXMatrixRotationZ(&m[3], D3DX_PI / 6.0f); + + for (i = 0; i < 49; i++) + in[i] = i + 1.01f; + + for (j = 0; j < 4; j++) + { + for (order = 0; order <= D3DXSH_MAXORDER; order++) + { + for (i = 0; i < 49; i++) + out[i] = ( i + 1.0f ) * ( i + 1.0f ); + + received_ptr = D3DXSHRotate(out, order, &m[j], in); + ok(received_ptr == out, "Order %u, expected %p, received %p\n", order, out, received_ptr); + + for (i = 0; i < 49; i++) + { + if ( ( i > 0 ) && ( ( i >= order * order ) || ( order > D3DXSH_MAXORDER ) ) ) + expected = ( i + 1.0f ) * ( i + 1.0f ); + else + expected = table[36 * j + i]; + + ok(relative_error(out[i], expected) < admitted_error, "Order %u index %u, expected %f, received %f\n", order, i, expected, out[i]); + } + } + } +} + static void test_D3DXSHRotateZ(void) { unsigned int i, j, order, square; @@ -2740,6 +2806,7 @@ START_TEST(math) test_D3DXSHEvalDirectionalLight(); test_D3DXSHMultiply2(); test_D3DXSHMultiply3(); + test_D3DXSHRotate(); test_D3DXSHRotateZ(); test_D3DXSHScale(); } diff --git a/include/d3dx9math.h b/include/d3dx9math.h index bcf8c17..971ec53 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -383,6 +383,7 @@ FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, CONST D3DXVECTOR3 *dir HRESULT WINAPI D3DXSHEvalDirectionalLight(UINT order, CONST D3DXVECTOR3 *dir, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); +FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, CONST D3DXMATRIX *matrix, CONST FLOAT *in); FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in); FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT scale);

1 0

Francois Gouget : wininet: Check for the 'http:' protocol in a locale independent way.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 2606b8568701e225ab3a8f30f7bf6aad6c24323b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2606b8568701e225ab3a8f30f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 11:33:05 2012 +0200 wininet: Check for the 'http:' protocol in a locale independent way. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 28f82a3..f465ad7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -640,7 +640,7 @@ static void HTTP_FixURL(http_request_t *request) } } - if(CSTR_EQUAL != CompareStringW( LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + if(CSTR_EQUAL != CompareStringW( LOCALE_INVARIANT, NORM_IGNORECASE, request->path, strlenW(request->path), szHttp, strlenW(szHttp) ) && request->path[0] != '/') /* not an absolute path ?? --> fix it !! */ {

1 0

Francois Gouget : mshtml/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 9c1402e6a9c72fc0f0006a7e2d01159491a0892c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1402e6a9c72fc0f0006a7e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 25 11:33:16 2012 +0200 mshtml/tests: Add a trailing '\n' to an ok() call. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c988ac6..d6fbd64 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4823,7 +4823,7 @@ static void test_defaults(IHTMLDocument2 *doc) str = NULL; hres = IHTMLDocument2_get_charset(doc, &str); ok(hres == S_OK, "get_charset failed: %08x\n", hres); - ok(str && *str, "charset is empty"); /* FIXME: better tests */ + ok(str && *str, "charset is empty\n"); /* FIXME: better tests */ SysFreeString(str); test_window(doc);

1 0

Francois Gouget : include: Remove a misplaced duplicate definition of SORT_STRINGSORT.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: d86abc4921b5d78cca5634ad6f6603fb47de50f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86abc4921b5d78cca5634ad6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 11:36:38 2012 +0200 include: Remove a misplaced duplicate definition of SORT_STRINGSORT. --- include/winnls.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index 71b5a8f..9ed4344 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -348,7 +348,7 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define SORT_DIGITSASNUMBERS 0x00000008 #define LINGUISTIC_IGNORECASE 0x00000010 #define LINGUISTIC_IGNOREDIACRITIC 0x00000020 -#define SORT_STRINGSORT 0x00001000 +#define SORT_STRINGSORT 0x00001000 /* Take punctuation into account */ #define NORM_IGNOREKANATYPE 0x00010000 #define NORM_IGNOREWIDTH 0x00020000 #define NORM_LINGUISTIC_CASING 0x08000000 @@ -395,8 +395,6 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define LCMAP_SORTKEY 0x00000400 /* Create a sort key */ #define LCMAP_BYTEREV 0x00000800 /* Reverse the result */ -#define SORT_STRINGSORT 0x00001000 /* Take punctuation into account */ - #define LCMAP_HIRAGANA 0x00100000 /* Transform Japanese katakana into hiragana */ #define LCMAP_KATAKANA 0x00200000 /* Transform Japanese hiragana into katakana */ #define LCMAP_HALFWIDTH 0x00400000 /* Use single byte chars in output */

1 0

Francois Gouget : shlwapi: PathCreateFromUrlA() should not crash when given NULL buffers.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 06439b303a723dcdb924251480f7fdf778ba332c URL: http://source.winehq.org/git/wine.git/?a=commit;h=06439b303a723dcdb92425148… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 16:32:57 2012 +0200 shlwapi: PathCreateFromUrlA() should not crash when given NULL buffers. Add NULL and insufficient buffer tests for PathCreateFromUrl(). --- dlls/shlwapi/path.c | 3 +++ dlls/shlwapi/tests/path.c | 45 ++++++++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index bb2879e..de89196 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3242,6 +3242,9 @@ HRESULT WINAPI PathCreateFromUrlA(LPCSTR pszUrl, LPSTR pszPath, HRESULT ret; DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA; + if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) + return E_INVALIDARG; + if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; if((ret = PathCreateFromUrlW(urlW.Buffer, pathW, &lenW, dwReserved)) == E_POINTER) { diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 24eab7d..0dd4e00 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -73,10 +73,10 @@ static const struct { {"file://c%3a/foo/../bar", "\\\\c:\\foo\\..\\bar", S_OK, 0}, {"file://c%7c/foo/../bar", "\\\\c|\\foo\\..\\bar", S_OK, 0x2}, {"file://foo%20ba%2fr", "\\\\foo ba/r", S_OK, 0x2}, - {"file://localhost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x2}, - {"file://localhost/c:/foo%20ba%5Cr", "c:\\foo ba\\r", S_OK, 0x2}, - {"file://LocalHost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x2}, - {"file:\\\\localhost\\c:\\foo\\bar", "c:\\foo\\bar", S_OK, 0x2}, + {"file://localhost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x6}, + {"file://localhost/c:/foo%20ba%5Cr", "c:\\foo ba\\r", S_OK, 0x6}, + {"file://LocalHost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x6}, + {"file:\\\\localhost\\c:\\foo\\bar", "c:\\foo\\bar", S_OK, 0x6}, {"file://incomplete", "\\\\incomplete", S_OK, 0}, /* 3 leading (back)slashes (omitting hostname) */ @@ -103,16 +103,16 @@ static const struct { {"file:%5C%5Clocalhost%5Cc:/foo/bar", "\\\\localhost\\c:\\foo\\bar", S_OK, 0}, /* Hostname handling */ - {"file://l%6fcalhost/c:/foo/bar", "\\\\localhostc:\\foo\\bar", S_OK, 0}, - {"file://localhost:80/c:/foo/bar", "\\\\localhost:80c:\\foo\\bar", S_OK, 0}, - {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file://l%6fcalhost/c:/foo/bar", "\\\\localhostc:\\foo\\bar", S_OK, 0x4}, + {"file://localhost:80/c:/foo/bar", "\\\\localhost:80c:\\foo\\bar", S_OK, 0x4}, + {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK, 0x4}, {"file://host//c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, {"file://host/\\c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, {"file://host/c:foo/bar", "\\\\hostc:foo\\bar", S_OK, 0x2}, {"file://host/foo/bar", "\\\\host\\foo\\bar", S_OK, 0}, - {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK, 0x4}, {"file:\\\\host\\ca\\foo\\bar", "\\\\host\\ca\\foo\\bar", S_OK, 0}, - {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK, 0x4}, {"file:\\%5Chost\\c:\\foo\\bar", "\\\\host\\c:\\foo\\bar", S_OK, 0}, {"file:\\\\host\\cx:\\foo\\bar", "\\\\host\\cx:\\foo\\bar", S_OK, 0}, {"file:///host/c:/foo/bar", "\\host\\c:\\foo\\bar", S_OK, 0}, @@ -257,21 +257,22 @@ static void test_PathCreateFromUrl(void) { size_t i; char ret_path[INTERNET_MAX_URL_LENGTH]; - DWORD len, ret; + DWORD len, len2, ret; WCHAR ret_pathW[INTERNET_MAX_URL_LENGTH]; WCHAR *pathW, *urlW; - static const char url[] = "http://www.winehq.org"; if (!pPathCreateFromUrlA) { win_skip("PathCreateFromUrlA not found\n"); return; } - /* Check ret_path = NULL */ - len = sizeof(url); - ret = pPathCreateFromUrlA(url, NULL, &len, 0); - ok ( ret == E_INVALIDARG, "got 0x%08x expected E_INVALIDARG\n", ret); + /* Won't say how much is needed without a buffer */ + len = 0xdeca; + ret = pPathCreateFromUrlA("file://foo", NULL, &len, 0); + ok(ret == E_INVALIDARG, "got 0x%08x expected E_INVALIDARG\n", ret); + ok(len == 0xdeca, "got %x expected 0xdeca\n", len); + /* Test the decoding itself */ for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); @@ -287,6 +288,7 @@ static void test_PathCreateFromUrl(void) /* Wrong string, don't bother checking the length */ ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } + if (pPathCreateFromUrlW) { len = INTERNET_MAX_URL_LENGTH; pathW = GetWideString(TEST_PATHFROMURL[i].path); @@ -307,6 +309,19 @@ static void test_PathCreateFromUrl(void) ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } + + if (SUCCEEDED(ret)) + { + /* Check what happens if the buffer is too small */ + len2 = 2; + ret = pPathCreateFromUrlW(urlW, ret_pathW, &len2, 0); + ok(ret == E_POINTER, "ret %08x, expected E_POINTER from url %s\n", ret, TEST_PATHFROMURL[i].url); + if(!(TEST_PATHFROMURL[i].todo & 0x4)) + ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); + else todo_wine + ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); + } + FreeWideString(urlW); FreeWideString(pathW); }

1 0

Huw Davies : comctl32: Forward the focus to the edit control if it exists.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 3cfc2ab772924cc18690c2c86afadeea0f10de9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cfc2ab772924cc18690c2c86… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 25 12:40:17 2012 +0100 comctl32: Forward the focus to the edit control if it exists. --- dlls/comctl32/comboex.c | 3 ++- dlls/comctl32/tests/comboex.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index a72f897..d92da3d 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -2308,7 +2308,8 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return COMBOEX_WindowPosChanging (infoPtr, (WINDOWPOS *)lParam); case WM_SETFOCUS: - SetFocus(infoPtr->hwndCombo); + if (infoPtr->hwndEdit) SetFocus( infoPtr->hwndEdit ); + else SetFocus( infoPtr->hwndCombo ); return 0; case WM_SYSCOLORCHANGE: diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 172e564..7cddbaf 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -345,6 +345,11 @@ static void test_WM_LBUTTONDOWN(void) "Current Selection: expected %d, got %d\n", 4, idx); ok(received_end_edit, "Expected to receive a CBEN_ENDEDIT message\n"); + SetFocus( hComboExParentWnd ); + ok( GetFocus() == hComboExParentWnd, "got %p\n", GetFocus() ); + SetFocus( hComboEx ); + ok( GetFocus() == hEdit, "got %p\n", GetFocus() ); + DestroyWindow(hComboEx); }

1 0

Huw Davies : comdlg32: Use the window handle to send messages to the filename control.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 01a084383c3f50ebeafc11f2930a0bb9a7d3428f URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a084383c3f50ebeafc11f29… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 25 12:40:18 2012 +0100 comdlg32: Use the window handle to send messages to the filename control. --- dlls/comdlg32/filedlg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 9ccd25c..416ee19 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1546,10 +1546,10 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("Value in Filename includes path, overriding InitialDir: %s, %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); } - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } else { - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } } @@ -1623,7 +1623,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("Value in Filename includes path, overriding initdir: %s, %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); } - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } /* 4. Win2000+: Recently used */ @@ -1707,7 +1707,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("No initial dir specified, using current dir of %s\n", debugstr_w(fodInfos->initdir)); } } - SetFocus(GetDlgItem(hwnd, IDC_FILENAME)); + SetFocus( fodInfos->DlgInfos.hwndFileName ); TRACE("After manipulation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); /* Must the open as read only check box be checked ?*/ @@ -3740,10 +3740,10 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U TRACE("\n"); - /* get the filenames from the edit control */ - nStrLen = SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0); + /* get the filenames from the filename control */ + nStrLen = GetWindowTextLengthW( fodInfos->DlgInfos.hwndFileName ); lpstrEdit = MemAlloc( (nStrLen+1)*sizeof(WCHAR) ); - GetDlgItemTextW(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1); + GetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrEdit, nStrLen+1); TRACE("nStrLen=%u str=%s\n", nStrLen, debugstr_w(lpstrEdit));

1 0