win32: use more unicode functions

Use the *W variants instead of the implicit *A functions. (One could
define the UNICODE macro to switch the functions without suffix from
A to W, but I'm too lazy to figure out how portable that is, etc.)

Also make sure io.h defines a unicode aware printf().

2 files changed, 22 insertions, 5 deletions

diff --git a/osdep/io.c b/osdep/io.c
index e3e750e30b..5531e3ce7c 100644
--- a/osdep/io.c
+++ b/osdep/io.c
@@ -92,13 +92,10 @@ int mp_stat(const char *path, struct stat *buf)
     return res;
 }
 
-int mp_fprintf(FILE *stream, const char *format, ...)
+static int mp_vfprintf(FILE *stream, const char *format, va_list args)
 {
-    va_list args;
     int done = 0;
 
-    va_start(args, format);
-
     if (stream == stdout || stream == stderr)
     {
         HANDLE *wstream = GetStdHandle(stream == stdout ?
@@ -146,9 +143,27 @@ int mp_fprintf(FILE *stream, const char *format, ...)
     else
         done = vfprintf(stream, format, args);
 
+    return done;
+}
+
+int mp_fprintf(FILE *stream, const char *format, ...)
+{
+    int res;
+    va_list args;
+    va_start(args, format);
+    res = mp_vfprintf(stream, format, args);
     va_end(args);
+    return res;
+}
 
-    return done;
+int mp_printf(const char *format, ...)
+{
+    int res;
+    va_list args;
+    va_start(args, format);
+    res = mp_vfprintf(stdout, format, args);
+    va_end(args);
+    return res;
 }
 
 int mp_open(const char *filename, int oflag, ...)
diff --git a/osdep/io.h b/osdep/io.h
index 462a84917b..4383d61143 100644
--- a/osdep/io.h
+++ b/osdep/io.h
@@ -46,6 +46,7 @@ char *mp_to_utf8(void *talloc_ctx, const wchar_t *s);
 void mp_get_converted_argv(int *argc, char ***argv);
 
 int mp_stat(const char *path, struct stat *buf);
+int mp_printf(const char *format, ...);
 int mp_fprintf(FILE *stream, const char *format, ...);
 int mp_open(const char *filename, int oflag, ...);
 int mp_creat(const char *filename, int mode);
@@ -58,6 +59,7 @@ int mp_mkdir(const char *path, int mode);
 // NOTE: Stat is not overridden with mp_stat, because MinGW-w64 defines it as
 //       macro.
 
+#define printf(...) mp_printf(__VA_ARGS__)
 #define fprintf(...) mp_fprintf(__VA_ARGS__)
 #define open(...) mp_open(__VA_ARGS__)
 #define creat(...) mp_creat(__VA_ARGS__)