aboutsummaryrefslogtreecommitdiff
path: root/binutils/winduni.c
diff options
context:
space:
mode:
Diffstat (limited to 'binutils/winduni.c')
-rw-r--r--binutils/winduni.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/binutils/winduni.c b/binutils/winduni.c
index f811de7..8b39af1 100644
--- a/binutils/winduni.c
+++ b/binutils/winduni.c
@@ -661,7 +661,15 @@ wind_MultiByteToWideChar (rc_uint_type cp, const char *mb,
rc_uint_type ret = 0;
#if defined (_WIN32) || defined (__CYGWIN__)
- ret = (rc_uint_type) MultiByteToWideChar (cp, MB_PRECOMPOSED,
+ rc_uint_type conv_flags = MB_PRECOMPOSED;
+
+ /* MB_PRECOMPOSED is not allowed for UTF-7 or UTF-8.
+ MultiByteToWideChar will set the last error to
+ ERROR_INVALID_FLAGS if we do. */
+ if (cp == CP_UTF8 || cp == CP_UTF7)
+ conv_flags = 0;
+
+ ret = (rc_uint_type) MultiByteToWideChar (cp, conv_flags,
mb, -1, u, u_len);
/* Convert to bytes. */
ret *= sizeof (unichar);