windows support: unicode filenames

Windows uses a legacy codepage for char* / runtime functions accepting
char *. Using UTF-8 as the codepage with setlocale() is explicitly
forbidden.

Work this around by overriding the MSVCRT functions with wrapper
macros, that assume UTF-8 and use "proper" API calls like _wopen etc.
to deal with unicode filenames. All code that uses standard functions
that take or return filenames must now include osdep/io.h. stat()
can't be overridden, because MinGW-w64 itself defines "stat" as a
macro. Change code to use use mp_stat() instead.

This is not perfectly clean, but still somewhat sane, and much better
than littering the rest of the mplayer code with MinGW specific hacks.
It's also a bit fragile, but that's actually little different from the
previous situation. Also, MinGW is unlikely to ever include a nice way
of dealing with this.

Author: wm4

Makefile

@@ -403,6 +403,7 @@ SRCS_COMMON = asxparser.c \
               libmpdemux/yuv4mpeg_ratio.c \
               libvo/osd.c \
               osdep/numcores.c \
+              osdep/io.c \
               osdep/$(GETCH) \
               osdep/$(TIMER) \
               stream/open.c \

input/input.c

@@ -31,6 +31,8 @@
 #include <ctype.h>
 #include <assert.h>
 
+#include "osdep/io.h"
+
 #include "input.h"
 #include "mp_fifo.h"
 #include "keycodes.h"
@@ -1776,13 +1778,16 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf)
 #endif
 
     if (input_conf->in_file) {
-        struct stat st;
-        int mode = O_RDONLY | O_NONBLOCK;
+        int mode = O_RDONLY;
+#ifndef __MINGW32__
         // Use RDWR for FIFOs to ensure they stay open over multiple accesses.
-        // Note that on Windows stat may fail for named pipes,
-        // but due to how the API works, using RDONLY should be ok.
+        // Note that on Windows due to how the API works, using RDONLY should
+        // be ok.
+        struct stat st;
         if (stat(input_conf->in_file, &st) == 0 && S_ISFIFO(st.st_mode))
-            mode = O_RDWR | O_NONBLOCK;
+            mode = O_RDWR;
+        mode |= O_NONBLOCK;
+#endif
         int in_file_fd = open(input_conf->in_file, mode);
         if (in_file_fd >= 0)
             mp_input_add_cmd_fd(ictx, in_file_fd, 1, NULL, close);

libmpcodecs/vf_remove_logo.c

@@ -86,6 +86,8 @@
 #include <ctype.h>
 #include <inttypes.h>
 
+#include "osdep/io.h"
+
 #include "config.h"
 #include "mp_msg.h"
 #include "libvo/fastmemcpy.h"

libmpdemux/demux_mf.c

@@ -23,6 +23,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "osdep/io.h"
+
 #include "talloc.h"
 #include "config.h"
 #include "mp_msg.h"
@@ -49,20 +51,19 @@ static void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,float audio_del
 //     1 = successfully read a packet
 static int demux_mf_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds){
   mf_t         * mf;
-  struct stat    fs;
   FILE         * f;
 
   mf=(mf_t*)demuxer->priv;
   if ( mf->curr_frame >= mf->nr_of_files ) return 0;
 
-  stat( mf->names[mf->curr_frame],&fs );
-//  printf( "[demux_mf] frame: %d (%s,%d)\n",mf->curr_frame,mf->names[mf->curr_frame],fs.st_size );
-
   if ( !( f=fopen( mf->names[mf->curr_frame],"rb" ) ) ) return 0;
   {
    sh_video_t     * sh_video = demuxer->video->sh;
-   demux_packet_t * dp = new_demux_packet( fs.st_size );
-   if ( !fread( dp->buffer,fs.st_size,1,f ) ) return 0;
+   fseek(f, 0, SEEK_END);
+   long file_size = ftell(f);
+   fseek(f, 0, SEEK_SET);
+   demux_packet_t * dp = new_demux_packet( file_size );
+   if ( !fread( dp->buffer,file_size,1,f ) ) return 0;
    dp->pts=mf->curr_frame / sh_video->fps;
    dp->pos=mf->curr_frame;
    dp->flags=0;

libmpdemux/mf.c

@@ -25,7 +25,8 @@
 #include <errno.h>
 #include <limits.h>
 #include <sys/types.h>
-#include <sys/stat.h>
+
+#include "osdep/io.h"
 
 #include "config.h"
 
@@ -38,6 +39,7 @@
 
 #include "mp_msg.h"
 #include "stream/stream.h"
+#include "path.h"
 
 #include "mf.h"
 
@@ -49,7 +51,6 @@ char * mf_type = NULL; //"jpg";
 mf_t* open_mf(char * filename){
 #if defined(HAVE_GLOB) || defined(__MINGW32__)
  glob_t        gg;
- struct stat   fs;
  int           i;
  char        * fname;
  mf_t        * mf;
@@ -63,13 +64,13 @@ mf_t* open_mf(char * filename){
    FILE *lst_f=fopen(filename + 1,"r");
    if ( lst_f )
     {
-     fname=malloc(PATH_MAX);
-     while ( fgets( fname,PATH_MAX,lst_f ) )
+     fname=malloc(MP_PATH_MAX);
+     while ( fgets( fname,MP_PATH_MAX,lst_f ) )
       {
        /* remove spaces from end of fname */
        char *t=fname + strlen( fname ) - 1;
        while ( t > fname && isspace( *t ) ) *(t--)=0;
-       if ( stat( fname,&fs ) )
+       if ( !mp_path_exists( fname ) )
         {
          mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname );
         }
@@ -94,7 +95,7 @@ mf_t* open_mf(char * filename){
 
    while ( ( fname=strsep( &filename,"," ) ) )
     {
-     if ( stat( fname,&fs ) )
+     if ( !mp_path_exists( fname ) )
       {
        mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname );
       }
@@ -130,8 +131,8 @@ mf_t* open_mf(char * filename){
 
    for( i=0;i < gg.gl_pathc;i++ )
     {
-     stat( gg.gl_pathv[i],&fs );
-     if( S_ISDIR( fs.st_mode ) ) continue;
+     if (mp_path_isdir(gg.gl_pathv[i]))
+       continue;
      mf->names[i]=strdup( gg.gl_pathv[i] );
 //     mp_msg( MSGT_STREAM,MSGL_DBG2,"[mf] added file %d.: %s\n",i,mf->names[i] );
     }
@@ -144,7 +145,7 @@ mf_t* open_mf(char * filename){
  while ( error_count < 5 )
   {
    sprintf( fname,filename,count++ );
-   if ( stat( fname,&fs ) )
+   if ( !mp_path_exists( fname ) )
     {
      error_count++;
      mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname );

libvo/vo_jpeg.c

@@ -45,6 +45,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "mplayer.h"			/* for exit_player_bad() */
+#include "osdep/io.h"
 
 /* ------------------------------------------------------------------------- */
 
@@ -107,15 +108,11 @@ static int framenum = 0;
 static void jpeg_mkdir(const char *buf, int verbose) {
     struct stat stat_p;
 
-#ifndef __MINGW32__
     if ( mkdir(buf, 0755) < 0 ) {
-#else
-    if ( mkdir(buf) < 0 ) {
-#endif
         switch (errno) { /* use switch in case other errors need to be caught
                             and handled in the future */
             case EEXIST:
-                if ( stat(buf, &stat_p ) < 0 ) {
+                if ( mp_stat(buf, &stat_p ) < 0 ) {
                     mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name,
                            _("This error has occurred"), strerror(errno) );
                     mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name,

libvo/vo_pnm.c

@@ -40,6 +40,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "mplayer.h"			/* for exit_player_bad() */
+#include "osdep/io.h"
 
 /* ------------------------------------------------------------------------- */
 
@@ -199,16 +200,11 @@ static int preinit(const char *arg)
 static void pnm_mkdir(char *buf, int verbose) {
     struct stat stat_p;
 
-/* Silly MING32 bug workaround */
-#ifndef __MINGW32__
     if ( mkdir(buf, 0755) < 0 ) {
-#else
-    if ( mkdir(buf) < 0 ) {
-#endif
         switch (errno) { /* use switch in case other errors need to be caught
                             and handled in the future */
             case EEXIST:
-                if ( stat(buf, &stat_p ) < 0 ) {
+                if ( mp_stat(buf, &stat_p ) < 0 ) {
                     mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name,
                            _("This error has occurred"), strerror(errno) );
                     mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name,

mplayer.c

@@ -27,6 +27,8 @@
 #include "config.h"
 #include "talloc.h"
 
+#include "osdep/io.h"
+
 #if defined(__MINGW32__) || defined(__CYGWIN__)
 #include <windows.h>
 #endif
@@ -875,11 +877,7 @@ static void parse_cfgfiles(struct MPContext *mpctx, m_config_t *conf)
     if ((conffile = get_path("")) == NULL)
         mp_tmsg(MSGT_CPLAYER, MSGL_WARN, "Cannot find HOME directory.\n");
     else {
-#ifdef __MINGW32__
-        mkdir(conffile);
-#else
         mkdir(conffile, 0777);
-#endif
         free(conffile);
         if ((conffile = get_path("config")) == NULL)
             mp_tmsg(MSGT_CPLAYER, MSGL_ERR, "get_path(\"config\") problem\n");
@@ -968,8 +966,7 @@ static void load_per_output_config(m_config_t *conf, char *cfg, char *out)
  */
 static int try_load_config(m_config_t *conf, const char *file)
 {
-    struct stat st;
-    if (stat(file, &st))
+    if (!mp_path_exists(file))
         return 0;
     mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "Loading config '%s'\n", file);
     m_config_parse_config_file(conf, file);
@@ -979,10 +976,10 @@ static int try_load_config(m_config_t *conf, const char *file)
 static void load_per_file_config(m_config_t *conf, const char * const file)
 {
     char *confpath;
-    char cfg[PATH_MAX];
+    char cfg[MP_PATH_MAX];
     const char *name;
 
-    if (strlen(file) > PATH_MAX - 14) {
+    if (strlen(file) > MP_PATH_MAX - 14) {
         mp_msg(MSGT_CPLAYER, MSGL_WARN, "Filename is too long, "
                "can not load file or directory specific config files\n");
         return;
@@ -991,7 +988,7 @@ static void load_per_file_config(m_config_t *conf, const char * const file)
 
     name = mp_basename(cfg);
     if (use_filedir_conf) {
-        char dircfg[PATH_MAX];
+        char dircfg[MP_PATH_MAX];
         strcpy(dircfg, cfg);
         strcpy(dircfg + (name - cfg), "mplayer.conf");
         try_load_config(conf, dircfg);
@@ -3974,6 +3971,10 @@ int main(int argc, char *argv[])
                      || !strcmp(argv[1], "--leak-report")))
         talloc_enable_leak_report();
 
+#ifdef __MINGW32__
+    mp_get_converted_argv(&argc, &argv);
+#endif
+
     char *mem_ptr;
 
     // movie info: