[ITSS] Sync with Wine 3.0. CORE-14225

diff --git a/dll/win32/itss/chm_lib.c b/dll/win32/itss/chm_lib.c
index e1d5034..12ba5fd 100644 (file)
--- a/dll/win32/itss/chm_lib.c
+++ b/dll/win32/itss/chm_lib.c
@@ -922,15 +922,10 @@ static UInt64 _chm_parse_cword(UChar **pEntry)
 /* parse a utf-8 string into an ASCII char buffer */
 static BOOL _chm_parse_UTF8(UChar **pEntry, UInt64 count, WCHAR *path)
 {
 /* parse a utf-8 string into an ASCII char buffer */
 static BOOL _chm_parse_UTF8(UChar **pEntry, UInt64 count, WCHAR *path)
 {

-    /* MJM - Modified to return real Unicode strings */ 
-    while (count != 0)
-    {
-        *path++ = (*(*pEntry)++);
-        --count;
-    }
-
-    *path = '\0';
-    return TRUE;
+    DWORD length = MultiByteToWideChar(CP_UTF8, 0, (char *)*pEntry, count, path, CHM_MAX_PATHLEN);
+    path[length] = '\0';
+    *pEntry += count;
+    return !!length;

 }
 
 /* parse a PMGL entry into a chmUnitInfo struct; return 1 on success. */
 }
 
 /* parse a PMGL entry into a chmUnitInfo struct; return 1 on success. */

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 2e3b15e..52792aa 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -84,7 +84,7 @@ reactos/dll/win32/initpki             # Synced to WineStaging-2.9
 reactos/dll/win32/inseng              # Synced to Wine-3.0
 reactos/dll/win32/iphlpapi            # Out of sync
 reactos/dll/win32/itircl              # Synced to WineStaging-2.9
 reactos/dll/win32/inseng              # Synced to Wine-3.0
 reactos/dll/win32/iphlpapi            # Out of sync
 reactos/dll/win32/itircl              # Synced to WineStaging-2.9

-reactos/dll/win32/itss                # Synced to WineStaging-2.9
+reactos/dll/win32/itss                # Synced to Wine-3.0

 reactos/dll/win32/jscript             # Synced to WineStaging-2.16
 reactos/dll/win32/jsproxy             # Synced to WineStaging-2.16
 reactos/dll/win32/loadperf            # Synced to WineStaging-2.9
 reactos/dll/win32/jscript             # Synced to WineStaging-2.16
 reactos/dll/win32/jsproxy             # Synced to WineStaging-2.16
 reactos/dll/win32/loadperf            # Synced to WineStaging-2.9