Michael Stefaniuc : inetcomm/tests: Use the available ARRAY_SIZE() macro.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0a74c8d24ae6234a1550fffad95b1d64115d1244
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0a74c8d24ae6234a1550fffad...

Author: Michael Stefaniuc 
Date:   Tue Jun  5 20:09:40 2018 +0200

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

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/inetcomm/tests/mimeole.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c
index 4c40c11..02b93e9 100644
--- a/dlls/inetcomm/tests/mimeole.c
+++ b/dlls/inetcomm/tests/mimeole.c
@@ -129,7 +129,7 @@ static WCHAR *a2w(const char *str)
 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);
 }

@@ -1430,7 +1430,7 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test)
     CloseHandle(file);

sprintf(urla, test->url, file_name);
-    MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, sizeof(test_url)/sizeof(WCHAR));
+    MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, ARRAY_SIZE(test_url));

hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol);
     ok(hres == S_OK, "Could not create protocol handler: %08x\n", hres);
@@ -1514,13 +1514,13 @@ static void test_mhtml_protocol_info(void)
                             &IID_IInternetProtocolInfo, (void**)&protocol_info);
     ok(hres == S_OK, "Could not create protocol info: %08x\n", hres);

-    for(i = 0; i < sizeof(combine_tests)/sizeof(*combine_tests); i++) {
+    for(i = 0; i < ARRAY_SIZE(combine_tests); i++) {
         base_url = a2w(combine_tests[i].base_url);
         relative_url = a2w(combine_tests[i].relative_url);

combined_len = 0xdeadbeef;
         hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE,
-                                                combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0);
+                                                combined_url, ARRAY_SIZE(combined_url), &combined_len, 0);
         todo_wine_if(combine_tests[i].todo)
         ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres);
         if(SUCCEEDED(hres)) {
@@ -1541,7 +1541,7 @@ static void test_mhtml_protocol_info(void)
     }

hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE,
-                                            combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0);
+                                            combined_url, ARRAY_SIZE(combined_url), &combined_len, 0);
     ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres);

IInternetProtocolInfo_Release(protocol_info);
@@ -1605,7 +1605,7 @@ static void test_mhtml_protocol(void)
     if(!broken_mhtml_resolver)
         test_mhtml_protocol_info();

-    for(i = 0; i < sizeof(binding_tests)/sizeof(*binding_tests); i++)
+    for(i = 0; i < ARRAY_SIZE(binding_tests); i++)
         test_mhtml_protocol_binding(binding_tests + i);
 }

@@ -1628,7 +1628,7 @@ static void test_MimeOleObjectFromMoniker(void)
         {"../test.mht", "mhtml:../test.mht"}
     };

-    for(i = 0; i < sizeof(tests)/sizeof(*tests); i++) {
+    for(i = 0; i < ARRAY_SIZE(tests); i++) {
         url = a2w(tests[i].url);
         hres = CreateURLMoniker(NULL, url, &mon);
         ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres);