From a1244111a790bbc4bf91b078ebcad3f415da79da Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 3 Feb 2012 08:05:11 +0100 Subject: 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. --- screenshot.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'screenshot.c') diff --git a/screenshot.c b/screenshot.c index 597a36afed..af1c5c1da2 100644 --- a/screenshot.c +++ b/screenshot.c @@ -21,10 +21,6 @@ #include #include -#include -#include -#include - #include #include @@ -33,6 +29,7 @@ #include "screenshot.h" #include "mp_core.h" #include "mp_msg.h" +#include "path.h" #include "libmpcodecs/img_format.h" #include "libmpcodecs/mp_image.h" #include "libmpcodecs/dec_video.h" @@ -130,11 +127,7 @@ error_exit: static int fexists(char *fname) { - struct stat dummy; - if (stat(fname, &dummy) == 0) - return 1; - else - return 0; + return mp_path_exists(fname); } static void gen_fname(screenshot_ctx *ctx) -- cgit v1.2.3