wininet/tests: Use the available ARRAY_SIZE() macro.

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);

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",

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");
 

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();

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;