Commit d4567778 authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent a1852086
...@@ -66,7 +66,8 @@ void __wine_init_codepages( const union cptable *ansi, const union cptable *oem, ...@@ -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) int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen)
{ {
#ifdef __APPLE__ #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 #endif
return (unix_table) ? return (unix_table) ?
wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ) : wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ) :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment