From e9cc98839574c7e8d546e890ebbf57d1766e5d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Fri, 20 Jan 2012 20:27:22 +0100 Subject: [PATCH] win32: Allow other programs to open the same files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to match Linux behaviour better our Windows-specific open() replacement should disable Windows default file locking. Signed-off-by: Martin Storsjö --- libavformat/os_support.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 451801ff70..1ecf43c3dc 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -32,6 +32,7 @@ #include #include #include +#include int ff_win32_open(const char *filename_utf8, int oflag, int pmode) { @@ -46,12 +47,12 @@ int ff_win32_open(const char *filename_utf8, int oflag, int pmode) filename_w = av_mallocz(sizeof(wchar_t) * num_chars); MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, filename_w, num_chars); - fd = _wopen(filename_w, oflag, pmode); + fd = _wsopen(filename_w, oflag, SH_DENYNO, pmode); av_freep(&filename_w); /* filename maybe be in CP_ACP */ if (fd == -1 && !(oflag & O_CREAT)) - return open(filename_utf8, oflag, pmode); + return _sopen(filename_utf8, oflag, SH_DENYNO, pmode); return fd; }