June 2018 - Wine-Devel - list.winehq.org

[PATCH] jscript: Use jsdisp_define_data_property in Object.getOwnPropertyDescriptor.
by Jacek Caban June 11, 2018

June 11, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.h | 6 ++++-- dlls/jscript/object.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-)

1 0

[PATCH] msvcr90/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index dd62f3ae6e..7ee2890e45 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -900,7 +900,7 @@ static void test_bsearch_s(void) CHECK_CALLED(invalid_parameter_handler, EINVAL); /* just try all array sizes */ - for (j=1;j<sizeof(arr)/sizeof(arr[0]);j++) { + for (j=1; j<ARRAY_SIZE(arr); j++) { for (i=0;i<j;i++) { l = arr[i]; g_bsearch_s_context_counter = 0; @@ -1494,7 +1494,7 @@ static void test__AdjustPointer(void) void *ret; int i; - for(i=0; i<sizeof(data)/sizeof(data[0]); i++) { + for(i=0; i<ARRAY_SIZE(data); i++) { ret = p__AdjustPointer(data[i].ptr, &data[i].this_ptr_offsets); ok(ret == data[i].ret, "%d) __AdjustPointer returned %p, expected %p\n", i, ret, data[i].ret); } @@ -1734,7 +1734,7 @@ static void test__fpieee_flt(void) ok(ret == EXCEPTION_CONTINUE_SEARCH, "_fpieee_flt returned %d\n", ret); ok(handler_called == 0, "handler_called = %d\n", handler_called); - for(i=0; i<sizeof(test_data)/sizeof(test_data[0]); i++) { + for(i=0; i<ARRAY_SIZE(test_data); i++) { ep.ExceptionRecord = &rec; ep.ContextRecord = &ctx; memset(&rec, 0, sizeof(rec)); -- 2.14.4

2 1

[PATCH] msvcr120/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 152bfdf42e..85e83a6c65 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -408,7 +408,7 @@ static void test_lconv(void) "Japanese", "Korean", "Spanish" }; - for(i = 0; i < sizeof(locstrs) / sizeof(char *); i ++) + for(i = 0; i < ARRAY_SIZE(locstrs); i ++) test_lconv_helper(locstrs[i]); } @@ -445,7 +445,7 @@ static void test__dpcomp(void) }; int i, ret; - for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { ret = p__dpcomp(tests[i].x, tests[i].y); ok(ret == tests[i].ret, "%d) dpcomp(%f, %f) = %x\n", i, tests[i].x, tests[i].y, ret); } @@ -473,7 +473,7 @@ static void test____lc_locale_name_func(void) int i, j; wchar_t **lc_names; - for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { if(!p_setlocale(LC_ALL, tests[i].locale)) continue; @@ -536,12 +536,11 @@ static void test__W_Gettnames(void) else ok(size==0x164, "structure size: %x\n", size); - for(i=0; i<sizeof(str)/sizeof(*str); i++) { + for(i=0; i<ARRAY_SIZE(str); i++) { ok(!strcmp(ret->str[i], str[i]), "ret->str[%d] = %s, expected %s\n", i, ret->str[i], str[i]); - MultiByteToWideChar(CP_ACP, 0, str[i], strlen(str[i])+1, - buf, sizeof(buf)/sizeof(*buf)); + MultiByteToWideChar(CP_ACP, 0, str[i], strlen(str[i])+1, buf, ARRAY_SIZE(buf)); ok(!lstrcmpW(ret->wstr[i], buf), "ret->wstr[%d] = %s, expected %s\n", i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf)); } @@ -640,7 +639,7 @@ static void test_remainder(void) if(sizeof(void*) != 8) /* errno handling slightly different on 32-bit */ return; - for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = -1; r = p_remainder(tests[i].x, tests[i].y); e = errno; @@ -907,7 +906,7 @@ static void test_wctype(void) }; int i, ret; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { + for(i=0; i<ARRAY_SIZE(properties); i++) { ret = p_wctype(properties[i].name); ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); } -- 2.14.4

2 1

[PATCH] msvcr110/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 3aa394d981..c0a182f546 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -61,7 +61,7 @@ static void test_setlocale(void) "uz-Latn-uz", }; - for(i=0; i<sizeof(names)/sizeof(*names); i++) { + for(i=0; i<ARRAY_SIZE(names); i++) { ret = p_setlocale(LC_ALL, names[i]); ok(ret != NULL, "expected success, but got NULL\n"); ok(!strcmp(ret, names[i]), "expected %s, got %s\n", names[i], ret); -- 2.14.4

2 1

[PATCH] msvcp90/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 24 ++++++++++++------------ dlls/msvcp90/tests/misc.c | 2 +- dlls/msvcp90/tests/string.c | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index c075f01f8c..8a911173f8 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1137,7 +1137,7 @@ static void test_num_get_get_uint64(void) { "0xx10", NULL, FMTFLAG_hex, IOSTATE_failbit, 42, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1287,7 +1287,7 @@ static void test_num_get_get_double(void) { "1.0e1,0", NULL, IOSTATE_goodbit, 10.0, ',' }, /* group in exponent */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1406,7 +1406,7 @@ static void test_num_put_put_double(void) { -1.23456789e-9, NULL, 9, FMTFLAG_fixed, "-0.000000001" } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func1(p_basic_stringstream_char_ctor, &ss); @@ -1499,7 +1499,7 @@ static void test_istream_ipfx(void) { "\n\t ws", TRUE, FALSE, TRUE, IOSTATE_goodbit, '\n' }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1579,7 +1579,7 @@ static void test_istream_ignore(void) { "ABC ", 42, ' ', IOSTATE_goodbit, EOF }, /* delim at end */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1643,7 +1643,7 @@ static void test_istream_seekg(void) { "", 0, SEEKDIR_beg, IOSTATE_failbit, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1702,7 +1702,7 @@ static void test_istream_seekg_fpos(void) { "", 0, IOSTATE_failbit, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1763,7 +1763,7 @@ static void test_istream_peek(void) { "ABCDEF", 'A', 'A', IOSTATE_goodbit }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1834,7 +1834,7 @@ static void test_istream_tellg(void) { "ABCDEFGHIJ", -6, -1, -1, 0 } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* stringstream<char> version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1980,7 +1980,7 @@ static void test_istream_getline(void) { "this is some text\n", "this is some text\n", '\0', IOSTATE_eofbit, "this is some text\n", '\n', IOSTATE_faileof }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -2208,7 +2208,7 @@ static void test_ostream_print_complex_float(void) { {-1.23456789e-9,2.3456789e9}, NULL, 9, FMTFLAG_fixed, "(-0.000000001,2345678848.000000000)" } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func1(p_basic_stringstream_char_ctor, &ss); if(tests[i].lcl) { @@ -2331,7 +2331,7 @@ static void test_istream_read_complex_double(void) { "(1.0eE10, 3)" , NULL, deadbeef, IOSTATE_failbit, ""}, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func2(p_basic_string_char_ctor_cstr, &str, deadbeef_str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); p_basic_istream_char_read_complex_double(&ss.base.base1, &val); diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index ffc7b9684f..e9fd1e06be 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -582,7 +582,7 @@ static void test_wctype(void) }; int i, ret; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { + for(i=0; i<ARRAY_SIZE(properties); i++) { ret = p_wctype(properties[i].name); ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); } diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 9d46df0f69..a0f16a9908 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -554,7 +554,7 @@ static void test_basic_string_char_rfind(void) { { "aaa", "z", 0, 1, *p_basic_string_char_npos } /* can't find */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); ret = (size_t)call_func4(p_basic_string_char_rfind_cstr_substr, &str, @@ -602,7 +602,7 @@ static void test_basic_string_char_replace(void) { { "ABCDEF", 6, *p_basic_string_char_npos, "-", "ABCDEF-" }, /* replace after end with npos */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); @@ -756,7 +756,7 @@ static void test_basic_string_char_find_last_not_of(void) { { "ABCDE", "", 5, 0, 4 }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); ret = (size_t)call_func4(p_basic_string_char_find_last_not_of_cstr_substr, -- 2.14.4

2 1

[PATCH] msvcp60/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 18 +++++++++--------- dlls/msvcp60/tests/string.c | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index 087aa2cb3f..1938a51df1 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -858,7 +858,7 @@ static void test_num_get_get_double(void) { "1.0e1,0", NULL, IOSTATE_goodbit, 10.0, ',' }, /* group in exponent */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -982,7 +982,7 @@ static void test_num_put_put_double(void) { -1.23456789e-9, NULL, 9, FMTFLAG_fixed, "-0.000000001" } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_stringstream_char_ctor_mode, &ss, OPENMODE_in|OPENMODE_out, TRUE); @@ -1072,7 +1072,7 @@ static void test_istream_ipfx(void) { "\n\t ws", TRUE, FALSE, TRUE, IOSTATE_goodbit, '\n' }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1152,7 +1152,7 @@ static void test_istream_ignore(void) { "ABC ", 42, ' ', IOSTATE_goodbit, EOF }, /* delim at end */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1216,7 +1216,7 @@ static void test_istream_seekg(void) { "", 0, SEEKDIR_beg, IOSTATE_goodbit, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1275,7 +1275,7 @@ static void test_istream_seekg_fpos(void) { "", 0, IOSTATE_goodbit, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1336,7 +1336,7 @@ static void test_istream_peek(void) { "ABCDEF", 'A', 'A', IOSTATE_goodbit }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1407,7 +1407,7 @@ static void test_istream_tellg(void) { "ABCDEFGHIJ", -6, 0, 0, 0 } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* stringstream<char> version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1554,7 +1554,7 @@ static void test_istream_getline(void) return; } - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index bf396f7b28..6a0efc178c 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -599,7 +599,7 @@ static void test_basic_string_char_rfind(void) { { "aaa", "z", 0, 1, *p_basic_string_char_npos } /* can't find */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); ret = (size_t)call_func4(p_basic_string_char_rfind_cstr_substr, &str, @@ -647,7 +647,7 @@ static void test_basic_string_char_replace(void) { { "ABCDEF", 6, *p_basic_string_char_npos, "-", "ABCDEF-" }, /* replace after end with npos */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); -- 2.14.4

2 1

[PATCH] msvcp140/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 593e0ce42b..06ea11d55b 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -555,11 +555,10 @@ static void test_to_byte(void) ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", dst); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { ret = p_To_byte(tests[i], dst); - expected = WideCharToMultiByte(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare), - NULL, NULL); + expected = WideCharToMultiByte(CP_ACP, 0, tests[i], -1, compare, ARRAY_SIZE(compare), NULL, NULL); ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", dst, i); } @@ -601,10 +600,10 @@ static void test_to_wide(void) ok(!ret, "Got unexpected result %d\n", ret); ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", wine_dbgstr_w(dst)); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { ret = p_To_wide(tests[i], dst); - expected = MultiByteToWideChar(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare)); + expected = MultiByteToWideChar(CP_ACP, 0, tests[i], -1, compare, ARRAY_SIZE(compare)); ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", wine_dbgstr_w(dst), i); @@ -829,7 +828,7 @@ static void test_Stat(void) todo_wine ok(0777 == perms, "_Lstat(): perms expect: 0777, got 0%o\n", perms); ok(CloseHandle(file), "CloseHandle\n"); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { perms = 0xdeadbeef; val = p_Stat(tests[i].path, &perms); todo_wine_if(tests[i].is_todo) { @@ -1043,7 +1042,7 @@ static void test_Unlink(void) ret = p_Link(f1W, f1_linkW); ok(ret == ERROR_SUCCESS, "_Link(): expect: ERROR_SUCCESS, got %d\n", ret); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_Unlink(tests[i].path); todo_wine_if(tests[i].is_todo) -- 2.14.4

2 1

[PATCH] msvcp120/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 7f72075d84..969902db8b 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -785,7 +785,7 @@ static void test__Xtime_diff_to_millis2(void) MSVCRT_long ret; xtime t1, t2; - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); ++ i) + for(i = 0; i < ARRAY_SIZE(tests); ++ i) { t1.sec = tests[i].sec_before; t1.nsec = tests[i].nsec_before; @@ -805,7 +805,7 @@ static void test_xtime_get(void) xtime before, after; int i; - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i ++) + for(i = 0; i < ARRAY_SIZE(tests); i ++) { p_xtime_get(&before, 1); Sleep(tests[i]); @@ -1166,7 +1166,7 @@ static void test_tr2_sys__Equivalent(void) ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); CloseHandle(file); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; val = p_tr2_sys__Equivalent(tests[i].path1, tests[i].path2); ok(tests[i].equivalent == val, "tr2_sys__Equivalent(): test %d expect: %d, got %d\n", i+1, tests[i].equivalent, val); @@ -1272,7 +1272,7 @@ static void test_tr2_sys__Make_dir(void) { "??invalid_name>>", -1 } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Make_dir(tests[i].path); ok(ret == tests[i].val, "tr2_sys__Make_dir(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret); @@ -1301,7 +1301,7 @@ static void test_tr2_sys__Remove_dir(void) ok(p_tr2_sys__Make_dir("tr2_test_dir"), "tr2_sys__Make_dir() failed\n"); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Remove_dir(tests[i].path); ok(ret == tests[i].val, "test_tr2_sys__Remove_dir(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret); @@ -1345,7 +1345,7 @@ static void test_tr2_sys__Copy_file(void) ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); todo_wine_if(tests[i].is_todo) @@ -1403,7 +1403,7 @@ static void test_tr2_sys__Rename(void) ret = p_tr2_sys__Rename("tr2_test_dir\\f1", "tr2_test_dir\\f1"); todo_wine ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; if(tests[i].val == ERROR_SUCCESS) { h1 = CreateFileA(tests[i].old_path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -1542,7 +1542,7 @@ static void test_tr2_sys__Stat(void) todo_wine ok(ERROR_SUCCESS == err_code, "tr2_sys__Lstat(): err_code expect: ERROR_SUCCESS, got %d\n", err_code); ok(CloseHandle(file), "CloseHandle\n"); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { err_code = 0xdeadbeef; val = p_tr2_sys__Stat(tests[i].path, &err_code); todo_wine_if(tests[i].is_todo) @@ -1744,7 +1744,7 @@ static void test_tr2_sys__Link(void) ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Link(tests[i].existing_path, tests[i].new_path); ok(ret == tests[i].last_error, "tr2_sys__Link(): test %d expect: %d, got %d\n", @@ -1820,7 +1820,7 @@ static void test_tr2_sys__Symlink(void) ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; SetLastError(0xdeadbeef); ret = p_tr2_sys__Symlink(tests[i].existing_path, tests[i].new_path); @@ -1892,7 +1892,7 @@ static void test_tr2_sys__Unlink(void) ret = p_tr2_sys__Link("tr2_test_dir/f1", "tr2_test_dir/f1_link"); ok(ret == ERROR_SUCCESS, "tr2_sys__Link(): expect: ERROR_SUCCESS, got %d\n", ret); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Unlink(tests[i].path); todo_wine_if(tests[i].is_todo) @@ -1949,14 +1949,14 @@ static void test_thrd(void) }; /* test for equal */ - for(i=0; i<sizeof(testeq)/sizeof(testeq[0]); i++) { + for(i=0; i<ARRAY_SIZE(testeq); i++) { ret = p__Thrd_equal(testeq[i].a, testeq[i].b); ok(ret == testeq[i].r, "(%p %u) = (%p %u) expected %d, got %d\n", testeq[i].a.hnd, testeq[i].a.id, testeq[i].b.hnd, testeq[i].b.id, testeq[i].r, ret); } /* test for less than */ - for(i=0; i<sizeof(testlt)/sizeof(testlt[0]); i++) { + for(i=0; i<ARRAY_SIZE(testlt); i++) { ret = p__Thrd_lt(testlt[i].a, testlt[i].b); ok(ret == testlt[i].r, "(%p %u) < (%p %u) expected %d, got %d\n", testlt[i].a.hnd, testlt[i].a.id, testlt[i].b.hnd, testlt[i].b.id, testlt[i].r, ret); @@ -2323,7 +2323,7 @@ static void test_vector_base_v4__Segment_index_of(void) {~0, 8*sizeof(void*)-1} }; - for(i=0; i<sizeof(tests) / sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { ret = p_vector_base_v4__Segment_index_of(tests[i].x); ok(ret == tests[i].expect, "expected %ld, got %ld for %ld\n", (long)tests[i].expect, (long)ret, (long)tests[i].x); -- 2.14.4

2 1

[PATCH] msvcirt/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 61f166b273..c856b50a41 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -3818,7 +3818,7 @@ static void test_ostream_print(void) ret = (int) call_func3(p_streambuf_xsputn, &ssb_test3.base, "we're gonna play it 3.14159", 27); ok(ret == 27, "expected 27 got %d\n", ret); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { os.base_ios.state = tests[i].state; os.base_ios.flags = tests[i].flags; os.base_ios.precision = tests[i].precision; @@ -5635,7 +5635,7 @@ static void test_istream_getint(void) pis = call_func3(p_istream_sb_ctor, &is, &ssb.base, TRUE); ok(pis == &is, "wrong return, expected %p got %p\n", &is, pis); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { len = strlen(tests[i].stream_content); is.base_ios.state = tests[i].initial_state; is.base_ios.flags = tests[i].flags; @@ -5747,7 +5747,7 @@ static void test_istream_getdouble(void) pis = call_func3(p_istream_sb_ctor, &is, &ssb.base, TRUE); ok(pis == &is, "wrong return, expected %p got %p\n", &is, pis); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { len = strlen(tests[i].stream_content); is.base_ios.state = tests[i].initial_state; is.base_ios.flags = tests[i].flags; @@ -5949,7 +5949,7 @@ static void test_istream_read(void) pis = call_func3(p_istream_sb_ctor, &is, &ssb.base, TRUE); ok(pis == &is, "wrong return, expected %p got %p\n", &is, pis); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { len = strlen(tests[i].stream_content); is.base_ios.state = IOSTATE_goodbit; is.base_ios.flags = tests[i].flags; -- 2.14.4

2 1

[PATCH 1/2] winevulkan: Correctly recognize commands belonging to multiple extensions.
by Józef Kucia June 11, 2018

June 11, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/vulkan-1.spec | 4 ++++ dlls/winevulkan/make_vulkan | 17 +++++++---------- dlls/winevulkan/winevulkan.spec | 4 ++++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index 0a4e85e96859..860b4c84c7b1 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -34,6 +34,7 @@ # but only in their entirety and only with respect to the Combined Software. # +@ stub vkAcquireNextImage2KHR @ stdcall vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) winevulkan.wine_vkAcquireNextImageKHR @ stdcall vkAllocateCommandBuffers(ptr ptr ptr) winevulkan.wine_vkAllocateCommandBuffers @ stdcall vkAllocateDescriptorSets(ptr ptr ptr) winevulkan.wine_vkAllocateDescriptorSets @@ -158,6 +159,8 @@ @ stub vkGetBufferMemoryRequirements2 @ stub vkGetDescriptorSetLayoutSupport @ stub vkGetDeviceGroupPeerMemoryFeatures +@ stub vkGetDeviceGroupPresentCapabilitiesKHR +@ stub vkGetDeviceGroupSurfacePresentModesKHR @ stdcall vkGetDeviceMemoryCommitment(ptr int64 ptr) winevulkan.wine_vkGetDeviceMemoryCommitment @ stdcall vkGetDeviceProcAddr(ptr str) winevulkan.wine_vkGetDeviceProcAddr @ stdcall vkGetDeviceQueue(ptr long long ptr) winevulkan.wine_vkGetDeviceQueue @@ -186,6 +189,7 @@ @ stub vkGetPhysicalDeviceImageFormatProperties2 @ stdcall vkGetPhysicalDeviceMemoryProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceMemoryProperties @ stub vkGetPhysicalDeviceMemoryProperties2 +@ stub vkGetPhysicalDevicePresentRectanglesKHR @ stdcall vkGetPhysicalDeviceProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceProperties @ stub vkGetPhysicalDeviceProperties2 @ stdcall vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ea64c052fa5f..47a216e46c7f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -113,7 +113,7 @@ BLACKLISTED_EXTENSIONS = [ "VK_KHR_external_semaphore_capabilities", "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", - "VK_NV_external_memory_win32" + "VK_NV_external_memory_win32", ] # The Vulkan loader provides entry-points for core functionality and important @@ -123,7 +123,7 @@ CORE_EXTENSIONS = [ "VK_KHR_display_swapchain", "VK_KHR_surface", "VK_KHR_swapchain", - "VK_KHR_win32_surface" + "VK_KHR_win32_surface", ] # Functions part of our winevulkan graphics driver interface. @@ -377,8 +377,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extension=None, alias=False): - self.extension = extension + def __init__(self, _type=None, name=None, params=[], extensions=[], alias=False): + self.extensions = [] self.name = name self.type = _type self.params = params @@ -448,13 +448,10 @@ class VkFunction(object): Core API as well as several KHR WSI extensions. """ - if self.extension is None: - return True - - if self.extension in CORE_EXTENSIONS: + if not self.extensions: return True - return False + return any(ext in self.extensions for ext in CORE_EXTENSIONS) def is_device_func(self): # If none of the other, it must be a device function @@ -2452,7 +2449,7 @@ class VkRegistry(object): commands = ext.findall("require/command") for command in commands: cmd_name = command.attrib["name"] - self.funcs[cmd_name].extension = ext_name + self.funcs[cmd_name].extensions.append(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index b923c6422518..f825079ba6f6 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -36,6 +36,7 @@ @ stdcall vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr @ stdcall vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion +@ stub vkAcquireNextImage2KHR @ stdcall wine_vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) @ stdcall wine_vkAllocateCommandBuffers(ptr ptr ptr) @ stdcall wine_vkAllocateDescriptorSets(ptr ptr ptr) @@ -159,6 +160,8 @@ @ stub vkGetBufferMemoryRequirements2 @ stub vkGetDescriptorSetLayoutSupport @ stub vkGetDeviceGroupPeerMemoryFeatures +@ stub vkGetDeviceGroupPresentCapabilitiesKHR +@ stub vkGetDeviceGroupSurfacePresentModesKHR @ stdcall wine_vkGetDeviceMemoryCommitment(ptr int64 ptr) @ stdcall wine_vkGetDeviceProcAddr(ptr str) @ stdcall wine_vkGetDeviceQueue(ptr long long ptr) @@ -187,6 +190,7 @@ @ stub vkGetPhysicalDeviceImageFormatProperties2 @ stdcall wine_vkGetPhysicalDeviceMemoryProperties(ptr ptr) @ stub vkGetPhysicalDeviceMemoryProperties2 +@ stub vkGetPhysicalDevicePresentRectanglesKHR @ stdcall wine_vkGetPhysicalDeviceProperties(ptr ptr) @ stub vkGetPhysicalDeviceProperties2 @ stdcall wine_vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr) -- 2.16.4

1 1