Alexandre Julliard : ntdll: Only recompose Unicode on Mac OS when using utf-8.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d45677788e87e5e3c5182ca1bd60c084f109bf44
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d45677788e87e5e3c5182ca1bd60c084f109bf44

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 30 15:10:25 2008 +0200

ntdll: Only recompose Unicode on Mac OS when using utf-8.

---

 dlls/ntdll/rtlstr.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index deec931..608857a 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -66,7 +66,8 @@ void __wine_init_codepages( const union cptable *ansi, const union cptable *oem,
 int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen)
 {
 #ifdef __APPLE__
-    flags |= MB_COMPOSITE;  /* work around broken Mac OS X filesystem that enforces decomposed Unicode */
+    /* work around broken Mac OS X filesystem that enforces decomposed Unicode */
+    if (!unix_table) flags |= MB_COMPOSITE;
 #endif
     return (unix_table) ?
         wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ) :