From dfc6b5c81491abf7effb97b23af17ccf7adcd132 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Thu, 8 Aug 2013 11:29:57 +0300 Subject: file: Move win32 utf8->wchar open wrapper to libavutil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When libavformat was changed to use the new avpriv_open function in 51eb213d001, this silently bypassed the existing wrapper for win32. Move the win32 wrapper into libavutil/file.c to make sure it gets called everywhere (not just in the libavformat case). This makes sure that non-ascii file names gets opened properly (where file names internally are stored as utf8, but they get converted to wchar_t and opened with _wsopen). Signed-off-by: Martin Storsjö --- libavformat/os_support.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'libavformat/os_support.c') diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 2d8a90346a..4ae5ac1bf0 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -27,46 +27,6 @@ #include "avformat.h" #include "os_support.h" -#if defined(_WIN32) && !defined(__MINGW32CE__) -#undef open -#undef lseek -#undef stat -#undef fstat -#include -#include -#include -#include -#include - -int ff_win32_open(const char *filename_utf8, int oflag, int pmode) -{ - int fd; - int num_chars; - wchar_t *filename_w; - - /* convert UTF-8 to wide chars */ - num_chars = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename_utf8, -1, NULL, 0); - if (num_chars <= 0) - goto fallback; - filename_w = av_mallocz(sizeof(wchar_t) * num_chars); - if (!filename_w) { - errno = ENOMEM; - return -1; - } - MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, filename_w, num_chars); - - fd = _wsopen(filename_w, oflag, SH_DENYNO, pmode); - av_freep(&filename_w); - - if (fd != -1 || (oflag & O_CREAT)) - return fd; - -fallback: - /* filename may be be in CP_ACP */ - return _sopen(filename_utf8, oflag, SH_DENYNO, pmode); -} -#endif - #if CONFIG_NETWORK #include #if !HAVE_POLL_H -- cgit v1.2.3