May 2013 - Wine-Commits - list.winehq.org

Christian Costa : msi: Use next cabinet from the media table instead of failing when there is a mismatch with continuous cabinet .
by Alexandre Julliard May 1, 2013

May 1, 2013

Module: wine Branch: master Commit: 7129293b9a75b72ec73a37ca321cf20e8d34f5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=7129293b9a75b72ec73a37ca3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 1 15:27:31 2013 +0200 msi: Use next cabinet from the media table instead of failing when there is a mismatch with continuous cabinet. --- dlls/msi/media.c | 25 +++++++++++++++++++++++-- dlls/msi/tests/install.c | 4 ++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 612624d..d97f4bd 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -358,8 +358,29 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, if (strcmpiW( mi->cabinet, cab )) { - ERR("Continuous cabinet does not match the next cabinet in the Media table\n"); - goto done; + char *next_cab; + ULONG length; + + WARN("Continuous cabinet %s does not match the next cabinet %s in the media table => use latter one\n", debugstr_w(cab), debugstr_w(mi->cabinet)); + + /* Use cabinet name from the media table */ + next_cab = strdupWtoA(mi->cabinet); + /* Modify path to cabinet file with full filename (psz3 points to a 256 bytes buffer that can be modified contrary to psz1 and psz2) */ + length = strlen(pfdin->psz3) + 1 + strlen(next_cab) + 1; + if (length > 256) + { + WARN("Cannot update next cabinet filename with a string size %u > 256\n", length); + msi_free(next_cab); + goto done; + } + else + { + strcat(pfdin->psz3, "\\"); + strcat(pfdin->psz3, next_cab); + } + /* Path psz3 and cabinet psz1 are concatenated by FDI so just reset psz1 */ + *pfdin->psz1 = 0; + msi_free(next_cab); } if (!(cabinet_file = get_cabinet_filename(mi))) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 207fdef..e5d996e 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3122,9 +3122,9 @@ static void test_continuouscabs(void) } else { - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - todo_wine ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); }

1 0

Daniel Jelinski : xolehlp: Fix calling convention.
by Alexandre Julliard May 1, 2013

May 1, 2013

Module: wine Branch: master Commit: 8651c3b00f0e69f1da812f54cb54d4670e80f072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8651c3b00f0e69f1da812f54c… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Apr 30 23:15:43 2013 +0200 xolehlp: Fix calling convention. --- dlls/xolehlp/xolehlp.c | 6 +++--- dlls/xolehlp/xolehlp.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index e1ec12c..475ef67 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -38,7 +38,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -HRESULT WINAPI DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, +HRESULT CDECL DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, DWORD dwReserved1, WORD wcbReserved2, void *pvReserved2, void **ppv) { FIXME("(%s, %s, %s, %d, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), @@ -46,7 +46,7 @@ HRESULT WINAPI DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, return E_NOTIMPL; } -HRESULT WINAPI DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, +HRESULT CDECL DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), @@ -54,7 +54,7 @@ HRESULT WINAPI DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID rii return E_NOTIMPL; } -HRESULT WINAPI DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, +HRESULT CDECL DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_w(host), debugstr_w(tm_name), diff --git a/dlls/xolehlp/xolehlp.spec b/dlls/xolehlp/xolehlp.spec index 0b149de..80c7c60 100644 --- a/dlls/xolehlp/xolehlp.spec +++ b/dlls/xolehlp/xolehlp.spec @@ -1,6 +1,6 @@ @ stub GetDtcLocaleResourceHandle -@ stdcall DtcGetTransactionManager(str str ptr long long ptr ptr) +@ cdecl DtcGetTransactionManager(str str ptr long long ptr ptr) @ stub DtcGetTransactionManagerEx @ stub DtcGetTransactionManagerC -@ stdcall DtcGetTransactionManagerExA(str str ptr long ptr ptr) -@ stdcall DtcGetTransactionManagerExW(wstr wstr ptr long ptr ptr) +@ cdecl DtcGetTransactionManagerExA(str str ptr long ptr ptr) +@ cdecl DtcGetTransactionManagerExW(wstr wstr ptr long ptr ptr)

1 0

Christian Costa : msi: Add tests to show that only msi cab filename is taken in case of mismatch with the one given by previous cab .
by Alexandre Julliard May 1, 2013

May 1, 2013

Module: wine Branch: master Commit: e249b930921a34ef43ee87095e48a70e1286dbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e249b930921a34ef43ee87095… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 1 15:20:20 2013 +0200 msi: Add tests to show that only msi cab filename is taken in case of mismatch with the one given by previous cab. --- dlls/msi/tests/install.c | 108 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 92 insertions(+), 16 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3065654..207fdef 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -392,6 +392,13 @@ static const CHAR cc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tV "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t12\t\ttest3.cab\tDISK3\t\n"; +static const CHAR cc3_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t10\t\ttest1.cab\tDISK1\t\n" + "2\t2\t\ttest2_.cab\tDISK2\t\n" + "3\t12\t\ttest3.cab\tDISK3\t\n"; + static const CHAR co_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" @@ -1460,6 +1467,18 @@ static const msi_table cc2_tables[] = ADD_TABLE(property), }; +static const msi_table cc3_tables[] = +{ + ADD_TABLE(cc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(cc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(cc3_media), + ADD_TABLE(property), +}; + static const msi_table co_tables[] = { ADD_TABLE(cc_component), @@ -2013,7 +2032,7 @@ static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, voi DWORD dwAccess = 0; DWORD dwShareMode = 0; DWORD dwCreateDisposition = OPEN_EXISTING; - + dwAccess = GENERIC_READ | GENERIC_WRITE; /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; @@ -2036,7 +2055,7 @@ static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv HANDLE handle = (HANDLE)hf; DWORD dwRead; BOOL res; - + res = ReadFile(handle, memory, cb, &dwRead, NULL); ok(res, "Failed to ReadFile\n"); @@ -2175,7 +2194,7 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, res = GetFileInformationByHandle(handle, &finfo); ok(res, "Expected GetFileInformationByHandle to succeed\n"); - + FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); @@ -3025,11 +3044,18 @@ static void test_continuouscabs(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + } + else + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } delete_cab_files(); DeleteFile(msifile); @@ -3043,16 +3069,66 @@ static void test_continuouscabs(void) if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); - goto error; } - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); - ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); + else + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } + + delete_cab_files(); + DeleteFile(msifile); + + /* Tests to show that only msi cab filename is taken in case of mismatch with the one given by previous cab */ + + /* Filename from cab is right and the one from msi is wrong */ + create_cc_test_files(); + create_database(msifile, cc3_tables, sizeof(cc3_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + } + else + { + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAIRE, got %u\n", r); + todo_wine ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\caesar", TRUE), "File installed\n"); + todo_wine ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n"); + todo_wine ok(!delete_pf("msitest", FALSE), "Directory created\n"); + } + + delete_cab_files(); + DeleteFile(msifile); + + /* Filename from msi is right and the one from cab is wrong */ + create_cc_test_files(); + ok(MoveFile("test2.cab", "test2_.cab"), "Cannot rename test3.cab to test3_.cab"); + create_database(msifile, cc3_tables, sizeof(cc3_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + } + else + { + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + todo_wine ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } -error: delete_cab_files(); DeleteFile(msifile); }

1 0

Ruslan Kabatsayev : netapi32: Add stub for NetGetAnyDCName.
by Alexandre Julliard May 1, 2013

May 1, 2013

Module: wine Branch: master Commit: 23b0c321ae1545d75371d49e956b24e3ffac163c URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b0c321ae1545d75371d49e9… Author: Ruslan Kabatsayev <b7.10110111(a)gmail.com> Date: Sat Apr 27 16:01:53 2013 +0400 netapi32: Add stub for NetGetAnyDCName. --- dlls/netapi32/access.c | 14 ++++++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 09b5b63..b77da79 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -729,6 +729,20 @@ NetGetDCName(LPCWSTR servername, LPCWSTR domainname, LPBYTE *bufptr) } /************************************************************ + * NetGetAnyDCName (NETAPI32.@) + * + * Return the name of any domain controller (DC) for a + * domain that is directly trusted by the specified server + */ + +NET_API_STATUS WINAPI NetGetAnyDCName(LPCWSTR servername, LPCWSTR domainname, LPBYTE *bufptr) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_w(servername), + debugstr_w(domainname), bufptr); + return ERROR_NO_SUCH_DOMAIN; +} + +/************************************************************ * NetGroupEnum (NETAPI32.@) * */ diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 50e7b0e..8e0f3ea 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -90,7 +90,7 @@ @ stub NetFileClose @ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetFileGetInfo -@ stub NetGetAnyDCName +@ stdcall NetGetAnyDCName(wstr wstr ptr) @ stdcall NetGetDCName(wstr wstr ptr) @ stub NetGetDisplayInformationIndex @ stdcall NetGetJoinInformation(wstr ptr ptr)

1 0

Austin English : msvcr110: Implement __crtGetShowWindowMode.
by Alexandre Julliard May 1, 2013

May 1, 2013

Module: wine Branch: master Commit: c649d8746dc3865d086fd39bfa5774127cbd2248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c649d8746dc3865d086fd39bf… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 30 15:43:15 2013 -0700 msvcr110: Implement __crtGetShowWindowMode. --- dlls/msvcr110/msvcr110.c | 15 +++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 9cf945a..04a0dc2 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -23,6 +23,9 @@ #include "stdlib.h" #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************* * DllMain (MSVCR110.@) @@ -47,3 +50,15 @@ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTO { return SetUnhandledExceptionFilter(filter); } + +/********************************************************************* + * __crtGetShowWindowMode (MSVCR110.@) + */ +int CDECL MSVCR110__crtGetShowWindowMode(void) +{ + STARTUPINFOW si; + + GetStartupInfoW(&si); + TRACE("window=%d\n", si.wShowWindow); + return si.wShowWindow; +} diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 12fc808..c38763a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -918,7 +918,7 @@ @ stub -arch=i386,win64 __crtFlsSetValue @ stub -arch=i386,win64 __crtGetDateFormatEx @ stub -arch=i386,win64 __crtGetLocaleInfoEx -@ stub __crtGetShowWindowMode +@ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode @ stub -arch=i386,win64 __crtGetTimeFormatEx @ stub -arch=i386,win64 __crtGetUserDefaultLocaleName @ stub -arch=i386,win64 __crtInitializeCriticalSectionEx

1 0

Alexandre Julliard : configure: Add rules for building libwine without soname on Android.
by Alexandre Julliard May 1, 2013

May 1, 2013

Module: wine Branch: master Commit: daa5116010a02c0509210776034a249e07a546aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa5116010a02c05092107760… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 12:44:42 2013 +0200 configure: Add rules for building libwine without soname on Android. --- configure | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 44 ++++++++++++ 2 files changed, 256 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daa5116010a02c0509210…

1 0

Alexandre Julliard : makefiles: Generate the platform-specific libwine rules from configure.
by Alexandre Julliard May 1, 2013

May 1, 2013

Module: wine Branch: master Commit: 54244470f36a864843aef6485db1197d4ac2bd8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=54244470f36a864843aef6485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 12:29:00 2013 +0200 makefiles: Generate the platform-specific libwine rules from configure. --- Make.rules.in | 3 +- Make.vars.in | 1 - configure | 159 +++++++++++++++++++++++++++++-------------------- configure.ac | 129 ++++++++++++++++++++++++++++------------ libs/wine/Makefile.in | 72 +--------------------- 5 files changed, 189 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54244470f36a864843aef…

1 0

Rico Schüller : d3dx9: Remove unneeded variables.
by Alexandre Julliard May 1, 2013

May 1, 2013

Module: wine Branch: master Commit: ae0d8b5e593db5498b2880b9374e4716f6ab9e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0d8b5e593db5498b2880b93… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 1 11:27:26 2013 +0200 d3dx9: Remove unneeded variables. --- dlls/d3dx9_36/math.c | 116 ++++++++++++++++++++++++++------------------------ 1 files changed, 60 insertions(+), 56 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b60cb89..43911e9 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -348,66 +348,70 @@ D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, cons return pout; } -D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, const D3DXVECTOR3 *peye, const D3DXVECTOR3 *pat, const D3DXVECTOR3 *pup) -{ - D3DXVECTOR3 right, rightn, up, upn, vec, vec2; - - TRACE("pout %p, peye %p, pat %p, pup %p\n", pout, peye, pat, pup); - - D3DXVec3Subtract(&vec2, pat, peye); - D3DXVec3Normalize(&vec, &vec2); - D3DXVec3Cross(&right, pup, &vec); - D3DXVec3Cross(&up, &vec, &right); - D3DXVec3Normalize(&rightn, &right); - D3DXVec3Normalize(&upn, &up); - pout->u.m[0][0] = rightn.x; - pout->u.m[1][0] = rightn.y; - pout->u.m[2][0] = rightn.z; - pout->u.m[3][0] = -D3DXVec3Dot(&rightn,peye); - pout->u.m[0][1] = upn.x; - pout->u.m[1][1] = upn.y; - pout->u.m[2][1] = upn.z; - pout->u.m[3][1] = -D3DXVec3Dot(&upn, peye); - pout->u.m[0][2] = vec.x; - pout->u.m[1][2] = vec.y; - pout->u.m[2][2] = vec.z; - pout->u.m[3][2] = -D3DXVec3Dot(&vec, peye); - pout->u.m[0][3] = 0.0f; - pout->u.m[1][3] = 0.0f; - pout->u.m[2][3] = 0.0f; - pout->u.m[3][3] = 1.0f; - return pout; +D3DXMATRIX * WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *out, const D3DXVECTOR3 *eye, const D3DXVECTOR3 *at, + const D3DXVECTOR3 *up) +{ + D3DXVECTOR3 right, upn, vec; + + TRACE("out %p, eye %p, at %p, up %p\n", out, eye, at, up); + + D3DXVec3Subtract(&vec, at, eye); + D3DXVec3Normalize(&vec, &vec); + D3DXVec3Cross(&right, up, &vec); + D3DXVec3Cross(&upn, &vec, &right); + D3DXVec3Normalize(&right, &right); + D3DXVec3Normalize(&upn, &upn); + out->u.m[0][0] = right.x; + out->u.m[1][0] = right.y; + out->u.m[2][0] = right.z; + out->u.m[3][0] = -D3DXVec3Dot(&right, eye); + out->u.m[0][1] = upn.x; + out->u.m[1][1] = upn.y; + out->u.m[2][1] = upn.z; + out->u.m[3][1] = -D3DXVec3Dot(&upn, eye); + out->u.m[0][2] = vec.x; + out->u.m[1][2] = vec.y; + out->u.m[2][2] = vec.z; + out->u.m[3][2] = -D3DXVec3Dot(&vec, eye); + 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 D3DXMatrixLookAtRH(D3DXMATRIX *pout, const D3DXVECTOR3 *peye, const D3DXVECTOR3 *pat, const D3DXVECTOR3 *pup) -{ - D3DXVECTOR3 right, rightn, up, upn, vec, vec2; - - TRACE("pout %p, peye %p, pat %p, pup %p\n", pout, peye, pat, pup); - - D3DXVec3Subtract(&vec2, pat, peye); - D3DXVec3Normalize(&vec, &vec2); - D3DXVec3Cross(&right, pup, &vec); - D3DXVec3Cross(&up, &vec, &right); - D3DXVec3Normalize(&rightn, &right); - D3DXVec3Normalize(&upn, &up); - pout->u.m[0][0] = -rightn.x; - pout->u.m[1][0] = -rightn.y; - pout->u.m[2][0] = -rightn.z; - pout->u.m[3][0] = D3DXVec3Dot(&rightn,peye); - pout->u.m[0][1] = upn.x; - pout->u.m[1][1] = upn.y; - pout->u.m[2][1] = upn.z; - pout->u.m[3][1] = -D3DXVec3Dot(&upn, peye); - pout->u.m[0][2] = -vec.x; - pout->u.m[1][2] = -vec.y; - pout->u.m[2][2] = -vec.z; - pout->u.m[3][2] = D3DXVec3Dot(&vec, peye); - pout->u.m[0][3] = 0.0f; - pout->u.m[1][3] = 0.0f; - pout->u.m[2][3] = 0.0f; - pout->u.m[3][3] = 1.0f; - return pout; +D3DXMATRIX * WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *out, const D3DXVECTOR3 *eye, const D3DXVECTOR3 *at, + const D3DXVECTOR3 *up) +{ + D3DXVECTOR3 right, upn, vec; + + TRACE("out %p, eye %p, at %p, up %p\n", out, eye, at, up); + + D3DXVec3Subtract(&vec, at, eye); + D3DXVec3Normalize(&vec, &vec); + D3DXVec3Cross(&right, up, &vec); + D3DXVec3Cross(&upn, &vec, &right); + D3DXVec3Normalize(&right, &right); + D3DXVec3Normalize(&upn, &upn); + out->u.m[0][0] = -right.x; + out->u.m[1][0] = -right.y; + out->u.m[2][0] = -right.z; + out->u.m[3][0] = D3DXVec3Dot(&right, eye); + out->u.m[0][1] = upn.x; + out->u.m[1][1] = upn.y; + out->u.m[2][1] = upn.z; + out->u.m[3][1] = -D3DXVec3Dot(&upn, eye); + out->u.m[0][2] = -vec.x; + out->u.m[1][2] = -vec.y; + out->u.m[2][2] = -vec.z; + out->u.m[3][2] = D3DXVec3Dot(&vec, eye); + 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 D3DXMatrixMultiply(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2)

1 0