Fixed ntdll_wcstoumbs and WideCharToMultiByte to set the 'used' flag

for UTF-8 codepage too. This was causing DIR_nt_to_unix to fail in some cases (tracked down with help from Alex Pasadyn).

Fixed ntdll_wcstoumbs and WideCharToMultiByte to set the 'used' flag
769a4bb5 · Alexandre Julliard · 0a5e2c5c · 769a4bb5 · 769a4bb5
Commit 769a4bb5 authored Apr 19, 2004 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

locale.c dlls/kernel/locale.c +1 -0

rtlstr.c dlls/ntdll/rtlstr.c +5 -4

No files found.
--- a/dlls/kernel/locale.c
+++ b/dlls/kernel/locale.c
@@ -1535,6 +1535,7 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen,
        }
        /* fall through */
    case CP_UTF8:
+        if (used) *used = FALSE;  /* all chars are valid for UTF-8 */
        ret = wine_utf8_wcstombs( src, srclen, dst, dstlen );
        break;
    default:

--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -71,10 +71,11 @@ int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int ds
 int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, int dstlen,
                    const char* defchar, int *used )
-{ 
+{
-    return (unix_table) ?
+    if (unix_table)
-        wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used ) :
+        return wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used );
-        wine_utf8_wcstombs( src, srclen, dst, dstlen );
+    if (used) *used = 0;  /* all chars are valid for UTF-8 */
+    return wine_utf8_wcstombs( src, srclen, dst, dstlen );
 }
 /**************************************************************************