September 2012 - Wine-Commits

Hans Leidekker : wbemprox: Implement Win32_ComputerSystem.Domain.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 7417e7b65a841a1d55ce776daa8230e3e888d020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7417e7b65a841a1d55ce776da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 13:39:04 2012 +0200 wbemprox: Implement Win32_ComputerSystem.Domain. --- dlls/wbemprox/builtin.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2718fc7..43122fe 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -100,6 +100,8 @@ static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR prop_displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; +static const WCHAR prop_domainW[] = + {'D','o','m','a','i','n',0}; static const WCHAR prop_domainroleW[] = {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_drivetypeW[] = @@ -209,6 +211,7 @@ static const struct column col_bios[] = static const struct column col_compsys[] = { { prop_descriptionW, CIM_STRING }, + { prop_domainW, CIM_STRING }, { prop_domainroleW, CIM_UINT16 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, @@ -317,6 +320,8 @@ static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; static const WCHAR compsys_descriptionW[] = {'A','T','/','A','T',' ','C','O','M','P','A','T','I','B','L','E',0}; +static const WCHAR compsys_domainW[] = + {'W','O','R','K','G','R','O','U','P',0}; static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = @@ -355,6 +360,7 @@ struct record_bios struct record_computersystem { const WCHAR *description; + const WCHAR *domain; UINT16 domainrole; const WCHAR *manufacturer; const WCHAR *model; @@ -533,6 +539,7 @@ static void fill_compsys( struct table *table ) rec = (struct record_computersystem *)table->data; rec->description = compsys_descriptionW; + rec->domain = compsys_domainW; rec->domainrole = 0; /* standalone workstation */ rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW;

1 0

Hans Leidekker : wbemprox: Add support for WbemAdministrativeLocator.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 163c8f31fd94599718029e118affeedfda660bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=163c8f31fd94599718029e118… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 13:38:05 2012 +0200 wbemprox: Add support for WbemAdministrativeLocator. --- dlls/wbemprox/builtin.c | 3 ++- dlls/wbemprox/main.c | 4 +++- dlls/wbemprox/services.c | 1 - dlls/wbemprox/wbemprox.idl | 7 +++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 54de2bb..1d39896 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -27,11 +27,12 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "wbemcli.h" +#include "wbemprov.h" #include "winsock2.h" #include "iphlpapi.h" #include "tlhelp32.h" -#include "initguid.h" #include "d3d10.h" #include "winternl.h" #include "winioctl.h" diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 6455efd..3e26a6f 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "objbase.h" #include "wbemcli.h" +#include "wbemprov.h" #include "rpcproxy.h" #include "wbemprox_private.h" @@ -140,7 +141,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); - if (IsEqualGUID( rclsid, &CLSID_WbemLocator )) + if (IsEqualGUID( rclsid, &CLSID_WbemLocator ) || + IsEqualGUID( rclsid, &CLSID_WbemAdministrativeLocator )) { cf = &wbem_locator_cf.IClassFactory_iface; } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 59b6da8..5e9cec0 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "objbase.h" #include "wbemcli.h" diff --git a/dlls/wbemprox/wbemprox.idl b/dlls/wbemprox/wbemprox.idl index 65cdac4..4b19384 100644 --- a/dlls/wbemprox/wbemprox.idl +++ b/dlls/wbemprox/wbemprox.idl @@ -24,3 +24,10 @@ uuid(4590f811-1d3a-11d0-891f-00aa004b2e24) ] coclass WbemLocator { interface IWbemLocator; } + +[ + helpstring("WBEM Administrative Locator"), + threading(both), + uuid(cb8555cc-9128-11d1-ad9b-00c04fd8fdff) +] +coclass WbemAdministrativeLocator { interface IWbemLocator; }

1 0

Hans Leidekker : wbemprox: Implement Win32_BIOS.Version.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 4734e0ffa5f00f21ccd1c4c412ee19f748436d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4734e0ffa5f00f21ccd1c4c41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 13:38:34 2012 +0200 wbemprox: Implement Win32_BIOS.Version. --- dlls/wbemprox/builtin.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1d39896..2718fc7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -172,6 +172,8 @@ static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_typeW[] = {'T','y','p','e',0}; +static const WCHAR prop_versionW[] = + {'V','e','r','s','i','o','n',0}; static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -201,7 +203,8 @@ static const struct column col_bios[] = { prop_descriptionW, CIM_STRING }, { prop_manufacturerW, CIM_STRING }, { prop_releasedateW, CIM_DATETIME }, - { prop_serialnumberW, CIM_STRING } + { prop_serialnumberW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_compsys[] = { @@ -310,6 +313,8 @@ static const WCHAR bios_releasedateW[] = {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR bios_serialnumberW[] = {'0',0}; +static const WCHAR bios_versionW[] = + {'W','I','N','E',' ',' ',' ','-',' ','1',0}; static const WCHAR compsys_descriptionW[] = {'A','T','/','A','T',' ','C','O','M','P','A','T','I','B','L','E',0}; static const WCHAR compsys_manufacturerW[] = @@ -345,6 +350,7 @@ struct record_bios const WCHAR *manufacturer; const WCHAR *releasedate; const WCHAR *serialnumber; + const WCHAR *version; }; struct record_computersystem { @@ -457,7 +463,7 @@ static const struct record_baseboard data_baseboard[] = }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW } + { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } }; static const struct record_params data_params[] = {

1 0

Hans Leidekker : wbemprox: Implement IWbemServices::ExecMethod.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 99a3ad06910b4badb519a542ca38ac7670fe2201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a3ad06910b4badb519a542c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 13:37:21 2012 +0200 wbemprox: Implement IWbemServices::ExecMethod. --- dlls/wbemprox/services.c | 20 ++++++++++++++++++-- dlls/wbemprox/table.c | 23 +++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index bf367c7..59b6da8 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -579,8 +579,24 @@ static HRESULT WINAPI wbem_services_ExecMethod( IWbemClassObject **ppOutParams, IWbemCallResult **ppCallResult ) { - FIXME("\n"); - return WBEM_E_FAILED; + const struct table *table; + class_method *func; + struct path *path; + HRESULT hr; + + TRACE("%p, %s, %s, %08x, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath), + debugstr_w(strMethodName), lFlags, pCtx, pInParams, ppOutParams, ppCallResult); + + if (lFlags) FIXME("flags %08x not supported\n", lFlags); + + if ((hr = parse_path( strObjectPath, &path )) != S_OK) return hr; + + table = get_table( path->class ); + free_path( path ); + if (!table) return WBEM_E_NOT_FOUND; + + if ((hr = get_method( table, strMethodName, &func )) != S_OK) return hr; + return func( pInParams, ppOutParams ); } static HRESULT WINAPI wbem_services_ExecMethodAsync( diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index c6dc845..c0e3eef 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -239,6 +239,29 @@ HRESULT set_value( const struct table *table, UINT row, UINT column, LONGLONG va return S_OK; } +HRESULT get_method( const struct table *table, const WCHAR *name, class_method **func ) +{ + UINT i, j; + + for (i = 0; i < table->num_rows; i++) + { + for (j = 0; j < table->num_cols; j++) + { + if (table->columns[j].type & COL_FLAG_METHOD && !strcmpW( table->columns[j].name, name )) + { + HRESULT hr; + LONGLONG val; + + if ((hr = get_value( table, i, j, &val )) != S_OK) return hr; + *func = (class_method *)(INT_PTR)val; + return S_OK; + } + } + } + return WBEM_E_INVALID_METHOD; + +} + static void clear_table( struct table *table ) { UINT i, j, type; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 2467a76..b99897e 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -162,6 +162,7 @@ HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN; BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN; HRESULT set_value( const struct table *, UINT, UINT, LONGLONG, CIMTYPE ) DECLSPEC_HIDDEN; +HRESULT get_method( const struct table *, const WCHAR *, class_method ** ) DECLSPEC_HIDDEN; HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE *, LONG * ) DECLSPEC_HIDDEN; HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mlang: Mode CodePagesToCodePage() code to IMLangFontLink2 and forward to it.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

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: Forward GetLcidFromRfc1766() to IMultiLanguage3 implementation.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

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

Jacek Caban : vbscript: Fixed copy&paste typo in invoke_builtin.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: c36045dbccc7389dc4378c1c3bd8118bcafd5564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36045dbccc7389dc4378c1c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 28 12:48:46 2012 +0200 vbscript: Fixed copy&paste typo in invoke_builtin. --- dlls/vbscript/vbdisp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 4721753..27c4aa3 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -157,7 +157,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f } break; case DISPATCH_PROPERTYPUT: - if(!(prop->flags & (BP_GET|BP_GETPUT))) { + if(!(prop->flags & BP_GETPUT)) { FIXME("property does not support DISPATCH_PROPERTYPUT\n"); return E_FAIL; }

1 0

Rico Schüller : d3dx9: Improve traces for D3DXSHMultiply2/3().
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

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 Sept. 28, 2012

Sept. 28, 2012

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 Sept. 28, 2012

Sept. 28, 2012

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