November 2017 - Wine-devel - list.winehq.org

[PATCH 1/3] mlang/tests: Add more code pages test data.
by Ziqing Hui 11 Nov '17

11 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/mlang.c | 2086 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2086 insertions(+)

1 0

Re: [PATCH 2/2] webservices/tests: Implement floating point handling for ARM
by Marvin 11 Nov '17

11 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34102 Your paranoid android. === w7u (32 bit writer) === writer.c:2329: Test failed: got 63027f writer.c:2332: Test failed: got 631f7f writer.c:2355: Test failed: got 631f7f === w7pro64 (32 bit writer) === writer.c:2329: Test failed: got 92027f writer.c:2332: Test failed: got 921f7f writer.c:2355: Test failed: got 921f7f === w8 (32 bit writer) === writer.c:2329: Test failed: got 28027f writer.c:2332: Test failed: got 281f7f writer.c:2355: Test failed: got 281f7f === w864 (32 bit writer) === writer.c:2329: Test failed: got 56027f writer.c:2332: Test failed: got 561f7f writer.c:2355: Test failed: got 561f7f === w1064 (32 bit writer) === writer.c:2329: Test failed: got 706d027f writer.c:2332: Test failed: got 706d1f7f writer.c:2355: Test failed: got 706d1f7f

1 0

[PATCH 2/2] webservices/tests: Implement floating point handling for ARM
by André Hentschel 11 Nov '17

11 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/webservices/tests/writer.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 79b60d1..be3da9c 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2203,28 +2203,35 @@ static void test_text_types(void) WsFreeWriter( writer ); } -static BOOL get_fpword( unsigned short *ret ) +static BOOL get_fpword( unsigned long *ret ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; + unsigned long fpword; __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); *ret = fpword; return TRUE; +#elif defined(__arm__) + unsigned long fpword; + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + *ret = fpword; + return TRUE; #endif return FALSE; } -static void set_fpword( unsigned short fpword ) +static void set_fpword( unsigned long fpword ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#elif defined(__arm__) + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); #endif } static void test_double(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; - unsigned short fpword; + unsigned long fpword; static const struct { double val; @@ -2318,10 +2325,17 @@ static void test_double(void) WsFreeWriter( writer ); return; } - ok( fpword == 0x27f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x27f, "got %04lx\n", fpword ); set_fpword( 0x1f7f ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); +#elif defined(__arm__) + ok( fpword == 0, "got %08lx\n", fpword ); + set_fpword( 0x00c00000 ); + get_fpword( &fpword ); + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); +#endif hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2337,8 +2351,13 @@ static void test_double(void) check_output( writer, "<t>100000000000000</t>", __LINE__ ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); set_fpword( 0x27f ); +#elif defined(__arm__) + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); + set_fpword( 0 ); +#endif WsFreeWriter( writer ); } -- 2.7.4

1 0

[PATCH 1/2] webservices: Implement floating point handling for ARM
by André Hentschel 11 Nov '17

11 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/webservices/reader.c | 22 ++++++++++++++++------ dlls/webservices/webservices_private.h | 4 ++-- dlls/webservices/writer.c | 4 ++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9d024a3..81f1bb6 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3596,26 +3596,36 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U return S_OK; } -BOOL set_fpword( unsigned short new, unsigned short *old ) +BOOL init_fpword( unsigned long *old ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; + unsigned long fpword; __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); *old = fpword; - fpword = new; + fpword = 0x37f; __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); return TRUE; +#elif defined(__arm__) + unsigned long fpword; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + *old = fpword; + fpword = 0; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + return TRUE; #else FIXME( "not implemented\n" ); return FALSE; #endif } -void restore_fpword( unsigned short fpword ) +void restore_fpword( unsigned long fpword ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#elif defined(__arm__) + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); #else FIXME( "not implemented\n" ); #endif @@ -3631,7 +3641,7 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) int sign = 1, exp_sign = 1, exp = 0, exp_tmp = 0, neg_exp, i, nb_digits, have_digits; unsigned __int64 val = 0, tmp; long double exp_val = 1.0, exp_mul = 10.0; - unsigned short fpword; + unsigned long fpword; while (len && read_isspace( *p )) { p++; len--; } while (len && read_isspace( p[len - 1] )) { len--; } @@ -3662,7 +3672,7 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) else if (*p == '+') { p++; len--; }; if (!len) return S_OK; - if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; + if (!init_fpword( &fpword )) return E_NOTIMPL; q = p; while (len && isdigit( *q )) { q++; len--; } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index f8cc6d9..cf7d480 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -60,8 +60,8 @@ void free_xml_string( WS_XML_STRING * ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; -BOOL set_fpword( unsigned short, unsigned short * ) DECLSPEC_HIDDEN; -void restore_fpword( unsigned short ) DECLSPEC_HIDDEN; +BOOL init_fpword( unsigned long * ) DECLSPEC_HIDDEN; +void restore_fpword( unsigned long ) DECLSPEC_HIDDEN; ULONG get_type_size( WS_TYPE, const void * ) DECLSPEC_HIDDEN; HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING *, WS_TYPE, const void *, WS_READ_OPTION, WS_HEAP *, void *, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f6917c6..f30d5d6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2159,10 +2159,10 @@ static HRESULT text_to_utf8text( const WS_XML_TEXT *text, const WS_XML_UTF8_TEXT { const WS_XML_DOUBLE_TEXT *double_text = (const WS_XML_DOUBLE_TEXT *)text; unsigned char buf[32]; /* "-1.1111111111111111E-308", oversized to address Valgrind limitations */ - unsigned short fpword; + unsigned long fpword; ULONG len; - if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; + if (!init_fpword( &fpword )) return E_NOTIMPL; len = format_double( &double_text->value, buf ); restore_fpword( fpword ); if (!len) return E_NOTIMPL; -- 2.7.4

1 0

[PATCH] winemine: Add confirmation to reset results button
by Vijay Kiran Kamuju 10 Nov '17

10 Nov '17

From: Andrey Semakin <and-semakin(a)ya.ru> Without translations. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/winemine/dialog.c | 8 ++++++++ programs/winemine/resource.h | 3 +++ programs/winemine/winemine.rc | 8 +++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c index 1f55f73e90..27558b1203 100644 --- a/programs/winemine/dialog.c +++ b/programs/winemine/dialog.c @@ -88,6 +88,8 @@ INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara { static BOARD *p_board; unsigned i; + int confirm_msgbox_result; + WCHAR confirm_title[256], confirm_text[256]; switch( uMsg ) { case WM_INITDIALOG: @@ -105,6 +107,12 @@ INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_COMMAND: switch( LOWORD( wParam ) ) { case IDC_RESET: + LoadStringW( NULL, IDC_CONFIRMTITLE, confirm_title, sizeof(confirm_title)/sizeof(WCHAR) ); + LoadStringW( NULL, IDC_CONFIRMTEXT, confirm_text, sizeof(confirm_text)/sizeof(WCHAR) ); + confirm_msgbox_result = MessageBoxW( NULL, confirm_text, confirm_title, MB_OKCANCEL | MB_DEFBUTTON2 | MB_ICONWARNING ); + if( confirm_msgbox_result != IDOK ) + break; + /* reset best names and times */ ResetResults( p_board ); diff --git a/programs/winemine/resource.h b/programs/winemine/resource.h index 22e4128fc8..7a576a6564 100644 --- a/programs/winemine/resource.h +++ b/programs/winemine/resource.h @@ -48,6 +48,9 @@ #define IDC_EDITMINES 1033 #define IDC_RESET 1041 +#define IDC_CONFIRMTITLE 1042 +#define IDC_CONFIRMTEXT 1043 + #define IDS_APPNAME 1101 #define IDS_NOBODY 1102 #define IDS_ABOUT 1103 diff --git a/programs/winemine/winemine.rc b/programs/winemine/winemine.rc index ddf43db11e..ce1dca740a 100644 --- a/programs/winemine/winemine.rc +++ b/programs/winemine/winemine.rc @@ -26,9 +26,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "WineMine" - IDS_NOBODY, "Nobody" - IDS_ABOUT, "Copyright 2000 Joshua Thielen" + IDS_APPNAME, "WineMine" + IDS_NOBODY, "Nobody" + IDS_ABOUT, "Copyright 2000 Joshua Thielen" + IDC_CONFIRMTITLE, "Reset Results" + IDC_CONFIRMTEXT, "All results will be lost. Are you sure?" } IDM_WINEMINE MENU -- 2.15.0

1 0

[PATCH] advapi32: Implement GetExplicitEntriesFromAclW.
by Vincent Povirk 10 Nov '17

10 Nov '17

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- This is from the wine-staging patchset advapi32-GetExplicitEntriesFromAclW. I haven't been able to figure out why it's marked as a "semi-stub" in staging. Every implemented ACE type is fully translated, and the default case has a FIXME. So I changed the main debug line to a TRACE. dlls/advapi32/security.c | 81 ++++++++++++++++++++++- dlls/advapi32/tests/security.c | 142 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c9d5cfaffad..d21946d4e5d 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4214,8 +4214,85 @@ DWORD WINAPI GetExplicitEntriesFromAclA( PACL pacl, PULONG pcCountOfExplicitEntr DWORD WINAPI GetExplicitEntriesFromAclW( PACL pacl, PULONG pcCountOfExplicitEntries, PEXPLICIT_ACCESSW* pListOfExplicitEntries) { - FIXME("%p %p %p\n",pacl, pcCountOfExplicitEntries, pListOfExplicitEntries); - return ERROR_CALL_NOT_IMPLEMENTED; + ACL_SIZE_INFORMATION sizeinfo; + EXPLICIT_ACCESSW* entries; + MAX_SID *sid_entries; + ACE_HEADER *ace; + NTSTATUS status; + int i; + + TRACE("%p %p %p\n",pacl, pcCountOfExplicitEntries, pListOfExplicitEntries); + + if (!pcCountOfExplicitEntries || !pListOfExplicitEntries) + return ERROR_INVALID_PARAMETER; + + status = RtlQueryInformationAcl(pacl, &sizeinfo, sizeof(sizeinfo), AclSizeInformation); + if (status) return RtlNtStatusToDosError(status); + + if (!sizeinfo.AceCount) + { + *pcCountOfExplicitEntries = 0; + *pListOfExplicitEntries = NULL; + return ERROR_SUCCESS; + } + + entries = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, (sizeof(EXPLICIT_ACCESSW) + sizeof(MAX_SID)) * sizeinfo.AceCount); + if (!entries) return ERROR_OUTOFMEMORY; + sid_entries = (MAX_SID*)((char*)entries + sizeof(EXPLICIT_ACCESSW) * sizeinfo.AceCount); + + for (i = 0; i < sizeinfo.AceCount; i++) + { + status = RtlGetAce(pacl, i, (void**)&ace); + if (status) goto error; + + switch (ace->AceType) + { + case ACCESS_ALLOWED_ACE_TYPE: + { + ACCESS_ALLOWED_ACE *allow = (ACCESS_ALLOWED_ACE *)ace; + entries[i].grfAccessMode = GRANT_ACCESS; + entries[i].grfInheritance = ace->AceFlags; + entries[i].grfAccessPermissions = allow->Mask; + + CopySid(sizeof(MAX_SID), (PSID)&sid_entries[i], (PSID)&allow->SidStart); + entries[i].Trustee.pMultipleTrustee = NULL; + entries[i].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + entries[i].Trustee.TrusteeForm = TRUSTEE_IS_SID; + entries[i].Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + entries[i].Trustee.ptstrName = (WCHAR *)&sid_entries[i]; + break; + } + + case ACCESS_DENIED_ACE_TYPE: + { + ACCESS_DENIED_ACE *deny = (ACCESS_DENIED_ACE *)ace; + entries[i].grfAccessMode = DENY_ACCESS; + entries[i].grfInheritance = ace->AceFlags; + entries[i].grfAccessPermissions = deny->Mask; + + CopySid(sizeof(MAX_SID), (PSID)&sid_entries[i], (PSID)&deny->SidStart); + entries[i].Trustee.pMultipleTrustee = NULL; + entries[i].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + entries[i].Trustee.TrusteeForm = TRUSTEE_IS_SID; + entries[i].Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + entries[i].Trustee.ptstrName = (WCHAR *)&sid_entries[i]; + break; + } + + default: + FIXME("Unhandled ace type %d\n", ace->AceType); + entries[i].grfAccessMode = NOT_USED_ACCESS; + continue; + } + } + + *pcCountOfExplicitEntries = sizeinfo.AceCount; + *pListOfExplicitEntries = entries; + return ERROR_SUCCESS; + +error: + LocalFree(entries); + return RtlNtStatusToDosError(status); } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 73fd7524776..08d3705771b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -133,6 +133,7 @@ static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID); +static DWORD (WINAPI *pGetExplicitEntriesFromAclW)(PACL,PULONG,PEXPLICIT_ACCESSW*); static HMODULE hmod; static int myARGC; @@ -227,6 +228,7 @@ static void init(void) pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx"); + pGetExplicitEntriesFromAclW = (void *)GetProcAddress(hmod, "GetExplicitEntriesFromAclW"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -7098,6 +7100,145 @@ static void test_child_token_sd(void) HeapFree(GetProcessHeap(), 0, sd); } +static void test_GetExplicitEntriesFromAclW(void) +{ + static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'}; + SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; + PSID everyone_sid = NULL, users_sid = NULL; + EXPLICIT_ACCESSW access; + EXPLICIT_ACCESSW *access2; + PACL new_acl, old_acl = NULL; + ULONG count; + DWORD res; + + if (!pGetExplicitEntriesFromAclW) + { + win_skip("GetExplicitEntriesFromAclW is not available\n"); + return; + } + + if (!pSetEntriesInAclW) + { + win_skip("SetEntriesInAclW is not available\n"); + return; + } + + old_acl = HeapAlloc(GetProcessHeap(), 0, 256); + res = InitializeAcl(old_acl, 256, ACL_REVISION); + if(!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("ACLs not implemented - skipping tests\n"); + HeapFree(GetProcessHeap(), 0, old_acl); + return; + } + ok(res, "InitializeAcl failed with error %d\n", GetLastError()); + + res = AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &everyone_sid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + res = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &users_sid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + res = AddAccessAllowedAce(old_acl, ACL_REVISION, KEY_READ, users_sid); + ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError()); + + access2 = NULL; + res = pGetExplicitEntriesFromAclW(old_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 1, "Expected count == 1, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_READ, "Expected KEY_READ, got %d\n", access2[0].grfAccessPermissions); + ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm); + ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance); + ok(EqualSid(access2[0].Trustee.ptstrName, users_sid), "Expected equal SIDs\n"); + LocalFree(access2); + + access.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + access.Trustee.pMultipleTrustee = NULL; + + access.grfAccessPermissions = KEY_WRITE; + access.grfAccessMode = GRANT_ACCESS; + access.grfInheritance = NO_INHERITANCE; + access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + access.Trustee.TrusteeForm = TRUSTEE_IS_SID; + access.Trustee.ptstrName = everyone_sid; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions); + ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN, + "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType); + ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm); + ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance); + ok(EqualSid(access2[0].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n"); + LocalFree(access2); + LocalFree(new_acl); + + access.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions); + ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN, + "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType); + ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm); + ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance); + ok(EqualSid(access2[0].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n"); + LocalFree(access2); + LocalFree(new_acl); + + access.Trustee.TrusteeForm = TRUSTEE_IS_NAME; + access.Trustee.ptstrName = (LPWSTR)wszCurrentUser; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions); + ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN, + "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType); + ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm); + ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance); + LocalFree(access2); + LocalFree(new_acl); + + access.grfAccessMode = REVOKE_ACCESS; + access.Trustee.TrusteeForm = TRUSTEE_IS_SID; + access.Trustee.ptstrName = users_sid; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + + access2 = (void *)0xdeadbeef; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 0, "Expected count == 0, got %d\n", count); + ok(access2 == NULL, "access2 was not NULL\n"); + LocalFree(new_acl); + + FreeSid(users_sid); + FreeSid(everyone_sid); + HeapFree(GetProcessHeap(), 0, old_acl); +} + START_TEST(security) { init(); @@ -7151,6 +7292,7 @@ START_TEST(security) test_pseudo_tokens(); test_maximum_allowed(); test_token_label(); + test_GetExplicitEntriesFromAclW(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.11.0

1 0

[PATCH] d3dx9/tests: Use a helper function to set matrix values in math tests
by Alex Henrie 10 Nov '17

10 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This gets the line lengths down to something reasonable as requested. I also made the whitespace more consistent. --- dlls/d3dx9_36/tests/math.c | 361 +++++++++++++++++++++++++-------------------- 1 file changed, 204 insertions(+), 157 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index ec07348685..0fb19c7561 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -195,6 +195,18 @@ static void expect_vec4_array_(unsigned int line, unsigned int count, const D3DX } } +static void set_matrix(D3DXMATRIX* mat, + float x0, float x1, float x2, float x3, + float y0, float y1, float y2, float y3, + float z0, float z1, float z2, float z3, + float w0, float w1, float w2, float w3) +{ + U(mat)->m[0][0] = x0; U(mat)->m[0][1] = x1; U(mat)->m[0][2] = x2; U(mat)->m[0][3] = x3; + U(mat)->m[1][0] = y0; U(mat)->m[1][1] = y1; U(mat)->m[1][2] = y2; U(mat)->m[1][3] = y3; + U(mat)->m[2][0] = z0; U(mat)->m[2][1] = z1; U(mat)->m[2][2] = z2; U(mat)->m[2][3] = z3; + U(mat)->m[3][0] = w0; U(mat)->m[3][1] = w1; U(mat)->m[3][2] = w2; U(mat)->m[3][3] = w3; +} + static void D3DXColorTest(void) { D3DXCOLOR color, color1, color2, expected, got; @@ -346,10 +358,11 @@ static void D3DXMatrixTest(void) angle = D3DX_PI/3.0f; /*____________D3DXMatrixAffineTransformation______*/ - U(expectedmat).m[0][0] = -459.239990f; U(expectedmat).m[0][1] = -576.719971f; U(expectedmat).m[0][2] = -263.440002f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = -1239.0f; U(expectedmat).m[3][1] = 667.0f; U(expectedmat).m[3][2] = 567.0f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + -459.239990f, -576.719971f, -263.440002f, 0.0f, + 519.760010f, -352.440002f, -277.679993f, 0.0f, + 363.119995f, -121.040001f, -117.479996f, 0.0f, + -1239.0f, 667.0f, 567.0f, 1.0f); D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, &q, &axis); expect_matrix(&expectedmat, &gotmat, 0); @@ -366,10 +379,11 @@ static void D3DXMatrixTest(void) D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, &q, NULL); expect_matrix(&expectedmat, &gotmat, 0); - U(expectedmat).m[0][0] = 3.56f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 3.56f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 3.56f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 3.56f, 0.0f, 0.0f, 0.0f, + 0.0f, 3.56f, 0.0f, 0.0f, + 0.0f, 0.0f, 3.56f, 0.0f, + 1.0f, -3.0f, 7.0f, 1.0f); D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, NULL, &axis); expect_matrix(&expectedmat, &gotmat, 0); @@ -389,11 +403,12 @@ static void D3DXMatrixTest(void) ok(equal, "Got unexpected determinant %.8e.\n", determinant); /*____________D3DXMatrixInverse______________*/ - U(expectedmat).m[0][0] = 16067.0f/73944.0f; U(expectedmat).m[0][1] = -10165.0f/147888.0f; U(expectedmat).m[0][2] = -2729.0f/147888.0f; U(expectedmat).m[0][3] = -1631.0f/49296.0f; - U(expectedmat).m[1][0] = -565.0f/36972.0f; U(expectedmat).m[1][1] = 2723.0f/73944.0f; U(expectedmat).m[1][2] = -1073.0f/73944.0f; U(expectedmat).m[1][3] = 289.0f/24648.0f; - U(expectedmat).m[2][0] = -389.0f/2054.0f; U(expectedmat).m[2][1] = 337.0f/4108.0f; U(expectedmat).m[2][2] = 181.0f/4108.0f; U(expectedmat).m[2][3] = 317.0f/4108.0f; - U(expectedmat).m[3][0] = 163.0f/5688.0f; U(expectedmat).m[3][1] = -101.0f/11376.0f; U(expectedmat).m[3][2] = -73.0f/11376.0f; U(expectedmat).m[3][3] = -127.0f/3792.0f; - D3DXMatrixInverse(&gotmat,&determinant,&mat); + set_matrix(&expectedmat, + 16067.0f/73944.0f, -10165.0f/147888.0f, -2729.0f/147888.0f, -1631.0f/49296.0f, + -565.0f/36972.0f, 2723.0f/73944.0f, -1073.0f/73944.0f, 289.0f/24648.0f, + -389.0f/2054.0f, 337.0f/4108.0f, 181.0f/4108.0f, 317.0f/4108.0f, + 163.0f/5688.0f, -101.0f/11376.0f, -73.0f/11376.0f, -127.0f/3792.0f); + D3DXMatrixInverse(&gotmat, &determinant, &mat); expect_matrix(&expectedmat, &gotmat, 1); equal = compare_float(determinant, -147888.0f, 0); ok(equal, "Got unexpected determinant %.8e.\n", determinant); @@ -419,211 +434,237 @@ static void D3DXMatrixTest(void) ok(expected == got, "Expected : %d, Got : %d\n", expected, got); /*____________D3DXMatrixLookAtLH_______________*/ - U(expectedmat).m[0][0] = -0.82246518f; U(expectedmat).m[0][1] = -0.40948939f; U(expectedmat).m[0][2] = -0.39480308f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = -0.55585691f; U(expectedmat).m[1][1] = 0.43128574f; U(expectedmat).m[1][2] = 0.71064550f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = -0.12072885f; U(expectedmat).m[2][1] = 0.80393475f; U(expectedmat).m[2][2] = -0.58233452f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 4.4946337f; U(expectedmat).m[3][1] = 0.80971903f; U(expectedmat).m[3][2] = 10.060076f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixLookAtLH(&gotmat,&eye,&at,&axis); + set_matrix(&expectedmat, + -0.82246518f, -0.40948939f, -0.39480308f, 0.0f, + -0.55585691f, 0.43128574f, 0.71064550f, 0.0f, + -0.12072885f, 0.80393475f, -0.58233452f, 0.0f, + 4.4946337f, 0.80971903f, 10.060076f, 1.0f); + D3DXMatrixLookAtLH(&gotmat, &eye, &at, &axis); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixLookAtRH_______________*/ - U(expectedmat).m[0][0] = 0.82246518f; U(expectedmat).m[0][1] = -0.40948939f; U(expectedmat).m[0][2] = 0.39480308f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.55585691f; U(expectedmat).m[1][1] = 0.43128574f; U(expectedmat).m[1][2] = -0.71064550f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.12072885f; U(expectedmat).m[2][1] = 0.80393475f; U(expectedmat).m[2][2] = 0.58233452f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = -4.4946337f; U(expectedmat).m[3][1] = 0.80971903f; U(expectedmat).m[3][2] = -10.060076f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixLookAtRH(&gotmat,&eye,&at,&axis); + set_matrix(&expectedmat, + 0.82246518f, -0.40948939f, 0.39480308f, 0.0f, + 0.55585691f, 0.43128574f, -0.71064550f, 0.0f, + 0.12072885f, 0.80393475f, 0.58233452f, 0.0f, + -4.4946337f, 0.80971903f, -10.060076f, 1.0f); + D3DXMatrixLookAtRH(&gotmat, &eye, &at, &axis); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixMultiply______________*/ - U(expectedmat).m[0][0] = 73.0f; U(expectedmat).m[0][1] = 193.0f; U(expectedmat).m[0][2] = -197.0f; U(expectedmat).m[0][3] = -77.0f; - U(expectedmat).m[1][0] = 231.0f; U(expectedmat).m[1][1] = 551.0f; U(expectedmat).m[1][2] = -489.0f; U(expectedmat).m[1][3] = -169.0; - U(expectedmat).m[2][0] = 239.0f; U(expectedmat).m[2][1] = 523.0f; U(expectedmat).m[2][2] = -400.0f; U(expectedmat).m[2][3] = -116.0f; - U(expectedmat).m[3][0] = -164.0f; U(expectedmat).m[3][1] = -320.0f; U(expectedmat).m[3][2] = 187.0f; U(expectedmat).m[3][3] = 31.0f; - D3DXMatrixMultiply(&gotmat,&mat,&mat2); + set_matrix(&expectedmat, + 73.0f, 193.0f, -197.0f, -77.0f, + 231.0f, 551.0f, -489.0f, -169.0f, + 239.0f, 523.0f, -400.0f, -116.0f, + -164.0f, -320.0f, 187.0f, 31.0f); + D3DXMatrixMultiply(&gotmat, &mat, &mat2); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixMultiplyTranspose____*/ - U(expectedmat).m[0][0] = 73.0f; U(expectedmat).m[0][1] = 231.0f; U(expectedmat).m[0][2] = 239.0f; U(expectedmat).m[0][3] = -164.0f; - U(expectedmat).m[1][0] = 193.0f; U(expectedmat).m[1][1] = 551.0f; U(expectedmat).m[1][2] = 523.0f; U(expectedmat).m[1][3] = -320.0; - U(expectedmat).m[2][0] = -197.0f; U(expectedmat).m[2][1] = -489.0f; U(expectedmat).m[2][2] = -400.0f; U(expectedmat).m[2][3] = 187.0f; - U(expectedmat).m[3][0] = -77.0f; U(expectedmat).m[3][1] = -169.0f; U(expectedmat).m[3][2] = -116.0f; U(expectedmat).m[3][3] = 31.0f; - D3DXMatrixMultiplyTranspose(&gotmat,&mat,&mat2); + set_matrix(&expectedmat, + 73.0f, 231.0f, 239.0f, -164.0f, + 193.0f, 551.0f, 523.0f, -320.0f, + -197.0f, -489.0f, -400.0f, 187.0f, + -77.0f, -169.0f, -116.0f, 31.0f); + D3DXMatrixMultiplyTranspose(&gotmat, &mat, &mat2); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixOrthoLH_______________*/ - U(expectedmat).m[0][0] = 0.8f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.27027027f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.15151515f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -0.48484848f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 0.8f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.27027027f, 0.0f, 0.0f, + 0.0f, 0.0f, -0.15151515f, 0.0f, + 0.0f, 0.0f, -0.48484848f, 1.0f); D3DXMatrixOrthoLH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f); expect_matrix(&expectedmat, &gotmat, 16); /*____________D3DXMatrixOrthoOffCenterLH_______________*/ - U(expectedmat).m[0][0] = 3.6363636f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.18018018f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.045662100f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = -1.7272727f; U(expectedmat).m[3][1] = -0.56756757f; U(expectedmat).m[3][2] = 0.42465753f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 3.6363636f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.18018018f, 0.0f, 0.0f, + 0.0f, 0.0f, -0.045662100f, 0.0f, + -1.7272727f, -0.56756757f, 0.42465753f, 1.0f); D3DXMatrixOrthoOffCenterLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 9.3, -12.6); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixOrthoOffCenterRH_______________*/ - U(expectedmat).m[0][0] = 3.6363636f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.18018018f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.045662100f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = -1.7272727f; U(expectedmat).m[3][1] = -0.56756757f; U(expectedmat).m[3][2] = 0.42465753f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 3.6363636f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.18018018f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.045662100f, 0.0f, + -1.7272727f, -0.56756757f, 0.42465753f, 1.0f); D3DXMatrixOrthoOffCenterRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 9.3, -12.6); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixOrthoRH_______________*/ - U(expectedmat).m[0][0] = 0.8f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.27027027f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.15151515f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -0.48484848f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 0.8f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.27027027f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.15151515f, 0.0f, + 0.0f, 0.0f, -0.48484848f, 1.0f); D3DXMatrixOrthoRH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f); expect_matrix(&expectedmat, &gotmat, 16); /*____________D3DXMatrixPerspectiveFovLH_______________*/ - U(expectedmat).m[0][0] = 13.288858f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 9.9666444f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.78378378f; U(expectedmat).m[2][3] = 1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.8810811f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + 13.288858f, 0.0f, 0.0f, 0.0f, + 0.0f, 9.9666444f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.78378378f, 1.0f, + 0.0f, 0.0f, 1.8810811f, 0.0f); D3DXMatrixPerspectiveFovLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); expect_matrix(&expectedmat, &gotmat, 4); /*____________D3DXMatrixPerspectiveFovRH_______________*/ - U(expectedmat).m[0][0] = 13.288858f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 9.9666444f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.78378378f; U(expectedmat).m[2][3] = -1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.8810811f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + 13.288858f, 0.0f, 0.0f, 0.0f, + 0.0f, 9.9666444f, 0.0f, 0.0f, + 0.0f, 0.0f, -0.78378378f, -1.0f, + 0.0f, 0.0f, 1.8810811f, 0.0f); D3DXMatrixPerspectiveFovRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); expect_matrix(&expectedmat, &gotmat, 4); /*____________D3DXMatrixPerspectiveLH_______________*/ - U(expectedmat).m[0][0] = -24.0f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = -6.4f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.78378378f; U(expectedmat).m[2][3] = 1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.8810811f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + -24.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -6.4f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.78378378f, 1.0f, + 0.0f, 0.0f, 1.8810811f, 0.0f); D3DXMatrixPerspectiveLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); expect_matrix(&expectedmat, &gotmat, 4); /*____________D3DXMatrixPerspectiveOffCenterLH_______________*/ - U(expectedmat).m[0][0] = 11.636364f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.57657658f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = -1.7272727f; U(expectedmat).m[2][1] = -0.56756757f; U(expectedmat).m[2][2] = 0.84079602f; U(expectedmat).m[2][3] = 1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -2.6905473f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + 11.636364f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.57657658f, 0.0f, 0.0f, + -1.7272727f, -0.56756757f, 0.84079602f, 1.0f, + 0.0f, 0.0f, -2.6905473f, 0.0f); D3DXMatrixPerspectiveOffCenterLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 3.2f, -16.9f); expect_matrix(&expectedmat, &gotmat, 8); /*____________D3DXMatrixPerspectiveOffCenterRH_______________*/ - U(expectedmat).m[0][0] = 11.636364f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.57657658f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 1.7272727f; U(expectedmat).m[2][1] = 0.56756757f; U(expectedmat).m[2][2] = -0.84079602f; U(expectedmat).m[2][3] = -1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -2.6905473f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + 11.636364f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.57657658f, 0.0f, 0.0f, + 1.7272727f, 0.56756757f, -0.84079602f, -1.0f, + 0.0f, 0.0f, -2.6905473f, 0.0f); D3DXMatrixPerspectiveOffCenterRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 3.2f, -16.9f); expect_matrix(&expectedmat, &gotmat, 8); /*____________D3DXMatrixPerspectiveRH_______________*/ - U(expectedmat).m[0][0] = -24.0f; U(expectedmat).m[0][1] = -0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = -6.4f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.78378378f; U(expectedmat).m[2][3] = -1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.8810811f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + -24.0f, -0.0f, 0.0f, 0.0f, + 0.0f, -6.4f, 0.0f, 0.0f, + 0.0f, 0.0f, -0.78378378f, -1.0f, + 0.0f, 0.0f, 1.8810811f, 0.0f); D3DXMatrixPerspectiveRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); expect_matrix(&expectedmat, &gotmat, 4); /*____________D3DXMatrixReflect______________*/ - U(expectedmat).m[0][0] = 0.30769235f; U(expectedmat).m[0][1] = -0.23076922f; U(expectedmat).m[0][2] = 0.92307687f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = -0.23076922; U(expectedmat).m[1][1] = 0.92307693f; U(expectedmat).m[1][2] = 0.30769232f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.92307687f; U(expectedmat).m[2][1] = 0.30769232f; U(expectedmat).m[2][2] = -0.23076922f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 1.6153846f; U(expectedmat).m[3][1] = 0.53846157f; U(expectedmat).m[3][2] = -2.1538463f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixReflect(&gotmat,&plane); + set_matrix(&expectedmat, + 0.30769235f, -0.23076922f, 0.92307687f, 0.0f, + -0.23076922, 0.92307693f, 0.30769232f, 0.0f, + 0.92307687f, 0.30769232f, -0.23076922f, 0.0f, + 1.6153846f, 0.53846157f, -2.1538463f, 1.0f); + D3DXMatrixReflect(&gotmat, &plane); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixRotationAxis_____*/ - U(expectedmat).m[0][0] = 0.50847453f; U(expectedmat).m[0][1] = 0.76380461f; U(expectedmat).m[0][2] = 0.39756277f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = -0.81465209f; U(expectedmat).m[1][1] = 0.57627118f; U(expectedmat).m[1][2] = -0.065219201f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = -0.27891868f; U(expectedmat).m[2][1] = -0.29071301f; U(expectedmat).m[2][2] = 0.91525424f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationAxis(&gotmat,&axis,angle); + set_matrix(&expectedmat, + 0.50847453f, 0.76380461f, 0.39756277f, 0.0f, + -0.81465209f, 0.57627118f, -0.065219201f, 0.0f, + -0.27891868f, -0.29071301f, 0.91525424f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationAxis(&gotmat, &axis, angle); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixRotationQuaternion______________*/ - U(expectedmat).m[0][0] = -129.0f; U(expectedmat).m[0][1] = -162.0f; U(expectedmat).m[0][2] = -74.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 146.0f; U(expectedmat).m[1][1] = -99.0f; U(expectedmat).m[1][2] = -78.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 102.0f; U(expectedmat).m[2][1] = -34.0f; U(expectedmat).m[2][2] = -33.0f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationQuaternion(&gotmat,&q); + set_matrix(&expectedmat, + -129.0f, -162.0f, -74.0f, 0.0f, + 146.0f, -99.0f, -78.0f, 0.0f, + 102.0f, -34.0f, -33.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationQuaternion(&gotmat, &q); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixRotationX______________*/ - U(expectedmat).m[0][0] = 1.0f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.5f; U(expectedmat).m[1][2] = sqrt(3.0f)/2.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = -sqrt(3.0f)/2.0f; U(expectedmat).m[2][2] = 0.5f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationX(&gotmat,angle); + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.5f, sqrt(3.0f)/2.0f, 0.0f, + 0.0f, -sqrt(3.0f)/2.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationX(&gotmat, angle); expect_matrix(&expectedmat, &gotmat, 1); /*____________D3DXMatrixRotationY______________*/ - U(expectedmat).m[0][0] = 0.5f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = -sqrt(3.0f)/2.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 1.0f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = sqrt(3.0f)/2.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.5f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationY(&gotmat,angle); + set_matrix(&expectedmat, + 0.5f, 0.0f, -sqrt(3.0f)/2.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + sqrt(3.0f)/2.0f, 0.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationY(&gotmat, angle); expect_matrix(&expectedmat, &gotmat, 1); /*____________D3DXMatrixRotationYawPitchRoll____*/ - U(expectedmat).m[0][0] = 0.88877726f; U(expectedmat).m[0][1] = 0.091874748f; U(expectedmat).m[0][2] = -0.44903678f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.35171318f; U(expectedmat).m[1][1] = 0.49148652f; U(expectedmat).m[1][2] = 0.79670501f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.29389259f; U(expectedmat).m[2][1] = -0.86602545f; U(expectedmat).m[2][2] = 0.40450847f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 0.88877726f, 0.091874748f, -0.44903678f, 0.0f, + 0.35171318f, 0.49148652f, 0.79670501f, 0.0f, + 0.29389259f, -0.86602545f, 0.40450847f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); D3DXMatrixRotationYawPitchRoll(&gotmat, 3.0f*angle/5.0f, angle, 3.0f*angle/17.0f); expect_matrix(&expectedmat, &gotmat, 64); /*____________D3DXMatrixRotationZ______________*/ - U(expectedmat).m[0][0] = 0.5f; U(expectedmat).m[0][1] = sqrt(3.0f)/2.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = -sqrt(3.0f)/2.0f; U(expectedmat).m[1][1] = 0.5f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 1.0f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationZ(&gotmat,angle); + set_matrix(&expectedmat, + 0.5f, sqrt(3.0f)/2.0f, 0.0f, 0.0f, + -sqrt(3.0f)/2.0f, 0.5f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationZ(&gotmat, angle); expect_matrix(&expectedmat, &gotmat, 1); /*____________D3DXMatrixScaling______________*/ - U(expectedmat).m[0][0] = 0.69f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.53f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 4.11f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixScaling(&gotmat,0.69f,0.53f,4.11f); + set_matrix(&expectedmat, + 0.69f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.53f, 0.0f, 0.0f, + 0.0f, 0.0f, 4.11f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixScaling(&gotmat, 0.69f, 0.53f, 4.11f); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixShadow______________*/ - U(expectedmat).m[0][0] = 12.786773f; U(expectedmat).m[0][1] = 5.0009613f; U(expectedmat).m[0][2] = 4.3537784f; U(expectedmat).m[0][3] = 3.7065949f; - U(expectedmat).m[1][0] = 1.8827150f; U(expectedmat).m[1][1] = 8.8056154f; U(expectedmat).m[1][2] = 1.4512594f; U(expectedmat).m[1][3] = 1.2355317f; - U(expectedmat).m[2][0] = -7.5308599f; U(expectedmat).m[2][1] = -6.6679487f; U(expectedmat).m[2][2] = 1.3335901f; U(expectedmat).m[2][3] = -4.9421268f; - U(expectedmat).m[3][0] = -13.179006f; U(expectedmat).m[3][1] = -11.668910f; U(expectedmat).m[3][2] = -10.158816f; U(expectedmat).m[3][3] = -1.5100943f; - D3DXMatrixShadow(&gotmat,&light,&plane); + set_matrix(&expectedmat, + 12.786773f, 5.0009613f, 4.3537784f, 3.7065949f, + 1.8827150f, 8.8056154f, 1.4512594f, 1.2355317f, + -7.5308599f, -6.6679487f, 1.3335901f, -4.9421268f, + -13.179006f, -11.668910f, -10.158816f, -1.5100943f); + D3DXMatrixShadow(&gotmat, &light, &plane); expect_matrix(&expectedmat, &gotmat, 8); /*____________D3DXMatrixTransformation______________*/ - U(expectedmat).m[0][0] = -0.21480007f; U(expectedmat).m[0][1] = 1.3116000f; U(expectedmat).m[0][2] = 0.47520003f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.95040143f; U(expectedmat).m[1][1] = -0.88360137f; U(expectedmat).m[1][2] = 0.92439979f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 1.0212044f; U(expectedmat).m[2][1] = 0.19359307f; U(expectedmat).m[2][2] = -1.3588026f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 18.298532f; U(expectedmat).m[3][1] = -29.624001f; U(expectedmat).m[3][2] = 15.683499f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixTransformation(&gotmat,&at,&q,NULL,&eye,&r,&last); + set_matrix(&expectedmat, + -0.21480007f, 1.3116000f, 0.47520003f, 0.0f, + 0.95040143f, -0.88360137f, 0.92439979f, 0.0f, + 1.0212044f, 0.19359307f, -1.3588026f, 0.0f, + 18.298532f, -29.624001f, 15.683499f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, NULL, &eye, &r, &last); expect_matrix(&expectedmat, &gotmat, 512); /*____________D3DXMatrixTranslation______________*/ - U(expectedmat).m[0][0] = 1.0f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 1.0f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 1.0f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.69f; U(expectedmat).m[3][1] = 0.53f; U(expectedmat).m[3][2] = 4.11f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixTranslation(&gotmat,0.69f,0.53f,4.11f); + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.69f, 0.53f, 4.11f, 1.0f); + D3DXMatrixTranslation(&gotmat, 0.69f, 0.53f, 4.11f); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixTranspose______________*/ - U(expectedmat).m[0][0] = 10.0f; U(expectedmat).m[0][1] = 11.0f; U(expectedmat).m[0][2] = 19.0f; U(expectedmat).m[0][3] = 2.0f; - U(expectedmat).m[1][0] = 5.0f; U(expectedmat).m[1][1] = 20.0f; U(expectedmat).m[1][2] = -21.0f; U(expectedmat).m[1][3] = 3.0f; - U(expectedmat).m[2][0] = 7.0f; U(expectedmat).m[2][1] = 16.0f; U(expectedmat).m[2][2] = 30.f; U(expectedmat).m[2][3] = -4.0f; - U(expectedmat).m[3][0] = 8.0f; U(expectedmat).m[3][1] = 33.0f; U(expectedmat).m[3][2] = 43.0f; U(expectedmat).m[3][3] = -40.0f; - D3DXMatrixTranspose(&gotmat,&mat); + set_matrix(&expectedmat, + 10.0f, 11.0f, 19.0f, 2.0f, + 5.0f, 20.0f, -21.0f, 3.0f, + 7.0f, 16.0f, 30.f, -4.0f, + 8.0f, 33.0f, 43.0f, -40.0f); + D3DXMatrixTranspose(&gotmat, &mat); expect_matrix(&expectedmat, &gotmat, 0); } @@ -1134,10 +1175,11 @@ static void D3DXVector2Test(void) w.x = 4.0f; w.y = -3.0f; x.x = 2.0f; x.y = -11.0f; - U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; - U(mat).m[1][0] = 5.0f; U(mat).m[1][1] = 6.0f; U(mat).m[1][2] = 7.0f; U(mat).m[1][3] = 8.0f; - U(mat).m[2][0] = 9.0f; U(mat).m[2][1] = 10.0f; U(mat).m[2][2] = 11.0f; U(mat).m[2][3] = 12.0f; - U(mat).m[3][0] = 13.0f; U(mat).m[3][1] = 14.0f; U(mat).m[3][2] = 15.0f; U(mat).m[3][3] = 16.0f; + set_matrix(&mat, + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f); coeff1 = 2.0f; coeff2 = 5.0f; scale = -6.5f; @@ -1309,10 +1351,11 @@ static void D3DXVector3Test(void) viewport.Width = 800; viewport.MinZ = 0.2f; viewport.X = 10; viewport.Height = 680; viewport.MaxZ = 0.9f; viewport.Y = 5; - U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; - U(mat).m[1][0] = 5.0f; U(mat).m[1][1] = 6.0f; U(mat).m[1][2] = 7.0f; U(mat).m[1][3] = 8.0f; - U(mat).m[2][0] = 9.0f; U(mat).m[2][1] = 10.0f; U(mat).m[2][2] = 11.0f; U(mat).m[2][3] = 12.0f; - U(mat).m[3][0] = 13.0f; U(mat).m[3][1] = 14.0f; U(mat).m[3][2] = 15.0f; U(mat).m[3][3] = 16.0f; + set_matrix(&mat, + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f); U(view).m[0][1] = 5.0f; U(view).m[0][2] = 7.0f; U(view).m[0][3] = 8.0f; U(view).m[1][0] = 11.0f; U(view).m[1][2] = 16.0f; U(view).m[1][3] = 33.0f; @@ -1321,10 +1364,11 @@ static void D3DXVector3Test(void) U(view).m[0][0] = 10.0f; U(view).m[1][1] = 20.0f; U(view).m[2][2] = 30.0f; U(view).m[3][3] = -40.0f; - U(world).m[0][0] = 21.0f; U(world).m[0][1] = 2.0f; U(world).m[0][2] = 3.0f; U(world).m[0][3] = 4.0; - U(world).m[1][0] = 5.0f; U(world).m[1][1] = 23.0f; U(world).m[1][2] = 7.0f; U(world).m[1][3] = 8.0f; - U(world).m[2][0] = -8.0f; U(world).m[2][1] = -7.0f; U(world).m[2][2] = 25.0f; U(world).m[2][3] = -5.0f; - U(world).m[3][0] = -4.0f; U(world).m[3][1] = -3.0f; U(world).m[3][2] = -2.0f; U(world).m[3][3] = 27.0f; + set_matrix(&world, + 21.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 23.0f, 7.0f, 8.0f, + -8.0f, -7.0f, 25.0f, -5.0f, + -4.0f, -3.0f, -2.0f, 27.0f); coeff1 = 2.0f; coeff2 = 5.0f; scale = -6.5f; @@ -1542,10 +1586,11 @@ static void D3DXVector4Test(void) w.x = 4.0f; w.y =6.0f; w.z = -2.0f; w.w = 1.0f; x.x = 6.0f; x.y = -7.0f; x.z =8.0f; x.w = -9.0f; - U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; - U(mat).m[1][0] = 5.0f; U(mat).m[1][1] = 6.0f; U(mat).m[1][2] = 7.0f; U(mat).m[1][3] = 8.0f; - U(mat).m[2][0] = 9.0f; U(mat).m[2][1] = 10.0f; U(mat).m[2][2] = 11.0f; U(mat).m[2][3] = 12.0f; - U(mat).m[3][0] = 13.0f; U(mat).m[3][1] = 14.0f; U(mat).m[3][2] = 15.0f; U(mat).m[3][3] = 16.0f; + set_matrix(&mat, + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f); coeff1 = 2.0f; coeff2 = 5.0; scale = -6.5f; @@ -2319,12 +2364,13 @@ static void test_D3DXVec_Array(void) inp_plane[i].b = inp_plane[i].d = inp_vec[i].y = inp_vec[i].w = ARRAY_SIZE(inp_vec) - i; } - U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; - U(mat).m[1][0] = 5.0f; U(mat).m[1][1] = 6.0f; U(mat).m[1][2] = 7.0f; U(mat).m[1][3] = 8.0f; - U(mat).m[2][0] = 9.0f; U(mat).m[2][1] = 10.0f; U(mat).m[2][2] = 11.0f; U(mat).m[2][3] = 12.0f; - U(mat).m[3][0] = 13.0f; U(mat).m[3][1] = 14.0f; U(mat).m[3][2] = 15.0f; U(mat).m[3][3] = 16.0f; + set_matrix(&mat, + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f); - D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f); + D3DXMatrixPerspectiveFovLH(&projection, D3DX_PI/4.0f, 20.0f/17.0f, 1.0f, 1000.0f); U(view).m[0][1] = 5.0f; U(view).m[0][2] = 7.0f; U(view).m[0][3] = 8.0f; U(view).m[1][0] = 11.0f; U(view).m[1][2] = 16.0f; U(view).m[1][3] = 33.0f; @@ -2333,10 +2379,11 @@ static void test_D3DXVec_Array(void) U(view).m[0][0] = 10.0f; U(view).m[1][1] = 20.0f; U(view).m[2][2] = 30.0f; U(view).m[3][3] = -40.0f; - U(world).m[0][0] = 21.0f; U(world).m[0][1] = 2.0f; U(world).m[0][2] = 3.0f; U(world).m[0][3] = 4.0; - U(world).m[1][0] = 5.0f; U(world).m[1][1] = 23.0f; U(world).m[1][2] = 7.0f; U(world).m[1][3] = 8.0f; - U(world).m[2][0] = -8.0f; U(world).m[2][1] = -7.0f; U(world).m[2][2] = 25.0f; U(world).m[2][3] = -5.0f; - U(world).m[3][0] = -4.0f; U(world).m[3][1] = -3.0f; U(world).m[3][2] = -2.0f; U(world).m[3][3] = 27.0f; + set_matrix(&world, + 21.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 23.0f, 7.0f, 8.0f, + -8.0f, -7.0f, 25.0f, -5.0f, + -4.0f, -3.0f, -2.0f, 27.0f); /* D3DXVec2TransformCoordArray */ exp_vec[1].x = 6.78571403e-01f; exp_vec[1].y = 7.85714269e-01f; -- 2.15.0

2 1

Re: [PATCH] d3dx11: Change D3DX11CompileFromMemory spec entry.
by Matteo Bruni 10 Nov '17

10 Nov '17

Same here. Regardless: Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

1 0

Re: [PATCH] d3dx10: Change D3DX10CompileFromMemory and D3DX10PreprocessShaderFromMemory spec entries.
by Matteo Bruni 10 Nov '17

10 Nov '17

I'd use "Fix" rather than the generic "Change" in the patch subject. Either way: Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

1 0

Re: [PATCH] d3dx9: Zero constantinfo_reserved on error in get_constants_desc().
by Matteo Bruni 10 Nov '17

10 Nov '17

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

1 0