From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 1 Oct 2018 11:57:08 +0000 (+0100)
Subject: [ITSS] Sync with Wine Staging 3.17. CORE-15127
X-Git-Tag: 0.4.12-dev~648
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=0ccdd32f50572374c9502873c0cfe7d236e7214b

[ITSS] Sync with Wine Staging 3.17. CORE-15127
---

diff --git a/dll/win32/itss/moniker.c b/dll/win32/itss/moniker.c
index 0509c9e1a5f..6c61f47482b 100644
--- a/dll/win32/itss/moniker.c
+++ b/dll/win32/itss/moniker.c
@@ -287,7 +287,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName(
     ITS_IMonikerImpl *This = impl_from_IMoniker(iface);
     static const WCHAR szFormat[] = {
         'm','s','-','i','t','s',':','%','s',':',':','%','s',0 };
-    DWORD len = sizeof szFormat / sizeof(WCHAR);
+    DWORD len;
     LPWSTR str;
 
     TRACE("%p %p %p %p\n", iface, pbc, pmkToLeft, ppszDisplayName);
@@ -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/dll/win32/itss/protocol.c b/dll/win32/itss/protocol.c
index 1cdb3650027..a7c40077cce 100644
--- a/dll/win32/itss/protocol.c
+++ b/dll/win32/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;
 }
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 60f29d4dda4..a867ad3b16b 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -84,7 +84,7 @@ reactos/dll/win32/initpki             # Synced to WineStaging-3.3
 reactos/dll/win32/inseng              # Synced to WineStaging-3.3
 reactos/dll/win32/iphlpapi            # Out of sync
 reactos/dll/win32/itircl              # Synced to WineStaging-3.3
-reactos/dll/win32/itss                # Synced to WineStaging-3.9
+reactos/dll/win32/itss                # Synced to WineStaging-3.17
 reactos/dll/win32/jscript             # Synced to WineStaging-3.9
 reactos/dll/win32/jsproxy             # Synced to WineStaging-3.3
 reactos/dll/win32/loadperf            # Synced to WineStaging-3.3