msvcrt: Write directly to the console in _putwch.

dlls/msvcr100/msvcr100.spec

@@ -1239,8 +1239,8 @@
 @ cdecl _putenv_s(str str)
 @ cdecl _putw(long ptr) MSVCRT__putw
 @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _putwch(long) MSVCRT__putwch
-@ stub _putwch_nolock
+@ cdecl _putwch(long)
+@ cdecl _putwch_nolock(long)
 @ cdecl _putws(wstr) MSVCRT__putws
 # extern _pwctype
 @ cdecl _read(long ptr long) MSVCRT__read

dlls/msvcr110/msvcr110.spec

@@ -1597,8 +1597,8 @@
 @ cdecl _putenv_s(str str)
 @ cdecl _putw(long ptr) MSVCRT__putw
 @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _putwch(long) MSVCRT__putwch
-@ stub _putwch_nolock
+@ cdecl _putwch(long)
+@ cdecl _putwch_nolock(long)
 @ cdecl _putws(wstr) MSVCRT__putws
 # extern _pwctype
 @ cdecl _read(long ptr long) MSVCRT__read

dlls/msvcr120/msvcr120.spec

@@ -1605,8 +1605,8 @@
 @ cdecl _putenv_s(str str)
 @ cdecl _putw(long ptr) MSVCRT__putw
 @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _putwch(long) MSVCRT__putwch
-@ stub _putwch_nolock
+@ cdecl _putwch(long)
+@ cdecl _putwch_nolock(long)
 @ cdecl _putws(wstr) MSVCRT__putws
 # extern _pwctype
 @ cdecl _read(long ptr long) MSVCRT__read

dlls/msvcr70/msvcr70.spec

@@ -495,7 +495,7 @@
 @ cdecl _putch(long)
 @ cdecl _putenv(str)
 @ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putwch(long) MSVCRT__putwch
+@ cdecl _putwch(long)
 @ cdecl _putws(wstr) MSVCRT__putws
 # extern _pwctype
 @ cdecl _read(long ptr long) MSVCRT__read

dlls/msvcr71/msvcr71.spec

@@ -490,7 +490,7 @@
 @ cdecl _putch(long)
 @ cdecl _putenv(str)
 @ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putwch(long) MSVCRT__putwch
+@ cdecl _putwch(long)
 @ cdecl _putws(wstr) MSVCRT__putws
 # extern _pwctype
 @ cdecl _read(long ptr long) MSVCRT__read

dlls/msvcr80/msvcr80.spec

@@ -914,8 +914,8 @@
 @ cdecl _putenv_s(str str)
 @ cdecl _putw(long ptr) MSVCRT__putw
 @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _putwch(long) MSVCRT__putwch
-@ stub _putwch_nolock
+@ cdecl _putwch(long)
+@ cdecl _putwch_nolock(long)
 @ cdecl _putws(wstr) MSVCRT__putws
 # extern _pwctype
 @ cdecl _read(long ptr long) MSVCRT__read

dlls/msvcr90/msvcr90.spec

@@ -889,8 +889,8 @@
 @ cdecl _putenv_s(str str)
 @ cdecl _putw(long ptr) MSVCRT__putw
 @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _putwch(long) MSVCRT__putwch
-@ stub _putwch_nolock
+@ cdecl _putwch(long)
+@ cdecl _putwch_nolock(long)
 @ cdecl _putws(wstr) MSVCRT__putws
 # extern _pwctype
 @ cdecl _read(long ptr long) MSVCRT__read

dlls/msvcrt/console.c

@@ -218,6 +218,28 @@ int CDECL _putch(int c)
 }
 
 /*********************************************************************
+ *		_putwch_nolock (MSVCR80.@)
+ */
+MSVCRT_wchar_t CDECL _putwch_nolock(MSVCRT_wchar_t c)
+{
+    DWORD count;
+    if (WriteConsoleW(MSVCRT_console_out, &c, 1, &count, NULL) && count==1)
+        return c;
+    return MSVCRT_WEOF;
+}
+
+/*********************************************************************
+ *		_putwch (MSVCRT.@)
+ */
+MSVCRT_wchar_t CDECL _putwch(MSVCRT_wchar_t c)
+{
+    LOCK_CONSOLE;
+    c = _putwch_nolock(c);
+    UNLOCK_CONSOLE;
+    return c;
+}
+
+/*********************************************************************
  *		_getche_nolock (MSVCR80.@)
  */
 int CDECL _getche_nolock(void)

dlls/msvcrt/file.c

@@ -4631,14 +4631,6 @@ int CDECL MSVCRT_putchar(int c)
 }
 
 /*********************************************************************
- *		_putwch (MSVCRT.@)
- */
-int CDECL MSVCRT__putwch(int c)
-{
-  return MSVCRT_fputwc(c, MSVCRT_stdout);
-}
-
-/*********************************************************************
  *		puts (MSVCRT.@)
  */
 int CDECL MSVCRT_puts(const char *s)

dlls/msvcrt/msvcrt.spec

@@ -861,7 +861,7 @@
 @ cdecl _putenv(str)
 @ cdecl _putenv_s(str str)
 @ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putwch(long) MSVCRT__putwch
+@ cdecl _putwch(long)
 @ cdecl _putws(wstr) MSVCRT__putws
 # extern _pwctype
 @ cdecl _read(long ptr long) MSVCRT__read