September 2012 - Wine-commits

Rico Schüller : d3dx9: Use float function in D3DXPlaneNormalize().
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: e420409b8d1e1be16b9085451c240460f81bbd20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e420409b8d1e1be16b9085451… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 28 08:43:04 2012 +0200 d3dx9: Use float function in D3DXPlaneNormalize(). --- dlls/d3dx9_36/math.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index d54095a..24303d2 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1197,30 +1197,29 @@ D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *p return pout; } -D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp) +D3DXPLANE * WINAPI D3DXPlaneNormalize(D3DXPLANE *out, const D3DXPLANE *p) { - D3DXPLANE out; FLOAT norm; - TRACE("(%p, %p)\n", pout, pp); + TRACE("out %p, p %p\n", out, p); - norm = sqrt(pp->a * pp->a + pp->b * pp->b + pp->c * pp->c); - if ( norm ) + norm = sqrtf(p->a * p->a + p->b * p->b + p->c * p->c); + if (norm) { - out.a = pp->a / norm; - out.b = pp->b / norm; - out.c = pp->c / norm; - out.d = pp->d / norm; + out->a = p->a / norm; + out->b = p->b / norm; + out->c = p->c / norm; + out->d = p->d / norm; } else { - out.a = 0.0f; - out.b = 0.0f; - out.c = 0.0f; - out.d = 0.0f; + out->a = 0.0f; + out->b = 0.0f; + out->c = 0.0f; + out->d = 0.0f; } - *pout = out; - return pout; + + return out; } D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, CONST D3DXMATRIX *pm)

1 0

Rico Schüller : d3dx9: Use float function in D3DXFresnelTerm().
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: aa344fc88d2fa3c39647e68be113dcb6c0ac43dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa344fc88d2fa3c39647e68be… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 28 08:43:14 2012 +0200 d3dx9: Use float function in D3DXFresnelTerm(). --- dlls/d3dx9_36/math.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 24303d2..a3aa07e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -81,13 +81,14 @@ FLOAT WINAPI D3DXFresnelTerm(FLOAT costheta, FLOAT refractionindex) { FLOAT a, d, g, result; - TRACE("(%f, %f)\n", costheta, refractionindex); + TRACE("costheta %f, refractionindex %f)\n", costheta, refractionindex); - g = sqrt(refractionindex * refractionindex + costheta * costheta - 1.0f); + g = sqrtf(refractionindex * refractionindex + costheta * costheta - 1.0f); a = g + costheta; d = g - costheta; - result = ( costheta * a - 1.0f ) * ( costheta * a - 1.0f ) / ( ( costheta * d + 1.0f ) * ( costheta * d + 1.0f ) ) + 1.0f; - result = result * 0.5f * d * d / ( a * a ); + result = (costheta * a - 1.0f) * (costheta * a - 1.0f) / ((costheta * d + 1.0f) * (costheta * d + 1.0f)) + 1.0f; + result *= 0.5f * d * d / (a * a); + return result; }

1 0

Rico Schüller : d3dx9: Improve D3DXMatrixAffineTransformation2D().
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: c131bee4fcc8862f7b4169cdc28afee63845bfff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c131bee4fcc8862f7b4169cdc… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 28 08:43:18 2012 +0200 d3dx9: Improve D3DXMatrixAffineTransformation2D(). --- dlls/d3dx9_36/math.c | 67 +++++++++++++++++++------------------------------ 1 files changed, 26 insertions(+), 41 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index a3aa07e..2c837a8 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -126,57 +126,42 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scalin return pout; } -D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR2 *protationcenter, FLOAT rotation, CONST D3DXVECTOR2 *ptranslation) +D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *out, FLOAT scaling, + const D3DXVECTOR2 *rotationcenter, FLOAT rotation, const D3DXVECTOR2 *translation) { - D3DXMATRIX m1, m2, m3, m4, m5; - D3DXQUATERNION rot; - D3DXVECTOR3 rot_center, trans; + FLOAT tmp1, tmp2, s; - TRACE("(%p, %f, %p, %f, %p)\n", pout, scaling, protationcenter, rotation, ptranslation); + TRACE("out %p, scaling %f, rotationcenter %p, rotation %f, translation %p\n", + out, scaling, rotationcenter, rotation, translation); - rot.w=cos(rotation/2.0f); - rot.x=0.0f; - rot.y=0.0f; - rot.z=sin(rotation/2.0f); + s = sinf(rotation / 2.0f); + tmp1 = 1.0f - 2.0f * s * s; + tmp2 = 2.0 * s * cosf(rotation / 2.0f); - if ( protationcenter ) - { - rot_center.x=protationcenter->x; - rot_center.y=protationcenter->y; - rot_center.z=0.0f; - } - else - { - rot_center.x=0.0f; - rot_center.y=0.0f; - rot_center.z=0.0f; - } + D3DXMatrixIdentity(out); + out->u.m[0][0] = scaling * tmp1; + out->u.m[0][1] = scaling * tmp2; + out->u.m[1][0] = -scaling * tmp2; + out->u.m[1][1] = scaling * tmp1; - if ( ptranslation ) + if (rotationcenter) { - trans.x=ptranslation->x; - trans.y=ptranslation->y; - trans.z=0.0f; + FLOAT x, y; + + x = rotationcenter->x; + y = rotationcenter->y; + + out->u.m[3][0] = y * tmp2 - x * tmp1 + x; + out->u.m[3][1] = -x * tmp2 - y * tmp1 + y; } - else + + if (translation) { - trans.x=0.0f; - trans.y=0.0f; - trans.z=0.0f; + out->u.m[3][0] += translation->x; + out->u.m[3][1] += translation->y; } - D3DXMatrixScaling(&m1, scaling, scaling, 1.0f); - D3DXMatrixTranslation(&m2, -rot_center.x, -rot_center.y, -rot_center.z); - D3DXMatrixTranslation(&m4, rot_center.x, rot_center.y, rot_center.z); - D3DXMatrixRotationQuaternion(&m3, &rot); - D3DXMatrixTranslation(&m5, trans.x, trans.y, trans.z); - - D3DXMatrixMultiply(&m1, &m1, &m2); - D3DXMatrixMultiply(&m1, &m1, &m3); - D3DXMatrixMultiply(&m1, &m1, &m4); - D3DXMatrixMultiply(pout, &m1, &m5); - - return pout; + return out; } HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, CONST D3DXMATRIX *pm)

1 0

Rico Schüller : d3dx9: Improve D3DXMatrixAffineTransformation().
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 945e81b341da104007bec608c7472cf36ddbea45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945e81b341da104007bec608c… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 28 08:43:26 2012 +0200 d3dx9: Improve D3DXMatrixAffineTransformation(). --- dlls/d3dx9_36/math.c | 75 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 56 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 2c837a8..70492fa 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -94,36 +94,73 @@ FLOAT WINAPI D3DXFresnelTerm(FLOAT costheta, FLOAT refractionindex) /*_________________D3DXMatrix____________________*/ -D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR3 *rotationcenter, CONST D3DXQUATERNION *rotation, CONST D3DXVECTOR3 *translation) +D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scaling, const D3DXVECTOR3 *rotationcenter, + const D3DXQUATERNION *rotation, const D3DXVECTOR3 *translation) { - D3DXMATRIX m1, m2, m3, m4, m5; - - TRACE("(%p, %f, %p, %p, %p)\n", pout, scaling, rotationcenter, rotation, translation); + TRACE("out %p, scaling %f, rotationcenter %p, rotation %p, translation %p\n", + out, scaling, rotationcenter, rotation, translation); - D3DXMatrixScaling(&m1, scaling, scaling, scaling); + D3DXMatrixIdentity(out); - if ( !rotationcenter ) + if (rotation) { - D3DXMatrixIdentity(&m2); - D3DXMatrixIdentity(&m4); + FLOAT temp00, temp01, temp02, temp10, temp11, temp12, temp20, temp21, temp22; + + temp00 = 1.0f - 2.0f * (rotation->y * rotation->y + rotation->z * rotation->z); + temp01 = 2.0f * (rotation->x * rotation->y + rotation->z * rotation->w); + temp02 = 2.0f * (rotation->x * rotation->z - rotation->y * rotation->w); + temp10 = 2.0f * (rotation->x * rotation->y - rotation->z * rotation->w); + temp11 = 1.0f - 2.0f * (rotation->x * rotation->x + rotation->z * rotation->z); + temp12 = 2.0f * (rotation->y * rotation->z + rotation->x * rotation->w); + temp20 = 2.0f * (rotation->x * rotation->z + rotation->y * rotation->w); + temp21 = 2.0f * (rotation->y * rotation->z - rotation->x * rotation->w); + temp22 = 1.0f - 2.0f * (rotation->x * rotation->x + rotation->y * rotation->y); + + out->u.m[0][0] = scaling * temp00; + out->u.m[0][1] = scaling * temp01; + out->u.m[0][2] = scaling * temp02; + out->u.m[1][0] = scaling * temp10; + out->u.m[1][1] = scaling * temp11; + out->u.m[1][2] = scaling * temp12; + out->u.m[2][0] = scaling * temp20; + out->u.m[2][1] = scaling * temp21; + out->u.m[2][2] = scaling * temp22; + + if (rotationcenter) + { + FLOAT x, y, z; + + x = -rotationcenter->x; + y = -rotationcenter->y; + z = -rotationcenter->z; + + out->u.m[3][0] = x * temp00 + y * temp10 + z * temp20; + out->u.m[3][1] = x * temp01 + y * temp11 + z * temp21; + out->u.m[3][2] = x * temp02 + y * temp12 + z * temp22; + } } else { - D3DXMatrixTranslation(&m2, -rotationcenter->x, -rotationcenter->y, -rotationcenter->z); - D3DXMatrixTranslation(&m4, rotationcenter->x, rotationcenter->y, rotationcenter->z); + out->u.m[0][0] = scaling; + out->u.m[1][1] = scaling; + out->u.m[2][2] = scaling; } - if ( !rotation ) D3DXMatrixIdentity(&m3); - else D3DXMatrixRotationQuaternion(&m3, rotation); + if (rotationcenter) + { + out->u.m[3][0] += rotationcenter->x; + out->u.m[3][1] += rotationcenter->y; + out->u.m[3][2] += rotationcenter->z; + } - if ( !translation ) D3DXMatrixIdentity(&m5); - else D3DXMatrixTranslation(&m5, translation->x, translation->y, translation->z); + if (translation) + { + out->u.m[3][0] += translation->x; + out->u.m[3][1] += translation->y; + out->u.m[3][2] += translation->z; + } - D3DXMatrixMultiply(&m1, &m1, &m2); - D3DXMatrixMultiply(&m1, &m1, &m3); - D3DXMatrixMultiply(&m1, &m1, &m4); - D3DXMatrixMultiply(pout, &m1, &m5); - return pout; + return out; } D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *out, FLOAT scaling,

1 0

Rico Schüller : d3dx9: Use float functions in D3DXMatrixRotationAxis().
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 3e24dc642bd4fc68c145e6e391b23633feb4d96d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e24dc642bd4fc68c145e6e39… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 28 08:43:30 2012 +0200 d3dx9: Use float functions in D3DXMatrixRotationAxis(). --- dlls/d3dx9_36/math.c | 44 ++++++++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 70492fa..5996a9f 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -551,24 +551,36 @@ D3DXMATRIX* WINAPI D3DXMatrixReflect(D3DXMATRIX *pout, CONST D3DXPLANE *pplane) return pout; } -D3DXMATRIX* WINAPI D3DXMatrixRotationAxis(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pv, FLOAT angle) +D3DXMATRIX * WINAPI D3DXMatrixRotationAxis(D3DXMATRIX *out, const D3DXVECTOR3 *v, FLOAT angle) { - D3DXVECTOR3 v; + D3DXVECTOR3 nv; + FLOAT sangle, cangle, cdiff; - TRACE("(%p, %p, %f)\n", pout, pv, angle); + TRACE("out %p, v %p, angle %f\n", out, v, angle); - D3DXVec3Normalize(&v,pv); - D3DXMatrixIdentity(pout); - pout->u.m[0][0] = (1.0f - cos(angle)) * v.x * v.x + cos(angle); - pout->u.m[1][0] = (1.0f - cos(angle)) * v.x * v.y - sin(angle) * v.z; - pout->u.m[2][0] = (1.0f - cos(angle)) * v.x * v.z + sin(angle) * v.y; - pout->u.m[0][1] = (1.0f - cos(angle)) * v.y * v.x + sin(angle) * v.z; - pout->u.m[1][1] = (1.0f - cos(angle)) * v.y * v.y + cos(angle); - pout->u.m[2][1] = (1.0f - cos(angle)) * v.y * v.z - sin(angle) * v.x; - pout->u.m[0][2] = (1.0f - cos(angle)) * v.z * v.x - sin(angle) * v.y; - pout->u.m[1][2] = (1.0f - cos(angle)) * v.z * v.y + sin(angle) * v.x; - pout->u.m[2][2] = (1.0f - cos(angle)) * v.z * v.z + cos(angle); - return pout; + D3DXVec3Normalize(&nv, v); + sangle = sinf(angle); + cangle = cosf(angle); + cdiff = 1.0f - cangle; + + out->u.m[0][0] = cdiff * nv.x * nv.x + cangle; + out->u.m[1][0] = cdiff * nv.x * nv.y - sangle * nv.z; + out->u.m[2][0] = cdiff * nv.x * nv.z + sangle * nv.y; + out->u.m[3][0] = 0.0f; + out->u.m[0][1] = cdiff * nv.y * nv.x + sangle * nv.z; + out->u.m[1][1] = cdiff * nv.y * nv.y + cangle; + out->u.m[2][1] = cdiff * nv.y * nv.z - sangle * nv.x; + out->u.m[3][1] = 0.0f; + out->u.m[0][2] = cdiff * nv.z * nv.x - sangle * nv.y; + out->u.m[1][2] = cdiff * nv.z * nv.y + sangle * nv.x; + out->u.m[2][2] = cdiff * nv.z * nv.z + cangle; + out->u.m[3][2] = 0.0f; + out->u.m[0][3] = 0.0f; + out->u.m[1][3] = 0.0f; + out->u.m[2][3] = 0.0f; + out->u.m[3][3] = 1.0f; + + return out; } D3DXMATRIX* WINAPI D3DXMatrixRotationQuaternion(D3DXMATRIX *pout, CONST D3DXQUATERNION *pq)

1 0

Rico Schüller : d3dx9: Improve traces for D3DXSHMultiply2/3().
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: effdcf98d6e3e81e2c75c849a04102ca85f1ac3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=effdcf98d6e3e81e2c75c849a… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 28 08:43:40 2012 +0200 d3dx9: Improve traces for D3DXSHMultiply2/3(). --- dlls/d3dx9_36/math.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 5996a9f..53dddd4 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2306,16 +2306,16 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight(UINT order, CONST D3DXVECTOR3 *dir, FL return D3D_OK; } -FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) +FLOAT * WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b) { FLOAT ta, tb; - TRACE("(%p, %p, %p)\n", out, a, b); + TRACE("out %p, a %p, b %p\n", out, a, b); ta = 0.28209479f * a[0]; tb = 0.28209479f * b[0]; - out[0]= 0.28209479f * D3DXSHDot(2, a, b); + out[0] = 0.28209479f * D3DXSHDot(2, a, b); out[1] = ta * b[1] + tb * a[1]; out[2] = ta * b[2] + tb * a[2]; out[3] = ta * b[3] + tb * a[3]; @@ -2323,13 +2323,13 @@ FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) return out; } -FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) +FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) { FLOAT t, ta, tb; - TRACE("(%p, %p, %p)\n", out, a, b); + TRACE("out %p, a %p, b %p\n", out, a, b); - out[0]= 0.28209479f * a[0] * b[0]; + out[0] = 0.28209479f * a[0] * b[0]; ta = 0.28209479f * a[0] - 0.12615662f * a[6] - 0.21850968f * a[8]; tb = 0.28209479f * b[0] - 0.12615662f * b[6] - 0.21850968f * b[8];

1 0

Nikolay Sivov : mlang: Forward GetLcidFromRfc1766() to IMultiLanguage3 implementation.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 7fe26a95158aa7a4b669be01a657fca6aaadd8fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe26a95158aa7a4b669be01a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 27 22:24:31 2012 +0400 mlang: Forward GetLcidFromRfc1766() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 67c318b..a0aae65 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2195,25 +2195,11 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid( static HRESULT WINAPI fnIMultiLanguage_GetLcidFromRfc1766( IMultiLanguage* iface, - LCID* pLocale, - BSTR bstrRfc1766) + LCID* locale, + BSTR rfc1766) { - HRESULT hr; - IEnumRfc1766 *rfc1766; - - TRACE("%p %p %s\n", iface, pLocale, debugstr_w(bstrRfc1766)); - - if (!pLocale || !bstrRfc1766) - return E_INVALIDARG; - - hr = IMultiLanguage_EnumRfc1766(iface, &rfc1766); - if (FAILED(hr)) - return hr; - - hr = lcid_from_rfc1766(rfc1766, pLocale, bstrRfc1766); - - IEnumRfc1766_Release(rfc1766); - return hr; + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_GetLcidFromRfc1766(&This->IMultiLanguage3_iface, locale, rfc1766); } /******************************************************************************/

1 0

Nikolay Sivov : mlang: Forward ConvertStringFromUnicode() to IMultiLanguage3 implementation.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 8e7006025cdd09d962e13fbe2deb892de84c12bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7006025cdd09d962e13fbe2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 27 22:28:09 2012 +0400 mlang: Forward ConvertStringFromUnicode() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index a0aae65..ba1feba 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2166,15 +2166,16 @@ static HRESULT WINAPI fnIMultiLanguage_ConvertStringToUnicode( static HRESULT WINAPI fnIMultiLanguage_ConvertStringFromUnicode( IMultiLanguage* iface, - DWORD* pdwMode, - DWORD dwEncoding, - WCHAR* pSrcStr, - UINT* pcSrcSize, - CHAR* pDstStr, - UINT* pcDstSize) + DWORD* mode, + DWORD encoding, + WCHAR* src, + UINT* src_size, + CHAR* dest, + UINT* dest_size) { - return ConvertINetUnicodeToMultiByte(pdwMode, dwEncoding, - pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_ConvertStringFromUnicode(&This->IMultiLanguage3_iface, + mode, encoding, src, src_size, dest, dest_size); } static HRESULT WINAPI fnIMultiLanguage_ConvertStringReset(

1 0

Nikolay Sivov : mlang: Use proper interface call instead of implementation function.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: d442f5fffaf3c3b77514b378eadcafbbc41a1a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d442f5fffaf3c3b77514b378e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 27 22:34:21 2012 +0400 mlang: Use proper interface call instead of implementation function. --- dlls/mlang/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index ba1feba..a361bc9 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1878,7 +1878,7 @@ static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( DWORD cp; HRESULT ret; - ret = fnIMLangFontLink_GetCharCodePages(iface, pszSrc[i], &cp); + ret = IMLangFontLink_GetCharCodePages(iface, pszSrc[i], &cp); if (ret != S_OK) return E_FAIL; if (!cps) cps = cp;

1 0

Nikolay Sivov : mlang: Move GetFontCodePages() code to IMLangFontLink2 and forward to it.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: b7eb9c234ec99ef56c209d132619e59fb9e4feaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7eb9c234ec99ef56c209d132… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 27 22:41:51 2012 +0400 mlang: Move GetFontCodePages() code to IMLangFontLink2 and forward to it. --- dlls/mlang/mlang.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index a361bc9..3d2cde7 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1972,24 +1972,12 @@ static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage( static HRESULT WINAPI fnIMLangFontLink_GetFontCodePages( IMLangFontLink* iface, - HDC hDC, - HFONT hFont, - DWORD* pdwCodePages) + HDC hdc, + HFONT hfont, + DWORD* codepages) { - HFONT old_font; - FONTSIGNATURE fontsig; - MLang_impl *This = impl_from_IMLangFontLink( iface ); - - TRACE("(%p)\n",This); - - old_font = SelectObject(hDC,hFont); - GetTextCharsetInfo(hDC,&fontsig, 0); - SelectObject(hDC,old_font); - - *pdwCodePages = fontsig.fsCsb[0]; - TRACE("CodePages is 0x%x\n",fontsig.fsCsb[0]); - - return S_OK; + MLang_impl *This = impl_from_IMLangFontLink(iface); + return IMLangFontLink2_GetFontCodePages(&This->IMLangFontLink2_iface, hdc, hfont, codepages); } static HRESULT WINAPI fnIMLangFontLink_MapFont( @@ -3279,11 +3267,23 @@ static HRESULT WINAPI fnIMLangFontLink2_CodePagesToCodePage(IMLangFontLink2* Thi return E_NOTIMPL; } -static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2* This, - HDC hDC, HFONT hFont, DWORD *pdwCodePages) +static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2 *iface, + HDC hdc, HFONT hfont, DWORD *codepages) { - FIXME("(%p)->%p %p %p\n",This, hDC, hFont, pdwCodePages); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMLangFontLink2(iface); + FONTSIGNATURE fontsig; + HFONT old_font; + + TRACE("(%p)->(%p %p %p)\n", This, hdc, hfont, codepages); + + old_font = SelectObject(hdc, hfont); + GetTextCharsetInfo(hdc, &fontsig, 0); + SelectObject(hdc, old_font); + + *codepages = fontsig.fsCsb[0]; + TRACE("ret 0x%x\n", fontsig.fsCsb[0]); + + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_ReleaseFont(IMLangFontLink2* This,

1 0