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

[PATCH 2/2] ntdll/tests: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc June 21, 2018

June 21, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/large_int.c | 8 +++----- dlls/ntdll/tests/rtl.c | 6 ++---- dlls/ntdll/tests/rtlstr.c | 31 +++++++++++-------------------- dlls/ntdll/tests/string.c | 24 ++++++++++-------------- 4 files changed, 26 insertions(+), 43 deletions(-) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index da7afa4f25..c980aebe5d 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -102,7 +102,6 @@ static const magic_divide_t magic_divide[] = { { ULL(0x74ae3b5f,0x1558c800), ULL(0x2f1e28fd,0x1b5cca00), 41, 0xabcde}, }; -#define NB_MAGIC_DIVIDE (sizeof(magic_divide)/sizeof(*magic_divide)) static void test_RtlExtendedMagicDivide(void) @@ -110,7 +109,7 @@ static void test_RtlExtendedMagicDivide(void) int i; LONGLONG result; - for (i = 0; i < NB_MAGIC_DIVIDE; i++) { + for (i = 0; i < ARRAY_SIZE(magic_divide); i++) { result = pRtlExtendedMagicDivide(magic_divide[i].a, magic_divide[i].b, magic_divide[i].shift); ok(result == magic_divide[i].result, "call failed: RtlExtendedMagicDivide(0x%s, 0x%s, %d) has result 0x%s, expected 0x%s\n", @@ -271,7 +270,6 @@ static const largeint2str_t largeint2str[] = { {20, 0xdeadbeef, 0, 9, "-------------------------------------------------------------------", STATUS_INVALID_PARAMETER}, {-8, 07654321, 0, 12, "-------------------------------------------------------------------", STATUS_INVALID_PARAMETER}, }; -#define NB_LARGEINT2STR (sizeof(largeint2str)/sizeof(*largeint2str)) static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t *largeint2str) @@ -360,7 +358,7 @@ static void test_RtlInt64ToUnicodeString(void) { int test_num; - for (test_num = 0; test_num < NB_LARGEINT2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(largeint2str); test_num++) { one_RtlInt64ToUnicodeString_test(test_num, &largeint2str[test_num]); } /* for */ } @@ -405,7 +403,7 @@ static void test_RtlLargeIntegerToChar(void) int test_num; ULONGLONG value; - for (test_num = 0; test_num < NB_LARGEINT2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(largeint2str); test_num++) { one_RtlLargeIntegerToChar_test(test_num, &largeint2str[test_num]); } /* for */ diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index db3dc9ff4e..e202408caa 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -708,7 +708,6 @@ static const all_accesses_t all_accesses[] = { {0xFEDCBA76, 0xC8C4B242, 1}, {0xC8C4B242, 0xFEDCBA76, 0}, }; -#define NB_ALL_ACCESSES (sizeof(all_accesses)/sizeof(*all_accesses)) static void test_RtlAreAllAccessesGranted(void) @@ -722,7 +721,7 @@ static void test_RtlAreAllAccessesGranted(void) return; } - for (test_num = 0; test_num < NB_ALL_ACCESSES; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(all_accesses); test_num++) { result = pRtlAreAllAccessesGranted(all_accesses[test_num].GrantedAccess, all_accesses[test_num].DesiredAccess); ok(all_accesses[test_num].result == result, @@ -751,7 +750,6 @@ static const any_accesses_t any_accesses[] = { {0xFEDCBA76, 0x00040000, 1}, {0xFED8BA76, 0x00040000, 0}, }; -#define NB_ANY_ACCESSES (sizeof(any_accesses)/sizeof(*any_accesses)) static void test_RtlAreAnyAccessesGranted(void) @@ -765,7 +763,7 @@ static void test_RtlAreAnyAccessesGranted(void) return; } - for (test_num = 0; test_num < NB_ANY_ACCESSES; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(any_accesses); test_num++) { result = pRtlAreAnyAccessesGranted(any_accesses[test_num].GrantedAccess, any_accesses[test_num].DesiredAccess); ok(any_accesses[test_num].result == result, diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 53cc185939..8b948fa82a 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -406,7 +406,6 @@ static const dupl_ustr_t dupl_ustr[] = { { 3, 0, 2, 2, NULL, 40, 42, 42, NULL, 40, 42, 0, NULL, STATUS_INVALID_PARAMETER}, { 3, 0, 0, 0, NULL, 40, 42, 42, NULL, 0, 2, 2, "", STATUS_SUCCESS}, }; -#define NB_DUPL_USTR (sizeof(dupl_ustr)/sizeof(*dupl_ustr)) static void test_RtlDuplicateUnicodeString(void) @@ -429,7 +428,7 @@ static void test_RtlDuplicateUnicodeString(void) return; } - for (test_num = 0; test_num < NB_DUPL_USTR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(dupl_ustr); test_num++) { source_str.Length = dupl_ustr[test_num].source_Length; source_str.MaximumLength = dupl_ustr[test_num].source_MaximumLength; if (dupl_ustr[test_num].source_buf != NULL) { @@ -776,7 +775,6 @@ static const ustr2astr_t ustr2astr[] = { { 0, 0, 12, NULL, 10, 10, 12, NULL, FALSE, 5, 0, 0, NULL, STATUS_BUFFER_OVERFLOW}, #endif }; -#define NB_USTR2ASTR (sizeof(ustr2astr)/sizeof(*ustr2astr)) static void test_RtlUnicodeStringToAnsiString(void) @@ -789,7 +787,7 @@ static void test_RtlUnicodeStringToAnsiString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_USTR2ASTR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ustr2astr); test_num++) { ansi_str.Length = ustr2astr[test_num].ansi_Length; ansi_str.MaximumLength = ustr2astr[test_num].ansi_MaximumLength; if (ustr2astr[test_num].ansi_buf != NULL) { @@ -852,7 +850,6 @@ static const app_asc2str_t app_asc2str[] = { { 5, 14, 15, NULL, NULL, 5, 14, 15, NULL, STATUS_SUCCESS}, { 5, 12, 15, "Tst\0S01234abcde", "tr\0i", 7, 12, 15, "Tst\0Str234abcde", STATUS_SUCCESS}, }; -#define NB_APP_ASC2STR (sizeof(app_asc2str)/sizeof(*app_asc2str)) static void test_RtlAppendAsciizToString(void) @@ -862,7 +859,7 @@ static void test_RtlAppendAsciizToString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_APP_ASC2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(app_asc2str); test_num++) { dest_str.Length = app_asc2str[test_num].dest_Length; dest_str.MaximumLength = app_asc2str[test_num].dest_MaximumLength; if (app_asc2str[test_num].dest_buf != NULL) { @@ -922,7 +919,6 @@ static const app_str2str_t app_str2str[] = { { 5, 14, 15, NULL, 0, 0, 7, NULL, 5, 14, 15, NULL, STATUS_SUCCESS}, { 5, 12, 15, "Tst\0S01234abcde", 4, 4, 7, "tr\0iZY", 9, 12, 15, "Tst\0Str\0i4abcde", STATUS_SUCCESS}, }; -#define NB_APP_STR2STR (sizeof(app_str2str)/sizeof(*app_str2str)) static void test_RtlAppendStringToString(void) @@ -934,7 +930,7 @@ static void test_RtlAppendStringToString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_APP_STR2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(app_str2str); test_num++) { dest_str.Length = app_str2str[test_num].dest_Length; dest_str.MaximumLength = app_str2str[test_num].dest_MaximumLength; if (app_str2str[test_num].dest_buf != NULL) { @@ -1005,7 +1001,6 @@ static const app_uni2str_t app_uni2str[] = { { 4, 14, 14, "Fake0123abcdef", "U\0stri\0", 10, 14, 14, "FakeU\0stri\0\0ef", STATUS_SUCCESS}, { 6, 14, 16, "Te\0\0stabcdefghij", "St\0\0ri", 8, 14, 16, "Te\0\0stSt\0\0efghij", STATUS_SUCCESS}, }; -#define NB_APP_UNI2STR (sizeof(app_uni2str)/sizeof(*app_uni2str)) static void test_RtlAppendUnicodeToString(void) @@ -1015,7 +1010,7 @@ static void test_RtlAppendUnicodeToString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_APP_UNI2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(app_uni2str); test_num++) { dest_str.Length = app_uni2str[test_num].dest_Length; dest_str.MaximumLength = app_uni2str[test_num].dest_MaximumLength; if (app_uni2str[test_num].dest_buf != NULL) { @@ -1079,7 +1074,6 @@ static const app_ustr2str_t app_ustr2str[] = { { 4, 14, 14, NULL, 0, 0, 8, NULL, 4, 14, 14, NULL, STATUS_SUCCESS}, { 6, 14, 16, "Te\0\0stabcdefghij", 6, 8, 8, "St\0\0riZY", 12, 14, 16, "Te\0\0stSt\0\0ri\0\0ij", STATUS_SUCCESS}, }; -#define NB_APP_USTR2STR (sizeof(app_ustr2str)/sizeof(*app_ustr2str)) static void test_RtlAppendUnicodeStringToString(void) @@ -1091,7 +1085,7 @@ static void test_RtlAppendUnicodeStringToString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_APP_USTR2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(app_ustr2str); test_num++) { dest_str.Length = app_ustr2str[test_num].dest_Length; dest_str.MaximumLength = app_ustr2str[test_num].dest_MaximumLength; if (app_ustr2str[test_num].dest_buf != NULL) { @@ -1189,7 +1183,6 @@ static const find_ch_in_ustr_t find_ch_in_ustr[] = { { 2, "abcdabcdabcdabcdabcdabcd", "abcd", 0, STATUS_NOT_FOUND}, { 3, "abcdabcdabcdabcdabcdabcd", "abcd", 0, STATUS_NOT_FOUND}, }; -#define NB_FIND_CH_IN_USTR (sizeof(find_ch_in_ustr)/sizeof(*find_ch_in_ustr)) static void test_RtlFindCharInUnicodeString(void) @@ -1209,7 +1202,7 @@ static void test_RtlFindCharInUnicodeString(void) return; } - for (test_num = 0; test_num < NB_FIND_CH_IN_USTR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(find_ch_in_ustr); test_num++) { if (find_ch_in_ustr[test_num].main_str != NULL) { main_str.Length = strlen(find_ch_in_ustr[test_num].main_str) * sizeof(WCHAR); main_str.MaximumLength = main_str.Length + sizeof(WCHAR); @@ -1371,7 +1364,6 @@ static const str2int_t str2int[] = { {-8, "0", 0, STATUS_INVALID_PARAMETER}, /* Negative base */ /* { 0, NULL, 0, STATUS_SUCCESS}, */ /* NULL as string */ }; -#define NB_STR2INT (sizeof(str2int)/sizeof(*str2int)) static void test_RtlUnicodeStringToInteger(void) @@ -1382,7 +1374,7 @@ static void test_RtlUnicodeStringToInteger(void) WCHAR *wstr; UNICODE_STRING uni; - for (test_num = 0; test_num < NB_STR2INT; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2int); test_num++) { wstr = AtoW(str2int[test_num].str); value = 0xdeadbeef; pRtlInitUnicodeString(&uni, wstr); @@ -1451,7 +1443,7 @@ static void test_RtlCharToInteger(void) int value; NTSTATUS result; - for (test_num = 0; test_num < NB_STR2INT; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2int); test_num++) { /* w2k skips a leading '\0' and processes the string after */ if (str2int[test_num].str[0] != '\0') { value = 0xdeadbeef; @@ -1600,7 +1592,6 @@ static const int2str_t int2str[] = { {20, 0xdeadbeef, 0, 9, "-----------------------------------", STATUS_INVALID_PARAMETER}, /* ill. base */ {-8, 07654321, 0, 12, "-----------------------------------", STATUS_INVALID_PARAMETER}, /* neg. base */ }; -#define NB_INT2STR (sizeof(int2str)/sizeof(*int2str)) static void one_RtlIntegerToUnicodeString_test(int test_num, const int2str_t *int2str) @@ -1673,7 +1664,7 @@ static void test_RtlIntegerToUnicodeString(void) { size_t test_num; - for (test_num = 0; test_num < NB_INT2STR; test_num++) + for (test_num = 0; test_num < ARRAY_SIZE(int2str); test_num++) one_RtlIntegerToUnicodeString_test(test_num, &int2str[test_num]); } @@ -1700,7 +1691,7 @@ static void test_RtlIntegerToChar(void) NTSTATUS result; size_t test_num; - for (test_num = 0; test_num < NB_INT2STR; test_num++) + for (test_num = 0; test_num < ARRAY_SIZE(int2str); test_num++) one_RtlIntegerToChar_test(test_num, &int2str[test_num]); result = pRtlIntegerToChar(int2str[0].value, 20, int2str[0].MaximumLength, NULL); diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 407bc0ffec..708d6e7b65 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -212,7 +212,6 @@ static const ulong2str_t ulong2str[] = { {36, 62193781, "111111\0------------------------------------------------------------", 0x77}, {37, 71270178, "111111\0------------------------------------------------------------", 0x77}, }; -#define NB_ULONG2STR (sizeof(ulong2str)/sizeof(*ulong2str)) static void one_itoa_test(int test_num, const ulong2str_t *ulong2str) @@ -276,7 +275,7 @@ static void test_ulongtoa(void) { int test_num; - for (test_num = 0; test_num < NB_ULONG2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ulong2str); test_num++) { if (ulong2str[test_num].mask & 0x01) { one_itoa_test(test_num, &ulong2str[test_num]); } /* if */ @@ -402,7 +401,7 @@ static void test_ulongtow(void) int test_num; LPWSTR result; - for (test_num = 0; test_num < NB_ULONG2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ulong2str); test_num++) { if (ulong2str[test_num].mask & 0x10) { one_itow_test(test_num, &ulong2str[test_num]); } /* if */ @@ -588,7 +587,6 @@ static const ulonglong2str_t ulonglong2str[] = { {37, 71270178, "111111\0------------------------------------------------------------", 0x33}, {99, ULL(0x2,0x3c9e468c), "111111\0------------------------------------------------------------", 0x33}, }; -#define NB_ULONGLONG2STR (sizeof(ulonglong2str)/sizeof(*ulonglong2str)) static void one_i64toa_test(int test_num, const ulonglong2str_t *ulonglong2str) @@ -642,7 +640,7 @@ static void test_ulonglongtoa(void) { int test_num; - for (test_num = 0; test_num < NB_ULONGLONG2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ulonglong2str); test_num++) { if (ulonglong2str[test_num].mask & 0x01) { one_i64toa_test(test_num, &ulonglong2str[test_num]); } /* if */ @@ -746,7 +744,7 @@ static void test_ulonglongtow(void) int test_num; LPWSTR result; - for (test_num = 0; test_num < NB_ULONGLONG2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ulonglong2str); test_num++) { if (ulonglong2str[test_num].mask & 0x10) { one_i64tow_test(test_num, &ulonglong2str[test_num]); } /* if */ @@ -885,7 +883,6 @@ static const str2long_t str2long[] = { { "", 0 }, /* empty string */ /* { NULL, 0 }, */ /* NULL as string */ }; -#define NB_STR2LONG (sizeof(str2long)/sizeof(*str2long)) static void test_wtoi(void) @@ -894,7 +891,7 @@ static void test_wtoi(void) UNICODE_STRING uni; int result; - for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { pRtlCreateUnicodeStringFromAsciiz(&uni, str2long[test_num].str); result = p_wtoi(uni.Buffer); ok(result == str2long[test_num].value, @@ -909,7 +906,7 @@ static void test_atoi(void) int test_num; int result; - for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { result = patoi(str2long[test_num].str); ok(result == str2long[test_num].value, "(test %d): call failed: _atoi(\"%s\") has result %d, expected: %d\n", @@ -922,7 +919,7 @@ static void test_atol(void) int test_num; int result; - for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { result = patol(str2long[test_num].str); ok(result == str2long[test_num].value, "(test %d): call failed: _atol(\"%s\") has result %d, expected: %d\n", @@ -936,7 +933,7 @@ static void test_wtol(void) UNICODE_STRING uni; LONG result; - for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { pRtlCreateUnicodeStringFromAsciiz(&uni, str2long[test_num].str); result = p_wtol(uni.Buffer); ok(result == str2long[test_num].value, @@ -1068,7 +1065,6 @@ static const str2longlong_t str2longlong[] = { { "", 0 }, /* empty string */ /* { NULL, 0 }, */ /* NULL as string */ }; -#define NB_STR2LONGLONG (sizeof(str2longlong)/sizeof(*str2longlong)) static void test_atoi64(void) @@ -1076,7 +1072,7 @@ static void test_atoi64(void) int test_num; LONGLONG result; - for (test_num = 0; test_num < NB_STR2LONGLONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2longlong); test_num++) { result = p_atoi64(str2longlong[test_num].str); if (str2longlong[test_num].overflow) ok(result == str2longlong[test_num].value || @@ -1100,7 +1096,7 @@ static void test_wtoi64(void) UNICODE_STRING uni; LONGLONG result; - for (test_num = 0; test_num < NB_STR2LONGLONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2longlong); test_num++) { pRtlCreateUnicodeStringFromAsciiz(&uni, str2longlong[test_num].str); result = p_wtoi64(uni.Buffer); if (str2longlong[test_num].overflow) -- 2.14.4

1 0

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

June 21, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/ftp.c | 2 +- dlls/wininet/tests/http.c | 10 ++++----- dlls/wininet/tests/internet.c | 16 ++++++------- dlls/wininet/tests/url.c | 52 +++++++++++++++++++++---------------------- dlls/wininet/tests/urlcache.c | 4 ++-- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index d2118faded..6f50104f3b 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -735,7 +735,7 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) return; } - for (i = 0; i < sizeof(command_test) / sizeof(command_test[0]); i++) + for (i = 0; i < ARRAY_SIZE(command_test); i++) { SetLastError(0xdeadbeef); ret = pFtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, command_test[i].cmd, 0, NULL); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 0524ddf3fd..ace8512399 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -172,7 +172,7 @@ static BOOL (WINAPI *pInternetGetSecurityInfoByURLA)(LPSTR,PCCERT_CHAIN_CONTEXT* static int strcmp_wa(LPCWSTR strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -4204,7 +4204,7 @@ static void test_http_status(int port) DWORD i, size; BOOL res; - for(i=0; i < sizeof(http_status_tests)/sizeof(*http_status_tests); i++) { + for(i = 0; i < ARRAY_SIZE(http_status_tests); i++) { send_buffer = http_status_tests[i].response_text; open_simple_request(&req, "localhost", port, NULL, "/send_from_buffer"); @@ -6543,14 +6543,14 @@ static const struct notification async_send_request_ex_chunked_test[] = static const struct notification_data notification_data[] = { { async_send_request_ex_chunked_test, - sizeof(async_send_request_ex_chunked_test)/sizeof(async_send_request_ex_chunked_test[0]), + ARRAY_SIZE(async_send_request_ex_chunked_test), "GET", "test.winehq.org", "tests/data.php" }, { async_send_request_ex_test, - sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), + ARRAY_SIZE(async_send_request_ex_test), "POST", "test.winehq.org", "tests/post.php", @@ -6565,7 +6565,7 @@ static const struct notification_data notification_data[] = { }, { async_send_request_ex_resolve_failure_test, - sizeof(async_send_request_ex_resolve_failure_test)/sizeof(async_send_request_ex_resolve_failure_test[0]), + ARRAY_SIZE(async_send_request_ex_resolve_failure_test), "GET", "brokenhost", "index.html", diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 39c698f5db..7889e40ea8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -629,7 +629,7 @@ static void test_cookie_url(void) ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetGetCookeA failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - len = sizeof(bufw)/sizeof(*bufw); + len = ARRAY_SIZE(bufw); res = InternetGetCookieW(about_blankW, NULL, bufw, &len); ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetGetCookeW failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); @@ -639,7 +639,7 @@ static void test_cookie_url(void) ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetGetCookeExA failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - len = sizeof(bufw)/sizeof(*bufw); + len = ARRAY_SIZE(bufw); res = pInternetGetCookieExW(about_blankW, NULL, bufw, &len, 0, NULL); ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetGetCookeExW failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); @@ -887,7 +887,7 @@ static void InternetTimeFromSystemTimeW_test(void) /* test too small buffer size */ SetLastError(0xdeadbeef); - ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string)/sizeof(string[0]) ); + ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, string, ARRAY_SIZE(string)); error = GetLastError(); ok( !ret, "InternetTimeFromSystemTimeW should have returned FALSE\n" ); ok( error == ERROR_INSUFFICIENT_BUFFER, @@ -1084,7 +1084,7 @@ static void test_PrivacyGetSetZonePreferenceW(void) trace("template %u\n", old_template); if(old_template == PRIVACY_TEMPLATE_ADVANCED) { - pref_size = sizeof(pref)/sizeof(WCHAR); + pref_size = ARRAY_SIZE(pref); ret = pPrivacyGetZonePreferenceW(zone, type, &old_template, pref, &pref_size); ok(ret == 0, "expected ret == 0, got %u\n", ret); } @@ -1721,7 +1721,7 @@ static void test_InternetGetConnectedStateExW(void) flags = 0; buffer[0] = 0; - res = pInternetGetConnectedStateExW(&flags, buffer, sizeof(buffer) / sizeof(buffer[0]), 0); + res = pInternetGetConnectedStateExW(&flags, buffer, ARRAY_SIZE(buffer), 0); trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); @@ -1755,21 +1755,21 @@ todo_wine ok(!buffer[0], "Buffer must not change, got %02X\n", buffer[0]); buffer[0] = 0; - res = pInternetGetConnectedStateExW(NULL, buffer, sizeof(buffer) / sizeof(buffer[0]), 0); + res = pInternetGetConnectedStateExW(NULL, buffer, ARRAY_SIZE(buffer), 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); sz = lstrlenW(buffer); ok(sz > 0, "Expected a connection name\n"); buffer[0] = 0; flags = 0; - res = pInternetGetConnectedStateExW(&flags, buffer, sizeof(buffer) / sizeof(buffer[0]), 0); + res = pInternetGetConnectedStateExW(&flags, buffer, ARRAY_SIZE(buffer), 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); sz = lstrlenW(buffer); ok(sz > 0, "Expected a connection name\n"); flags = 0; - res = pInternetGetConnectedStateExW(&flags, NULL, sizeof(buffer) / sizeof(buffer[0]), 0); + res = pInternetGetConnectedStateExW(&flags, NULL, ARRAY_SIZE(buffer), 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 0af58358eb..18c77b6647 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -672,17 +672,17 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof(comp); comp.lpszScheme = scheme; - comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); + comp.dwSchemeLength = ARRAY_SIZE(scheme); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.dwHostNameLength = ARRAY_SIZE(host); comp.lpszUserName = user; - comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); + comp.dwUserNameLength = ARRAY_SIZE(user); comp.lpszPassword = pwd; - comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); + comp.dwPasswordLength = ARRAY_SIZE(pwd); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + comp.dwUrlPathLength = ARRAY_SIZE(urlpart); comp.lpszExtraInfo = extra; - comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); + comp.dwExtraInfoLength = ARRAY_SIZE(extra); SetLastError(0xdeadbeef); r = InternetCrackUrlW(NULL, 0, 0, &comp ); @@ -721,9 +721,9 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; - comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.dwHostNameLength = ARRAY_SIZE(host); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + comp.dwUrlPathLength = ARRAY_SIZE(urlpart); r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n"); @@ -739,11 +739,11 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; - comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.dwHostNameLength = ARRAY_SIZE(host); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + comp.dwUrlPathLength = ARRAY_SIZE(urlpart); comp.lpszExtraInfo = NULL; - comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); + comp.dwExtraInfoLength = ARRAY_SIZE(extra); r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n"); @@ -763,17 +763,17 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof(comp)); comp.dwStructSize = sizeof(comp); comp.lpszScheme = scheme; - comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); + comp.dwSchemeLength = ARRAY_SIZE(scheme); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.dwHostNameLength = ARRAY_SIZE(host); comp.lpszUserName = user; - comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); + comp.dwUserNameLength = ARRAY_SIZE(user); comp.lpszPassword = pwd; - comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); + comp.dwPasswordLength = ARRAY_SIZE(pwd); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + comp.dwUrlPathLength = ARRAY_SIZE(urlpart); comp.lpszExtraInfo = extra; - comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); + comp.dwExtraInfoLength = ARRAY_SIZE(extra); r = InternetCrackUrlW(url2, 0, 0, &comp); ok(!r, "InternetCrackUrl should have failed\n"); @@ -791,17 +791,17 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszScheme = scheme; - comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); + comp.dwSchemeLength = ARRAY_SIZE(scheme); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.dwHostNameLength = ARRAY_SIZE(host); comp.lpszUserName = user; - comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); + comp.dwUserNameLength = ARRAY_SIZE(user); comp.lpszPassword = pwd; - comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); + comp.dwPasswordLength = ARRAY_SIZE(pwd); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + comp.dwUrlPathLength = ARRAY_SIZE(urlpart); comp.lpszExtraInfo = extra; - comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); + comp.dwExtraInfoLength = ARRAY_SIZE(extra); r = InternetCrackUrlW(url3, 0, 0, &comp ); ok( r, "InternetCrackUrlW failed unexpectedly\n"); ok( host[0] == 'x', "host should be x.org\n"); @@ -812,9 +812,9 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof(comp)); comp.dwStructSize = sizeof(comp); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.dwHostNameLength = ARRAY_SIZE(host); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + comp.dwUrlPathLength = ARRAY_SIZE(urlpart); r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp); todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n"); todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); @@ -1224,7 +1224,7 @@ START_TEST(url) return; } - for(i=0; i < sizeof(crack_url_tests)/sizeof(*crack_url_tests); i++) + for(i = 0; i < ARRAY_SIZE(crack_url_tests); i++) test_crack_url(crack_url_tests+i); test_long_url(); diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 310054b6a7..3799500489 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -891,13 +891,13 @@ static void test_urlcacheW(void) if(ie10_cache) { if(!MultiByteToWideChar(CP_ACP, 0, urls[6].encoded_url, -1, - urls[6].url, sizeof(urls[6].url)/sizeof(WCHAR))) + urls[6].url, ARRAY_SIZE(urls[6].url))) urls[6].url[0] = 0; trace("converted url in test 6: %s\n", wine_dbgstr_w(urls[6].url)); } - for(i=0; i<sizeof(urls)/sizeof(*urls); i++) { + for(i=0; i<ARRAY_SIZE(urls); i++) { INTERNET_CACHE_ENTRY_INFOA *entry_infoA; INTERNET_CACHE_ENTRY_INFOW *entry_infoW; DWORD size; -- 2.14.4

1 0

[PATCH] appwiz.cpl: Support installing minor updates when installing addons
by Piotr Caban June 21, 2018

June 21, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 0/3] Add DXTn 3D texture support.
by Connor McAdams June 21, 2018

June 21, 2018

This patch series adds support for using DXTn volume textures, by decompressing and converting them using the CPU. This fixes issues with games such as Halo Online, and others mentioned in the bugzilla page here: https://bugs.winehq.org/show_bug.cgi?id=39253 Let me know what needs changed or fixed, this is my first patch, so I assume it wont be perfect. :) Thanks, Connor McAdams (Conmanx360 in IRC) Connor McAdams (3): Add decompression functions for DXT1, DXT3, and DXT5 Add format change before upload for non-volume textures Add new test for DXTn volume textures. dlls/d3d9/tests/visual.c | 190 +++++++++++++++++++--------- dlls/wined3d/texture.c | 26 ++++ dlls/wined3d/utils.c | 321 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 462 insertions(+), 75 deletions(-) -- 2.7.4

2 4

[PATCH 7/7] ninput: Add RegisterOutputCallbackInteractionContext() stub.
by Józef Kucia June 21, 2018

June 21, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ninput/main.c | 13 +++++++++++++ dlls/ninput/ninput.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 01703749d087..5d2be62fec21 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -148,6 +148,19 @@ HRESULT WINAPI SetInteractionConfigurationInteractionContext(HINTERACTIONCONTEXT return S_OK; } +HRESULT WINAPI RegisterOutputCallbackInteractionContext(HINTERACTIONCONTEXT handle, + INTERACTION_CONTEXT_OUTPUT_CALLBACK callback, void *data) +{ + struct interaction_context *context = context_from_handle(handle); + + FIXME("context %p, callback %p, data %p: stub!.\n", context, callback, data); + + if (!context) + return E_HANDLE; + + return S_OK; +} + HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context) { FIXME("context %p: stub!\n", context); diff --git a/dlls/ninput/ninput.spec b/dlls/ninput/ninput.spec index 70d296cc597f..e2897872b683 100644 --- a/dlls/ninput/ninput.spec +++ b/dlls/ninput/ninput.spec @@ -12,7 +12,7 @@ @ stub ProcessBufferedPacketsInteractionContext @ stdcall ProcessInertiaInteractionContext(ptr) @ stub ProcessPointerFramesInteractionContext -@ stub RegisterOutputCallbackInteractionContext +@ stdcall RegisterOutputCallbackInteractionContext(ptr ptr ptr) @ stub RemovePointerInteractionContext @ stub ResetInteractionContext @ stub SetCrossSlideParametersInteractionContext -- 2.16.4

1 0

[PATCH 6/7] ninput: Add SetInteractionConfigurationInteractionContext() stub.
by Józef Kucia June 21, 2018

June 21, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ninput/main.c | 17 +++++++++++++++++ dlls/ninput/ninput.spec | 2 +- dlls/ninput/tests/ninput.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 90f9e7e0c4ee..01703749d087 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -131,6 +131,23 @@ HRESULT WINAPI SetPropertyInteractionContext(HINTERACTIONCONTEXT handle, } } +HRESULT WINAPI SetInteractionConfigurationInteractionContext(HINTERACTIONCONTEXT handle, + UINT32 count, const INTERACTION_CONTEXT_CONFIGURATION *configuration) +{ + struct interaction_context *context = context_from_handle(handle); + + FIXME("context %p, count %u, configuration %p: stub!.\n", context, count, configuration); + + if (!context) + return E_HANDLE; + if (!count) + return E_INVALIDARG; + if (!configuration) + return E_POINTER; + + return S_OK; +} + HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context) { FIXME("context %p: stub!\n", context); diff --git a/dlls/ninput/ninput.spec b/dlls/ninput/ninput.spec index 166e3d1ec8c1..70d296cc597f 100644 --- a/dlls/ninput/ninput.spec +++ b/dlls/ninput/ninput.spec @@ -17,7 +17,7 @@ @ stub ResetInteractionContext @ stub SetCrossSlideParametersInteractionContext @ stub SetInertiaParameterInteractionContext -@ stub SetInteractionConfigurationInteractionContext +@ stdcall SetInteractionConfigurationInteractionContext(ptr long ptr) @ stub SetMouseWheelParameterInteractionContext @ stub SetPivotInteractionContext @ stdcall SetPropertyInteractionContext(ptr long long) diff --git a/dlls/ninput/tests/ninput.c b/dlls/ninput/tests/ninput.c index 156e3e898366..7fd389378b01 100644 --- a/dlls/ninput/tests/ninput.c +++ b/dlls/ninput/tests/ninput.c @@ -82,8 +82,44 @@ static void test_properties(void) ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr); } +static void test_configuration(void) +{ + HINTERACTIONCONTEXT context; + HRESULT hr; + + static const INTERACTION_CONTEXT_CONFIGURATION config[] = + { + { + INTERACTION_ID_MANIPULATION, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_TRANSLATION_X | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_TRANSLATION_Y | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_SCALING | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_TRANSLATION_INERTIA | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_SCALING_INERTIA + }, + }; + + hr = CreateInteractionContext(&context); + ok(hr == S_OK, "Failed to create context, hr %#x.\n", hr); + + hr = SetInteractionConfigurationInteractionContext(NULL, 0, NULL); + ok(hr == E_HANDLE, "Got hr %#x.\n", hr); + hr = SetInteractionConfigurationInteractionContext(context, 0, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = SetInteractionConfigurationInteractionContext(context, 1, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = SetInteractionConfigurationInteractionContext(context, ARRAY_SIZE(config), config); + ok(hr == S_OK, "Failed to set configuration, hr %#x.\n", hr); + + hr = DestroyInteractionContext(context); + ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr); +} + START_TEST(ninput) { test_context(); test_properties(); + test_configuration(); } -- 2.16.4

1 0

[PATCH 5/7] ninput: Implement SetPropertyInteractionContext().
by Józef Kucia June 21, 2018

June 21, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ninput/main.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ninput/ninput.spec | 4 ++-- dlls/ninput/tests/ninput.c | 48 +++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 932d159ab390..90f9e7e0c4ee 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -72,6 +72,65 @@ HRESULT WINAPI DestroyInteractionContext(HINTERACTIONCONTEXT handle) return S_OK; } +HRESULT WINAPI GetPropertyInteractionContext(HINTERACTIONCONTEXT handle, + INTERACTION_CONTEXT_PROPERTY property, UINT32 *value) +{ + struct interaction_context *context = context_from_handle(handle); + + TRACE("context %p, property %#x, value %p.\n", context, property, value); + + if (!context) + return E_HANDLE; + if (!value) + return E_POINTER; + + switch (property) + { + case INTERACTION_CONTEXT_PROPERTY_MEASUREMENT_UNITS: + case INTERACTION_CONTEXT_PROPERTY_INTERACTION_UI_FEEDBACK: + FIXME("Unhandled property %#x.\n", property); + *value = 0; + return E_NOTIMPL; + + case INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS: + *value = context->filter_pointers; + return S_OK; + + default: + WARN("Invalid property %#x.\n", property); + return E_INVALIDARG; + } +} + +HRESULT WINAPI SetPropertyInteractionContext(HINTERACTIONCONTEXT handle, + INTERACTION_CONTEXT_PROPERTY property, UINT32 value) +{ + struct interaction_context *context = context_from_handle(handle); + + TRACE("context %p, property %#x, value %#x.\n", context, property, value); + + if (!context) + return E_HANDLE; + + switch (property) + { + case INTERACTION_CONTEXT_PROPERTY_MEASUREMENT_UNITS: + case INTERACTION_CONTEXT_PROPERTY_INTERACTION_UI_FEEDBACK: + FIXME("Unhandled property %#x.\n", property); + return E_NOTIMPL; + + case INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS: + if (value != FALSE && value != TRUE) + return E_INVALIDARG; + context->filter_pointers = value; + return S_OK; + + default: + WARN("Invalid property %#x.\n", property); + return E_INVALIDARG; + } +} + HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context) { FIXME("context %p: stub!\n", context); diff --git a/dlls/ninput/ninput.spec b/dlls/ninput/ninput.spec index fe7c6b3c53b3..166e3d1ec8c1 100644 --- a/dlls/ninput/ninput.spec +++ b/dlls/ninput/ninput.spec @@ -7,7 +7,7 @@ @ stub GetInertiaParameterInteractionContext @ stub GetInteractionConfigurationInteractionContext @ stub GetMouseWheelParameterInteractionContext -@ stub GetPropertyInteractionContext +@ stdcall GetPropertyInteractionContext(ptr long ptr) @ stub GetStateInteractionContext @ stub ProcessBufferedPacketsInteractionContext @ stdcall ProcessInertiaInteractionContext(ptr) @@ -20,5 +20,5 @@ @ stub SetInteractionConfigurationInteractionContext @ stub SetMouseWheelParameterInteractionContext @ stub SetPivotInteractionContext -@ stub SetPropertyInteractionContext +@ stdcall SetPropertyInteractionContext(ptr long long) @ stub StopInteractionContext diff --git a/dlls/ninput/tests/ninput.c b/dlls/ninput/tests/ninput.c index d894ab8a847a..156e3e898366 100644 --- a/dlls/ninput/tests/ninput.c +++ b/dlls/ninput/tests/ninput.c @@ -35,7 +35,55 @@ static void test_context(void) ok(hr == E_HANDLE, "Got hr %#x.\n", hr); } +static void test_properties(void) +{ + HINTERACTIONCONTEXT context; + UINT32 value; + HRESULT hr; + + hr = CreateInteractionContext(&context); + ok(hr == S_OK, "Failed to create context, hr %#x.\n", hr); + + hr = GetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, &value); + ok(hr == S_OK, "Failed to get property, hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = SetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, TRUE); + ok(hr == S_OK, "Failed to set property, hr %#x.\n", hr); + hr = GetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, &value); + ok(hr == S_OK, "Failed to get property, hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = SetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, FALSE); + ok(hr == S_OK, "Failed to set property, hr %#x.\n", hr); + hr = GetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, &value); + ok(hr == S_OK, "Failed to get property, hr %#x.\n", hr); + ok(value == FALSE, "Got unexpected value %#x.\n", value); + + hr = SetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, 2); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = SetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, 3); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = SetPropertyInteractionContext(context, 0xdeadbeef, 0); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = GetPropertyInteractionContext(context, 0xdeadbeef, &value); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = GetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = SetPropertyInteractionContext(NULL, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, FALSE); + ok(hr == E_HANDLE, "Got hr %#x.\n", hr); + hr = GetPropertyInteractionContext(NULL, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, &value); + ok(hr == E_HANDLE, "Got hr %#x.\n", hr); + + hr = DestroyInteractionContext(context); + ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr); +} + START_TEST(ninput) { test_context(); + test_properties(); } -- 2.16.4

1 0

[PATCH 4/7] ninput: Add ProcessInertiaInteractionContext() stub.
by Józef Kucia June 21, 2018

June 21, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ninput/main.c | 6 ++++++ dlls/ninput/ninput.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 1aa3c4652b6e..932d159ab390 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -72,6 +72,12 @@ HRESULT WINAPI DestroyInteractionContext(HINTERACTIONCONTEXT handle) return S_OK; } +HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context) +{ + FIXME("context %p: stub!\n", context); + return E_NOTIMPL; +} + BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { TRACE("(%p, %d, %p)\n", inst, reason, reserved); diff --git a/dlls/ninput/ninput.spec b/dlls/ninput/ninput.spec index 0717cb1c2f47..fe7c6b3c53b3 100644 --- a/dlls/ninput/ninput.spec +++ b/dlls/ninput/ninput.spec @@ -10,7 +10,7 @@ @ stub GetPropertyInteractionContext @ stub GetStateInteractionContext @ stub ProcessBufferedPacketsInteractionContext -@ stub ProcessInertiaInteractionContext +@ stdcall ProcessInertiaInteractionContext(ptr) @ stub ProcessPointerFramesInteractionContext @ stub RegisterOutputCallbackInteractionContext @ stub RemovePointerInteractionContext -- 2.16.4

1 0

[PATCH 3/7] ninput: Implement CreateInteractionContext().
by Józef Kucia June 21, 2018

June 21, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- For bug 44720 --- configure | 1 + configure.ac | 1 + dlls/ninput/Makefile.in | 1 + dlls/ninput/main.c | 53 ++++++++++++++++++++++++++++++++++++++++--- dlls/ninput/ninput.spec | 4 ++-- dlls/ninput/tests/Makefile.in | 4 ++++ dlls/ninput/tests/ninput.c | 41 +++++++++++++++++++++++++++++++++ 7 files changed, 100 insertions(+), 5 deletions(-) create mode 100644 dlls/ninput/tests/Makefile.in create mode 100644 dlls/ninput/tests/ninput.c diff --git a/configure b/configure index bcb660d56982..26aa115002d9 100755 --- a/configure +++ b/configure @@ -19023,6 +19023,7 @@ wine_fn_config_makefile dlls/netprofm enable_netprofm wine_fn_config_makefile dlls/netprofm/tests enable_tests wine_fn_config_makefile dlls/newdev enable_newdev wine_fn_config_makefile dlls/ninput enable_ninput +wine_fn_config_makefile dlls/ninput/tests enable_tests wine_fn_config_makefile dlls/normaliz enable_normaliz wine_fn_config_makefile dlls/npmshtml enable_npmshtml wine_fn_config_makefile dlls/npptools enable_npptools diff --git a/configure.ac b/configure.ac index 469fa8d72977..0f7e130c322e 100644 --- a/configure.ac +++ b/configure.ac @@ -3522,6 +3522,7 @@ WINE_CONFIG_MAKEFILE(dlls/netprofm) WINE_CONFIG_MAKEFILE(dlls/netprofm/tests) WINE_CONFIG_MAKEFILE(dlls/newdev) WINE_CONFIG_MAKEFILE(dlls/ninput) +WINE_CONFIG_MAKEFILE(dlls/ninput/tests) WINE_CONFIG_MAKEFILE(dlls/normaliz) WINE_CONFIG_MAKEFILE(dlls/npmshtml) WINE_CONFIG_MAKEFILE(dlls/npptools) diff --git a/dlls/ninput/Makefile.in b/dlls/ninput/Makefile.in index 3d3cc7fe85e8..8f1039b73c86 100644 --- a/dlls/ninput/Makefile.in +++ b/dlls/ninput/Makefile.in @@ -1,4 +1,5 @@ MODULE = ninput.dll +IMPORTLIB = ninput C_SRCS = \ main.c diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 0f23128cfe4d..1aa3c4652b6e 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -22,19 +22,66 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "wine/heap.h" + +#include "interactioncontext.h" WINE_DEFAULT_DEBUG_CHANNEL(ninput); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +struct interaction_context +{ + BOOL filter_pointers; +}; + +static struct interaction_context *context_from_handle(HINTERACTIONCONTEXT handle) +{ + return (struct interaction_context *)handle; +} + +HRESULT WINAPI CreateInteractionContext(HINTERACTIONCONTEXT *handle) +{ + struct interaction_context *context; + + TRACE("handle %p.\n", handle); + + if (!handle) + return E_POINTER; + + if (!(context = heap_alloc(sizeof(*context)))) + return E_OUTOFMEMORY; + + context->filter_pointers = TRUE; + + TRACE("Created context %p.\n", context); + + *handle = (HINTERACTIONCONTEXT)context; + + return S_OK; +} + +HRESULT WINAPI DestroyInteractionContext(HINTERACTIONCONTEXT handle) +{ + struct interaction_context *context = context_from_handle(handle); + + TRACE("context %p.\n", context); + + if (!context) + return E_HANDLE; + + heap_free(context); + return S_OK; +} + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + TRACE("(%p, %d, %p)\n", inst, reason, reserved); switch (reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); + DisableThreadLibraryCalls(inst); break; } return TRUE; diff --git a/dlls/ninput/ninput.spec b/dlls/ninput/ninput.spec index 372beb20eb15..0717cb1c2f47 100644 --- a/dlls/ninput/ninput.spec +++ b/dlls/ninput/ninput.spec @@ -1,8 +1,8 @@ @ stub DefaultInputHandler @ stub AddPointerInteractionContext @ stub BufferPointerPacketsInteractionContext -@ stub CreateInteractionContext -@ stub DestroyInteractionContext +@ stdcall CreateInteractionContext(ptr) +@ stdcall DestroyInteractionContext(ptr) @ stub GetCrossSlideParameterInteractionContext @ stub GetInertiaParameterInteractionContext @ stub GetInteractionConfigurationInteractionContext diff --git a/dlls/ninput/tests/Makefile.in b/dlls/ninput/tests/Makefile.in new file mode 100644 index 000000000000..9c0b44fa17dc --- /dev/null +++ b/dlls/ninput/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = ninput.dll +IMPORTS = ninput + +C_SRCS = ninput.c diff --git a/dlls/ninput/tests/ninput.c b/dlls/ninput/tests/ninput.c new file mode 100644 index 000000000000..d894ab8a847a --- /dev/null +++ b/dlls/ninput/tests/ninput.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Józef Kucia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "interactioncontext.h" +#include "wine/test.h" + +static void test_context(void) +{ + HINTERACTIONCONTEXT context; + HRESULT hr; + + hr = CreateInteractionContext(&context); + ok(hr == S_OK, "Failed to create context, hr %#x.\n", hr); + hr = DestroyInteractionContext(context); + ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr); + + hr = CreateInteractionContext(NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = DestroyInteractionContext(NULL); + ok(hr == E_HANDLE, "Got hr %#x.\n", hr); +} + +START_TEST(ninput) +{ + test_context(); +} -- 2.16.4

1 0

[PATCH 2/7] include: Add interactioncontext.h.
by Józef Kucia June 21, 2018

June 21, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/Makefile.in | 1 + include/interactioncontext.h | 195 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 include/interactioncontext.h diff --git a/include/Makefile.in b/include/Makefile.in index 78ab095d77e7..72a701090047 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -314,6 +314,7 @@ SOURCES = \ inputscope.idl \ inseng.idl \ inspectable.idl \ + interactioncontext.h \ intshcut.h \ ipexport.h \ iphlpapi.h \ diff --git a/include/interactioncontext.h b/include/interactioncontext.h new file mode 100644 index 000000000000..a643b626cd7e --- /dev/null +++ b/include/interactioncontext.h @@ -0,0 +1,195 @@ +/* + * Copyright 2018 Józef Kucia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef INTERACTION_CONTEXT_H +#define INTERACTION_CONTEXT_H + +#include <windows.h> + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ + +DECLARE_HANDLE(HINTERACTIONCONTEXT); + +typedef enum INTERACTION_CONTEXT_PROPERTY +{ + INTERACTION_CONTEXT_PROPERTY_MEASUREMENT_UNITS = 1, + INTERACTION_CONTEXT_PROPERTY_INTERACTION_UI_FEEDBACK = 2, + INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS = 3, + INTERACTION_CONTEXT_PROPERTY_MAX = 0xffffffff, +} INTERACTION_CONTEXT_PROPERTY; + +typedef enum INTERACTION_ID +{ + INTERACTION_ID_NONE = 0, + INTERACTION_ID_MANIPULATION = 1, + INTERACTION_ID_TAP = 2, + INTERACTION_ID_SECONDARY_TAP = 3, + INTERACTION_ID_HOLD = 4, + INTERACTION_ID_DRAG = 5, + INTERACTION_ID_CROSS_SLIDE = 6, + INTERACTION_ID_MAX = 0xffffffff, +} INTERACTION_ID; + +typedef enum INTERACTION_FLAGS +{ + INTERACTION_FLAG_NONE = 0x00000000, + INTERACTION_FLAG_BEGIN = 0x00000001, + INTERACTION_FLAG_END = 0x00000002, + INTERACTION_FLAG_CANCEL = 0x00000004, + INTERACTION_FLAG_INERTIA = 0x00000008, + INTERACTION_FLAG_MAX = 0xffffffff, +} INTERACTION_FLAGS; + +typedef enum INTERACTION_CONFIGURATION_FLAGS +{ + INTERACTION_CONFIGURATION_FLAG_NONE = 0x00000000, + + INTERACTION_CONFIGURATION_FLAG_MANIPULATION = 0x00000001, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_TRANSLATION_X = 0x00000002, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_TRANSLATION_Y = 0x00000004, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_ROTATION = 0x00000008, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_SCALING = 0x00000010, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_TRANSLATION_INERTIA = 0x00000020, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_ROTATION_INERTIA = 0x00000040, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_SCALING_INERTIA = 0x00000080, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_RAILS_X = 0x00000100, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_RAILS_Y = 0x00000200, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_EXACT = 0x00000400, + + INTERACTION_CONFIGURATION_FLAG_TAP = 0x00000001, + INTERACTION_CONFIGURATION_FLAG_TAP_DOUBLE = 0x00000002, + + INTERACTION_CONFIGURATION_FLAG_SECONDARY_TAP = 0x00000001, + + INTERACTION_CONFIGURATION_FLAG_HOLD = 0x00000001, + INTERACTION_CONFIGURATION_FLAG_HOLD_MOUSE = 0x00000002, + + INTERACTION_CONFIGURATION_FLAG_DRAG = 0x00000001, + + INTERACTION_CONFIGURATION_FLAG_CROSS_SLIDE = 0x00000001, + INTERACTION_CONFIGURATION_FLAG_CROSS_SLIDE_HORIZONTAL = 0x00000002, + INTERACTION_CONFIGURATION_FLAG_CROSS_SLIDE_SELECT = 0x00000004, + INTERACTION_CONFIGURATION_FLAG_CROSS_SLIDE_SPEED_BUMP = 0x00000008, + INTERACTION_CONFIGURATION_FLAG_CROSS_SLIDE_REARRANGE = 0x00000010, + INTERACTION_CONFIGURATION_FLAG_CROSS_SLIDE_EXACT = 0x00000020, + + INTERACTION_CONFIGURATION_FLAG_MAX = 0xffffffff, +} INTERACTION_CONFIGURATION_FLAGS; + +typedef struct INTERACTION_CONTEXT_CONFIGURATION +{ + INTERACTION_ID interactionId; + INTERACTION_CONFIGURATION_FLAGS enable; + +} INTERACTION_CONTEXT_CONFIGURATION; + +typedef struct MANIPULATION_TRANSFORM +{ + float translationX; + float translationY; + float scale; + float expansion; + float rotation; +} MANIPULATION_TRANSFORM; + +typedef struct MANIPULATION_VELOCITY +{ + float velocityX; + float velocityY; + float velocityExapnsion; + float velocityAngular; +} MANIPULATION_VELOCITY; + +typedef enum MANIPULATION_RAILS_STATE +{ + MANIPULATION_RAILS_STATE_UNDECIDED = 0, + MANIPULATION_RAILS_STATE_FREE = 1, + MANIPULATION_RAILS_STATE_RAILED = 2, + MANIPULATION_RAILS_STATE_MAX = 0xffffffff, +} MANIPULATION_RAILS_STATE; + +typedef struct INTERACTION_ARGUMENTS_MANIPULATION +{ + MANIPULATION_TRANSFORM delta; + MANIPULATION_TRANSFORM cumulative; + MANIPULATION_VELOCITY veolcity; + MANIPULATION_RAILS_STATE railsState; +} INTERACTION_ARGUMENTS_MANIPULATION; + +typedef struct INTERACTION_ARGUMENTS_TAP +{ + UINT32 count; +} INTERACTION_ARGUMENTS_TAP; + +typedef enum CROSS_SLIDE_FLAGS +{ + CROSS_SLIDE_FLAGS_NONE = 0x00000000, + CROSS_SLIDE_FLAGS_SELECT = 0x00000001, + CROSS_SLIDE_FLAGS_SPEED_BUMP = 0x00000002, + CROSS_SLIDE_FLAGS_REARRANGE = 0x00000004, + CROSS_SLIDE_FLAGS_MAX = 0xffffffff, +} CROSS_SLIDE_FLAGS; + +typedef struct INTERACTION_ARGUMENTS_CROSS_SLIDE +{ + CROSS_SLIDE_FLAGS flags; +} INTERACTION_ARGUMENTS_CROSS_SLIDE; + +typedef struct INTERACTION_CONTEXT_OUTPUT +{ + INTERACTION_ID interactionId; + INTERACTION_FLAGS interactionFlags; + POINTER_INPUT_TYPE inputType; + float x; + float y; + union + { + INTERACTION_ARGUMENTS_MANIPULATION manipulation; + INTERACTION_ARGUMENTS_TAP tap; + INTERACTION_ARGUMENTS_CROSS_SLIDE crossSlide; + } arguments; +} INTERACTION_CONTEXT_OUTPUT; + +typedef void (CALLBACK *INTERACTION_CONTEXT_OUTPUT_CALLBACK)(void *data, + const INTERACTION_CONTEXT_OUTPUT *output); + +HRESULT WINAPI CreateInteractionContext(HINTERACTIONCONTEXT *context); +HRESULT WINAPI DestroyInteractionContext(HINTERACTIONCONTEXT context); + +HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context); + +HRESULT WINAPI RegisterOutputCallbackInteractionContext(HINTERACTIONCONTEXT context, + INTERACTION_CONTEXT_OUTPUT_CALLBACK callback, void *data); + +HRESULT WINAPI GetInteractionConfigurationInteractionContext(HINTERACTIONCONTEXT context, + UINT32 count, INTERACTION_CONTEXT_CONFIGURATION *configuration); +HRESULT WINAPI SetInteractionConfigurationInteractionContext(HINTERACTIONCONTEXT context, + UINT32 count, const INTERACTION_CONTEXT_CONFIGURATION *configuration); + +HRESULT WINAPI GetPropertyInteractionContext(HINTERACTIONCONTEXT context, + INTERACTION_CONTEXT_PROPERTY proerty, UINT32 *value); +HRESULT WINAPI SetPropertyInteractionContext(HINTERACTIONCONTEXT context, + INTERACTION_CONTEXT_PROPERTY property, UINT32 value); + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* defined(__cplusplus) */ + +#endif -- 2.16.4

1 0

[PATCH 1/7] include: Add POINTER_INPUT_TYPE.
by Józef Kucia June 21, 2018

June 21, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/winuser.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index f546a4a1f3da..ceaf82dcb528 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3377,6 +3377,15 @@ typedef struct tagPOINTER_DEVICE_INFO { WCHAR productString[POINTER_DEVICE_PRODUCT_STRING_MAX]; } POINTER_DEVICE_INFO; +enum tagPOINTER_INPUT_TYPE +{ + PT_POINTER = 1, + PT_TOUCH = 2, + PT_PEN = 3, + PT_MOUSE = 4, +}; +typedef DWORD POINTER_INPUT_TYPE; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); -- 2.16.4

1 0

[PATCH] shell32/tests: Don't test CommandLineToArgv() in test_argify().
by Zebediah Figura June 21, 2018

June 21, 2018

This is essentially redundant. We should have tests for all behaviours of CommandLineToArgv() above; the purpose of test_argify() is to test how ShellExecute() et al. parses its parameters, and to show that this is different from CommandLineToArgv(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/tests/shlexec.c | 167 +++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 108 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index c67cc46..ab77fa1 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1418,8 +1418,8 @@ typedef struct const char* verb; const char* params; int todo; - cmdline_tests_t cmd; - cmdline_tests_t broken; + const char *cmd; + const char *broken; } argify_tests_t; static const argify_tests_t argify_tests[] = @@ -1429,33 +1429,28 @@ static const argify_tests_t argify_tests[] = * parameters string, including the trailing spaces, no matter what * arguments have already been used. */ - {"Params232S", "p2 p3 p4 ", 0xc2, - {" p2 p3 \"p2\" \"p2 p3 p4 \"", - {"", "p2", "p3", "p2", "p2 p3 p4 ", NULL}, 0}}, + {"Params232S", "p2 p3 p4 ", TRUE, + " p2 p3 \"p2\" \"p2 p3 p4 \""}, /* Unquoted argument references like %2 don't automatically quote their * argument. Similarly, when they are quoted they don't escape the quotes * that their argument may contain. */ - {"Params232S", "\"p two\" p3 p4 ", 0x3f3, - {" p two p3 \"p two\" \"\"p two\" p3 p4 \"", - {"", "p", "two", "p3", "p two", "p", "two p3 p4 ", NULL}, 0}}, + {"Params232S", "\"p two\" p3 p4 ", TRUE, + " p two p3 \"p two\" \"\"p two\" p3 p4 \""}, /* Only single digits are supported so only %1 to %9. Shown here with %20 * because %10 is a pain. */ - {"Params20", "p", 0, - {" \"p0\"", - {"", "p0", NULL}, 0}}, + {"Params20", "p", FALSE, + " \"p0\""}, /* Only (double-)quotes have a special meaning. */ - {"Params23456", "'p2 p3` p4\\ $even", 0x40, - {" \"'p2\" \"p3`\" \"p4\\\" \"$even\" \"\"", - {"", "'p2", "p3`", "p4\" $even \"", NULL}, 0}}, + {"Params23456", "'p2 p3` p4\\ $even", FALSE, + " \"'p2\" \"p3`\" \"p4\\\" \"$even\" \"\""}, - {"Params23456", "p=2 p-3 p4\tp4\rp4\np4", 0x1c2, - {" \"p=2\" \"p-3\" \"p4\tp4\rp4\np4\" \"\" \"\"", - {"", "p=2", "p-3", "p4\tp4\rp4\np4", "", "", NULL}, 0}}, + {"Params23456", "p=2 p-3 p4\tp4\rp4\np4", TRUE, + " \"p=2\" \"p-3\" \"p4\tp4\rp4\np4\" \"\" \"\""}, /* In unquoted strings, quotes are treated are a parameter separator just * like spaces! However they can be doubled to get a literal quote. @@ -1463,125 +1458,102 @@ static const argify_tests_t argify_tests[] = * 2n quotes -> n quotes * 2n+1 quotes -> n quotes and a parameter separator */ - {"Params23456789", "one\"quote \"p four\" one\"quote p7", 0xff3, - {" \"one\" \"quote\" \"p four\" \"one\" \"quote\" \"p7\" \"\" \"\"", - {"", "one", "quote", "p four", "one", "quote", "p7", "", "", NULL}, 0}}, + {"Params23456789", "one\"quote \"p four\" one\"quote p7", TRUE, + " \"one\" \"quote\" \"p four\" \"one\" \"quote\" \"p7\" \"\" \"\""}, - {"Params23456789", "two\"\"quotes \"p three\" two\"\"quotes p5", 0xf2, - {" \"two\"quotes\" \"p three\" \"two\"quotes\" \"p5\" \"\" \"\" \"\" \"\"", - {"", "twoquotes p", "three twoquotes", "p5", "", "", "", "", NULL}, 0}}, + {"Params23456789", "two\"\"quotes \"p three\" two\"\"quotes p5", TRUE, + " \"two\"quotes\" \"p three\" \"two\"quotes\" \"p5\" \"\" \"\" \"\" \"\""}, - {"Params23456789", "three\"\"\"quotes \"p four\" three\"\"\"quotes p6", 0xff3, - {" \"three\"\" \"quotes\" \"p four\" \"three\"\" \"quotes\" \"p6\" \"\" \"\"", - {"", "three\"", "quotes", "p four", "three\"", "quotes", "p6", "", "", NULL}, 0}}, + {"Params23456789", "three\"\"\"quotes \"p four\" three\"\"\"quotes p6", TRUE, + " \"three\"\" \"quotes\" \"p four\" \"three\"\" \"quotes\" \"p6\" \"\" \"\""}, - {"Params23456789", "four\"\"\"\"quotes \"p three\" four\"\"\"\"quotes p5", 0xf3, - {" \"four\"\"quotes\" \"p three\" \"four\"\"quotes\" \"p5\" \"\" \"\" \"\" \"\"", - {"", "four\"quotes p", "three fourquotes p5 \"", "", "", "", NULL}, 0}}, + {"Params23456789", "four\"\"\"\"quotes \"p three\" four\"\"\"\"quotes p5", TRUE, + " \"four\"\"quotes\" \"p three\" \"four\"\"quotes\" \"p5\" \"\" \"\" \"\" \"\""}, /* Quoted strings cannot be continued by tacking on a non space character * either. */ - {"Params23456", "\"p two\"p3 \"p four\"p5 p6", 0x1f3, - {" \"p two\" \"p3\" \"p four\" \"p5\" \"p6\"", - {"", "p two", "p3", "p four", "p5", "p6", NULL}, 0}}, + {"Params23456", "\"p two\"p3 \"p four\"p5 p6", TRUE, + " \"p two\" \"p3\" \"p four\" \"p5\" \"p6\""}, /* In quoted strings, the quotes are halved and an odd number closes the * string. Specifically: * 2n quotes -> n quotes * 2n+1 quotes -> n quotes and closes the string and hence the parameter */ - {"Params23456789", "\"one q\"uote \"p four\" \"one q\"uote p7", 0xff3, - {" \"one q\" \"uote\" \"p four\" \"one q\" \"uote\" \"p7\" \"\" \"\"", - {"", "one q", "uote", "p four", "one q", "uote", "p7", "", "", NULL}, 0}}, + {"Params23456789", "\"one q\"uote \"p four\" \"one q\"uote p7", TRUE, + " \"one q\" \"uote\" \"p four\" \"one q\" \"uote\" \"p7\" \"\" \"\""}, - {"Params23456789", "\"two \"\" quotes\" \"p three\" \"two \"\" quotes\" p5", 0x1ff3, - {" \"two \" quotes\" \"p three\" \"two \" quotes\" \"p5\" \"\" \"\" \"\" \"\"", - {"", "two ", "quotes p", "three two", " quotes", "p5", "", "", "", "", NULL}, 0}}, + {"Params23456789", "\"two \"\" quotes\" \"p three\" \"two \"\" quotes\" p5", TRUE, + " \"two \" quotes\" \"p three\" \"two \" quotes\" \"p5\" \"\" \"\" \"\" \"\""}, - {"Params23456789", "\"three q\"\"\"uotes \"p four\" \"three q\"\"\"uotes p7", 0xff3, - {" \"three q\"\" \"uotes\" \"p four\" \"three q\"\" \"uotes\" \"p7\" \"\" \"\"", - {"", "three q\"", "uotes", "p four", "three q\"", "uotes", "p7", "", "", NULL}, 0}}, + {"Params23456789", "\"three q\"\"\"uotes \"p four\" \"three q\"\"\"uotes p7", TRUE, + " \"three q\"\" \"uotes\" \"p four\" \"three q\"\" \"uotes\" \"p7\" \"\" \"\""}, - {"Params23456789", "\"four \"\"\"\" quotes\" \"p three\" \"four \"\"\"\" quotes\" p5", 0xff3, - {" \"four \"\" quotes\" \"p three\" \"four \"\" quotes\" \"p5\" \"\" \"\" \"\" \"\"", - {"", "four \"", "quotes p", "three four", "", "quotes p5 \"", "", "", "", NULL}, 0}}, + {"Params23456789", "\"four \"\"\"\" quotes\" \"p three\" \"four \"\"\"\" quotes\" p5", TRUE, + " \"four \"\" quotes\" \"p three\" \"four \"\" quotes\" \"p5\" \"\" \"\" \"\" \"\""}, /* The quoted string rules also apply to consecutive quotes at the start * of a parameter but don't count the opening quote! */ - {"Params23456789", "\"\"twoquotes \"p four\" \"\"twoquotes p7", 0xbf3, - {" \"\" \"twoquotes\" \"p four\" \"\" \"twoquotes\" \"p7\" \"\" \"\"", - {"", "", "twoquotes", "p four", "", "twoquotes", "p7", "", "", NULL}, 0}}, + {"Params23456789", "\"\"twoquotes \"p four\" \"\"twoquotes p7", TRUE, + " \"\" \"twoquotes\" \"p four\" \"\" \"twoquotes\" \"p7\" \"\" \"\""}, - {"Params23456789", "\"\"\"three quotes\" \"p three\" \"\"\"three quotes\" p5", 0x6f3, - {" \"\"three quotes\" \"p three\" \"\"three quotes\" \"p5\" \"\" \"\" \"\" \"\"", - {"", "three", "quotes p", "three \"three", "quotes p5 \"", "", "", "", NULL}, 0}}, + {"Params23456789", "\"\"\"three quotes\" \"p three\" \"\"\"three quotes\" p5", TRUE, + " \"\"three quotes\" \"p three\" \"\"three quotes\" \"p5\" \"\" \"\" \"\" \"\""}, - {"Params23456789", "\"\"\"\"fourquotes \"p four\" \"\"\"\"fourquotes p7", 0xbf3, - {" \"\"\" \"fourquotes\" \"p four\" \"\"\" \"fourquotes\" \"p7\" \"\" \"\"", - {"", "\"", "fourquotes", "p four", "\"", "fourquotes", "p7", "", "", NULL}, 0}}, + {"Params23456789", "\"\"\"\"fourquotes \"p four\" \"\"\"\"fourquotes p7", TRUE, + " \"\"\" \"fourquotes\" \"p four\" \"\"\" \"fourquotes\" \"p7\" \"\" \"\""}, /* An unclosed quoted string gets lost! */ - {"Params23456", "p2 \"p3\" \"p4 is lost", 0x1c3, - {" \"p2\" \"p3\" \"\" \"\" \"\"", - {"", "p2", "p3", "", "", "", NULL}, 0}, - {" \"p2\" \"p3\" \"p3\" \"\" \"\"", - {"", "p2", "p3", "p3", "", "", NULL}, 0}}, + {"Params23456", "p2 \"p3\" \"p4 is lost", TRUE, + " \"p2\" \"p3\" \"\" \"\" \"\"", + " \"p2\" \"p3\" \"p3\" \"\" \"\""}, /* NT4/2k */ /* Backslashes have no special meaning even when preceding quotes. All * they do is start an unquoted string. */ - {"Params23456", "\\\"p\\three \"pfour\\\" pfive", 0x73, - {" \"\\\" \"p\\three\" \"pfour\\\" \"pfive\" \"\"", - {"", "\" p\\three pfour\"", "pfive", "", NULL}, 0}}, + {"Params23456", "\\\"p\\three \"pfour\\\" pfive", TRUE, + " \"\\\" \"p\\three\" \"pfour\\\" \"pfive\" \"\""}, /* Environment variables are left untouched. */ - {"Params23456", "%TMPDIR% %t %c", 0, - {" \"%TMPDIR%\" \"%t\" \"%c\" \"\" \"\"", - {"", "%TMPDIR%", "%t", "%c", "", "", NULL}, 0}}, + {"Params23456", "%TMPDIR% %t %c", FALSE, + " \"%TMPDIR%\" \"%t\" \"%c\" \"\" \"\""}, /* %~2 is equivalent to %*. However %~3 and higher include the spaces * before the parameter! * (but not the previous parameter's closing quote fortunately) */ - {"Params2345Etc", "p2 p3 \"p4\" p5 p6 ", 0x3f3, - {" ~2=\"p2 p3 \"p4\" p5 p6 \" ~3=\" p3 \"p4\" p5 p6 \" ~4=\" \"p4\" p5 p6 \" ~5= p5 p6 ", - {"", "~2=p2 p3 p4 p5 p6 ", "~3= p3 p4 p5 p6 ", "~4= p4 p5 p6 ", "~5=", "p5", "p6", NULL}, 0}}, + {"Params2345Etc", "p2 p3 \"p4\" p5 p6 ", TRUE, + " ~2=\"p2 p3 \"p4\" p5 p6 \" ~3=\" p3 \"p4\" p5 p6 \" ~4=\" \"p4\" p5 p6 \" ~5= p5 p6 "}, /* %~n works even if there is no nth parameter. */ - {"Params9Etc", "p2 p3 p4 p5 p6 p7 p8 ", 0x12, - {" ~9=\" \"", - {"", "~9= ", NULL}, 0}}, + {"Params9Etc", "p2 p3 p4 p5 p6 p7 p8 ", TRUE, + " ~9=\" \""}, - {"Params9Etc", "p2 p3 p4 p5 p6 p7 ", 0x12, - {" ~9=\"\"", - {"", "~9=", NULL}, 0}}, + {"Params9Etc", "p2 p3 p4 p5 p6 p7 ", TRUE, + " ~9=\"\""}, /* The %~n directives also transmit the tenth parameter and beyond. */ - {"Params9Etc", "p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 and beyond!", 0x12, - {" ~9=\" p9 p10 p11 and beyond!\"", - {"", "~9= p9 p10 p11 and beyond!", NULL}, 0}}, + {"Params9Etc", "p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 and beyond!", TRUE, + " ~9=\" p9 p10 p11 and beyond!\""}, /* Bad formatting directives lose their % sign, except those followed by * a tilde! Environment variables are not expanded but lose their % sign. */ - {"ParamsBad", "p2 p3 p4 p5", 0x12, - {" \"% - %~ %~0 %~1 %~a %~* a b c TMPDIR\"", - {"", "% - %~ %~0 %~1 %~a %~* a b c TMPDIR", NULL}, 0}}, + {"ParamsBad", "p2 p3 p4 p5", TRUE, + " \"% - %~ %~0 %~1 %~a %~* a b c TMPDIR\""}, - {NULL, NULL, 0, {NULL, {NULL}, 0}} + {0} }; static void test_argify(void) { - BOOL has_cl2a = TRUE; char fileA[MAX_PATH], params[2*MAX_PATH+12]; INT_PTR rc; const argify_tests_t* test; - const cmdline_tests_t *bad; + const char *bad; const char* cmd; - unsigned i, count; /* Test with a long parameter */ for (rc = 0; rc < MAX_PATH; rc++) @@ -1614,21 +1586,11 @@ static void test_argify(void) test = argify_tests; while (test->params) { - bad = test->broken.cmd ? &test->broken : &test->cmd; + bad = test->broken ? test->broken : test->cmd; - /* trace("***** verb='%s' params='%s'\n", test->verb, test->params); */ rc = shell_execute_ex(SEE_MASK_DOENVSUBST, test->verb, fileA, test->params, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc); - count = 0; - while (test->cmd.args[count]) - count++; - /* +4 for the shlexec arguments, -1 because of the added "" - * argument for the CommandLineToArgvW() tests. - */ - todo_wine_if(test->todo & 0x1) - okChildInt("argcA", 4 + count - 1); - cmd = getChildString("Child", "cmdlineA"); /* Our commands are such that the verb immediately precedes the * part we are interested in. @@ -1636,20 +1598,9 @@ static void test_argify(void) if (cmd) cmd = strstr(cmd, test->verb); if (cmd) cmd += strlen(test->verb); if (!cmd) cmd = "(null)"; - todo_wine_if(test->todo & 0x2) - okShell(!strcmp(cmd, test->cmd.cmd) || broken(!strcmp(cmd, bad->cmd)), - "the cmdline is '%s' instead of '%s'\n", cmd, test->cmd.cmd); - - for (i = 0; i < count - 1; i++) - { - char argname[18]; - sprintf(argname, "argvA%d", 4 + i); - todo_wine_if(test->todo & (1 << (i+4))) - okChildStringBroken(argname, test->cmd.args[i+1], bad->args[i+1]); - } - - if (has_cl2a) - has_cl2a = test_one_cmdline(&(test->cmd)); + todo_wine_if(test->todo) + okShell(!strcmp(cmd, test->cmd) || broken(!strcmp(cmd, bad)), + "expected '%s', got '%s'\n", cmd, test->cmd); test++; } } -- 2.7.4

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä June 21, 2018

June 21, 2018

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/fi.po b/po/fi.po index 7e8bb62be9..abe62894f7 100644 --- a/po/fi.po +++ b/po/fi.po @@ -14743,6 +14743,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Ohjelma koneellasi kaatui, mutta WineDbg ei pystynyt liittymään siihen eikä " +"keräämään virheenjäljitystietoja (backtrace)." #: winedbg.rc:41 msgid "(unidentified)" -- 2.17.1

1 0

[PATCH 1/4] testbot: Build the per-module test unit list from the list of Wine files.
by Francois Gouget June 21, 2018

June 21, 2018

This also caches winefiles.txt so it is only reloaded when it changes. Also stop generating and retrieving testlist.txt since it is not needed anymore. If desired testlist.txt can be deleted for cleanup. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 10 ----- testbot/lib/WineTestBot/PatchUtils.pm | 62 +++++++++++++-------------- 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2950799d5..2e338c975 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -414,16 +414,6 @@ if ($NewStatus eq "completed") } } - Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); - if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) - { - copy "$TaskDir/testlist.txt", "$DataDir/latest/testlist.txt"; - } - elsif (!defined $TAError) - { - $TAError = "An error occurred while retrieving the test list: ". $TA->GetLastError(); - } - Debug(Elapsed($Start), " Retrieving the list of Wine files '$TaskDir/winefiles.txt'\n"); if ($TA->GetFile("latest/winefiles.txt", "$TaskDir/winefiles.txt")) { diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index f83df6087..3bf172125 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -58,8 +58,8 @@ my $IgnoredPathsRe = join('|', =item C<UpdateWineData()> -Updates the summary information about the Wine source such as the list of -tests (testlist.txt) and the full list of Wine files. +Updates information about the Wine source, such as the list of Wine files, +for use by the TestBot server. =back =cut @@ -72,51 +72,51 @@ sub UpdateWineData($) my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt'`; return $ErrMessage if ($? != 0); - - if (open(my $fh, ">", "$DataDir/testlist.txt")) - { - foreach my $TestFile (glob("$WineDir/*/*/tests/*.c"), - glob("$WineDir/*/*/tests/*.spec")) - { - next if ($TestFile =~ m=/testlist\.c$=); - $TestFile =~ s=^$WineDir/==; - print $fh "$TestFile\n"; - } - close($fh); - return undef; - } - - return "Could not open 'testlist.txt' for writing: $!"; } +my $_TimeStamp; +my $_TestList; + =pod =over 12 -=item C<GetTestList()> +=item C<_LoadWineFiles()> -Returns a hashtable containing the list of the source files for a given module. -This structure is built from the latest/testlist.txt file. +Reads latest/winefiles.txt to build a per-module hashtable of the test unit +files. =back =cut -sub GetTestList() +sub _LoadWineFiles() { - my $TestList = {}; - if (open(my $File, "<", "$DataDir/latest/testlist.txt")) + my $FileName = "$DataDir/latest/winefiles.txt"; + my $MTime = (stat($FileName))[9] || 0; + + if ($_TestList and $_TimeStamp == $MTime) { - while (my $TestFileName = <$File>) + # The file has not changed since we loaded it + return; + } + + $_TimeStamp = $MTime; + $_TestList = {}; + if (open(my $fh, "<", $FileName)) + { + while (my $Line = <$fh>) { - chomp $TestFileName; - if ($TestFileName =~ m~^\w+/([^/]+)/tests/([^/]+)$~) + chomp $Line; + + if ($Line =~ m~^\w+/([^/]+)/tests/([^/]+)$~) { my ($Module, $File) = ($1, $2); - $TestList->{$Module}->{$File} = 1; + next if ($File eq "testlist.c"); + next if ($File !~ /\.(?:c|spec)$/); + $_TestList->{$Module}->{$File} = 1; } } - close($File); + close($fh); } - return $TestList; } sub _HandleFile($$$) @@ -154,8 +154,7 @@ sub _HandleFile($$$) if (!$Tests->{$Module}->{Files}) { - my $TestList = ( $Impacts->{TestList} ||= GetTestList() ); - foreach my $File (keys %{$TestList->{$Module}}) + foreach my $File (keys %{$_TestList->{$Module}}) { $Tests->{$Module}->{Files}->{$File} = 0; # not modified } @@ -192,6 +191,7 @@ sub GetPatchImpact($;$$) NoUnits => $NoUnits, Tests => {}, }; + _LoadWineFiles(); if ($PastImpacts) { -- 2.17.1

1 3

[PATCH 1/2] testbot/build: Quote the paths in the shell commands.
by Francois Gouget June 21, 2018

June 21, 2018

Also check that $DataDir does not contain single quotes, thus ensuring our simple quoting scheme works. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- A more absolutist approach would be to use ShQuote() everywhere which would remove the single quote restriction. But that would compromise readability. So this solution seems like a good compromise. Also this is mostly cosmetic in the first place since the administrator would presumably not put spaces, stars, dollar signs or single quotes in the $DataDir path. Still I much prefer having proper quoting in my shell scripts. testbot/bin/build/Build.pl | 16 +++++++++++----- testbot/bin/build/Reconfig.pl | 17 +++++++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index c23bb8780..17ae74ff5 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -82,7 +82,7 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd $DataDir/wine && set -x && ". + system("cd '$DataDir/wine' && set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0) @@ -95,7 +95,7 @@ sub ApplyPatch($) if ($Impacts->{Makefiles}) { InfoMsg "\nRunning make_makefiles\n"; - system("cd $DataDir/wine && set -x && ./tools/make_makefiles"); + system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); if ($? != 0) { LogMsg "make_makefiles failed\n"; @@ -106,7 +106,7 @@ sub ApplyPatch($) if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) { InfoMsg "\nRunning autoconf\n"; - system("cd $DataDir/wine && set -x && autoconf"); + system("cd '$DataDir/wine' && set -x && autoconf"); if ($? != 0) { LogMsg "Autoconf failed\n"; @@ -122,7 +122,7 @@ sub BuildNative() mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); InfoMsg "\nRebuilding native tools\n"; - system("cd $DataDir/build-native && set -x && ". + system("cd '$DataDir/build-native' && set -x && ". "time make -j$ncpus __tooldeps__"); if ($? != 0) { @@ -147,7 +147,7 @@ sub BuildTestExecutables($$) } InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; - system("cd $DataDir/build-mingw$Bits && set -x && ". + system("cd '$DataDir/build-mingw$Bits' && set -x && ". "time make -j$ncpus ". join(" ", sort @BuildDirs)); if ($? != 0) { @@ -226,6 +226,12 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } +if ($DataDir =~ /'/) +{ + LogMsg "The install path contains invalid characters\n"; + exit(1); +} + my $Impacts = ApplyPatch($PatchFile); exit(1) if (!$Impacts); diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 2da2f54a4..5ecbc2af3 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -73,7 +73,7 @@ sub BuildTestAgentd() if (! -x "$BinDir/build/testagentd") { InfoMsg "\nBuilding the native testagentd\n"; - system("cd $::RootDir/src/testagentd && set -x && ". + system("cd '$::RootDir/src/testagentd' && set -x && ". "time make -j$ncpus build"); if ($? != 0) { @@ -83,7 +83,7 @@ sub BuildTestAgentd() } InfoMsg "\nRebuilding the Windows TestAgentd\n"; - system("cd $::RootDir/src/testagentd && set -x && ". + system("cd '$::RootDir/src/testagentd' && set -x && ". "time make -j$ncpus iso"); if ($? != 0) { @@ -97,7 +97,7 @@ sub BuildTestAgentd() sub BuildTestLauncher() { InfoMsg "\nRebuilding TestLauncher\n"; - system("cd $::RootDir/src/TestLauncher && set -x && ". + system("cd '$::RootDir/src/TestLauncher' && set -x && ". "time make -j$ncpus"); if ($? != 0) { @@ -111,7 +111,7 @@ sub BuildTestLauncher() sub GitPull() { InfoMsg "\nUpdating the Wine source\n"; - system("cd $DataDir/wine && git pull"); + system("cd '$DataDir/wine' && git pull"); if ($? != 0) { LogMsg "Git pull failed\n"; @@ -134,7 +134,7 @@ sub BuildNative() # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; - system("cd $DataDir/build-native && set -x && ". + system("cd '$DataDir/build-native' && set -x && ". "rm -rf * && ". "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". "time make -j$ncpus __tooldeps__"); @@ -157,7 +157,7 @@ sub BuildCross($) # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding the $Bits-bit test executables\n"; - system("cd $DataDir/build-mingw$Bits && set -x && ". + system("cd '$DataDir/build-mingw$Bits' && set -x && ". "rm -rf * && ". "time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && ". "time make -j$ncpus buildtests"); @@ -173,6 +173,11 @@ sub BuildCross($) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; +if ($DataDir =~ /'/) +{ + LogMsg "The install path contains invalid characters\n"; + exit(1); +} if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") { LogMsg "Unable to create '$DataDir/staging': $!\n"; -- 2.17.1

1 1

[PATCH 1/3] testbot/WineRunTask: Keep the old reference report if the new one is missing.
by Francois Gouget June 21, 2018

June 21, 2018

The WineTest results usually don't change too much from one run to the next so it's better to have a slightly out of date report than nothing at all. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index c4ca578e2..ed190348b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -291,13 +291,20 @@ sub WrapUpAndExit($;$$$) if ($Status eq 'completed' and $Step->Type eq 'suite') { - # Update the reference VM suite results for WineSendLog.pl - my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, "_", - $Step->FileType eq "exe64" ? "64" : "32"); - unlink("$LatestBaseName.log"); - link("$TaskDir/log", "$LatestBaseName.log") if (-f "$TaskDir/log"); - unlink("$LatestBaseName.err"); - link("$TaskDir/err", "$LatestBaseName.err") if (-f "$TaskDir/err"); + # Keep the old report if the new one is missing + if (-f "$TaskDir/log" and !-z "$TaskDir/log") + { + # Update the reference VM suite results for WineSendLog.pl + my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, "_", + $Step->FileType eq "exe64" ? "64" : "32"); + unlink("$LatestBaseName.log"); + link("$TaskDir/log", "$LatestBaseName.log"); + unlink("$LatestBaseName.err"); + if (-f "$TaskDir/err" and !-z "$TaskDir/err") + { + link("$TaskDir/err", "$LatestBaseName.err"); + } + } } my $Result = $VM->Name .": ". $VM->Status ." Status: $Status Failures: ". (defined $TestFailures ? $TestFailures : "unset"); -- 2.17.1

1 2

[PATCH] testbot/WineRun*: Don't duplicate errors and factorize the log parsing.
by Francois Gouget June 21, 2018

June 21, 2018

Move the task log parsing functions to LogUtils.pm so the WineRun*.pl scripts can share them. Also stop copying the 'Build: *' result lines from the log to the err file. It's up to the GUI to present all the relevant lines when only showing the log summary (which it does now). Finally, there is nothing for the script to do if the patch fails to apply. So even if we did not get the full log or the task timed out somehow, the status of the task should be 'badpatch' and the other errors don't matter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 49 ++++++++---------- testbot/bin/WineRunReconfig.pl | 49 ++++++------------ testbot/lib/WineTestBot/LogUtils.pm | 77 +++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 64 deletions(-) create mode 100644 testbot/lib/WineTestBot/LogUtils.pm diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 1bc6cffbc..60af32c73 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -46,6 +46,7 @@ use WineTestBot::Jobs; use WineTestBot::PatchUtils; use WineTestBot::VMs; use WineTestBot::Log; +use WineTestBot::LogUtils; use WineTestBot::Engine::Notify; @@ -391,39 +392,29 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - if (open(my $LogFile, "<", "$TaskDir/log")) + my $Result = ParseTaskLog("$TaskDir/log", "Build"); + if ($Result eq "ok") { - # Collect and analyze the 'Build:' status line(s) - $ErrMessage ||= ""; - foreach my $Line (<$LogFile>) - { - chomp($Line); - next if ($Line !~ /^Build: (.*)$/); - if ($1 eq "ok") - { - # We must have gotten the full log and the build did succeed. - # So forget any prior error. - $NewStatus = "completed"; - $TAError = $ErrMessage = undef; - } - else - { - $NewStatus = ($1 eq "Patch failed to apply") ? "badpatch" : "badbuild"; - # Collect all the build errors (32 bit, 64 bit, etc) - $ErrMessage .= "$1\n"; - } - } - close($LogFile); - - if (!defined $NewStatus) - { - $NewStatus = "badbuild"; - $ErrMessage = "Missing build status line\n"; - } + # We must have gotten the full log and the build did succeed. + # So forget any prior error. + $NewStatus = "completed"; + $TAError = $ErrMessage = undef; + } + elsif ($Result eq "badpatch") + { + # This too is conclusive enough to ignore other errors. + $NewStatus = "badpatch"; + $TAError = $ErrMessage = undef; + } + elsif ($Result =~ s/^nolog://) + { + FatalError("$Result\n", "retry"); } else { - FatalError("Unable to open the build log for reading: $!\n", "retry"); + # If the result line is missing we probably already have an error message + # that explains why. + $NewStatus = "badbuild"; } } elsif (!defined $TAError) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index d04b78061..2950799d5 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -45,6 +45,7 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; +use WineTestBot::LogUtils; use WineTestBot::Engine::Notify; @@ -373,45 +374,23 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - if (open(my $LogFile, "<", "$TaskDir/log")) + my $Result = ParseTaskLog("$TaskDir/log", "Reconfig"); + if ($Result eq "ok") { - # Collect and analyze the 'Reconfig:' status line(s). - my $LogErrors; - foreach my $Line (<$LogFile>) - { - chomp($Line); - next if ($Line !~ /^Reconfig: (.*)$/); - # Add the error message or an empty string for 'ok' - $LogErrors = ($LogErrors || "") . ($1 ne "ok" ? "$1\n" : ""); - } - close($LogFile); - - if (!defined $LogErrors) - { - if (!defined $ErrMessage) - { - $NewStatus = "badbuild"; - $ErrMessage = "Missing reconfig status line\n"; - } - # otherwise $ErrMessage probably already explains why the reconfig - # status line is missing - } - elsif ($LogErrors eq "") - { - # We must have gotten the full log and the build did succeed. - # So forget any prior error. - $NewStatus = "completed"; - $TAError = $ErrMessage = undef; - } - else - { - $NewStatus = "badbuild"; - $ErrMessage = $LogErrors . ($ErrMessage || ""); - } + # We must have gotten the full log and the build did succeed. + # So forget any prior error. + $NewStatus = "completed"; + $TAError = $ErrMessage = undef; + } + elsif ($Result =~ s/^nolog://) + { + FatalError("$Result\n", "retry"); } else { - FatalError("Unable to open the build log for reading: $!\n"); + # We should not have badpatch errors and if the result line is missing we + # probably already have an error message that explains why. + $NewStatus = "badbuild"; } } elsif (!defined $TAError) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm new file mode 100644 index 000000000..3e40fbc35 --- /dev/null +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -0,0 +1,77 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 2018 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package WineTestBot::LogUtils; + +=head1 NAME + +WineTestBot::LogUtils - Provides functions to parse task logs + +=cut + + +use Exporter 'import'; +our @EXPORT = qw(ParseTaskLog); + + +# +# Task log parser +# + +=pod +=over 12 + +=item C<ParseTaskLog()> + +Returns ok if the task was successful and an error code otherwise. + +=back +=cut + +sub ParseTaskLog($$) +{ + my ($FileName, $ResultPrefix) = @_; + + if (open(my $LogFile, "<", $FileName)) + { + my $Result; + foreach my $Line (<$LogFile>) + { + chomp $Line; + if ($Line =~ /^$ResultPrefix: ok$/) + { + $Result ||= "ok"; + } + elsif ($Line =~ /^$ResultPrefix: Patch failed to apply$/) + { + $Result = "badpatch"; + last; # Should be the last and most specific message + } + elsif ($Line =~ /^$ResultPrefix: /) + { + $Result = "failed"; + } + } + close($LogFile); + return $Result || "missing"; + } + return "nolog:Unable to open the task log for reading: $!"; +} + +1; -- 2.17.1

1 0

[PATCH] testbot: VMs::FilterHypervisors() is not used anymore so remove it.
by Francois Gouget June 21, 2018

June 21, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index a29eebbba..2f494cb81 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -730,11 +730,4 @@ sub FilterEnabledStatus($) $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running", "off", "offline"]); } -sub FilterHypervisors($$) -{ - my ($self, $Hypervisors) = @_; - - $self->AddFilter("VirtURI", $Hypervisors); -} - 1; -- 2.17.1

1 0

[PATCH] testbot/web: Detect and highlight some more Git errors.
by Francois Gouget June 21, 2018

June 21, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8cc354e84..410d18691 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -253,9 +253,12 @@ sub GetHtmlLine($$$) $Line =~ / done $258$/ or $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or $Line =~ /^Unhandled exception: / or + # Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or # Build errors $Line =~ /: error: / or - $Line =~ /^error: patch failed:/ or $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors -- 2.17.1

1 0

[PATCH 1/2] testbot/web: Better present the logs and task errors.
by Francois Gouget June 21, 2018

June 21, 2018

Add a horizontal ruler so the log / test report is always clearly separated from the task error messages. Avoid duplicating the code that shows the task errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 152 +++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 85 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3add52b4c..1536e87cd 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -408,127 +408,109 @@ sub GenerateBody($) my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; my $ErrName = $LogName eq "log.old" ? "err.old" : "err"; - if (open LOGFILE, "<", "$TaskDir/$LogName") + my ($EmptyDiag, $LogFirst); + if (open(my $LogFile, "<", "$TaskDir/$LogName")) { - my $HasLogEntries = !1; - my $First = 1; + my $HasLogEntries; my $CurrentDll = ""; my $PrintedDll = ""; - my $Line; - while (defined($Line = <LOGFILE>)) + $LogFirst = 1; + foreach my $Line (<$LogFile>) { $HasLogEntries = 1; - chomp($Line); + chomp $Line; if ($Line =~ m/^([^:]+):[^ ]+ start [^ ]+ -\s*$/) { $CurrentDll = $1; } my ($Highlight, $Plain) = $self->GetHtmlLine($MoreInfo->{Full}, $Line); - if ($MoreInfo->{Full} || defined $Highlight) + next if (!$MoreInfo->{Full} and !defined $Highlight); + + if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) + { + print "</code></pre>" if (!$LogFirst); + print "<div class='LogDllName'>$CurrentDll:</div><pre><code>"; + $PrintedDll = $CurrentDll; + $LogFirst = 0; + } + elsif ($LogFirst) + { + print "<pre><code>"; + $LogFirst = 0; + } + if (!$MoreInfo->{Full} && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + { + my $Unit = $1 ne "" ? "$1: " : ""; + print "${Unit}Timeout\n"; + } + else { - if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) - { - if ($First) - { - $First = !1; - } - else - { - print "</code></pre>"; - } - print "<div class='LogDllName'>$CurrentDll:</div><pre><code>"; - $PrintedDll = $CurrentDll; - } - elsif ($First) - { - print "<pre><code>"; - $First = !1; - } - if (!$MoreInfo->{Full} && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) - { - my $Unit = $1 ne "" ? "$1: " : ""; - print "${Unit}Timeout\n"; - } - else - { - print(($Highlight || $Plain), "\n"); - } + print(($Highlight || $Plain), "\n"); } } - close LOGFILE; + close($LogFile); - if (open ERRFILE, "<", "$TaskDir/$ErrName") + if (!$LogFirst) { - $CurrentDll = "*err*"; - while (defined($Line = <ERRFILE>)) + print "</code></pre>\n"; + } + elsif ($HasLogEntries) + { + # Here we know we did not show the full log since it was not empty, + # and yet we did not show anything to the user. But don't claim there + # is no failure if the error log is not empty. + if (-z "$TaskDir/$ErrName") { - $HasLogEntries = 1; - chomp($Line); - if ($PrintedDll ne $CurrentDll) - { - if ($First) - { - $First = !1; - } - else - { - print "</code></pre>\n"; - } - print "<br><pre><code>"; - $PrintedDll = $CurrentDll; - } - print $self->escapeHTML($Line), "\n"; + print "No ". ($StepTask->Type eq "single" || + $StepTask->Type eq "suite" ? "test" : "build") . + " failures found"; + $LogFirst = 0; } - close ERRFILE; } - - if (! $First) + elsif ($StepTask->Status eq "canceled") { - print "</code></pre>\n"; + $EmptyDiag = "<p>No log, task was canceled</p>\n"; + } + elsif ($StepTask->Status eq "skipped") + { + $EmptyDiag = "<p>No log, task skipped</p>\n"; } else { - print $HasLogEntries ? "No " . - ($StepTask->Type eq "single" || - $StepTask->Type eq "suite" ? "test" : "build") . - " failures found" : "Empty log"; + print "Empty log"; + $LogFirst = 0; } } - elsif (open ERRFILE, "<", "$TaskDir/$ErrName") + else + { + print "No log". ($StepTask->Status =~ /^(?:queued|running)$/ ? " yet" : ""); + $LogFirst = 0; + } + + if (open(my $ErrFile, "<", "$TaskDir/$ErrName")) { - my $HasErrEntries = !1; - my $Line; - while (defined($Line = <ERRFILE>)) + my $ErrFirst = 1; + foreach my $Line (<$ErrFile>) { - chomp($Line); - if (! $HasErrEntries) + chomp $Line; + if ($ErrFirst) { + print "<hr>\n" if (!$LogFirst); print "<pre><code>"; - $HasErrEntries = 1; + $ErrFirst = 0; } print $self->escapeHTML($Line), "\n"; } - if ($HasErrEntries) + close($ErrFile); + + if (!$ErrFirst) { print "</code></pre>\n"; } - else + elsif (defined $EmptyDiag) { - print "Empty log"; + print $EmptyDiag; } - close ERRFILE; - } - elsif ($StepTask->Status eq "canceled") - { - print "<p>No log, task was canceled</p>\n"; - } - elsif ($StepTask->Status eq "skipped") - { - print "<p>No log, task skipped</p>\n"; - } - else - { - print "<p>No log available yet</p>\n"; } } print "</div>\n"; -- 2.17.1

1 1

[PATCH 2/2] msvcrt/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 21, 2018

June 21, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 6 +++--- dlls/msvcrt/tests/dir.c | 16 ++++++++-------- dlls/msvcrt/tests/file.c | 23 +++++++++++----------- dlls/msvcrt/tests/locale.c | 6 +++--- dlls/msvcrt/tests/misc.c | 4 ++-- dlls/msvcrt/tests/printf.c | 4 ++-- dlls/msvcrt/tests/string.c | 48 +++++++++++++++++++++++----------------------- 7 files changed, 53 insertions(+), 54 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index cf5e4c7d60..07b49ae755 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1108,8 +1108,8 @@ static void test_demangle_datatype(void) { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, /* { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$011@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$011@@@",FALSE}, */ }; - int i, num_test = (sizeof(demangle)/sizeof(struct _demangle)); - + int i, num_test = ARRAY_SIZE(demangle); + for (i = 0; i < num_test; i++) { name = p__unDName(0, demangle[i].mangled, 0, pmalloc, pfree, 0x2800); @@ -1326,7 +1326,7 @@ static void test_demangle(void) /* 130 */ {"??_E?$TStrArray@$$BY0BAA(a)D$0BA@@@UAEPAXI(a)Z", "public: virtual void * __thiscall TStrArray<char [256],16>::`vector deleting destructor'(unsigned int)"}, }; - int i, num_test = (sizeof(test)/sizeof(test[0])); + int i, num_test = ARRAY_SIZE(test); char* name; for (i = 0; i < num_test; i++) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index a29d32b9d3..210cf3983c 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -97,7 +97,7 @@ static void test_makepath(void) unsigned int i, n; - for (i = 0; i < sizeof(makepath_cases)/sizeof(makepath_cases[0]); ++i) + for (i = 0; i < ARRAY_SIZE(makepath_cases); ++i) { const makepath_case* p = &makepath_cases[i]; @@ -253,7 +253,7 @@ static void test_makepath_s(void) ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); /* Test with the normal _makepath cases. */ - for (i = 0; i < sizeof(makepath_cases)/sizeof(makepath_cases[0]); i++) + for (i = 0; i < ARRAY_SIZE(makepath_cases); i++) { const makepath_case *p = makepath_cases + i; @@ -296,7 +296,7 @@ static void test_makepath_s(void) } /* Try insufficient length cases. */ - for (i = 0; i < sizeof(makepath_s_cases)/sizeof(makepath_s_cases[0]); i++) + for (i = 0; i < ARRAY_SIZE(makepath_s_cases); i++) { const makepath_s_case *p = makepath_s_cases + i; @@ -457,12 +457,12 @@ static void test_searchenv(void) ok(path_len, "GetTempPath failed\n"); memcpy(path, tmppath, path_len); - for(i=0; i<sizeof(dirs)/sizeof(*dirs); i++) { + for (i=0; i<ARRAY_SIZE(dirs); i++) { strcpy(path+path_len, dirs[i]); ok(!mkdir(path), "mkdir failed (dir = %s)\n", path); } - for(i=0; i<sizeof(files)/sizeof(*files); i++) { + for (i=0; i<ARRAY_SIZE(files); i++) { strcpy(path+path_len, files[i]); tmp_file = fopen(path, "wb"); ok(tmp_file != NULL, "fopen failed (file = %s)\n", path); @@ -471,7 +471,7 @@ static void test_searchenv(void) strcpy(env1, "TEST_PATH="); strcpy(env2, "TEST_PATH=;"); - for(i=1; i<sizeof(dirs)/sizeof(*dirs); i++) { + for (i=1; i<ARRAY_SIZE(dirs); i++) { strcat(env1, tmppath); strcat(env1, dirs[i]); strcat(env1, ";"); @@ -599,12 +599,12 @@ static void test_searchenv(void) putenv("TEST_PATH="); - for(i=sizeof(files)/sizeof(*files)-1; i>=0; i--) { + for (i=ARRAY_SIZE(files)-1; i>=0; i--) { strcpy(path+path_len, files[i]); ok(!remove(path), "remove failed (file = %s)\n", path); } - for(i=sizeof(dirs)/sizeof(*dirs)-1; i>=0; i--) { + for (i=ARRAY_SIZE(dirs)-1; i>=0; i--) { strcpy(path+path_len, dirs[i]); ok(!rmdir(path), "rmdir failed (dir = %s)\n", path); } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 136ee1563e..fe62d5c385 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -144,7 +144,7 @@ static void test_fileops( void ) write (fd, outbuffer, sizeof (outbuffer)); close (fd); - for (bufmode=0; bufmode < sizeof(bufmodes)/sizeof(bufmodes[0]); bufmode++) + for (bufmode=0; bufmode < ARRAY_SIZE(bufmodes); bufmode++) { fd = open ("fdopen.tst", O_RDONLY | O_BINARY); file = fdopen (fd, "rb"); @@ -195,13 +195,13 @@ static void test_fileops( void ) } fd = open ("fdopen.tst", O_RDONLY | O_TEXT); file = fdopen (fd, "rt"); /* open in TEXT mode */ - ok(fgetws(wbuffer,sizeof(wbuffer)/sizeof(wbuffer[0]),file) !=0,"fgetws failed unexpected\n"); - ok(fgetws(wbuffer,sizeof(wbuffer)/sizeof(wbuffer[0]),file) ==0,"fgetws didn't signal EOF\n"); + ok(fgetws(wbuffer,ARRAY_SIZE(wbuffer),file) !=0,"fgetws failed unexpected\n"); + ok(fgetws(wbuffer,ARRAY_SIZE(wbuffer),file) ==0,"fgetws didn't signal EOF\n"); ok(feof(file) !=0,"feof doesn't signal EOF\n"); rewind(file); ok(fgetws(wbuffer,strlen(outbuffer),file) !=0,"fgetws failed unexpected\n"); ok(lstrlenW(wbuffer) == (lstrlenA(outbuffer) -1),"fgetws didn't read right size\n"); - ok(fgetws(wbuffer,sizeof(outbuffer)/sizeof(outbuffer[0]),file) !=0,"fgets failed unexpected\n"); + ok(fgetws(wbuffer,ARRAY_SIZE(outbuffer),file) !=0,"fgets failed unexpected\n"); ok(lstrlenW(wbuffer) == 1,"fgets dropped chars\n"); fclose (file); @@ -624,7 +624,7 @@ static void test_flsbuf( void ) static const int bufmodes[] = {_IOFBF,_IONBF}; tempf=_tempnam(".","wne"); - for (bufmode=0; bufmode < sizeof(bufmodes)/sizeof(bufmodes[0]); bufmode++) + for (bufmode=0; bufmode < ARRAY_SIZE(bufmodes); bufmode++) { tempfh = fopen(tempf,"wb"); setvbuf(tempfh,NULL,bufmodes[bufmode],2048); @@ -878,8 +878,7 @@ static void test_fgetwc_locale(const char* text, const char* locale, int codepag { /* mbstowcs rejects invalid multibyte sequence, so we use MultiByteToWideChar here. */ - ret = MultiByteToWideChar(codepage, 0, text, -1, - wtextW, sizeof(wtextW)/sizeof(wtextW[0])); + ret = MultiByteToWideChar(codepage, 0, text, -1, wtextW, ARRAY_SIZE(wtextW)); ok(ret > 0, "MultiByteToWideChar failed\n"); } else @@ -910,7 +909,7 @@ static void test_fgetwc_locale(const char* text, const char* locale, int codepag tempfh = fopen(tempfile, "rb"); ok(tempfh != NULL, "can't open tempfile\n"); - for (i = 0; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + for (i = 0; i < ARRAY_SIZE(wchar_text); i++) { ch = fgetwc(tempfh); ok(ch == wchar_text[i], "got %04hx, expected %04x (cp%d[%d])\n", ch, wchar_text[i], codepage, i); @@ -946,7 +945,7 @@ static void test_fgetwc_unicode(void) tempfh = fopen(tempfile, "rt,ccs=unicode"); ok(tempfh != NULL, "can't open tempfile\n"); - for (i = 1; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) { ch = fgetwc(tempfh); ok(ch == wchar_text[i], @@ -958,7 +957,7 @@ static void test_fgetwc_unicode(void) tempfh = fopen(tempfile, "wb"); ok(tempfh != NULL, "can't open tempfile\n"); - ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text, sizeof(wchar_text)/sizeof(wchar_text[0]), + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text, ARRAY_SIZE(wchar_text), utf8_text, sizeof(utf8_text), NULL, NULL); ok(ret > 0, "utf-8 conversion failed\n"); fwrite(utf8_text, sizeof(char), ret, tempfh); @@ -966,7 +965,7 @@ static void test_fgetwc_unicode(void) tempfh = fopen(tempfile, "rt, ccs=UTF-8"); ok(tempfh != NULL, "can't open tempfile\n"); - for (i = 1; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) { ch = fgetwc(tempfh); ok(ch == wchar_text[i], @@ -2659,5 +2658,5 @@ START_TEST(file) /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order */ - WaitForMultipleObjects(sizeof(proc_handles)/sizeof(proc_handles[0]), proc_handles, TRUE, 5000); + WaitForMultipleObjects(ARRAY_SIZE(proc_handles), proc_handles, TRUE, 5000); } diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 024afc15b3..ff777599aa 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -643,7 +643,7 @@ static void test_crtGetStringTypeW(void) return; } - for(i=0; i<sizeof(str)/sizeof(*str); i++) { + for(i=0; i<ARRAY_SIZE(str); i++) { ret_crt = p__crtGetStringTypeW(0, CT_CTYPE1, str[i], 1, &out_crt); ret = GetStringTypeW(CT_CTYPE1, str[i], 1, &out); ok(ret == ret_crt, "%d) ret_crt = %d\n", i, (int)ret_crt); @@ -708,7 +708,7 @@ static void test__Gettnames(void) else ok(size==0x164 || broken(size==0xb8), "structure size: %x\n", size); - for (i = 0; i < sizeof(time_data)/sizeof(time_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(time_data); i++) { size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), time_data[i], buf, sizeof(buf)); @@ -722,7 +722,7 @@ static void test__Gettnames(void) return; ret = _Gettnames(); - for (i = 0; i < sizeof(time_data)/sizeof(time_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(time_data); i++) { size = GetLocaleInfoA(MAKELCID(LANG_GERMAN, SORT_DEFAULT), time_data[i], buf, sizeof(buf)); diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 017ae7758a..c170d23225 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -164,7 +164,7 @@ static void test_I10_OUTPUT(void) if (j != 12) trace("sizeof(long double) = %d on this machine\n", j); - for(i=0; i<sizeof(I10_OUTPUT_tests)/sizeof(I10_OUTPUT_test); i++) { + for(i=0; i<ARRAY_SIZE(I10_OUTPUT_tests); i++) { memset(out.str, '#', sizeof(out.str)); if (sizeof(long double) == 12) @@ -621,7 +621,7 @@ static void test__lfind_s(void) } key = 1234; - num = sizeof(tests)/sizeof(tests[0]); + num = ARRAY_SIZE(tests); errno = 0xdeadbeef; found = p_lfind_s(NULL, tests, &num, sizeof(int), _lfind_s_comp, NULL); diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 64658ce25f..80180ff8b2 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -841,7 +841,7 @@ static void test_snprintf (void) const int bufsiz = sizeof buffer; unsigned int i; - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i].format; const int expect = tests[i].expected; const int n = _snprintf (buffer, bufsiz, fmt); @@ -1215,7 +1215,7 @@ static void test_vsnwprintf(void) wchar_t str[32]; char buf[32]; - ret = _vsnwprintf_wrapper( str, sizeof(str)/sizeof(str[0]), format, one, two, three ); + ret = _vsnwprintf_wrapper( str, ARRAY_SIZE(str), format, one, two, three ); ok( ret == 11, "got %d expected 11\n", ret ); WideCharToMultiByte( CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL ); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 07458d4474..744035a1b8 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1014,7 +1014,7 @@ static void test_wcscpy_s(void) return; } - ret = p_wcsncpy_s(NULL, 18, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ret = p_wcsncpy_s(NULL, 18, szLongText, ARRAY_SIZE(szLongText)); ok(ret == EINVAL, "p_wcsncpy_s expect EINVAL got %d\n", ret); szDest[0] = 'A'; @@ -1028,16 +1028,16 @@ static void test_wcscpy_s(void) ok(szDest[0] == 0, "szDest[0] not 0\n"); szDest[0] = 'A'; - ret = p_wcsncpy_s(szDest, 0, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ret = p_wcsncpy_s(szDest, 0, szLongText, ARRAY_SIZE(szLongText)); ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); ok(szDest[0] == 0 || ret == EINVAL, "szDest[0] not 0\n"); - ret = p_wcsncpy_s(szDest, 18, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ret = p_wcsncpy_s(szDest, 18, szLongText, ARRAY_SIZE(szLongText)); ok(ret == 0, "expected 0 got %d\n", ret); ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); szDest[0] = 'A'; - ret = p_wcsncpy_s(szDestShort, 8, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ret = p_wcsncpy_s(szDestShort, 8, szLongText, ARRAY_SIZE(szLongText)); ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); @@ -1065,7 +1065,7 @@ static void test__wcsupr_s(void) static const WCHAR expectedString[] = {'M', 'I', 'X', 'E', 'D', 'L', 'O', 'W', 'E', 'R', 'U', 'P', 'P', 'E', 'R', 0}; - WCHAR testBuffer[2*sizeof(mixedString)/sizeof(WCHAR)]; + WCHAR testBuffer[2*ARRAY_SIZE(mixedString)]; int ret; if (!p_wcsupr_s) @@ -1082,7 +1082,7 @@ static void test__wcsupr_s(void) /* Test NULL input string and valid size. */ errno = EBADF; - ret = p_wcsupr_s(NULL, sizeof(testBuffer)/sizeof(WCHAR)); + ret = p_wcsupr_s(NULL, ARRAY_SIZE(testBuffer)); ok(ret == EINVAL, "Expected _wcsupr_s to fail with EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); @@ -1126,21 +1126,21 @@ static void test__wcsupr_s(void) /* Test normal string uppercasing. */ wcscpy(testBuffer, mixedString); - ret = p_wcsupr_s(testBuffer, sizeof(mixedString)/sizeof(WCHAR)); + ret = p_wcsupr_s(testBuffer, ARRAY_SIZE(mixedString)); ok(ret == 0, "Expected _wcsupr_s to succeed, got %d\n", ret); ok(!wcscmp(testBuffer, expectedString), "Expected the string to be fully upper-case\n"); /* Test uppercasing with a shorter buffer size count. */ wcscpy(testBuffer, mixedString); errno = EBADF; - ret = p_wcsupr_s(testBuffer, sizeof(mixedString)/sizeof(WCHAR) - 1); + ret = p_wcsupr_s(testBuffer, ARRAY_SIZE(mixedString) - 1); ok(ret == EINVAL, "Expected _wcsupr_s to fail with EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); ok(testBuffer[0] == '\0', "Expected the first buffer character to be null\n"); /* Test uppercasing with a longer buffer size count. */ wcscpy(testBuffer, mixedString); - ret = p_wcsupr_s(testBuffer, sizeof(testBuffer)/sizeof(WCHAR)); + ret = p_wcsupr_s(testBuffer, ARRAY_SIZE(testBuffer)); ok(ret == 0, "Expected _wcsupr_s to succeed, got %d\n", ret); ok(!wcscmp(testBuffer, expectedString), "Expected the string to be fully upper-case\n"); } @@ -1152,7 +1152,7 @@ static void test__wcslwr_s(void) static const WCHAR expectedString[] = {'m', 'i', 'x', 'e', 'd', 'l', 'o', 'w', 'e', 'r', 'u', 'p', 'p', 'e', 'r', 0}; - WCHAR buffer[2*sizeof(mixedString)/sizeof(WCHAR)]; + WCHAR buffer[2*ARRAY_SIZE(mixedString)]; int ret; if (!p_wcslwr_s) @@ -1169,7 +1169,7 @@ static void test__wcslwr_s(void) /* Test NULL input string and valid size. */ errno = EBADF; - ret = p_wcslwr_s(NULL, sizeof(buffer)/sizeof(buffer[0])); + ret = p_wcslwr_s(NULL, ARRAY_SIZE(buffer)); ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); ok(errno == EINVAL, "expected errno EINVAL, got %d\n", errno); @@ -1213,21 +1213,21 @@ static void test__wcslwr_s(void) /* Test normal string uppercasing. */ wcscpy(buffer, mixedString); - ret = p_wcslwr_s(buffer, sizeof(mixedString)/sizeof(WCHAR)); + ret = p_wcslwr_s(buffer, ARRAY_SIZE(mixedString)); ok(ret == 0, "expected 0, got %d\n", ret); ok(!wcscmp(buffer, expectedString), "expected lowercase\n"); /* Test uppercasing with a shorter buffer size count. */ wcscpy(buffer, mixedString); errno = EBADF; - ret = p_wcslwr_s(buffer, sizeof(mixedString)/sizeof(WCHAR) - 1); + ret = p_wcslwr_s(buffer, ARRAY_SIZE(mixedString) - 1); ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); ok(errno == EINVAL, "expected errno to be EINVAL, got %d\n", errno); ok(buffer[0] == '\0', "expected empty string\n"); /* Test uppercasing with a longer buffer size count. */ wcscpy(buffer, mixedString); - ret = p_wcslwr_s(buffer, sizeof(buffer)/sizeof(WCHAR)); + ret = p_wcslwr_s(buffer, ARRAY_SIZE(buffer)); ok(ret == 0, "expected 0, got %d\n", ret); ok(!wcscmp(buffer, expectedString), "expected lowercase\n"); } @@ -1243,7 +1243,7 @@ static void test_mbcjisjms(void) unsigned int i, j; int prev_cp = _getmbcp(); - for (i = 0; i < sizeof(cp)/sizeof(cp[0]); i++) + for (i = 0; i < ARRAY_SIZE(cp); i++) { _setmbcp(cp[i]); for (j = 0; jisjms[j][0] != 0; j++) @@ -1271,7 +1271,7 @@ static void test_mbcjmsjis(void) unsigned int i, j; int prev_cp = _getmbcp(); - for (i = 0; i < sizeof(cp)/sizeof(cp[0]); i++) + for (i = 0; i < ARRAY_SIZE(cp); i++) { _setmbcp(cp[i]); for (j = 0; jmsjis[j][0] != 0; j++) @@ -1298,7 +1298,7 @@ static void test_mbctohira(void) unsigned int prev_cp = _getmbcp(); _setmbcp(_MB_CP_SBCS); - for (i = 0; i < sizeof(mbchira_932)/sizeof(mbchira_932[0]); i++) + for (i = 0; i < ARRAY_SIZE(mbchira_932); i++) { int ret, exp = mbchira_932[i][0]; ret = _mbctohira(mbchira_932[i][0]); @@ -1306,7 +1306,7 @@ static void test_mbctohira(void) } _setmbcp(932); - for (i = 0; i < sizeof(mbchira_932)/sizeof(mbchira_932[0]); i++) + for (i = 0; i < ARRAY_SIZE(mbchira_932); i++) { unsigned int ret, exp; ret = _mbctohira(mbchira_932[i][0]); @@ -1327,7 +1327,7 @@ static void test_mbctokata(void) unsigned int prev_cp = _getmbcp(); _setmbcp(_MB_CP_SBCS); - for (i = 0; i < sizeof(mbckata_932)/sizeof(mbckata_932[0]); i++) + for (i = 0; i < ARRAY_SIZE(mbckata_932); i++) { int ret, exp = mbckata_932[i][0]; ret = _mbctokata(mbckata_932[i][0]); @@ -1335,7 +1335,7 @@ static void test_mbctokata(void) } _setmbcp(932); - for (i = 0; i < sizeof(mbckata_932)/sizeof(mbckata_932[0]); i++) + for (i = 0; i < ARRAY_SIZE(mbckata_932); i++) { unsigned int ret, exp; ret = _mbctokata(mbckata_932[i][0]); @@ -1356,7 +1356,7 @@ static void test_mbbtombc(void) int i, j; int prev_cp = _getmbcp(); - for (i = 0; i < sizeof(cp)/sizeof(cp[0]); i++) + for (i = 0; i < ARRAY_SIZE(cp); i++) { _setmbcp(cp[i]); for (j = 0; mbbmbc[j][0] != 0; j++) @@ -1409,13 +1409,13 @@ static void test_ismbckata(void) { unsigned int i; _setmbcp(_MB_CP_SBCS); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { ret = _ismbckata(tests[i].c); ok(!ret, "expected 0, got %d for %04x\n", ret, tests[i].c); } _setmbcp(932); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { ret = _ismbckata(tests[i].c); ok(!!ret == tests[i].exp, "expected %d, got %d for %04x\n", tests[i].exp, !!ret, tests[i].c); @@ -2993,7 +2993,7 @@ static void test__wcstoi64(void) ok(ures == 071, "ures != 071\n"); /* Test various unicode digits */ - for (i = 0; i < sizeof(zeros) / sizeof(zeros[0]); ++i) { + for (i = 0; i < ARRAY_SIZE(zeros); ++i) { WCHAR tmp[] = {zeros[i] + 4, zeros[i], zeros[i] + 5, 0}; res = p_wcstoi64(tmp, NULL, 0); ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], (int)res); -- 2.14.4

2 1

[PATCH 1/2] msvcrt: Rename a macro to ARRAY_SIZE()
by Michael Stefaniuc June 21, 2018

June 21, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/string.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 2e963dc8ad..07458d4474 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -607,8 +607,6 @@ static void test_strcpy_s(void) dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } -#define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) - #define okchars(dst, b0, b1, b2, b3, b4, b5, b6, b7) \ ok(dst[0] == b0 && dst[1] == b1 && dst[2] == b2 && dst[3] == b3 && \ dst[4] == b4 && dst[5] == b5 && dst[6] == b6 && dst[7] == b7, \ @@ -628,14 +626,14 @@ static void test_memcpy_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_memcpy_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Copying a buffer into a big enough destination returned %d, expected 0\n", ret); okchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], 'X', 'X'); /* Vary source size */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_memcpy_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(ret == ERANGE, "Copying a big buffer to a small destination returned %d, expected ERANGE\n", ret); ok(errno == ERANGE, "errno is %d, expected ERANGE\n", errno); okchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -643,7 +641,7 @@ static void test_memcpy_s(void) /* Replace source with NULL */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_memcpy_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Copying a NULL source buffer returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -651,21 +649,21 @@ static void test_memcpy_s(void) /* Vary dest size */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_memcpy_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(ret == ERANGE, "Copying into a destination of size 0 returned %d, expected ERANGE\n", ret); ok(errno == ERANGE, "errno is %d, expected ERANGE\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); /* Replace dest with NULL */ errno = 0xdeadbeef; - ret = p_memcpy_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_memcpy_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Copying a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); /* Combinations */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_memcpy_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Copying a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); @@ -684,20 +682,20 @@ static void test_memmove_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_memmove_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Moving a buffer into a big enough destination returned %d, expected 0\n", ret); okchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], 'X', 'X'); /* Overlapping */ memcpy(dest, big, sizeof(dest)); - ret = p_memmove_s(dest+1, NUMELMS(dest)-1, dest, NUMELMS(dest)-1); + ret = p_memmove_s(dest+1, ARRAY_SIZE(dest)-1, dest, ARRAY_SIZE(dest)-1); ok(ret == 0, "Moving a buffer up one char returned %d, expected 0\n", ret); okchars(dest, big[0], big[0], big[1], big[2], big[3], big[4], big[5], big[6]); /* Vary source size */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_memmove_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(ret == ERANGE, "Moving a big buffer to a small destination returned %d, expected ERANGE\n", ret); ok(errno == ERANGE, "errno is %d, expected ERANGE\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); @@ -705,7 +703,7 @@ static void test_memmove_s(void) /* Replace source with NULL */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_memmove_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Moving a NULL source buffer returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); @@ -713,21 +711,21 @@ static void test_memmove_s(void) /* Vary dest size */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_memmove_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(ret == ERANGE, "Moving into a destination of size 0 returned %d, expected ERANGE\n", ret); ok(errno == ERANGE, "errno is %d, expected ERANGE\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); /* Replace dest with NULL */ errno = 0xdeadbeef; - ret = p_memmove_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_memmove_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Moving a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); /* Combinations */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_memmove_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Moving a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); -- 2.14.4

2 1

[PATCH 1/2] iphlpapi: Use a standalone buffer in IcmpSendEcho().
by Zhiyi Zhang June 21, 2018

June 21, 2018

Fix https://bugs.winehq.org/show_bug.cgi?id=43252 The old implementation uses user provided buffer to receive packet data, which is alway not enough, causing data corruptions or incorrectly timeout. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/iphlpapi/icmp.c | 38 +++++++++++++++++++++++++++------- dlls/iphlpapi/tests/iphlpapi.c | 21 +++++++++++++++---- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index ebc2f2b65c..7c91443598 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -113,6 +113,9 @@ typedef struct { #define IP_OPTS_DEFAULT 1 #define IP_OPTS_CUSTOM 2 +#define MAXIPLEN 60 +#define MAXICMPLEN 76 + /* The sequence number is unique process wide, so that all threads * have a distinct sequence number. */ @@ -270,13 +273,14 @@ DWORD WINAPI IcmpSendEcho( icmp_t* icp=(icmp_t*)IcmpHandle; unsigned char* reqbuf; int reqsize; + unsigned char* repbuf; + int repsize; struct icmp_echo_reply* ier; struct ip* ip_header; struct icmp* icmp_header; char* endbuf; int ip_header_len; - int maxlen; struct pollfd fdr; DWORD send_time,recv_time; struct sockaddr_in addr; @@ -312,6 +316,16 @@ DWORD WINAPI IcmpSendEcho( return 0; } + /* max ip header + max icmp header and error data + reply size(max 65535 on Windows) */ + /* FIXME: request size of 65535 is not supported yet because max buffer size of raw socket on linux is 32767 */ + repsize=MAXIPLEN+MAXICMPLEN+(ReplySize&0xFFFF); + repbuf=HeapAlloc(GetProcessHeap(), 0, repsize); + if (reqbuf==NULL) { + HeapFree(GetProcessHeap(), 0, reqbuf); + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + icmp_header=(struct icmp*)reqbuf; icmp_header->icmp_type=ICMP_ECHO; icmp_header->icmp_code=0; @@ -367,9 +381,7 @@ DWORD WINAPI IcmpSendEcho( fdr.events = POLLIN; addrlen=sizeof(addr); ier=ReplyBuffer; - ip_header=(struct ip *) ((char *) ReplyBuffer+sizeof(ICMP_ECHO_REPLY)); endbuf=(char *) ReplyBuffer+ReplySize; - maxlen=ReplySize-sizeof(ICMP_ECHO_REPLY); /* Send the packet */ TRACE("Sending %d bytes (RequestSize=%d) to %s\n", reqsize, RequestSize, inet_ntoa(addr.sin_addr)); @@ -407,10 +419,11 @@ DWORD WINAPI IcmpSendEcho( } /* Get the reply */ + ip_header=(struct ip*)repbuf; ip_header_len=0; /* because gcc was complaining */ while (poll(&fdr,1,Timeout)>0) { recv_time = GetTickCount(); - res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); + res=recvfrom(icp->sid, (char*)repbuf, repsize, 0, (struct sockaddr*)&addr, &addrlen); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); ier->Status=IP_REQ_TIMED_OUT; @@ -508,6 +521,12 @@ DWORD WINAPI IcmpSendEcho( else Timeout = 0; continue; } else { + /* Check free space, should be large enough for an ICMP_ECHO_REPLY and remainning icmp data */ + if (endbuf-(char *)ier < sizeof(struct icmp_echo_reply)+(res-ip_header_len-ICMP_MINLEN)) { + res=ier-(ICMP_ECHO_REPLY *)ReplyBuffer; + SetLastError(IP_GENERAL_FAILURE); + goto done; + } /* This is a reply to our packet */ memcpy(&ier->Address,&ip_header->ip_src,sizeof(IPAddr)); /* Status is already set */ @@ -515,7 +534,7 @@ DWORD WINAPI IcmpSendEcho( ier->DataSize=res-ip_header_len-ICMP_MINLEN; ier->Reserved=0; ier->Data=endbuf-ier->DataSize; - memmove(ier->Data,((char*)ip_header)+ip_header_len+ICMP_MINLEN,ier->DataSize); + memcpy(ier->Data, ((char *)ip_header)+ip_header_len+ICMP_MINLEN, ier->DataSize); ier->Options.Ttl=ip_header->ip_ttl; ier->Options.Tos=ip_header->ip_tos; ier->Options.Flags=ip_header->ip_off >> 13; @@ -523,7 +542,7 @@ DWORD WINAPI IcmpSendEcho( if (ier->Options.OptionsSize!=0) { ier->Options.OptionsData=(unsigned char *) ier->Data-ier->Options.OptionsSize; /* FIXME: We are supposed to rearrange the option's 'source route' data */ - memmove(ier->Options.OptionsData,((char*)ip_header)+ip_header_len,ier->Options.OptionsSize); + memcpy(ier->Options.OptionsData, ((char *)ip_header)+ip_header_len, ier->Options.OptionsSize); endbuf=(char*)ier->Options.OptionsData; } else { ier->Options.OptionsData=NULL; @@ -531,9 +550,8 @@ DWORD WINAPI IcmpSendEcho( } /* Prepare for the next packet */ + endbuf-=ier->DataSize; ier++; - ip_header=(struct ip*)(((char*)ip_header)+sizeof(ICMP_ECHO_REPLY)); - maxlen=endbuf-(char*)ip_header; /* Check out whether there is more but don't wait this time */ Timeout=0; @@ -542,6 +560,10 @@ DWORD WINAPI IcmpSendEcho( res=ier-(ICMP_ECHO_REPLY*)ReplyBuffer; if (res==0) SetLastError(IP_REQ_TIMED_OUT); + else + SetLastError(NO_ERROR); +done: + HeapFree(GetProcessHeap(), 0, repbuf); TRACE("received %d replies\n",res); return res; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d5613d7b4b..f964878d68 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -951,6 +951,8 @@ static void testIcmpSendEcho(void) char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; DWORD ret, error, replysz = sizeof(replydata); IPAddr address; + ICMP_ECHO_REPLY *reply; + INT i; if (!pIcmpSendEcho || !pIcmpCreateFile) { @@ -1038,12 +1040,10 @@ todo_wine replysz = sizeof(replydata) - 1; ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); - todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); - } SetLastError(0xdeadbeef); replysz = sizeof(ICMP_ECHO_REPLY); @@ -1056,7 +1056,6 @@ todo_wine replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); @@ -1064,7 +1063,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); @@ -1111,6 +1109,21 @@ todo_wine { skip ("Failed to ping with error %d, is lo interface down?.\n", error); } + + /* check reply data */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + reply = (ICMP_ECHO_REPLY *)replydata; + ok(ret, "IcmpSendEcho failed unexpectedly\n"); + ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); + ok(INADDR_LOOPBACK == ntohl(reply->Address), "Address mismatch, expect:%s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Expect data size:%d, got:%d\n", sizeof(senddata), reply->DataSize); + ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); } /* -- 2.17.1

2 3

[PATCH 2/2] vulkan-1/tests: Add tests.
by Józef Kucia June 21, 2018

June 21, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/vulkan-1/Makefile.in | 1 + dlls/vulkan-1/tests/Makefile.in | 5 +++ dlls/vulkan-1/tests/vulkan.c | 92 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+) create mode 100644 dlls/vulkan-1/tests/Makefile.in create mode 100644 dlls/vulkan-1/tests/vulkan.c diff --git a/configure b/configure index bcb660d56982..ddd6db152cc9 100755 --- a/configure +++ b/configure @@ -19222,6 +19222,7 @@ wine_fn_config_makefile dlls/vnetbios.vxd enable_win16 wine_fn_config_makefile dlls/vssapi enable_vssapi wine_fn_config_makefile dlls/vtdapi.vxd enable_win16 wine_fn_config_makefile dlls/vulkan-1 enable_vulkan_1 +wine_fn_config_makefile dlls/vulkan-1/tests enable_tests wine_fn_config_makefile dlls/vwin32.vxd enable_win16 wine_fn_config_makefile dlls/w32skrnl enable_win16 wine_fn_config_makefile dlls/w32sys.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 469fa8d72977..68f7f146ca1f 100644 --- a/configure.ac +++ b/configure.ac @@ -3721,6 +3721,7 @@ WINE_CONFIG_MAKEFILE(dlls/vnetbios.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vssapi) WINE_CONFIG_MAKEFILE(dlls/vtdapi.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vulkan-1) +WINE_CONFIG_MAKEFILE(dlls/vulkan-1/tests) WINE_CONFIG_MAKEFILE(dlls/vwin32.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/w32skrnl,enable_win16) WINE_CONFIG_MAKEFILE(dlls/w32sys.dll16,enable_win16) diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in index 4bb8cec41287..2abc54df0e41 100644 --- a/dlls/vulkan-1/Makefile.in +++ b/dlls/vulkan-1/Makefile.in @@ -1,5 +1,6 @@ MODULE = vulkan-1.dll IMPORTS = winevulkan +IMPORTLIB = vulkan-1 C_SRCS = \ vulkan.c diff --git a/dlls/vulkan-1/tests/Makefile.in b/dlls/vulkan-1/tests/Makefile.in new file mode 100644 index 000000000000..c9f9f0727c80 --- /dev/null +++ b/dlls/vulkan-1/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = vulkan-1.dll +IMPORTS = vulkan-1 + +C_SRCS = \ + vulkan.c diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c new file mode 100644 index 000000000000..67da880fe470 --- /dev/null +++ b/dlls/vulkan-1/tests/vulkan.c @@ -0,0 +1,92 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "wine/heap.h" +#include "wine/vulkan.h" +#include "wine/test.h" + +static VkResult create_instance(uint32_t extension_count, + const char * const *enabled_extensions, VkInstance *vk_instance) +{ + VkInstanceCreateInfo create_info; + + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.pApplicationInfo = NULL; + create_info.enabledLayerCount = 0; + create_info.ppEnabledLayerNames = NULL; + create_info.enabledExtensionCount = extension_count; + create_info.ppEnabledExtensionNames = enabled_extensions; + + return vkCreateInstance(&create_info, NULL, vk_instance); +} + +static void test_enumerate_physical_devices(void) +{ + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDeviceProperties properties; + VkInstance vk_instance; + unsigned int i; + uint32_t count; + VkResult vr; + + if ((vr = create_instance(0, NULL, &vk_instance)) < 0) + { + skip("Failed to create Vulkan instance, vr %d.\n", vr); + return; + } + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + { + skip("No physical devices.\n"); + vkDestroyInstance(vk_instance, NULL); + return; + } + + trace("Got %u physical device(s).\n", count); + vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + ok(!!vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + for (i = 0; i < count; ++i) + { + vkGetPhysicalDeviceProperties(vk_physical_devices[i], &properties); + + trace("Device '%s', %#x:%#x, driver version %u.%u.%u (%#x), api version %u.%u.%u.\n", + properties.deviceName, properties.vendorID, properties.deviceID, + VK_VERSION_MAJOR(properties.driverVersion), VK_VERSION_MINOR(properties.driverVersion), + VK_VERSION_PATCH(properties.driverVersion), properties.driverVersion, + VK_VERSION_MAJOR(properties.apiVersion), VK_VERSION_MINOR(properties.apiVersion), + VK_VERSION_PATCH(properties.apiVersion)); + } + + heap_free(vk_physical_devices); + + vkDestroyInstance(vk_instance, NULL); +} + +START_TEST(vulkan) +{ + test_enumerate_physical_devices(); +} -- 2.16.4

1 0

[PATCH 1/2] wrc: Accept hyphens in identificators.
by Józef Kucia June 21, 2018

June 21, 2018

It is a bit more permissive than it should be, hyphens should be allowed in resource names, but not in filenames. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- I need it to add tests for vulkan-1. I would like to add some tests for structure conversion bugs. --- tools/wrc/parser.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 32a231b5a2ea..0f46670288ce 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -402,7 +402,7 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) 0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } -[A-Za-z_0-9./\\]+ { +[A-Za-z_0-9./\\][A-Za-z_0-9./\\\-]* { struct keyword *tok = iskeyword(yytext); if(tok) -- 2.16.4

1 0