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

[PATCH v3] vbscript: Treat \r as a newline separator.
by Zebediah Figura June 18, 2018

June 18, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Sorry about the delay; seems this one got lost somehow. dlls/vbscript/lex.c | 6 ++++-- dlls/vbscript/tests/run.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 98b4cbb..b0fac48 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -383,13 +383,14 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) static void skip_spaces(parser_ctx_t *ctx) { - while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') + while(*ctx->ptr == ' ' || *ctx->ptr == '\t') ctx->ptr++; } static int comment_line(parser_ctx_t *ctx) { - ctx->ptr = strchrW(ctx->ptr, '\n'); + static const WCHAR newlineW[] = {'\n','\r',0}; + ctx->ptr = strpbrkW(ctx->ptr, newlineW); if(ctx->ptr) ctx->ptr++; else @@ -421,6 +422,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) switch(c) { case '\n': + case '\r': ctx->ptr++; return tNL; case '\'': diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6b57540..191f5a7 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2394,6 +2394,18 @@ static void run_tests(void) ok(FAILED(hres), "script didn't fail\n"); todo_wine CHECK_CALLED(OnScriptError); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("' comment\r" + "Sub testsub(arg)\r" + "If arg = 1 Then\r\r" + "Call reportSuccess()\n\n" + "End If\r\n" + "End Sub\n\r" + "Call testsub(1)"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + run_from_res("lang.vbs"); run_from_res("api.vbs"); run_from_res("regexp.vbs"); -- 2.7.4

2 1

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

June 18, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/misc.c | 66 +++++++++++++++++--------------------- dlls/urlmon/tests/protocol.c | 26 +++++++-------- dlls/urlmon/tests/sec_mgr.c | 20 ++++++------ dlls/urlmon/tests/uri.c | 76 ++++++++++++++++++++++---------------------- dlls/urlmon/tests/url.c | 2 +- 5 files changed, 91 insertions(+), 99 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index e88c960497..ff0f24ed76 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -85,7 +85,7 @@ static HRESULT (WINAPI *pIEInstallScope)(DWORD*); static int strcmp_wa(const WCHAR *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); } @@ -367,23 +367,23 @@ static void test_CoInternetParseUrl(void) 3, &size, 0); ok(hres == E_POINTER, "schema failed: %08x, expected E_POINTER\n", hres); - for(i=0; i < sizeof(parse_tests)/sizeof(parse_tests[0]); i++) { + for(i = 0; i < ARRAY_SIZE(parse_tests); i++) { memset(buf, 0xf0, sizeof(buf)); hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_SECURITY_URL, 0, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == parse_tests[i].secur_hres, "[%d] security url failed: %08x, expected %08x\n", i, hres, parse_tests[i].secur_hres); memset(buf, 0xf0, sizeof(buf)); hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_ENCODE, 0, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "[%d] encoding failed: %08x\n", i, hres); ok(size == lstrlenW(parse_tests[i].encoded_url), "[%d] wrong size\n", i); ok(!lstrcmpW(parse_tests[i].encoded_url, buf), "[%d] wrong encoded url\n", i); memset(buf, 0xf0, sizeof(buf)); hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_PATH_FROM_URL, 0, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == parse_tests[i].path_hres, "[%d] path failed: %08x, expected %08x\n", i, hres, parse_tests[i].path_hres); if(parse_tests[i].path) { @@ -393,7 +393,7 @@ static void test_CoInternetParseUrl(void) memset(buf, 0xf0, sizeof(buf)); hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_SCHEMA, 0, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "[%d] schema failed: %08x\n", i, hres); ok(size == lstrlenW(parse_tests[i].schema), "[%d] wrong size\n", i); ok(!lstrcmpW(parse_tests[i].schema, buf), "[%d] wrong schema\n", i); @@ -402,7 +402,7 @@ static void test_CoInternetParseUrl(void) && memcmp(parse_tests[i].url, wszAbout, 5*sizeof(WCHAR))) { memset(buf, 0xf0, sizeof(buf)); hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == parse_tests[i].domain_hres, "[%d] domain failed: %08x\n", i, hres); if(parse_tests[i].domain) ok(!lstrcmpW(parse_tests[i].domain, buf), "[%d] wrong domain, received %s\n", i, wine_dbgstr_w(buf)); @@ -410,7 +410,7 @@ static void test_CoInternetParseUrl(void) memset(buf, 0xf0, sizeof(buf)); hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_ROOTDOCUMENT, 0, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == parse_tests[i].rootdocument_hres, "[%d] rootdocument failed: %08x\n", i, hres); if(parse_tests[i].rootdocument) ok(!lstrcmpW(parse_tests[i].rootdocument, buf), "[%d] wrong rootdocument, received %s\n", i, wine_dbgstr_w(buf)); @@ -451,7 +451,7 @@ static void test_CoInternetQueryInfo(void) DWORD cb, i; HRESULT hres; - for(i=0; i < sizeof(query_info_tests)/sizeof(query_info_tests[0]); i++) { + for(i = 0; i < ARRAY_SIZE(query_info_tests); i++) { cb = 0xdeadbeef; memset(buf, '?', sizeof(buf)); hres = pCoInternetQueryInfo(query_info_tests[0].url, QUERY_USES_NETWORK, 0, buf, sizeof(buf), &cb, 0); @@ -724,7 +724,7 @@ static void test_FindMimeFromData(void) static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR text_plainW[] = {'t','e','x','t','/','p','l','a','i','n',0}; - for(i=0; i<sizeof(mime_tests)/sizeof(mime_tests[0]); i++) { + for(i = 0; i < ARRAY_SIZE(mime_tests); i++) { mime = (LPWSTR)0xf0f0f0f0; url = a2w(mime_tests[i].url); hres = pFindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); @@ -757,7 +757,7 @@ static void test_FindMimeFromData(void) heap_free(url); } - for(i=0; i < sizeof(mime_tests2)/sizeof(mime_tests2[0]); i++) { + for(i = 0; i < ARRAY_SIZE(mime_tests2); i++) { url = a2w(mime_tests2[i].url); proposed_mime = a2w(mime_tests2[i].proposed_mime); hres = pFindMimeFromData(NULL, url, mime_tests2[i].data, mime_tests2[i].size, @@ -879,9 +879,9 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface if(ParseAction == PARSE_SECURITY_URL) { if(pcchResult) - *pcchResult = sizeof(url1)/sizeof(WCHAR); + *pcchResult = ARRAY_SIZE(url1); - if(cchResult<sizeof(url1)/sizeof(WCHAR)) + if(cchResult < ARRAY_SIZE(url1)) return S_FALSE; memcpy(pwzResult, url1, sizeof(url1)); @@ -1032,8 +1032,7 @@ static void test_NameSpace(void) SET_EXPECT(CreateInstance); SET_EXPECT(ParseUrl); - hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), - &size, 0); + hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); @@ -1044,8 +1043,7 @@ static void test_NameSpace(void) SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl); - hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), - &size, 0); + hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); @@ -1054,11 +1052,10 @@ static void test_NameSpace(void) SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl); - hres = pCoInternetParseUrl(url8, PARSE_SECURITY_URL, 0, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); + hres = pCoInternetParseUrl(url8, PARSE_SECURITY_URL, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); - ok(size == sizeof(url1)/sizeof(WCHAR), "Size = %d\n", size); - if(size == sizeof(url1)/sizeof(WCHAR)) + ok(size == ARRAY_SIZE(url1), "Size = %d\n", size); + if(size == ARRAY_SIZE(url1)) ok(!memcmp(buf, url1, sizeof(url1)), "Encoded url = %s\n", wine_dbgstr_w(buf)); CHECK_CALLED(QI_IInternetProtocolInfo); @@ -1071,7 +1068,7 @@ static void test_NameSpace(void) hres = pCoInternetGetSecurityUrl(url8, &sec_url, PSU_SECURITY_URL_ONLY, 0); ok(hres == S_OK, "CoInternetGetSecurityUrl failed: %08x\n", hres); if(hres == S_OK) { - ok(lstrlenW(sec_url)>sizeof(wszFile)/sizeof(WCHAR) && + ok(lstrlenW(sec_url) > ARRAY_SIZE(wszFile) && !memcmp(sec_url, wszFile, sizeof(wszFile)-sizeof(WCHAR)), "Encoded url = %s\n", wine_dbgstr_w(sec_url)); CoTaskMemFree(sec_url); @@ -1084,8 +1081,7 @@ static void test_NameSpace(void) hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); - hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), - &size, 0); + hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); hres = IInternetSession_RegisterNameSpace(session, &test_protocol_cf2, &IID_NULL, @@ -1103,8 +1099,7 @@ static void test_NameSpace(void) SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl); - hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), - &size, 0); + hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); @@ -1116,8 +1111,7 @@ static void test_NameSpace(void) SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl); - hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), - &size, 0); + hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); @@ -1130,8 +1124,7 @@ static void test_NameSpace(void) SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl); - hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), - &size, 0); + hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); @@ -1149,8 +1142,7 @@ static void test_NameSpace(void) hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf2, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); - hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), - &size, 0); + hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); IInternetSession_Release(session); @@ -1627,7 +1619,7 @@ static void test_MkParseDisplayNameEx(void) CreateBindCtx(0, &bctx); - for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + for (i = 0; i < ARRAY_SIZE(invalid_parameters); i++) { eaten = 0xdeadbeef; mon = (IMoniker *)0xdeadbeef; @@ -1643,7 +1635,7 @@ static void test_MkParseDisplayNameEx(void) hres = MkParseDisplayNameEx(bctx, url9, &eaten, &mon); ok(hres == S_OK, "MkParseDisplayNameEx failed: %08x\n", hres); - ok(eaten == sizeof(url9)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(url9)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, NULL, 0, &name); @@ -1659,7 +1651,7 @@ static void test_MkParseDisplayNameEx(void) hres = MkParseDisplayNameEx(bctx, clsid_nameW, &eaten, &mon); ok(hres == S_OK, "MkParseDisplayNameEx failed: %08x\n", hres); - ok(eaten == sizeof(clsid_nameW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(clsid_nameW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_IsSystemMoniker(mon, &issys); @@ -1733,7 +1725,7 @@ static void test_internet_feature_defaults(void) { HRESULT hres; DWORD i; - for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(default_feature_tests); ++i) { hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags); todo_wine_if (default_feature_tests[i].todo) ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", @@ -1880,7 +1872,7 @@ static void test_CoInternetSetFeatureEnabled(void) { hres = pCoInternetSetFeatureEnabled(FEATURE_ENTRY_COUNT,SET_FEATURE_ON_PROCESS,TRUE); ok(hres == E_FAIL, "CoInternetSetFeatureEnabled returned %08x, expected E_FAIL\n", hres); - for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(internet_feature_tests); ++i) { hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags, internet_feature_tests[i].enable); todo_wine_if (internet_feature_tests[i].set_todo) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 0ca8feebcb..999b591f5f 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -824,7 +824,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, if (winetest_debug > 1) { - if (ulStatusCode < sizeof(status_names)/sizeof(status_names[0])) + if (ulStatusCode < ARRAY_SIZE(status_names)) trace( "progress: %s %s\n", status_names[ulStatusCode], wine_dbgstr_w(szStatusText) ); else trace( "progress: %u %s\n", ulStatusCode, wine_dbgstr_w(szStatusText) ); @@ -3051,55 +3051,55 @@ static void test_file_protocol(void) { test_file_protocol_url(index_url); memcpy(buf, wszFile, sizeof(wszFile)); - len = sizeof(wszFile)/sizeof(WCHAR)-1; - len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len); + len = ARRAY_SIZE(wszFile)-1; + len += GetCurrentDirectoryW(ARRAY_SIZE(buf)-len, buf+len); buf[len++] = '\\'; memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); - file_name = buf + sizeof(wszFile)/sizeof(WCHAR)-1; + file_name = buf + ARRAY_SIZE(wszFile)-1; bindf = 0; test_file_protocol_url(buf); bindf = BINDF_FROMURLMON; test_file_protocol_url(buf); memcpy(buf, wszFile2, sizeof(wszFile2)); - len = GetCurrentDirectoryW(sizeof(file_name_buf)/sizeof(WCHAR), file_name_buf); + len = GetCurrentDirectoryW(ARRAY_SIZE(file_name_buf), file_name_buf); file_name_buf[len++] = '\\'; memcpy(file_name_buf+len, wszIndexHtml, sizeof(wszIndexHtml)); - lstrcpyW(buf+sizeof(wszFile2)/sizeof(WCHAR)-1, file_name_buf); + lstrcpyW(buf+ARRAY_SIZE(wszFile2)-1, file_name_buf); file_name = file_name_buf; bindf = 0; test_file_protocol_url(buf); bindf = BINDF_FROMURLMON; test_file_protocol_url(buf); - buf[sizeof(wszFile2)/sizeof(WCHAR)] = '|'; + buf[ARRAY_SIZE(wszFile2)] = '|'; test_file_protocol_url(buf); memcpy(buf, wszFile3, sizeof(wszFile3)); - len = sizeof(wszFile3)/sizeof(WCHAR)-1; - len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len); + len = ARRAY_SIZE(wszFile3)-1; + len += GetCurrentDirectoryW(ARRAY_SIZE(buf)-len, buf+len); buf[len++] = '\\'; memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); - file_name = buf + sizeof(wszFile3)/sizeof(WCHAR)-1; + file_name = buf + ARRAY_SIZE(wszFile3)-1; bindf = 0; test_file_protocol_url(buf); bindf = BINDF_FROMURLMON; test_file_protocol_url(buf); memcpy(buf, wszFile4, sizeof(wszFile4)); - len = GetCurrentDirectoryW(sizeof(file_name_buf)/sizeof(WCHAR), file_name_buf); + len = GetCurrentDirectoryW(ARRAY_SIZE(file_name_buf), file_name_buf); file_name_buf[len++] = '\\'; memcpy(file_name_buf+len, wszIndexHtml, sizeof(wszIndexHtml)); - lstrcpyW(buf+sizeof(wszFile4)/sizeof(WCHAR)-1, file_name_buf); + lstrcpyW(buf+ARRAY_SIZE(wszFile4)-1, file_name_buf); file_name = file_name_buf; bindf = 0; test_file_protocol_url(buf); bindf = BINDF_FROMURLMON; test_file_protocol_url(buf); - buf[sizeof(wszFile4)/sizeof(WCHAR)] = '|'; + buf[ARRAY_SIZE(wszFile4)] = '|'; test_file_protocol_url(buf); /* Fragment part of URL is skipped if the file doesn't exist. */ diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 411a3b7781..2974eecc36 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -221,7 +221,7 @@ static LONG myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) dwMaxSubkeyLen++; dwMaxValueLen++; dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); - if (dwMaxLen > sizeof(szNameBuf)/sizeof(CHAR)) + if (dwMaxLen > ARRAY_SIZE(szNameBuf)) { /* Name too big: alloc a buffer for it */ if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(CHAR)))) @@ -381,7 +381,7 @@ static void test_SecurityManager(void) if(FAILED(hres)) return; - for(i=0; i < sizeof(secmgr_tests)/sizeof(secmgr_tests[0]); i++) { + for(i = 0; i < ARRAY_SIZE(secmgr_tests); i++) { zone = 100; hres = IInternetSecurityManager_MapUrlToZone(secmgr, secmgr_tests[i].url, &zone, 0); @@ -785,7 +785,7 @@ static BOOL register_zone_domains(void) res = RegOpenKeyA(HKEY_CURRENT_USER, szZoneMapDomainsKey, &domains); ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); - for(i = 0; i < sizeof(zone_domain_mappings)/sizeof(zone_domain_mappings[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(zone_domain_mappings); ++i) { const zone_domain_mapping *test = zone_domain_mappings+i; HKEY domain; @@ -830,7 +830,7 @@ static void unregister_zone_domains(void) res = RegOpenKeyA(HKEY_CURRENT_USER, szZoneMapDomainsKey, &domains); ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); - for(i = 0; i < sizeof(zone_domain_mappings)/sizeof(zone_domain_mappings[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(zone_domain_mappings); ++i) { const zone_domain_mapping *test = zone_domain_mappings+i; /* FIXME: Uses the "cludge" approach to remove the test data from the registry! @@ -936,7 +936,7 @@ static void test_zone_domain_mappings(void) RegCloseKey(domains); } - for(i = 0; i < sizeof(zone_mapping_tests)/sizeof(zone_mapping_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(zone_mapping_tests); ++i) { const zone_mapping_test *test = zone_mapping_tests+i; LPWSTR urlW = a2w(test->url); zone = URLZONE_INVALID; @@ -1360,7 +1360,7 @@ static void test_InternetGetSecurityUrl(void) trace("testing CoInternetGetSecurityUrl...\n"); - for(i=0; i<sizeof(in)/sizeof(WCHAR*); i++) { + for(i = 0; i < ARRAY_SIZE(in); i++) { hres = pCoInternetGetSecurityUrl(in[i], &sec, PSU_DEFAULT, 0); ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); if(hres == S_OK) { @@ -1625,7 +1625,7 @@ static void test_InternetGetSecurityUrlEx(void) ok(hr == E_INVALIDARG, "CoInternetGetSecurityUrlEx returned 0x%08x, expected E_INVALIDARG\n", hr); ok(result == (void*) 0xdeadbeef, "'result' was %p\n", result); - for(i = 0; i < sizeof(sec_url_ex_tests)/sizeof(sec_url_ex_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(sec_url_ex_tests); ++i) { LPWSTR uriW = a2w(sec_url_ex_tests[i].uri); uri = NULL; @@ -1827,7 +1827,7 @@ static void test_SecurityManagerEx2(void) IUri_Release(uri); - for(i = 0; i < sizeof(sec_mgr_ex2_tests)/sizeof(sec_mgr_ex2_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(sec_mgr_ex2_tests); ++i) { LPWSTR uriW = a2w(sec_mgr_ex2_tests[i].uri); uri = NULL; @@ -1925,7 +1925,7 @@ static void test_CoInternetIsFeatureZoneElevationEnabled(void) trace("Testing CoInternetIsFeatureZoneElevationEnabled... (%x)\n", hres); - for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + for(i = 0; i < ARRAY_SIZE(testcases); i++) { if(hres==S_OK && testcases[i].flags == GET_FEATURE_FROM_PROCESS) testcases[i].policy_flags = URLPOLICY_ALLOW; } @@ -1940,7 +1940,7 @@ static void test_CoInternetIsFeatureZoneElevationEnabled(void) return; } - for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + for(i = 0; i < ARRAY_SIZE(testcases); i++) { url_from = a2w(testcases[i].url_from); url_to = a2w(testcases[i].url_to); diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 90f51bf5dd..7580a1302d 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7786,7 +7786,7 @@ static void change_property(IUriBuilder *builder, const uri_builder_property *pr static void test_CreateUri_InvalidFlags(void) { DWORD i; - for(i = 0; i < sizeof(invalid_flag_tests)/sizeof(invalid_flag_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(invalid_flag_tests); ++i) { HRESULT hr; IUri *uri = (void*) 0xdeadbeef; @@ -7825,7 +7825,7 @@ static void test_CreateUri_InvalidArgs(void) { static void test_CreateUri_InvalidUri(void) { DWORD i; - for(i = 0; i < sizeof(invalid_uri_tests)/sizeof(invalid_uri_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(invalid_uri_tests); ++i) { invalid_uri test = invalid_uri_tests[i]; IUri *uri = NULL; LPWSTR uriW; @@ -7877,7 +7877,7 @@ static void test_IUri_GetPropertyBSTR(void) { } if(uri) IUri_Release(uri); - for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_tests); ++i) { uri_properties test = uri_tests[i]; LPWSTR uriW; uri = NULL; @@ -7937,7 +7937,7 @@ static void test_IUri_GetPropertyDWORD(void) { } if(uri) IUri_Release(uri); - for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_tests); ++i) { uri_properties test = uri_tests[i]; LPWSTR uriW; uri = NULL; @@ -7952,7 +7952,7 @@ static void test_IUri_GetPropertyDWORD(void) { DWORD j; /* Checks all the DWORD properties of the uri. */ - for(j = 0; j < sizeof(test.dword_props)/sizeof(test.dword_props[0]); ++j) { + for(j = 0; j < ARRAY_SIZE(test.dword_props); ++j) { DWORD received; uri_dword_property prop = test.dword_props[j]; @@ -8029,7 +8029,7 @@ static void test_IUri_GetStrProperties(void) { } if(uri) IUri_Release(uri); - for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_tests); ++i) { uri_properties test = uri_tests[i]; LPWSTR uriW; uri = NULL; @@ -8257,7 +8257,7 @@ static void test_IUri_GetDwordProperties(void) { } if(uri) IUri_Release(uri); - for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_tests); ++i) { uri_properties test = uri_tests[i]; LPWSTR uriW; uri = NULL; @@ -8343,7 +8343,7 @@ static void test_IUri_GetPropertyLength(void) { } if(uri) IUri_Release(uri); - for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_tests); ++i) { uri_properties test = uri_tests[i]; LPWSTR uriW; uri = NULL; @@ -8426,7 +8426,7 @@ static void test_IUri_GetProperties(void) { } if(uri) IUri_Release(uri); - for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_tests); ++i) { uri_properties test = uri_tests[i]; LPWSTR uriW; uri = NULL; @@ -8475,7 +8475,7 @@ static void test_IUri_HasProperty(void) { } if(uri) IUri_Release(uri); - for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_tests); ++i) { uri_properties test = uri_tests[i]; LPWSTR uriW; uri = NULL; @@ -8540,7 +8540,7 @@ static void test_IUri_IsEqual(void) { IUri_Release(uriA); IUri_Release(uriB); - for(i = 0; i < sizeof(equality_tests)/sizeof(equality_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(equality_tests); ++i) { uri_equality test = equality_tests[i]; LPWSTR uriA_W, uriB_W; @@ -8592,7 +8592,7 @@ static void test_CreateUriWithFragment_InvalidArgs(void) { static void test_CreateUriWithFragment_InvalidFlags(void) { DWORD i; - for(i = 0; i < sizeof(invalid_flag_tests)/sizeof(invalid_flag_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(invalid_flag_tests); ++i) { HRESULT hr; IUri *uri = (void*) 0xdeadbeef; @@ -8606,7 +8606,7 @@ static void test_CreateUriWithFragment_InvalidFlags(void) { static void test_CreateUriWithFragment(void) { DWORD i; - for(i = 0; i < sizeof(uri_fragment_tests)/sizeof(uri_fragment_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_fragment_tests); ++i) { HRESULT hr; IUri *uri = NULL; LPWSTR uriW, fragW; @@ -8685,7 +8685,7 @@ static void test_IUriBuilder_CreateUri(IUriBuilder *builder, const uri_builder_t if(SUCCEEDED(hr)) { DWORD i; - for(i = 0; i < sizeof(test->expected_str_props)/sizeof(test->expected_str_props[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->expected_str_props); ++i) { uri_builder_str_property prop = test->expected_str_props[i]; BSTR received = NULL; @@ -8703,7 +8703,7 @@ static void test_IUriBuilder_CreateUri(IUriBuilder *builder, const uri_builder_t SysFreeString(received); } - for(i = 0; i < sizeof(test->expected_dword_props)/sizeof(test->expected_dword_props[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->expected_dword_props); ++i) { uri_builder_dword_property prop = test->expected_dword_props[i]; DWORD received = -2; @@ -8737,7 +8737,7 @@ static void test_IUriBuilder_CreateUriSimple(IUriBuilder *builder, const uri_bui if(SUCCEEDED(hr)) { DWORD i; - for(i = 0; i < sizeof(test->expected_str_props)/sizeof(test->expected_str_props[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->expected_str_props); ++i) { uri_builder_str_property prop = test->expected_str_props[i]; BSTR received = NULL; @@ -8755,7 +8755,7 @@ static void test_IUriBuilder_CreateUriSimple(IUriBuilder *builder, const uri_bui SysFreeString(received); } - for(i = 0; i < sizeof(test->expected_dword_props)/sizeof(test->expected_dword_props[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->expected_dword_props); ++i) { uri_builder_dword_property prop = test->expected_dword_props[i]; DWORD received = -2; @@ -8790,7 +8790,7 @@ static void test_IUriBuilder_CreateUriWithFlags(IUriBuilder *builder, const uri_ if(SUCCEEDED(hr)) { DWORD i; - for(i = 0; i < sizeof(test->expected_str_props)/sizeof(test->expected_str_props[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->expected_str_props); ++i) { uri_builder_str_property prop = test->expected_str_props[i]; BSTR received = NULL; @@ -8808,7 +8808,7 @@ static void test_IUriBuilder_CreateUriWithFlags(IUriBuilder *builder, const uri_ SysFreeString(received); } - for(i = 0; i < sizeof(test->expected_dword_props)/sizeof(test->expected_dword_props[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->expected_dword_props); ++i) { uri_builder_dword_property prop = test->expected_dword_props[i]; DWORD received = -2; @@ -9051,7 +9051,7 @@ static void test_IUriBuilder_GetFragment(IUriBuilder *builder, const uri_builder const uri_builder_property *prop = NULL; /* Check if the property was set earlier. */ - for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->properties); ++i) { if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_FRAGMENT) prop = &(test->properties[i]); } @@ -9146,7 +9146,7 @@ static void test_IUriBuilder_GetHost(IUriBuilder *builder, const uri_builder_tes const uri_builder_property *prop = NULL; /* Check if the property was set earlier. */ - for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->properties); ++i) { if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_HOST) prop = &(test->properties[i]); } @@ -9241,7 +9241,7 @@ static void test_IUriBuilder_GetPassword(IUriBuilder *builder, const uri_builder const uri_builder_property *prop = NULL; /* Check if the property was set earlier. */ - for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->properties); ++i) { if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_PASSWORD) prop = &(test->properties[i]); } @@ -9336,7 +9336,7 @@ static void test_IUriBuilder_GetPath(IUriBuilder *builder, const uri_builder_tes const uri_builder_property *prop = NULL; /* Check if the property was set earlier. */ - for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->properties); ++i) { if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_PATH) prop = &(test->properties[i]); } @@ -9498,7 +9498,7 @@ static void test_IUriBuilder_GetQuery(IUriBuilder *builder, const uri_builder_te const uri_builder_property *prop = NULL; /* Check if the property was set earlier. */ - for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->properties); ++i) { if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_QUERY) prop = &(test->properties[i]); } @@ -9593,7 +9593,7 @@ static void test_IUriBuilder_GetSchemeName(IUriBuilder *builder, const uri_build const uri_builder_property *prop = NULL; /* Check if the property was set earlier. */ - for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->properties); ++i) { if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_SCHEME_NAME) prop = &(test->properties[i]); } @@ -9688,7 +9688,7 @@ static void test_IUriBuilder_GetUserName(IUriBuilder *builder, const uri_builder const uri_builder_property *prop = NULL; /* Check if the property was set earlier. */ - for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(test->properties); ++i) { if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_USER_NAME) prop = &(test->properties[i]); } @@ -9780,7 +9780,7 @@ static void test_IUriBuilder(void) { IUriBuilder *builder; DWORD i; - for(i = 0; i < sizeof(uri_builder_tests)/sizeof(uri_builder_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_builder_tests); ++i) { IUri *uri = NULL; uri_builder_test test = uri_builder_tests[i]; LPWSTR uriW = NULL; @@ -10132,7 +10132,7 @@ static void test_IUriBuilder_RemoveProperties(void) { } if(builder) IUriBuilder_Release(builder); - for(i = 0; i < sizeof(uri_builder_remove_tests)/sizeof(uri_builder_remove_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_builder_remove_tests); ++i) { uri_builder_remove_test test = uri_builder_remove_tests[i]; IUri *uri = NULL; LPWSTR uriW; @@ -10328,7 +10328,7 @@ static void test_CoInternetCombineIUri(void) { if(base) IUri_Release(base); if(relative) IUri_Release(relative); - for(i = 0; i < sizeof(uri_combine_tests)/sizeof(uri_combine_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_combine_tests); ++i) { LPWSTR baseW = a2w(uri_combine_tests[i].base_uri); hr = pCreateUri(baseW, uri_combine_tests[i].base_create_flags, 0, &base); @@ -10349,7 +10349,7 @@ static void test_CoInternetCombineIUri(void) { if(SUCCEEDED(hr)) { DWORD j; - for(j = 0; j < sizeof(uri_combine_tests[i].str_props)/sizeof(uri_combine_tests[i].str_props[0]); ++j) { + for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) { uri_combine_str_property prop = uri_combine_tests[i].str_props[j]; BSTR received; @@ -10366,7 +10366,7 @@ static void test_CoInternetCombineIUri(void) { SysFreeString(received); } - for(j = 0; j < sizeof(uri_combine_tests[i].dword_props)/sizeof(uri_combine_tests[i].dword_props[0]); ++j) { + for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].dword_props); ++j) { uri_dword_property prop = uri_combine_tests[i].dword_props[j]; DWORD received; @@ -10619,7 +10619,7 @@ static void test_CoInternetCombineUrlEx(void) { hr, E_POINTER); if(base) IUri_Release(base); - for(i = 0; i < sizeof(uri_combine_tests)/sizeof(uri_combine_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_combine_tests); ++i) { LPWSTR baseW = a2w(uri_combine_tests[i].base_uri); hr = pCreateUri(baseW, uri_combine_tests[i].base_create_flags, 0, &base); @@ -10636,7 +10636,7 @@ static void test_CoInternetCombineUrlEx(void) { if(SUCCEEDED(hr)) { DWORD j; - for(j = 0; j < sizeof(uri_combine_tests[i].str_props)/sizeof(uri_combine_tests[i].str_props[0]); ++j) { + for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) { uri_combine_str_property prop = uri_combine_tests[i].str_props[j]; BSTR received; LPCSTR value = (prop.value_ex) ? prop.value_ex : prop.value; @@ -10654,7 +10654,7 @@ static void test_CoInternetCombineUrlEx(void) { SysFreeString(received); } - for(j = 0; j < sizeof(uri_combine_tests[i].dword_props)/sizeof(uri_combine_tests[i].dword_props[0]); ++j) { + for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].dword_props); ++j) { uri_dword_property prop = uri_combine_tests[i].dword_props[j]; DWORD received; @@ -10776,7 +10776,7 @@ static void test_CoInternetParseIUri_InvalidArgs(void) { len = INTERNET_MAX_URL_LENGTH*2; longurl = heap_alloc((len+1)*sizeof(WCHAR)); memcpy(longurl, http_urlW, sizeof(http_urlW)); - for(i = sizeof(http_urlW)/sizeof(WCHAR)-1; i < len; i++) + for(i = ARRAY_SIZE(http_urlW)-1; i < len; i++) longurl[i] = 'x'; longurl[len] = 0; @@ -10803,7 +10803,7 @@ static void test_CoInternetParseIUri_InvalidArgs(void) { static void test_CoInternetParseIUri(void) { DWORD i; - for(i = 0; i < sizeof(uri_parse_tests)/sizeof(uri_parse_tests[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(uri_parse_tests); ++i) { HRESULT hr; IUri *uri; LPWSTR uriW; @@ -11001,7 +11001,7 @@ static void test_CreateURLMoniker(void) IUri *uri, *base_uri; HRESULT hres; - for(test = create_urlmon_tests; test < create_urlmon_tests + sizeof(create_urlmon_tests)/sizeof(*create_urlmon_tests); test++) { + for(test = create_urlmon_tests; test < create_urlmon_tests + ARRAY_SIZE(create_urlmon_tests); test++) { url = a2w(test->url); base_url = a2w(test->base_url); @@ -11100,7 +11100,7 @@ static void test_IPersistStream(void) props_order[Uri_PROPERTY_SCHEME_NAME] = 8; props_order[Uri_PROPERTY_USER_NAME] = 9; - for(i=0; i<sizeof(uri_tests)/sizeof(*uri_tests); i++) { + for(i = 0; i < ARRAY_SIZE(uri_tests); i++) { const uri_properties *test = uri_tests+i; LPWSTR uriW; IUri *uri; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 8da0fd8256..893632fd2e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2901,7 +2901,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) } if(url_a) - MultiByteToWideChar(CP_ACP, 0, url_a, -1, current_url, sizeof(current_url)/sizeof(*current_url)); + MultiByteToWideChar(CP_ACP, 0, url_a, -1, current_url, ARRAY_SIZE(current_url)); test_redirect = (flags & BINDTEST_REDIRECT) != 0; use_cache_file = (flags & BINDTEST_USE_CACHE) != 0; -- 2.14.4

3 2

[PATCH v2 3/3] gdiplus: Avoid calling GdipFillPath() with an empty path.
by Zhiyi Zhang June 18, 2018

June 18, 2018

There is no point filling an empty path. And an empty path will cause SelectClipPath() used in brush_fill_path() to return error. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 3 +++ dlls/gdiplus/tests/graphics.c | 47 +++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 030019cb4b..3ba3f0f4f4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4268,6 +4268,9 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p if(!brush || !graphics || !path) return InvalidParameter; + if (!path->pathdata.Count) + return Ok; + if(graphics->busy) return ObjectBusy; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ae75c0efc1..5eb0a8a4d0 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1539,6 +1539,52 @@ static void test_GdipFillClosedCurveI(void) ReleaseDC(hwnd, hdc); } +static void test_GdipFillPath(void) +{ + GpStatus status; + GpGraphics *graphics; + GpSolidFill *brush; + GpPath *path; + HDC hdc = GetDC(hwnd); + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + status = GdipCreateSolidFill((ARGB)0xffffffff, &brush); + expect(Ok, status); + ok(brush != NULL, "Expected brush to be initialized\n"); + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + ok(path != NULL, "Expected path to be initialized\n"); + + /* Empty path */ + GdipResetPath(path); + status = GdipFillPath(graphics, (GpBrush *)brush, path); + expect(Ok, status); + + /* Not closed path */ + GdipResetPath(path); + status = GdipAddPathLineI(path, 0, 0, 2, 2); + expect(Ok, status); + status = GdipAddPathLineI(path, 2, 2, 4, 0); + expect(Ok, status); + status = GdipFillPath(graphics, (GpBrush *)brush, path); + expect(Ok, status); + + /* Closed path */ + GdipResetPath(path); + status = GdipAddPathRectangle(path, 0, 0, 4, 4); + expect(Ok, status); + status = GdipFillPath(graphics, (GpBrush *)brush, path); + expect(Ok, status); + + GdipDeletePath(path); + GdipDeleteBrush((GpBrush *)brush); + GdipDeleteGraphics(graphics); + ReleaseDC(hwnd, hdc); +} + static void test_Get_Release_DC(void) { GpStatus status; @@ -6795,6 +6841,7 @@ START_TEST(graphics) test_GdipDrawImagePointsRect(); test_GdipFillClosedCurve(); test_GdipFillClosedCurveI(); + test_GdipFillPath(); test_GdipDrawString(); test_GdipGetNearestColor(); test_GdipGetVisibleClipBounds(); -- 2.17.1

2 1

[PATCH v2 2/3] gdiplus: Report error for brush_fill_path().
by Zhiyi Zhang June 18, 2018

June 18, 2018

Operation should be skipped if SelectClipPath() returns any error. And we should report unexpected error to the caller. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 894e879233..030019cb4b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1050,8 +1050,10 @@ static BOOL brush_can_fill_path(GpBrush *brush, BOOL is_fill) } } -static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) +static GpStatus brush_fill_path(GpGraphics *graphics, GpBrush *brush) { + DWORD error; + GpStatus status = Ok; switch (brush->bt) { case BrushTypeSolidColor: @@ -1064,13 +1066,25 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) RECT rc; /* partially transparent fill */ - SelectClipPath(graphics->hdc, RGN_AND); + if (!SelectClipPath(graphics->hdc, RGN_AND)) + { + error = GetLastError(); + if (error == ERROR_CAN_NOT_COMPLETE) + status = GenericError; + else if (error == ERROR_INVALID_PARAMETER) + status = InvalidParameter; + else if (error == ERROR_NOT_ENOUGH_MEMORY) + status = OutOfMemory; + DeleteObject(bmp); + break; + } if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { HDC hdc = CreateCompatibleDC(NULL); if (!hdc) { + status = OutOfMemory; DeleteObject(bmp); break; } @@ -1091,7 +1105,11 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) HBRUSH gdibrush, old_brush; gdibrush = create_gdi_brush(brush); - if (!gdibrush) return; + if (!gdibrush) + { + status = OutOfMemory; + break; + } old_brush = SelectObject(graphics->hdc, gdibrush); FillPath(graphics->hdc); @@ -1100,6 +1118,8 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) break; } } + + return status; } static BOOL brush_can_fill_pixels(GpBrush *brush) @@ -4205,7 +4225,7 @@ static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath if(retval == Ok) { EndPath(graphics->hdc); - brush_fill_path(graphics, brush); + retval = brush_fill_path(graphics, brush); } gdi_transform_release(graphics); @@ -4511,13 +4531,13 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, Rectangle(graphics->hdc, rc.left, rc.top, rc.right, rc.bottom); EndPath(graphics->hdc); - brush_fill_path(graphics, brush); + status = brush_fill_path(graphics, brush); } RestoreDC(graphics->hdc, save_state); - return Ok; + return status; } static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, -- 2.17.1

2 1

[PATCH] gdiplus: Check return value of SelectClipPath in brush_fill_path().
by Zhiyi Zhang June 18, 2018

June 18, 2018

For Crossover bug 16126. When GraphicPath is empty, filling path with gdi32 will result in a DC with empty path. When SelectClipPath() is called with such a DC, it will fail because it requires a closed path in DC. Thus further operation should be canceled. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 76aabe74bf..2a95d686fa 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1052,6 +1052,7 @@ static BOOL brush_can_fill_path(GpBrush *brush, BOOL is_fill) static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) { + BOOL success; switch (brush->bt) { case BrushTypeSolidColor: @@ -1064,8 +1065,8 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) RECT rc; /* partially transparent fill */ - SelectClipPath(graphics->hdc, RGN_AND); - if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + success = SelectClipPath(graphics->hdc, RGN_AND); + if (success && GetClipBox(graphics->hdc, &rc) != NULLREGION) { HDC hdc = CreateCompatibleDC(NULL); -- 2.17.1

3 5

[PATCH v6 1/8] include: Add SYSTEM_FIRMWARE_TABLE_INFORMATION to winternl.h
by Alex Henrie June 18, 2018

June 18, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/winternl.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 58c475dfff..6e0bd987b6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1579,6 +1579,23 @@ typedef struct _SYSTEM_TIME_ADJUSTMENT { BOOLEAN TimeAdjustmentDisabled; } SYSTEM_TIME_ADJUSTMENT, *PSYSTEM_TIME_ADJUSTMENT; +typedef enum _SYSTEM_FIRMWARE_TABLE_ACTION +{ + SystemFirmwareTable_Enumerate = 0, + SystemFirmwareTable_Get = 1 +} SYSTEM_FIRMWARE_TABLE_ACTION, *PSYSTEM_FIRMWARE_TABLE_ACTION; + +/* System Information Class 0x4C */ + +typedef struct _SYSTEM_FIRMWARE_TABLE_INFORMATION +{ + ULONG ProviderSignature; + SYSTEM_FIRMWARE_TABLE_ACTION Action; + ULONG TableID; + ULONG TableBufferLength; + UCHAR TableBuffer[1]; +} SYSTEM_FIRMWARE_TABLE_INFORMATION, *PSYSTEM_FIRMWARE_TABLE_INFORMATION; + typedef struct _TIME_FIELDS { CSHORT Year; CSHORT Month; -- 2.17.1

3 12

[PATCH] msi: Mark exported wine functions CDECL.
by Zebediah Figura June 18, 2018

June 18, 2018

Fixes relay traces on 64-bit. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msi/custom.c | 2 +- programs/msiexec/msiexec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 8deebe5..e68528f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -484,7 +484,7 @@ static void handle_msi_break(LPCSTR target) static WCHAR ncalrpcW[] = {'n','c','a','l','r','p','c',0}; static WCHAR endpoint_lrpcW[] = {'m','s','i',0}; -UINT __wine_msi_call_dll_function(const GUID *guid) +UINT CDECL __wine_msi_call_dll_function(const GUID *guid) { MsiCustomActionEntryPoint fn; MSIHANDLE remote_package = 0; diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 2ed0557..5ebfea7 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -393,7 +393,7 @@ static DWORD DoUnregServer(void) return ret; } -extern UINT __wine_msi_call_dll_function(GUID *guid); +extern UINT CDECL __wine_msi_call_dll_function(GUID *guid); static int DoEmbedding(LPCWSTR key) { -- 2.7.4

2 1

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

June 18, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/tests/editor.c | 62 ++++++++++++++++++++----------------------- dlls/riched20/tests/richole.c | 4 +-- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2a6907bfe7..85c607becf 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -340,14 +340,12 @@ static void test_EM_FINDTEXT(BOOL unicode) hwndRichEdit = new_richedit(NULL); /* Empty rich edit control */ - run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, - sizeof(find_tests)/sizeof(struct find_s), unicode); + run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, ARRAY_SIZE(find_tests), unicode); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)haystack); /* Haystack text */ - run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, - sizeof(find_tests2)/sizeof(struct find_s), unicode); + run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, ARRAY_SIZE(find_tests2), unicode); /* Setting a format on an arbitrary range should have no effect in search results. This tests correct offset reporting across runs. */ @@ -359,8 +357,7 @@ static void test_EM_FINDTEXT(BOOL unicode) SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); /* Haystack text, again */ - run_tests_EM_FINDTEXT(hwndRichEdit, "2-bis", find_tests2, - sizeof(find_tests2)/sizeof(struct find_s), unicode); + run_tests_EM_FINDTEXT(hwndRichEdit, "2-bis", find_tests2, ARRAY_SIZE(find_tests2), unicode); /* Yet another range */ cf2.dwMask = CFM_BOLD | cf2.dwMask; @@ -369,8 +366,7 @@ static void test_EM_FINDTEXT(BOOL unicode) SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); /* Haystack text, again */ - run_tests_EM_FINDTEXT(hwndRichEdit, "2-bisbis", find_tests2, - sizeof(find_tests2)/sizeof(struct find_s), unicode); + run_tests_EM_FINDTEXT(hwndRichEdit, "2-bisbis", find_tests2, ARRAY_SIZE(find_tests2), unicode); DestroyWindow(hwndRichEdit); } @@ -404,7 +400,7 @@ static void test_EM_GETLINE(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text); memset(origdest, 0xBB, nBuf); - for (i = 0; i < sizeof(gl)/sizeof(struct getline_s); i++) + for (i = 0; i < ARRAY_SIZE(gl); i++) { int nCopied; int expected_nCopied = min(gl[i].buffer_len, strlen(gl[i].text)); @@ -509,7 +505,7 @@ static void test_EM_LINELENGTH(void) {15, 4}, /* Line 3: |wine */ }; SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); - for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + for (i = 0; i < ARRAY_SIZE(offset_test1); i++) { result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", offset_test1[i][0], result, offset_test1[i][1]); @@ -2049,7 +2045,7 @@ static void test_EM_AUTOURLDETECT(void) urlRet=SendMessageA(hwndRichEdit, EM_AUTOURLDETECT, (WPARAM)"h", (LPARAM)"h"); ok(urlRet==E_INVALIDARG, "Bad wParam2: urlRet is: %d\n", urlRet); /* for each url, check the text to see if CFE_LINK effect is present */ - for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + for (i = 0; i < ARRAY_SIZE(urls); i++) { SendMessageA(hwndRichEdit, EM_AUTOURLDETECT, FALSE, 0); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)urls[i].text); @@ -2063,10 +2059,10 @@ static void test_EM_AUTOURLDETECT(void) DestroyWindow(hwndRichEdit); /* Test detection of URLs within normal text - WM_SETTEXT case. */ - for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + for (i = 0; i < ARRAY_SIZE(urls); i++) { hwndRichEdit = new_richedit(parent); - for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + for (j = 0; j < ARRAY_SIZE(templates_delim); j++) { char * at_pos; int at_offset; int end_offset; @@ -2117,7 +2113,7 @@ static void test_EM_AUTOURLDETECT(void) } } - for (j = 0; j < sizeof(templates_non_delim) / sizeof(const char *); j++) { + for (j = 0; j < ARRAY_SIZE(templates_non_delim); j++) { char * at_pos; int at_offset; int end_offset; @@ -2158,7 +2154,7 @@ static void test_EM_AUTOURLDETECT(void) } } - for (j = 0; j < sizeof(templates_xten_delim) / sizeof(const char *); j++) { + for (j = 0; j < ARRAY_SIZE(templates_xten_delim); j++) { char * at_pos; int at_offset; int end_offset; @@ -2213,7 +2209,7 @@ static void test_EM_AUTOURLDETECT(void) } } - for (j = 0; j < sizeof(templates_neutral_delim) / sizeof(const char *); j++) { + for (j = 0; j < ARRAY_SIZE(templates_neutral_delim); j++) { char * at_pos, * end_pos; int at_offset; int end_offset; @@ -2421,7 +2417,7 @@ static void test_EM_AUTOURLDETECT(void) */ /* Set entire text in one go, like WM_SETTEXT */ - for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + for (j = 0; j < ARRAY_SIZE(templates_delim); j++) { char * at_pos; int at_offset; int end_offset; @@ -2476,7 +2472,7 @@ static void test_EM_AUTOURLDETECT(void) } /* Set selection with X to the URL */ - for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + for (j = 0; j < ARRAY_SIZE(templates_delim); j++) { char * at_pos; int at_offset; int end_offset; @@ -2530,7 +2526,7 @@ static void test_EM_AUTOURLDETECT(void) } /* Set selection with X to the first character of the URL, then the rest */ - for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + for (j = 0; j < ARRAY_SIZE(templates_delim); j++) { char * at_pos; int at_offset; int end_offset; @@ -2598,7 +2594,7 @@ static void test_EM_AUTOURLDETECT(void) hwndRichEdit = new_richedit(parent); /* Set selection with X to the URL */ - for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + for (j = 0; j < ARRAY_SIZE(templates_delim); j++) { char * at_pos; int at_offset; int end_offset; @@ -2649,7 +2645,7 @@ static void test_EM_AUTOURLDETECT(void) } /* Set selection with X to the first character of the URL, then the rest */ - for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + for (j = 0; j < ARRAY_SIZE(templates_delim); j++) { char * at_pos; int at_offset; int end_offset; @@ -4933,7 +4929,7 @@ static void test_EM_EXSETSEL(void) { HWND hwndRichEdit = new_richedit(NULL); int i; - const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + const int num_tests = ARRAY_SIZE(exsetsel_tests); /* sending some text to the window */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); @@ -4988,7 +4984,7 @@ static void test_EM_SETSEL(void) char buffA[32] = {0}; HWND hwndRichEdit = new_richedit(NULL); int i; - const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + const int num_tests = ARRAY_SIZE(exsetsel_tests); /* sending some text to the window */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); @@ -5623,7 +5619,7 @@ static void test_EM_FORMATRANGE(void) SendMessageA(hwndRichEdit, EM_FORMATRANGE, FALSE, 0); - for (i = 0; i < sizeof(fmtstrings)/sizeof(fmtstrings[0]); i++) + for (i = 0; i < ARRAY_SIZE(fmtstrings); i++) { GETTEXTLENGTHEX gtl; SIZE stringsize; @@ -5831,7 +5827,7 @@ static void test_EM_STREAMIN(void) }; const WCHAR streamText5[] = { 'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't' }; - int length5 = sizeof(streamText5) / sizeof(WCHAR); + int length5 = ARRAY_SIZE(streamText5); struct StringWithLength cookieForStream5 = { sizeof(streamText5), (char *)streamText5, @@ -6868,7 +6864,7 @@ static void test_EN_LINK(void) GetCursorPos(&orig_cursor_pos); SetCursorPos(0, 0); - for (i = 0; i < sizeof(link_notify_tests)/sizeof(link_notify_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(link_notify_tests); i++) { link_notify_test("cursor position simulated", i, hwnd, parent, link_notify_tests[i].msg, link_notify_tests[i].wParam, link_notify_tests[i].lParam, @@ -6878,7 +6874,7 @@ static void test_EN_LINK(void) ClientToScreen(hwnd, &cursor_screen_pos); SetCursorPos(cursor_screen_pos.x, cursor_screen_pos.y); - for (i = 0; i < sizeof(link_notify_tests)/sizeof(link_notify_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(link_notify_tests); i++) { link_notify_test("cursor position set", i, hwnd, parent, link_notify_tests[i].msg, link_notify_tests[i].wParam, link_notify_tests[i].lParam, @@ -8178,7 +8174,7 @@ static void test_EM_FINDWORDBREAK_W(void) int i; HWND hwndRichEdit = new_richeditW(NULL); ok(IsWindowUnicode(hwndRichEdit), "window should be unicode\n"); - for (i = 0; i < sizeof(delimiter_tests)/sizeof(delimiter_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(delimiter_tests); i++) { WCHAR wbuf[2]; int result; @@ -8212,7 +8208,7 @@ static void test_EM_FINDWORDBREAK_A(void) HWND hwndRichEdit = new_richedit(NULL); ok(!IsWindowUnicode(hwndRichEdit), "window should not be unicode\n"); - for (i = 0; i < sizeof(delimiter_tests)/sizeof(delimiter_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(delimiter_tests); i++) { int result; char buf[2]; @@ -8256,7 +8252,7 @@ static void test_enter(void) HWND hwndRichEdit = new_richedit(NULL); UINT i,j; - for (i = 0; i < sizeof(testenteritems)/sizeof(testenteritems[0]); i++) { + for (i = 0; i < ARRAY_SIZE(testenteritems); i++) { char buf[1024] = {0}; LRESULT result; @@ -8538,7 +8534,7 @@ static void test_alignment_style(void) EDITSTREAM es; int i; - for (i = 0; i < sizeof(align_style) / sizeof(align_style[0]); i++) + for (i = 0; i < ARRAY_SIZE(align_style); i++) { DWORD dwStyle, new_align; @@ -8646,8 +8642,8 @@ static void test_rtf(void) result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); ok( result == 11, "got %ld\n", result ); - result = SendMessageW( edit, WM_GETTEXT, sizeof(buf)/sizeof(buf[0]), (LPARAM)buf ); - ok( result == sizeof(expect_specials)/sizeof(expect_specials[0]), "got %ld\n", result ); + result = SendMessageW( edit, WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf ); + ok( result == ARRAY_SIZE(expect_specials), "got %ld\n", result ); ok( !memcmp( buf, expect_specials, sizeof(expect_specials) ), "got %s\n", wine_dbgstr_w(buf) ); /* Show that \rtlpar propagates to the second paragraph and is diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index c4fe425dfa..aaf52bcfdd 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -247,8 +247,8 @@ static void test_ITextDocument_Open(void) tomReadOnly|tomShareDenyWrite, tomReadOnly|tomShareDenyRead }; - int tomNumSingle = sizeof(tomConstantsSingle)/sizeof(tomConstantsSingle[0]); - int tomNumMulti = sizeof(tomConstantsMulti)/sizeof(tomConstantsMulti[0]); + int tomNumSingle = ARRAY_SIZE(tomConstantsSingle); + int tomNumMulti = ARRAY_SIZE(tomConstantsMulti); int i; V_VT(&testfile) = VT_BSTR; -- 2.14.4

2 1

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

June 18, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched32/tests/editor.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 6fe4005599..7751d2b402 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -104,7 +104,7 @@ static void test_WM_SETTEXT(void) * for line breaking (only \n adds a line break) */ - for (i = 0; i < sizeof(testitems)/sizeof(testitems[0]); i++) { + for (i = 0; i < ARRAY_SIZE(testitems); i++) { char buf[1024] = {0}; LRESULT result; @@ -410,7 +410,7 @@ static void test_EM_GETLINE(void) } memset(origdest, 0xBB, nBuf); - for (i = 0; i < sizeof(gl)/sizeof(struct getline_s); i++) + for (i = 0; i < ARRAY_SIZE(gl); i++) { int nCopied, expected_nCopied, expected_bytes_written; char gl_text[1024]; @@ -504,7 +504,7 @@ static void test_EM_LINELENGTH(void) } ok(result == 9, "Incorrect line count of %ld\n", result); - for (i = 0; i < sizeof(offset_test)/sizeof(offset_test[0]); i++) { + for (i = 0; i < ARRAY_SIZE(offset_test); i++) { result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test[i][0], 0); ok(result == offset_test[i][1], "Length of line at offset %d is %ld, expected %d\n", offset_test[i][0], result, offset_test[i][1]); @@ -525,7 +525,7 @@ static void test_EM_LINELENGTH(void) {16, 4}, /* Line 3: |wine */ }; SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); - for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + for (i = 0; i < ARRAY_SIZE(offset_test1); i++) { result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); todo_wine_if (offset_test1[i][2]) ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", @@ -781,20 +781,17 @@ static void test_EM_FINDTEXT(void) HWND hwndRichEdit = new_richedit(NULL); /* Empty rich edit control */ - run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, - sizeof(find_tests)/sizeof(struct find_s)); + run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, ARRAY_SIZE(find_tests)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)haystack); /* Haystack text */ - run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, - sizeof(find_tests2)/sizeof(struct find_s)); + run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, ARRAY_SIZE(find_tests2)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)haystack2); /* Haystack text 2 (with EOL characters) */ - run_tests_EM_FINDTEXT(hwndRichEdit, "3", find_tests3, - sizeof(find_tests3)/sizeof(struct find_s)); + run_tests_EM_FINDTEXT(hwndRichEdit, "3", find_tests3, ARRAY_SIZE(find_tests3)); DestroyWindow(hwndRichEdit); } @@ -1178,7 +1175,7 @@ static void test_enter(void) HWND hwndRichEdit = new_richedit(NULL); UINT i,j; - for (i = 0; i < sizeof(testenteritems)/sizeof(testenteritems[0]); i++) { + for (i = 0; i < ARRAY_SIZE(testenteritems); i++) { char buf[1024] = {0}; LRESULT result; @@ -1321,7 +1318,7 @@ static void test_EM_EXSETSEL(void) { HWND hwndRichEdit = new_richedit(NULL); int i; - const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + const int num_tests = ARRAY_SIZE(exsetsel_tests); /* sending some text to the window */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); @@ -1378,7 +1375,7 @@ static void test_EM_SETSEL(void) char buffA[32] = {0}; HWND hwndRichEdit = new_richedit(NULL); int i; - const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + const int num_tests = ARRAY_SIZE(exsetsel_tests); /* sending some text to the window */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); -- 2.14.4

2 1

[PATCH 1/2] user32/tests: Ignore all non-keyboard messages in test_Input_blackbox().
by Zebediah Figura June 17, 2018

June 17, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/input.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index e52f7d2..2185cda 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -848,16 +848,7 @@ static LRESULT CALLBACK WndProc2(HWND hWnd, UINT Msg, WPARAM wParam, { if (winetest_debug > 1) trace("MSG: %8x W:%8lx L:%8lx\n", Msg, wParam, lParam); - if (Msg != WM_PAINT && - Msg != WM_NCPAINT && - Msg != WM_SYNCPAINT && - Msg != WM_ERASEBKGND && - Msg != WM_NCHITTEST && - Msg != WM_GETTEXT && - Msg != WM_GETICON && - Msg != WM_IME_SELECT && - Msg != WM_DEVICECHANGE && - Msg != WM_TIMECHANGE) + if ((Msg >= WM_KEYFIRST && Msg <= WM_KEYLAST) || Msg == WM_SYSCOMMAND) { ok(sent_messages_cnt < MAXKEYMESSAGES, "Too many messages\n"); if (sent_messages_cnt < MAXKEYMESSAGES) -- 2.7.4

2 3