Changeset 21506 for trunk/src

Timestamp:

Dec 3, 2010, 6:09:59 PM (15 years ago)

Author:

dmik

Message:

minivcrt: Added a bunch of *wprintf() functions.

Location:

trunk/src/msvcrt

Files:

• file.c (modified) (5 diffs)
• minivcrt_internal.h (modified) (2 diffs)
• wcs.c (modified) (1 diff)

trunk/src/msvcrt/file.c

@@ -2466 +2466 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              vfwprintf (MSVCRT.@)
@@ -2472 +2474 @@
  * (then we must test for equality too)?
  */
-int MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, va_list valist)
+int MSVCRT(vfwprintf)(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, va_list valist)
 {
   MSVCRT_wchar_t buf[2048], *mem = buf;
@@ -2492 +2494 @@
 }
 
+#ifndef __MINIVCRT__
+
 /*********************************************************************
  *              vprintf (MSVCRT.@)
@@ -2500 +2504 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              vwprintf (MSVCRT.@)
  */
-int MSVCRT_vwprintf(const MSVCRT_wchar_t *format, va_list valist)
-{
-  return MSVCRT_vfwprintf(MSVCRT_stdout,format,valist);
-}
+int MSVCRT(vwprintf)(const MSVCRT_wchar_t *format, va_list valist)
+{
+  return MSVCRT(vfwprintf)(MSVCRT_stdout,format,valist);
+}
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -2521 +2529 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              fwprintf (MSVCRT.@)
  */
-int MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...)
+int MSVCRT(fwprintf)(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...)
 {
     va_list valist;
     int res;
     va_start(valist, format);
-    res = MSVCRT_vfwprintf(file, format, valist);
+    res = MSVCRT(vfwprintf)(file, format, valist);
     va_end(valist);
     return res;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************

trunk/src/msvcrt/minivcrt_internal.h

@@ -21 +21 @@
 #define MSVCRT_wchar_t  WCHAR
 #define MSVCRT_size_t   size_t
+#define MSVCRT_FILE     FILE
+#define MSVCRT_EOF      EOF
+#define MSVCRT_stdout   stdout
 
 #define MSVCRT__errno       _errno
@@ -27 +30 @@
 #define MSVCRT__fullpath    _fullpath
 #endif
+
 #define MSVCRT_malloc       malloc
+#define MSVCRT_free         free
+#define MSVCRT_fwrite       fwrite
 
 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)

trunk/src/msvcrt/wcs.c

@@ -146 +146 @@
  *              vswprintf (MSVCRT.@)
  */
-int MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, va_list args )
+int MSVCRT(vswprintf)( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, va_list args )
 {
     return vsnprintfW( str, INT_MAX, format, args );