- wine-devel - winehq.org

[PATCH 2/2] webservices/tests: Implement floating point handling for ARM (try 3)
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..36cd967 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 = LOWORD(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 2/2] webservices/tests: Implement floating point handling for ARM (try 2)
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..9254be9 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 & 0xffff; + 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 2/3] mlang: Fix font name of code page families.
by Ziqing Hui 11 Nov '17

11 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 24 ++++++++--------- dlls/mlang/tests/mlang.c | 69 ++++++++++++------------------------------------ 2 files changed, 29 insertions(+), 64 deletions(-)

1 1

[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

[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

[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

Re: [PATCH] d3dx9/tests: Relax D3DXQuaternionToAxisAngle test stringency a bit
by Matteo Bruni 10 Nov '17

10 Nov '17

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

1 0

Switch to wine-devel for patch submissions
by Alexandre Julliard 10 Nov '17

10 Nov '17

Folks, The wine-devel list can now be used for submitting patches. Please start using it instead of wine-patches for all patch submissions and signoff replies. For the time being, both lists feed into the patch tracker. Once we have confirmed that everything works, wine-patches will be retired. The tracker should be able to figure out which mails are patches, but for the benefit of human readers, please add a [PATCH] notice in the subject line of your mails. Please let me know if you notice anything broken. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] d3dx9/tests: Use a macro to initialize matrix rows in math tests
by Henri Verbeet 10 Nov '17

10 Nov '17

On 10 November 2017 at 08:06, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c > index ec07348685..409e3cb650 100644 > --- a/dlls/d3dx9_36/tests/math.c > +++ b/dlls/d3dx9_36/tests/math.c > @@ -25,6 +25,8 @@ > > #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) > > +#define SET_ARRAY4(array, a, b, c, d) array[0] = a; array[1] = b; array[2] = c; array[3] = d You don't need a macro for that.

2 2

Re: [Resend PATCH] kernel32: Handle zh-Hant and zh-Hans in LocaleNameToLCID.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Zhiyi Zhang <yi.gd.cn(a)gmail.com> writes: > Superseded patch 138395. > > LocaleNameToLCID now can handle zh-Hant and zh-Hans correctly with > get_default_children().get_default_children() acts as a map from a > parent language to its default child language.Since zh-Hant and > zh-Hans are not actual locale identifiers. All locale info of zh-Hant > and zh-Hans are directly mapped to its own child language, zh-HK and zh-CN. The LOCALE_SPARENT data is a good addition, but this could be split to a separate patch. Also you should be able to extend the existing get_default_sublang() logic instead of adding another table of defaults. -- Alexandre Julliard julliard(a)winehq.org

2 2

[PATCH] kernel32/nls: Add LOCALE_SPARENT entries.
by Zhiyi Zhang 10 Nov '17

10 Nov '17

1 0

Re: [PATCH v2] d3dx9: Reduce rounding error in D3DXQuaternionToAxisAngle
by Henri Verbeet 10 Nov '17

10 Nov '17

On 9 November 2017 at 20:04, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > v2: Change 2.0f to simply 2.0 to make it clear that truncation is done > after multiplication. Mostly for what it's worth, note that that makes no difference for a multiplication by two. The exponent is incremented, the significand stays the same.

2 1

Re: [PATCH] d3dx10: Add D3DX10PreprocessShaderFromMemory stub.
by Henri Verbeet 09 Nov '17

09 Nov '17

On 9 November 2017 at 17:55, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, > + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, > + ID3D10Blob **errors, HRESULT *hresult) > +{ > + FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, errors %p, " > + "hresult %p stub!\n", > + debugstr_a(data), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult); It's questionable how useful debugstr_a() is for "data", but it's also wrong. "data" is not necessarily \0 terminated, "data_size" specifies its length. > -@ stub D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) > +@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr ptr) Likewise.

2 1

Re: d3dx9_36: Silence an uninitialized compiler warning (GCC 8).
by Paul Gofman 09 Nov '17

09 Nov '17

There is actually no usage of uninitialized variable there, though it is probably not exactly straightforward for compiler to guess. Why it does not complain that 'cdesc[index]' may be used uninitialized while it is handled the same way? AFAIK GCC 8 is not released yet, maybe this will change before final release? If still to change that, does the attached patch fixes the warning as well (sorry, I don't have gcc 8 in hands to test)? If yes, I would suggest that would be a tiny bit nicer way to silence the warning. On 11/07/2017 01:22 AM, Gerald Pfeifer wrote: > There are more of this in d3dx9_36, but at least this is one down. > > Gerald > > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/d3dx9_36/preshader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index e3e91c643b..ed22dc4045 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -888,7 +888,7 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab > for (i = 0; i < desc.Constants; ++i) > { > unsigned int index = out->input_count; > - WORD constantinfo_reserved; > + WORD constantinfo_reserved = 0; > > hc = ID3DXConstantTable_GetConstant(ctab, NULL, i); > if (!hc)

3 5

Re: [PATCH v2] d3dx9: Reduce rounding error in D3DXQuaternionToAxisAngle
by Matteo Bruni 09 Nov '17

09 Nov '17

2017-11-09 17:34 GMT+01:00 Alex Henrie <alexhenrie24(a)gmail.com>: > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > Fixes test failure on 64-bit Linux. > > v2: Change 2.0f to simply 2.0 to make it clear that truncation is done > after multiplication. > --- > dlls/d3dx9_36/math.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c > index 8f5f5b2413..1b4edf82cf 100644 > --- a/dlls/d3dx9_36/math.c > +++ b/dlls/d3dx9_36/math.c > @@ -1651,7 +1651,7 @@ void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *pax > paxis->z = pq->z; > } > if (pangle) > - *pangle = 2.0f * acosf(pq->w); > + *pangle = 2.0 * acos(pq->w); /* acosf has too much rounding error */ > } > > /*_________________D3DXVec2_____________________*/ > -- > 2.14.2 I think just relaxing the test a tiny bit, allowing 1 ULP of error margin, is preferable in this case.

1 0

Re: [PATCH] d3dx9/tests: Provide 8 significant digits in matrix reference values
by Henri Verbeet 09 Nov '17

09 Nov '17

Thanks for fixing these. 2017-11-09 6:10 GMT+01:00 Alex Henrie <alexhenrie24(a)gmail.com>: > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > Fixes test failures on 64-bit Linux. > > A 32-bit float can hold 7.2 decimal digits, so it's best to provide 8 to > make sure that the correct values are accurately represented. > If it were up to me, I'd prefer these to be in the same %.8e format the failure messages use. > The correct outputs of functions that take simple floats as inputs were > computed by feeding equations into Wolfram Alpha. I think that's probably fine, but note that we don't care about the "correct" values so much as "whatever Windows produces". Hopefully those would be reasonably close, but they're by no means guaranteed to be the same.

3 2

Re: [PATCH] d3dx9: Reduce rounding error in D3DXQuaternionToAxisAngle
by Henri Verbeet 09 Nov '17

09 Nov '17

On 9 November 2017 at 16:45, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > - *pangle = 2.0f * acosf(pq->w); > + *pangle = 2.0f * acos(pq->w); /* acosf has too much rounding error */ Does that rounding error by any chance get better if you replace "acosf(x)" with "atan2f(sqrtf((1.0f - x) * (1.0f + x)), x)"?

3 3

Re: [PATCH 3/3] quartz/tests: Add test AVI and MPG files.
by Marvin 09 Nov '17

09 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=34047 Your paranoid android. === w2008s64 (32 bit avisplitter) === avisplitter.c:420: Test failed: Could not create null renderer: 80040154 0b98:avisplitter: unhandled exception c0000005 at 00402884 === w2008s64 (64 bit avisplitter) === avisplitter.c:420: Test failed: Could not create null renderer: 80040154 07ec:avisplitter: unhandled exception c0000005 at 0000000000402489

1 0

Re: [PATCH] ws2_32: Divide values returned for SO_RCVBUF and SO_SNDBUF by two.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Alex Henrie <alexhenrie24(a)gmail.com> writes: > From: Sebastian Lackner <sebastian(a)fds-team.de> > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > Patch from Wine Staging. It looks perfectly reasonable to me, and it > fixes a couple of tests. The right way is to store that information in the server (or in a local cache) so that it's fixed for other platforms too. This was discussed on wine-devel a while back. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] make_unicode: Update unicode collation to version 10.0.0.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Jens Reyer <jre.winesim(a)gmail.com> writes: > @@ -757,13 +757,12 @@ sub READ_SORTKEYS_FILE() > } > close $INPUT; > > - # compress the keys to 32 bit: > - # key 1 to 16 bits, key 2 to 8 bits, key 3 to 4 bits, key 4 to 1 bit > + # compress the keys to 16 bit: > + # key 1 to 8 bits, key 2 to 4 bits, key 3 to 2 bits There's no matching code change, why are you changing this comment? -- Alexandre Julliard julliard(a)winehq.org

2 1

WineConf action items
by Alexandre Julliard 08 Nov '17

08 Nov '17

Folks, We've had many good discussions at WineConf, and decided to make a number of changes. Here are the resulting action items on my plate. I'll be working on putting these changes into place over the next days/weeks: * We'll merge the wine-devel and wine-patches mailing lists, with wine-devel becoming the single channel for both patches and discussions. * We'll be hosting vkd3d, the D3D12->Vulkan library, on winehq.org in its own git repository. * We'll create a new mailing list for AppDB maintainers. * We'll start to use more detailed git commit messages, including bug references. Jeremy volunteered to research best practices from other projects so we can come up with some standards for what the messages should look like. * We'll start building binary packages for Android. * We'll continue to assign reviewers at random from the maintainer pool for patches that don't have a specific maintainer. I was concerned that this wasn't working so well, but the general consensus was that it's worth trying some more. * Code freeze for 3.0 will start around the end of November, with a final release around the end of the year. -- Alexandre Julliard julliard(a)winehq.org

8 9

Re: [PATCH 1/4] oleaut32: Initial preparation to make marshalling compatible with x86_64.
by Sebastian Lackner 08 Nov '17

08 Nov '17

On 05.11.2017 16:00, Marcus Meissner wrote: > From: Sebastian Lackner <sebastian(a)fds-team.de> > > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/oleaut32/tmarshal.c | 94 ++++++++++++++++++++++++++---------------------- > dlls/oleaut32/typelib.c | 8 ++--- > dlls/oleaut32/typelib.h | 2 +- > 3 files changed, 57 insertions(+), 47 deletions(-) Thanks for reviewing the patches. I don't care in this case, but please note that adding Signed-off-by for other people is still not allowed (unless this was changed in the last WineConf).

2 1

Re: [PATCH] kernel32: Fix LocaleNameToLCID can not handle zh-Hant and, zh-Hans.
by Marvin 08 Nov '17

08 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=34034 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: When to mark a bug as STAGED
by KKing 08 Nov '17

08 Nov '17

<< IMO, the real question is why dead-end hacks are being included in staging in the first place. >> IMO: If not in staging, then there should be an alternative place for such hacks or patches, ideally that the AppDb can point to. People go to the AppdDb to see if an app they want or need can run ... They'll be more impressed and potentially get involved in Wine more in some way if it helps them. You can make all sorts of usual disclaimers about not part of pure process and may break at anytime etc. Accepting such hacks (somewhere) can potentially introduce a wider developer (of varying Wine based aptitude) base to draw from. The hack could provide a basis for either progressing/converting it to non dead end approach by either mentoring the original author(s) Or providing stimulus for another to take on and submit a more acceptable patch. The hack may also allow sight of further bugs down the line in the app(s) it was intended for, which sometimes helps with tackling the original issue(s) and the solution approach. << IMO if the patch solves the bug for a user, and the patch is in staging, it should be marked STAGED. The whole point of staging is that the patches may not be up to par, but are good enough for some purpose. If Office works and it didn't before, I'd say that standard is met. >> +1 Ken.

3 3

Re: V3 msvcp100: add time_get::get function with format parameters, add missing arm exports for time_get::get functions
by Piotr Caban 07 Nov '17

07 Nov '17

Hi, > On 7 Nov 2017, at 21:37, Vijay Kiran Kamuju <infyquest(a)gmail.com> wrote: > > Changes from V2: fix the msvcp100 spec for 64bit. > Changes from V1: rewrite based on updated spec file. > > The 64 bit spec entry for the functions have the same parameters count > as 32 bit spec entry > <0001-V3-msvcp100-add-time_get-get-function-with-format-pa.patch> The 64-bit spec file entries still look wrong. The entries should look like this: @ cdecl -arch=win64 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@PEBD4@Z(ptr ptr ptr ptr ptr ptr ptr ptr ptr) time_get_char_get_fmt Thanks, Piotr

1 0

Re: V2 msvcp100: add time_get::get function with format parameters, add missing arm exports for time_get::get functions
by Piotr Caban 07 Nov '17

07 Nov '17

Hi, On 11/07/17 12:01, Vijay Kiran Kamuju wrote: > +@ cdecl -arch=win64 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@PEBD4@Z(ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) time_get_char_get_fmt You have missed the win64 change in msvcp100.spec file. > +@ cdecl -arch=win64 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@PEBD4@Z(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) time_get_char_get_fmt The function is taking 9 ptr parameters in 64-bit case (not 11). Thanks, Piotr

2 3

Re: [PATCH 2/3] wined3d: Show the device window when changing fullscreen resolutions (v2).
by Henri Verbeet 07 Nov '17

07 Nov '17

On 6 November 2017 at 21:33, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c > index e23e99b67b..a26185ae4d 100644 > --- a/dlls/wined3d/swapchain.c > +++ b/dlls/wined3d/swapchain.c > @@ -1429,6 +1429,7 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha > device->filter_messages = TRUE; > > MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); > + ShowWindow(swapchain->device_window, SW_SHOWNORMAL); > This breaks the ddraw tests: ddraw1.c:2683: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2690: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2716: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2739: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2768: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2794: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2814: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2850: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536).

1 0

Re: [PATCH 2/9] winemine: Update faces.bmp with one from ReactOS project
by Alexandre Julliard 07 Nov '17

07 Nov '17

"Yandex Mail" <and-semakin(a)ya.ru> writes: > From 4cef6694e5153202a119c01a2d88ef617543d7cc Mon Sep 17 00:00:00 2001 > From: Andrey Semakin <and-semakin(a)ya.ru> > Date: Mon, 6 Nov 2017 13:08:53 +0500 > Subject: [PATCH 2/9] winemine: Update faces.bmp with one from ReactOS project > > Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> > --- > programs/winemine/faces.bmp | Bin 1558 -> 1558 bytes > 1 file changed, 0 insertions(+), 0 deletions(-) It would be better to redesign these using SVG files, so we can make them scale properly for high-DPI. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2 PATCH] msvcrt: Implement _memicmp_l()
by Marvin 07 Nov '17

07 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=33995 Your paranoid android. === wvistau64 (32 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL === w7u (32 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL === w1064 (32 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL === wvistau64 (64 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL === w1064 (64 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL

1 0

Re: [v2 PATCH 1/3] gdiplus/metafile: Support linear gradient brushes in playback
by Dmitry Timoshkov 07 Nov '17

07 Nov '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + status = GdipCreateLineBrush(&startpoint, &endpoint, data->BrushData.lineargradient.StartColor, > + data->BrushData.lineargradient.EndColor, data->BrushData.lineargradient.WrapMode, &gradient); > + if (status == Ok && transform) > + status = GdipSetLineTransform(gradient, (const GpMatrix *)transform); Result of the above calls is ignored. > + if (brushflags & BrushDataPresetColors) > + status = GdipSetLinePresetBlend(gradient, (ARGB *)(record_data + offset + position_count * sizeof(REAL)), > + (REAL *)(record_data + offset), position_count); > + else if (brushflags & BrushDataBlendFactorsH) > + status = GdipSetLineBlend(gradient, (REAL *)(record_data + offset + position_count * sizeof(REAL)), > + (REAL *)(record_data + offset), position_count); > + > + if (brushflags & BrushDataIsGammaCorrected) > + FIXME("BrushDataIsGammaCorrected is not handled.\n"); > + > + if (status == Ok) > + *brush = (GpBrush *)gradient; > + else > + GdipDeleteBrush((GpBrush *)gradient); > + > + break; > + } -- Dmitry.

1 0

Re: [PATCH 3/4] oleaut32: Implement asm proxys for x86_64.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Marcus Meissner <marcus(a)jet.franken.de> writes: > From: Sebastian Lackner <sebastian(a)fds-team.de> > > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/oleaut32/tmarshal.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 52 insertions(+), 2 deletions(-) The existing code is ugly, and instead of trying to retrofit 64-bit support into it, I'd suggest looking into reusing the rpcrt4 routines which already handle pretty much all of this in a more correct way. -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH 1/9] vulkan: Add initial Wine vulkan header.
by Sebastian Lackner 07 Nov '17

07 Nov '17

On 06.11.2017 09:08, Roderick Colenbrander wrote: > This file is directly generated from Vulkan's vk.xml. For now it contains Core > Vulkan types and functions. Will be extended with extensions when we support them. > Note there are 4 lines of C++ style comments, but these directly come from the spec > and appear in the regular headers as well. > > Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> > --- > include/wine/vulkan.h | 2367 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 2367 insertions(+) > create mode 100644 include/wine/vulkan.h I'm not sure if you are already aware that the struct sizes/alignments do not match between Linux and Windows. There are many structs which have to be defined twice and converted on-the-fly to be compatible with 32-bit.

2 3

Re: [PATCH v4 2/2] quartz/tests: Add test AVI and MPG files.
by Marvin 07 Nov '17

07 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=33983 Your paranoid android. === wxppro (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w2003std (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 4 not 5 === wvistau64 (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w2008s64 (32 bit avisplitter) === avisplitter.c:475: Test failed: Could not create null renderer: 80040154 === w7pro64 (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w1064 (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 5 not 6 === wvistau64 (64 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w2008s64 (64 bit avisplitter) === avisplitter.c:475: Test failed: Could not create null renderer: 80040154 === w7pro64 (64 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w864 (64 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w1064 (64 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 5 not 6

1 0

Re: [PATCH v3 2/2] quartz/tests: Add test AVI and MPG files.
by Marvin 07 Nov '17

07 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=33980 Your paranoid android. === wxppro (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2003std (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 4 not 5 === wvistau64 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2008s64 (32 bit avisplitter) === avisplitter.c:473: Test failed: Could not create null renderer: 80040154 === w7pro64 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w864 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w1064 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 5 not 7 === wvistau64 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2008s64 (64 bit avisplitter) === avisplitter.c:473: Test failed: Could not create null renderer: 80040154 === w7pro64 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w864 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w1064 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 5 not 6

1 0

Re: [PATCH 2/2] quartz/tests: Add test AVI and MPG files.
by Marvin 07 Nov '17

07 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=33978 Your paranoid android. === wxppro (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2003std (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 4 not 5 === wvistau64 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2008s64 (32 bit avisplitter) === avisplitter.c:473: Test failed: Could not create null renderer: 80040154 === w7pro64 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w864 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w1064 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 5 not 7 === wvistau64 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2008s64 (64 bit avisplitter) === avisplitter.c:473: Test failed: Could not create null renderer: 80040154 === w7pro64 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w864 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w1064 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 5 not 6

1 0

Re: [PATCH 2/2] quartz/tests: Add test AVI and MPG files.
by Dmitry Timoshkov 07 Nov '17

07 Nov '17

Zebediah Figura <z.figura12(a)gmail.com> wrote: > --- a/dlls/quartz/tests/avisplitter.c > +++ b/dlls/quartz/tests/avisplitter.c ... > + WCHAR *filename = load_resource(avifile); ... > if (file == INVALID_HANDLE_VALUE) > { > - skip("Could not read test file \"%s\", skipping test\n", afile); > + skip("Could not read test file \"%s\", skipping test\n", wine_dbgstr_w(filename)); > return; > } etc. > --- a/dlls/quartz/tests/filtergraph.c > +++ b/dlls/quartz/tests/filtergraph.c ... > + WCHAR *filename = load_resource(file); ... > + hr = IGraphBuilder_RenderFile(pgraph, filename, NULL); > + if (hr == VFW_E_CANNOT_RENDER) > + skip("%s: codec not supported; skipping test\n", wine_dbgstr_w(file)); > + else > + { > + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); > + rungraph(); > + } > > releasefiltergraph(); > > /* check reference leaks */ > - h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); > + h = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); > ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); > CloseHandle(h); > } It seems that new tests leave the temporary created files behind. -- Dmitry.

2 2

When to mark a bug as STAGED
by Josh DuBois 06 Nov '17

06 Nov '17

I was recently looking at bug 18070 in relation to a problem I had installing Office 2010: https://bugs.winehq.org/show_bug.cgi?id=18070 The last comment asks whether the bug can be marked STAGED. In talking with Sebastian he questioned whether it would make sense in this case, because the patch in the staging tree which improves behavior is clearly a hack as opposed to something which is progress toward a more permanent solution. To me it made sense to go ahead and mark the bug as STAGED anyhow, to record the fact that one of the patches in the stating tree addresses the behavior. Perhaps this is one way to help associate patchsets with bugs so that we can tell the motivation for a particular patchset in staging. (In this case, a URL on the bug also has information about the motivation, here: https://dev.wine-staging.com/patches/132/ ). So the question: If a staging patchset is more along the lines of a dead-end hack than it is progress toward a long-term solution, should bugs which are fixed by the patchset still be marked STAGED? My gut differed from Sebastian's, so I thought it best to ask here to reach a consensus. (I can see the value either way - just looking for a standard approach.)

3 2

Re: [PATCH 3/5] gdiplus/metafile: Support linear gradient brushes in playback
by Vincent Povirk 06 Nov '17

06 Nov '17

+ GpLineGradient *gradient; ... + if (status == Ok) + *brush = (GpBrush *)gradient; + else + GdipDeleteBrush((GpBrush *)gradient); This can free gradient without initializing it.

1 0

Re: [PATCH 3/3] quartz/tests: Add test AVI and MPG files.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Zebediah Figura <z.figura12(a)gmail.com> writes: > Generated with ffmpeg using the following commands: > > ffmpeg -f lavfi -i smptebars -t 1 -r 1 -f avi -vcodec rawvideo -pix_fmt yuv420p -vf scale=32x24 test.avi > > ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/quartz/tests/Makefile.in | 3 +++ > dlls/quartz/tests/filtergraph.c | 42 +++++++++++++++++++++++++++++++++++----- > dlls/quartz/tests/rsrc.rc | 27 ++++++++++++++++++++++++++ > dlls/quartz/tests/test.avi | Bin 0 -> 6938 bytes > dlls/quartz/tests/test.mpg | Bin 0 -> 6144 bytes > 5 files changed, 67 insertions(+), 5 deletions(-) > create mode 100644 dlls/quartz/tests/rsrc.rc > create mode 100644 dlls/quartz/tests/test.avi > create mode 100644 dlls/quartz/tests/test.mpg It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M quartz.dll -p quartz_test.exe.so avisplitter && touch avisplitter.ok avisplitter.c:498: Test failed: The thread count should be 3 not 2 avisplitter.c:574: Test succeeded inside todo block: The thread count should be 1 not 1 Makefile:194: recipe for target 'avisplitter.ok' failed make: *** [avisplitter.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

2 1

FOSDEM participation - talk?
by Marcus Meissner 06 Nov '17

06 Nov '17

Hi, We can still consider a FOSDEM participation in scope of a Talk/Lecture. We could fit to the Retrocomputing DevRoom with a winky smiley: - Emulation of old systems to run videogames, legacy software, etc - Open source software emulation/simulation - Open hardware - Operating systems/executives for retrocomputers/retrosystems - Uses of retrocomputing today - Other retrosystems topics - Opportunities in retrocomputing https://fosdem.org/2018/schedule/track/retrocomputing/ https://lists.fosdem.org/pipermail/fosdem/2017-October/002623.html Cfp runs until Nov 25. Ciao, Marcus

3 3

Re: [PATCH 2/2] riched20: Protect read-only Richedit against pasting and cutting data.
by Huw Davies 06 Nov '17

06 Nov '17

This looks good apart from some style issues - see inline below. On Sun, Nov 05, 2017 at 07:28:39PM +0100, Rafał Harabień wrote: > Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> > --- > dlls/riched20/editor.c | 60 +++++++++++++++++++++++--------------------- > dlls/riched20/tests/editor.c | 15 +++++++++++ > 2 files changed, 47 insertions(+), 28 deletions(-) > > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index a7b1bc7..3da19fa 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -2294,6 +2294,13 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO > struct paste_format *format; > IDataObject *data; > > + /* Protect read-only edit control from modification */ > + if (editor->styleFlags & ES_READONLY) { Please put the open brace on a new line matching the rest of the function. > + if (!check_only) > + MessageBeep(MB_ICONERROR); > + return FALSE; > + } > + > init_paste_formats(); > > if (ps && ps->dwAspect != DVASPECT_CONTENT) > @@ -2351,6 +2358,29 @@ static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) > return SUCCEEDED(hr); > } > > +static BOOL copy_or_cut(ME_TextEditor *editor, BOOL cut) > +{ > + BOOL result; > + int nOfs, nChars; > + int nStartCur = ME_GetSelectionOfs(editor, &nOfs, &nChars); > + ME_Cursor *selStart = &editor->pCursors[nStartCur]; Let's take the opportunity to use lower case variable names. How about offs, num_chars, start_cursor and sel_start. > + > + if (cut && (editor->styleFlags & ES_READONLY)) { Again, opening brace to new line. > + MessageBeep(MB_ICONERROR); > + return FALSE; > + } > + > + nChars -= nOfs; > + result = ME_Copy(editor, selStart, nChars); > + if (result && cut) > + { > + ME_InternalDeleteText(editor, selStart, nChars, FALSE); Indent this block 4 spaces. > + ME_CommitUndo(editor); > + ME_UpdateRepaint(editor, TRUE); > + } > + return result; > +} > + Huw.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel