wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Qian Hong : iphlpapi: Set DhcpEnabled to TRUE for all interfaces.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: b3e7f710912388b4dca7de2d2e91a3cf8b225c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e7f710912388b4dca7de2d2… Author: Qian Hong <fracting(a)gmail.com> Date: Thu Sep 27 23:14:32 2012 +0800 iphlpapi: Set DhcpEnabled to TRUE for all interfaces. --- dlls/iphlpapi/iphlpapi_main.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f3568b8..dae779c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -598,6 +598,8 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) ptr->Next = &pAdapterInfo[ndx + 1]; else ptr->Next = NULL; + + ptr->DhcpEnabled = TRUE; } ret = NO_ERROR; } @@ -2008,9 +2010,7 @@ DWORD WINAPI GetUniDirectionalAdapterInfo(PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS pIP */ DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) { - TRACE("AdapterInfo %p\n", AdapterInfo); - /* not a stub, never going to support this (and I never mark an adapter as - DHCP enabled, see GetAdaptersInfo, so this should never get called) */ + FIXME("Stub AdapterInfo %p\n", AdapterInfo); return ERROR_NOT_SUPPORTED; } @@ -2036,9 +2036,7 @@ DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) */ DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) { - TRACE("AdapterInfo %p\n", AdapterInfo); - /* not a stub, never going to support this (and I never mark an adapter as - DHCP enabled, see GetAdaptersInfo, so this should never get called) */ + FIXME("Stub AdapterInfo %p\n", AdapterInfo); return ERROR_NOT_SUPPORTED; }

1 0

Nikolay Sivov : dwrite: Added IDWriteTextLayout stub.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: f49d360ffd36a1ad0d2d2b5ca9e691d100970142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49d360ffd36a1ad0d2d2b5ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 28 12:13:17 2012 +0400 dwrite: Added IDWriteTextLayout stub. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/layout.c | 645 +++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 10 +- dlls/dwrite/tests/Makefile.in | 3 +- dlls/dwrite/tests/layout.c | 90 ++++++ 6 files changed, 747 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f49d360ffd36a1ad0d2d2…

1 0

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

28 Sep '12

Module: wine Branch: master Commit: 810ceb86c6d40ebb8e7484cb614e7e970f424190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=810ceb86c6d40ebb8e7484cb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 27 22:48:37 2012 +0400 mlang: Mode CodePagesToCodePage() code to IMLangFontLink2 and forward to it. --- dlls/mlang/mlang.c | 98 +++++++++++++++++++++++++--------------------------- 1 files changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 3d2cde7..325828a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1920,54 +1920,13 @@ static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages( static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage( IMLangFontLink* iface, - DWORD dwCodePages, - UINT uDefaultCodePage, - UINT* puCodePage) + DWORD codepages, + UINT def_codepage, + UINT* codepage) { - MLang_impl *This = impl_from_IMLangFontLink( iface ); - DWORD mask = 0x00000000; - UINT i; - CHARSETINFO cs; - BOOL rc; - - TRACE("(%p) scanning 0x%x default page %u\n",This, dwCodePages, - uDefaultCodePage); - - *puCodePage = 0x00000000; - - rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)uDefaultCodePage, &cs, - TCI_SRCCODEPAGE); - - if (rc && (dwCodePages & cs.fs.fsCsb[0])) - { - TRACE("Found Default Codepage\n"); - *puCodePage = uDefaultCodePage; - return S_OK; - } - - - for (i = 0; i < 32; i++) - { - - mask = 1 << i; - if (dwCodePages & mask) - { - DWORD Csb[2]; - Csb[0] = mask; - Csb[1] = 0x0; - rc = TranslateCharsetInfo(Csb, &cs, TCI_SRCFONTSIG); - if (!rc) - continue; - - TRACE("Falling back to least significant found CodePage %u\n", - cs.ciACP); - *puCodePage = cs.ciACP; - return S_OK; - } - } - - TRACE("no codepage found\n"); - return E_FAIL; + MLang_impl *This = impl_from_IMLangFontLink(iface); + return IMLangFontLink2_CodePagesToCodePage(&This->IMLangFontLink2_iface, codepages, + def_codepage, codepage); } static HRESULT WINAPI fnIMLangFontLink_GetFontCodePages( @@ -3260,11 +3219,48 @@ static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* Thi return E_NOTIMPL; } -static HRESULT WINAPI fnIMLangFontLink2_CodePagesToCodePage(IMLangFontLink2* This, - DWORD dwCodePages, UINT uDefaultCodePage, UINT *puCodePage) +static HRESULT WINAPI fnIMLangFontLink2_CodePagesToCodePage(IMLangFontLink2* iface, + DWORD codepages, UINT def_codepage, UINT *codepage) { - FIXME("(%p)->%i %i %p\n",This, dwCodePages, uDefaultCodePage, puCodePage); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMLangFontLink2(iface); + DWORD mask = 0; + CHARSETINFO cs; + BOOL rc; + UINT i; + + TRACE("(%p)->(0x%x %u %p)\n", This, codepages, def_codepage, codepage); + + *codepage = 0; + + rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)def_codepage, &cs, TCI_SRCCODEPAGE); + if (rc && (codepages & cs.fs.fsCsb[0])) + { + TRACE("Found Default Codepage\n"); + *codepage = def_codepage; + return S_OK; + } + + for (i = 0; i < 32; i++) + { + mask = 1 << i; + if (codepages & mask) + { + DWORD Csb[2]; + Csb[0] = mask; + Csb[1] = 0x0; + rc = TranslateCharsetInfo(Csb, &cs, TCI_SRCFONTSIG); + if (!rc) + continue; + + TRACE("Falling back to least significant found CodePage %u\n", + cs.ciACP); + *codepage = cs.ciACP; + return S_OK; + } + } + + TRACE("no codepage found\n"); + return E_FAIL; } static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2 *iface,

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

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

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

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

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