[ros-diffs] 01/01: [ITSS] Sync with Wine 3.0. CORE-14225

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08fb1fc8febb7128c2a28…

commit 08fb1fc8febb7128c2a28e397c1dd07086c6a5ef
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Jan 19 00:43:54 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Jan 19 00:43:54 2018 +0100

    [ITSS] Sync with Wine 3.0. CORE-14225
---
 dll/win32/itss/chm_lib.c | 13 ++++---------
 media/doc/README.WINE    |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dll/win32/itss/chm_lib.c b/dll/win32/itss/chm_lib.c
index e1d50342c6..12ba5fd0f2 100644
--- 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)
 {
-    /* 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. */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 2e3b15e1d6..52792aaca6 100644
--- 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/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