Huw Davies : ntdll: Pass the start of the string to compose_string().

[Alexandre Julliard]

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

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Thu Jul  2 10:44:16 2020 +0100

ntdll: Pass the start of the string to compose_string().

Fixes a regression caused by 520040dc4a287fd62d7d5161c083cee990c3d6e6.

Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/unix/env.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c
index 789a398405..eb75e6e949 100644
--- a/dlls/ntdll/unix/env.c
+++ b/dlls/ntdll/unix/env.c
@@ -557,7 +557,7 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen )
         }
         reslen = dstlen - (dstend - dst);
 #ifdef __APPLE__  /* work around broken Mac OS X filesystem that enforces NFD */
-        if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen );
+        if (reslen && nfc_table) reslen = compose_string( nfc_table, dst - reslen, reslen );
 #endif
     }
     return reslen;