Michael Stefaniuc : shdocvw: Use the ARRAY_SIZE() macro.

Alexandre Julliard julliard at winehq.org
Wed Aug 15 14:39:54 CDT 2018


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

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Wed Aug  8 11:30:15 2018 +0200

shdocvw: Use the ARRAY_SIZE() macro.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shdocvw/shdocvw_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 52c622c..2657dfa 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -386,7 +386,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
             plen ? *plen : 0, unknown ? *unknown : 0);
 
     if (!PathIsURLW(ptr)) {
-        len = sizeof(buffer_in) / sizeof(buffer_in[0]);
+        len = ARRAY_SIZE(buffer_in);
         buffer_in[0] = 0;
         hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT);
         TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in));
@@ -400,7 +400,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
         }
     }
 
-    len = sizeof(buffer_out) / sizeof(buffer_out[0]);
+    len = ARRAY_SIZE(buffer_out);
     buffer_out[0] = '\0';
     hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY);
     needed = lstrlenW(buffer_out)+1;
@@ -442,7 +442,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
         MultiByteToWideChar(CP_ACP, 0, url, -1, urlW, len);
     }
 
-    len = sizeof(buffer) / sizeof(buffer[0]);
+    len = ARRAY_SIZE(buffer);
     ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown);
     HeapFree(GetProcessHeap(), 0, urlW);
 




More information about the wine-cvs mailing list