From b4b69429bd2c9a5be7c9b45ea1be53f90ed339a4 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Tue, 24 Jul 2018 00:01:22 +0200 Subject: [PATCH] itss: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc Signed-off-by: Alexandre Julliard --- dlls/itss/moniker.c | 2 +- dlls/itss/protocol.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 3315b914d34..6c61f47482b 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -435,7 +435,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( { static const WCHAR szPrefix[] = { '@','M','S','I','T','S','t','o','r','e',':',0 }; - const DWORD prefix_len = (sizeof szPrefix/sizeof szPrefix[0])-1; + const DWORD prefix_len = ARRAY_SIZE(szPrefix)-1; DWORD n; ITS_IParseDisplayNameImpl *This = impl_from_IParseDisplayName(iface); diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 1cdb3650027..a7c40077cce 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -153,12 +153,12 @@ static LPCWSTR skip_schema(LPCWSTR url) static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; - if(!strncmpiW(its_schema, url, sizeof(its_schema)/sizeof(WCHAR))) - return url+sizeof(its_schema)/sizeof(WCHAR); - if(!strncmpiW(msits_schema, url, sizeof(msits_schema)/sizeof(WCHAR))) - return url+sizeof(msits_schema)/sizeof(WCHAR); - if(!strncmpiW(mk_schema, url, sizeof(mk_schema)/sizeof(WCHAR))) - return url+sizeof(mk_schema)/sizeof(WCHAR); + if(!strncmpiW(its_schema, url, ARRAY_SIZE(its_schema))) + return url + ARRAY_SIZE(its_schema); + if(!strncmpiW(msits_schema, url, ARRAY_SIZE(msits_schema))) + return url + ARRAY_SIZE(msits_schema); + if(!strncmpiW(mk_schema, url, ARRAY_SIZE(mk_schema))) + return url + ARRAY_SIZE(mk_schema); return NULL; }