generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

win32: Allow other programs to open the same files

Browse Source 
In order to match Linux behaviour better our Windows-specific
open() replacement should disable Windows default file locking.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Reimar Döffinger
2012-01-20 20:27:22 +01:00
committed by Martin Storsjö
parent cfe5908a72
commit e9cc988395
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/os_support.c
View File

@@ -32,6 +32,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <io.h> #include <io.h>
#include <windows.h> #include <windows.h>
#include <share.h>
int ff_win32_open(const char *filename_utf8, int oflag, int pmode) 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); filename_w = av_mallocz(sizeof(wchar_t) * num_chars);
MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, filename_w, 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); av_freep(&filename_w);
/* filename maybe be in CP_ACP */ /* filename maybe be in CP_ACP */
if (fd == -1 && !(oflag & O_CREAT)) if (fd == -1 && !(oflag & O_CREAT))
return open(filename_utf8, oflag, pmode); return _sopen(filename_utf8, oflag, SH_DENYNO, pmode);
return fd; return fd;
} }