From 77eb2df0b27388b896bef2a4e22dc39cdd7782e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Fri, 19 Mar 2004 23:00:35 +0000
Subject: [PATCH] Handle invalid Unicode strings for %S format like MS does

svn path=/trunk/; revision=8802
---
 reactos/lib/msvcrt/stdio/vfprintf.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/reactos/lib/msvcrt/stdio/vfprintf.c b/reactos/lib/msvcrt/stdio/vfprintf.c
index c95864f3d75..4b5419659eb 100644
--- a/reactos/lib/msvcrt/stdio/vfprintf.c
+++ b/reactos/lib/msvcrt/stdio/vfprintf.c
@@ -679,9 +679,20 @@ static int stringw(FILE *f, const wchar_t* sw, int len, int field_width, int pre
 		}
 	for (i = 0; i < len; ++i)
 	{
-		if (putc((unsigned char)(*sw++), f) == EOF)
-			return -1;
-		done++;
+#define MB_CUR_MAX 1
+		char mb[MB_CUR_MAX];
+		int mbcount, j;
+		mbcount = wctomb(mb, *sw++);
+		if (mbcount <= 0)
+		{
+			break;
+		}
+		for (j = 0; j < mbcount; j++)
+		{
+			if (putc(mb[j], f) == EOF)
+				return -1;
+			done++;
+		}
 	}
 	while (len < field_width--)
 	{