Young Chung : ucrtbase: Add __conio_common_vcprintf()/_vcwprintf().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cd2c28433b362ab688a40d295f3928335617662d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cd2c28433b362ab688a40d295f3928335617662d

Author: Young Chung <ychung at esri.com>
Date:   Tue Jan 31 10:01:03 2017 -0800

ucrtbase: Add __conio_common_vcprintf()/_vcwprintf().

Signed-off-by: Young Chung <ychung at esri.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 .../api-ms-win-crt-conio-l1-1-0.spec               |  4 ++--
 dlls/msvcrt/console.c                              | 24 ++++++++++++++++++++++
 dlls/ucrtbase/ucrtbase.spec                        |  4 ++--
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec b/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec
index 3b7f637..6d71343 100644
--- a/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec
@@ -1,8 +1,8 @@
-@ stub __conio_common_vcprintf
+@ cdecl __conio_common_vcprintf(int64 str ptr ptr) ucrtbase.__conio_common_vcprintf
 @ stub __conio_common_vcprintf_p
 @ stub __conio_common_vcprintf_s
 @ stub __conio_common_vcscanf
-@ stub __conio_common_vcwprintf
+@ cdecl __conio_common_vcwprintf(int64 wstr ptr ptr) ucrtbase.__conio_common_vcwprintf
 @ stub __conio_common_vcwprintf_p
 @ stub __conio_common_vcwprintf_s
 @ stub __conio_common_vcwscanf
diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c
index 8293b1d..ebde26a 100644
--- a/dlls/msvcrt/console.c
+++ b/dlls/msvcrt/console.c
@@ -560,3 +560,27 @@ int CDECL _cwprintf(const MSVCRT_wchar_t* format, ...)
 
   return retval;
 }
+
+/*********************************************************************
+ *		__conio_common_vcprintf (MSVCRT.@)
+ */
+int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* format,
+                                        MSVCRT__locale_t locale, __ms_va_list valist)
+{
+    if (options & ~UCRTBASE_PRINTF_MASK)
+        FIXME("options %s not handled\n", wine_dbgstr_longlong(options));
+    return pf_printf_a(puts_clbk_console_a, NULL, format, locale,
+             options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist);
+}
+
+/*********************************************************************
+ *		__conio_common_vcwprintf (MSVCRT.@)
+ */
+int CDECL MSVCRT__conio_common_vcwprintf(unsigned __int64 options, const MSVCRT_wchar_t* format,
+                                         MSVCRT__locale_t locale, __ms_va_list valist)
+{
+    if (options & ~UCRTBASE_PRINTF_MASK)
+        FIXME("options %s not handled\n", wine_dbgstr_longlong(options));
+    return pf_printf_w(puts_clbk_console_w, NULL, format, locale,
+             options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist);
+}
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 800ae8f..85f196b 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -73,11 +73,11 @@
 @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func
 @ cdecl ___mb_cur_max_l_func(ptr)
 @ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func
-@ stub __conio_common_vcprintf
+@ cdecl __conio_common_vcprintf(int64 str ptr ptr) MSVCRT__conio_common_vcprintf
 @ stub __conio_common_vcprintf_p
 @ stub __conio_common_vcprintf_s
 @ stub __conio_common_vcscanf
-@ stub __conio_common_vcwprintf
+@ cdecl __conio_common_vcwprintf(int64 wstr ptr ptr) MSVCRT__conio_common_vcwprintf
 @ stub __conio_common_vcwprintf_p
 @ stub __conio_common_vcwprintf_s
 @ stub __conio_common_vcwscanf