wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

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

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: 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: 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

Dmitry Timoshkov : gdiplus: Add GIF palette to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 0ef523e2bfe44d14d51a402a19feff47174b342f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef523e2bfe44d14d51a402a1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:55:57 2012 +0900 gdiplus: Add GIF palette to the image properties. --- dlls/gdiplus/image.c | 63 +++++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b71b35b..5e0b1ea 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3275,6 +3275,62 @@ static PropertyItem *get_gif_background(IWICMetadataReader *reader) return background; } +static PropertyItem *get_gif_palette(IWICBitmapDecoder *decoder, IWICMetadataReader *reader) +{ + static const WCHAR global_flagW[] = { 'G','l','o','b','a','l','C','o','l','o','r','T','a','b','l','e','F','l','a','g',0 }; + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *palette; + UINT count = 0; + WICColor colors[256]; + + if (!get_bool_property(reader, &GUID_MetadataFormatLSD, global_flagW)) + return NULL; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (hr != S_OK) return NULL; + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + if (hr == S_OK) + { + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + if (hr == S_OK) + IWICPalette_GetColors(palette, 256, colors, &count); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); + + if (count) + { + PropertyItem *pal; + UINT i; + BYTE *rgb; + + pal = GdipAlloc(sizeof(*pal) + count * 3); + if (!pal) return NULL; + pal->type = PropertyTagTypeByte; + pal->id = PropertyTagGlobalPalette; + pal->value = pal + 1; + pal->length = count * 3; + + rgb = pal->value; + + for (i = 0; i < count; i++) + { + rgb[i*3] = (colors[i] >> 16) & 0xff; + rgb[i*3 + 1] = (colors[i] >> 8) & 0xff; + rgb[i*3 + 2] = colors[i] & 0xff; + } + + return pal; + } + + return NULL; +} + static PropertyItem *get_gif_transparent_idx(IWICMetadataReader *reader) { static const WCHAR transparency_flagW[] = { 'T','r','a','n','s','p','a','r','e','n','c','y','F','l','a','g',0 }; @@ -3337,7 +3393,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataReader *reader; UINT frame_count, block_count, i; PropertyItem *delay = NULL, *comment = NULL, *background = NULL; - PropertyItem *transparent_idx = NULL, *loop = NULL; + PropertyItem *transparent_idx = NULL, *loop = NULL, *palette = NULL; IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); if (frame_count > 1) @@ -3387,6 +3443,9 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (!background) background = get_gif_background(reader); + if (!palette) + palette = get_gif_palette(decoder, reader); + IWICMetadataReader_Release(reader); } } @@ -3410,11 +3469,13 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (delay) add_property(bitmap, delay); if (comment) add_property(bitmap, comment); if (loop) add_property(bitmap, loop); + if (palette) add_property(bitmap, palette); if (background) add_property(bitmap, background); GdipFree(delay); GdipFree(comment); GdipFree(loop); + GdipFree(palette); GdipFree(background); /* Win7 gdiplus always returns transparent color index from frame 0 */ diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9313f2c..62bc48b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3988,7 +3988,6 @@ static void test_gif_properties(void) status = GdipGetPropertyCount(image, &prop_count); expect(Ok, status); -todo_wine ok(prop_count == sizeof(td)/sizeof(td[0]) || broken(prop_count == 1) /* before win7 */, "expected property count %u, got %u\n", (UINT)(sizeof(td)/sizeof(td[0])), prop_count);

1 0

Dmitry Timoshkov : gdiplus: Add GIF loopcount to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: faa24d96d43c7a87523126c167a14aabacd931fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa24d96d43c7a87523126c16… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:55:04 2012 +0900 gdiplus: Add GIF loopcount to the image properties. --- dlls/gdiplus/image.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1732781..b71b35b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3222,6 +3222,47 @@ static PropertyItem *get_gif_comment(IWICMetadataReader *reader) return comment; } +static PropertyItem *get_gif_loopcount(IWICMetadataReader *reader) +{ + static const WCHAR applicationW[] = { 'A','p','p','l','i','c','a','t','i','o','n',0 }; + static const WCHAR dataW[] = { 'D','a','t','a',0 }; + PropertyItem *appext = NULL, *appdata = NULL, *loop = NULL; + + appext = get_property(reader, &GUID_MetadataFormatAPE, applicationW); + if (appext) + { + if (appext->type == PropertyTagTypeByte && appext->length == 11 && + (!memcmp(appext->value, "NETSCAPE2.0", 11) || !memcmp(appext->value, "ANIMEXTS1.0", 11))) + { + appdata = get_property(reader, &GUID_MetadataFormatAPE, dataW); + if (appdata) + { + if (appdata->type == PropertyTagTypeByte && appdata->length == 4) + { + BYTE *data = appdata->value; + if (data[0] == 3 && data[1] == 1) + { + loop = GdipAlloc(sizeof(*loop) + sizeof(SHORT)); + if (loop) + { + loop->type = PropertyTagTypeShort; + loop->id = PropertyTagLoopCount; + loop->length = sizeof(SHORT); + loop->value = loop + 1; + *(SHORT *)loop->value = data[2] | (data[3] << 8); + } + } + } + } + } + } + + GdipFree(appext); + GdipFree(appdata); + + return loop; +} + static PropertyItem *get_gif_background(IWICMetadataReader *reader) { static const WCHAR backgroundW[] = { 'B','a','c','k','g','r','o','u','n','d','C','o','l','o','r','I','n','d','e','x',0 }; @@ -3296,7 +3337,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataReader *reader; UINT frame_count, block_count, i; PropertyItem *delay = NULL, *comment = NULL, *background = NULL; - PropertyItem *transparent_idx = NULL; + PropertyItem *transparent_idx = NULL, *loop = NULL; IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); if (frame_count > 1) @@ -3340,6 +3381,9 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (!comment) comment = get_gif_comment(reader); + if (frame_count > 1 && !loop) + loop = get_gif_loopcount(reader); + if (!background) background = get_gif_background(reader); @@ -3350,12 +3394,27 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataBlockReader_Release(block_reader); } + if (frame_count > 1 && !loop) + { + loop = GdipAlloc(sizeof(*loop) + sizeof(SHORT)); + if (loop) + { + loop->type = PropertyTagTypeShort; + loop->id = PropertyTagLoopCount; + loop->length = sizeof(SHORT); + loop->value = loop + 1; + *(SHORT *)loop->value = 1; + } + } + if (delay) add_property(bitmap, delay); if (comment) add_property(bitmap, comment); + if (loop) add_property(bitmap, loop); if (background) add_property(bitmap, background); GdipFree(delay); GdipFree(comment); + GdipFree(loop); GdipFree(background); /* Win7 gdiplus always returns transparent color index from frame 0 */

1 0

Dmitry Timoshkov : gdiplus: Add GIF transparent index to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 54edca19e1dbcb33f197771557c7ee05faf0f7bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54edca19e1dbcb33f19777155… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:54:01 2012 +0900 gdiplus: Add GIF transparent index to the image properties. --- dlls/gdiplus/image.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e3c4353..1732781 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3144,6 +3144,33 @@ static void add_property(GpBitmap *bitmap, PropertyItem *item) bitmap->prop_count++; } +static BOOL get_bool_property(IWICMetadataReader *reader, const GUID *guid, const WCHAR *prop_name) +{ + HRESULT hr; + GUID format; + PROPVARIANT id, value; + BOOL ret = FALSE; + + IWICMetadataReader_GetMetadataFormat(reader, &format); + if (!IsEqualGUID(&format, guid)) return FALSE; + + PropVariantInit(&id); + PropVariantInit(&value); + + id.vt = VT_LPWSTR; + id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + if (!id.u.pwszVal) return FALSE; + lstrcpyW(id.u.pwszVal, prop_name); + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + if (hr == S_OK && value.vt == VT_BOOL) + ret = value.u.boolVal; + + PropVariantClear(&id); + PropVariantClear(&value); + + return ret; +} + static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, const WCHAR *prop_name) { HRESULT hr; @@ -3207,6 +3234,21 @@ static PropertyItem *get_gif_background(IWICMetadataReader *reader) return background; } +static PropertyItem *get_gif_transparent_idx(IWICMetadataReader *reader) +{ + static const WCHAR transparency_flagW[] = { 'T','r','a','n','s','p','a','r','e','n','c','y','F','l','a','g',0 }; + static const WCHAR colorW[] = { 'T','r','a','n','s','p','a','r','e','n','t','C','o','l','o','r','I','n','d','e','x',0 }; + PropertyItem *index = NULL; + + if (get_bool_property(reader, &GUID_MetadataFormatGCE, transparency_flagW)) + { + index = get_property(reader, &GUID_MetadataFormatGCE, colorW); + if (index) + index->id = PropertyTagIndexTransparent; + } + return index; +} + static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) { static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; @@ -3254,6 +3296,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataReader *reader; UINT frame_count, block_count, i; PropertyItem *delay = NULL, *comment = NULL, *background = NULL; + PropertyItem *transparent_idx = NULL; IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); if (frame_count > 1) @@ -3314,6 +3357,36 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI GdipFree(delay); GdipFree(comment); GdipFree(background); + + /* Win7 gdiplus always returns transparent color index from frame 0 */ + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + if (hr != S_OK) return; + + hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); + if (hr == S_OK) + { + hr = IWICMetadataBlockReader_GetCount(block_reader, &block_count); + if (hr == S_OK) + { + for (i = 0; i < block_count; i++) + { + hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); + if (hr == S_OK) + { + if (!transparent_idx) + transparent_idx = get_gif_transparent_idx(reader); + + IWICMetadataReader_Release(reader); + } + } + } + IWICMetadataBlockReader_Release(block_reader); + } + + if (transparent_idx) add_property(bitmap, transparent_idx); + GdipFree(transparent_idx); + + IWICBitmapFrameDecode_Release(frame); } typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame);

1 0

Dmitry Timoshkov : gdiplus: Add GIF background to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: a950a0549fda5a560ab93e49f615d73297e5f609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a950a0549fda5a560ab93e49f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:53:08 2012 +0900 gdiplus: Add GIF background to the image properties. --- dlls/gdiplus/image.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5c7c30a..e3c4353 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3195,6 +3195,18 @@ static PropertyItem *get_gif_comment(IWICMetadataReader *reader) return comment; } +static PropertyItem *get_gif_background(IWICMetadataReader *reader) +{ + static const WCHAR backgroundW[] = { 'B','a','c','k','g','r','o','u','n','d','C','o','l','o','r','I','n','d','e','x',0 }; + PropertyItem *background; + + background = get_property(reader, &GUID_MetadataFormatLSD, backgroundW); + if (background) + background->id = PropertyTagIndexBackground; + + return background; +} + static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) { static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; @@ -3241,7 +3253,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataBlockReader *block_reader; IWICMetadataReader *reader; UINT frame_count, block_count, i; - PropertyItem *delay = NULL, *comment = NULL; + PropertyItem *delay = NULL, *comment = NULL, *background = NULL; IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); if (frame_count > 1) @@ -3285,6 +3297,9 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (!comment) comment = get_gif_comment(reader); + if (!background) + background = get_gif_background(reader); + IWICMetadataReader_Release(reader); } } @@ -3294,9 +3309,11 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (delay) add_property(bitmap, delay); if (comment) add_property(bitmap, comment); + if (background) add_property(bitmap, background); GdipFree(delay); GdipFree(comment); + GdipFree(background); } typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame);

1 0

Dmitry Timoshkov : gdiplus: Add GIF frame delay to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 3bb4974dd45b8030afd64948e20f616f8a6cc8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb4974dd45b8030afd64948e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:52:19 2012 +0900 gdiplus: Add GIF frame delay to the image properties. --- dlls/gdiplus/image.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 69879ac..5c7c30a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3195,13 +3195,81 @@ static PropertyItem *get_gif_comment(IWICMetadataReader *reader) return comment; } -static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) +static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) { + static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; HRESULT hr; IWICMetadataBlockReader *block_reader; IWICMetadataReader *reader; UINT block_count, i; - PropertyItem *comment = NULL; + PropertyItem *delay; + LONG value = 0; + + hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); + if (hr == S_OK) + { + hr = IWICMetadataBlockReader_GetCount(block_reader, &block_count); + if (hr == S_OK) + { + for (i = 0; i < block_count; i++) + { + hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); + if (hr == S_OK) + { + delay = get_property(reader, &GUID_MetadataFormatGCE, delayW); + if (delay) + { + if (delay->type == PropertyTagTypeShort && delay->length == 2) + value = *(SHORT *)delay->value; + + GdipFree(delay); + } + IWICMetadataReader_Release(reader); + } + } + } + IWICMetadataBlockReader_Release(block_reader); + } + + return value; +} + +static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) +{ + HRESULT hr; + IWICBitmapFrameDecode *frame; + IWICMetadataBlockReader *block_reader; + IWICMetadataReader *reader; + UINT frame_count, block_count, i; + PropertyItem *delay = NULL, *comment = NULL; + + IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + if (frame_count > 1) + { + delay = GdipAlloc(sizeof(*delay) + frame_count * sizeof(LONG)); + if (delay) + { + LONG *value; + + delay->type = PropertyTagTypeLong; + delay->id = PropertyTagFrameDelay; + delay->length = frame_count * sizeof(LONG); + delay->value = delay + 1; + + value = delay->value; + + for (i = 0; i < frame_count; i++) + { + hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); + if (hr == S_OK) + { + value[i] = get_gif_frame_delay(frame); + IWICBitmapFrameDecode_Release(frame); + } + else value[i] = 0; + } + } + } hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICMetadataBlockReader, (void **)&block_reader); if (hr == S_OK) @@ -3224,8 +3292,10 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataBlockReader_Release(block_reader); } + if (delay) add_property(bitmap, delay); if (comment) add_property(bitmap, comment); + GdipFree(delay); GdipFree(comment); }

1 0

Dmitry Timoshkov : gdiplus: Add GIF comment to the image properties.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 000f4725aa67dee4f3c321b87d03b297257a53a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000f4725aa67dee4f3c321b87… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:51:23 2012 +0900 gdiplus: Add GIF comment to the image properties. --- dlls/gdiplus/image.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 126 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c6018ab..69879ac 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3100,8 +3100,133 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * return GdipLoadImageFromFile(filename, image); } -static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame) +static void add_property(GpBitmap *bitmap, PropertyItem *item) { + UINT prop_size, prop_count; + PropertyItem *prop_item; + + if (bitmap->prop_item == NULL) + { + prop_size = prop_count = 0; + prop_item = GdipAlloc(item->length + sizeof(PropertyItem)); + if (!prop_item) return; + } + else + { + UINT i; + char *item_value; + + GdipGetPropertySize((GpImage *)bitmap, &prop_size, &prop_count); + + prop_item = GdipAlloc(prop_size + item->length + sizeof(PropertyItem)); + if (!prop_item) return; + memcpy(prop_item, bitmap->prop_item, sizeof(PropertyItem) * bitmap->prop_count); + prop_size -= sizeof(PropertyItem) * bitmap->prop_count; + memcpy(prop_item + prop_count + 1, bitmap->prop_item + prop_count, prop_size); + + item_value = (char *)(prop_item + prop_count + 1); + + for (i = 0; i < prop_count; i++) + { + prop_item[i].value = item_value; + item_value += prop_item[i].length; + } + } + + prop_item[prop_count].id = item->id; + prop_item[prop_count].type = item->type; + prop_item[prop_count].length = item->length; + prop_item[prop_count].value = (char *)(prop_item + prop_count + 1) + prop_size; + memcpy(prop_item[prop_count].value, item->value, item->length); + + GdipFree(bitmap->prop_item); + bitmap->prop_item = prop_item; + bitmap->prop_count++; +} + +static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, const WCHAR *prop_name) +{ + HRESULT hr; + GUID format; + PROPVARIANT id, value; + PropertyItem *item = NULL; + + IWICMetadataReader_GetMetadataFormat(reader, &format); + if (!IsEqualGUID(&format, guid)) return NULL; + + PropVariantInit(&id); + PropVariantInit(&value); + + id.vt = VT_LPWSTR; + id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + if (!id.u.pwszVal) return NULL; + lstrcpyW(id.u.pwszVal, prop_name); + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + if (hr == S_OK) + { + UINT item_size = propvariant_size(&value); + if (item_size) + { + item_size += sizeof(*item); + item = GdipAlloc(item_size); + if (propvariant_to_item(&value, item, item_size, 0) != Ok) + { + GdipFree(item); + item = NULL; + } + } + } + + PropVariantClear(&id); + PropVariantClear(&value); + + return item; +} + +static PropertyItem *get_gif_comment(IWICMetadataReader *reader) +{ + static const WCHAR textentryW[] = { 'T','e','x','t','E','n','t','r','y',0 }; + PropertyItem *comment; + + comment = get_property(reader, &GUID_MetadataFormatGifComment, textentryW); + if (comment) + comment->id = PropertyTagExifUserComment; + + return comment; +} + +static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) +{ + HRESULT hr; + IWICMetadataBlockReader *block_reader; + IWICMetadataReader *reader; + UINT block_count, i; + PropertyItem *comment = NULL; + + hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICMetadataBlockReader, (void **)&block_reader); + if (hr == S_OK) + { + hr = IWICMetadataBlockReader_GetCount(block_reader, &block_count); + if (hr == S_OK) + { + for (i = 0; i < block_count; i++) + { + hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); + if (hr == S_OK) + { + if (!comment) + comment = get_gif_comment(reader); + + IWICMetadataReader_Release(reader); + } + } + } + IWICMetadataBlockReader_Release(block_reader); + } + + if (comment) add_property(bitmap, comment); + + GdipFree(comment); } typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012