ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Implement fopen/wfopen on top of fsopen/wfsopen instead of the other way around.

This commit is contained in:
Alexandre Julliard 2007-02-07 13:25:29 +01:00
parent 712e67723a
commit 2851b31f4c
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/msvcrt/file.c
View File

@ -2356,9 +2356,9 @@ MSVCRT_wint_t CDECL _fputwchar(MSVCRT_wint_t wc)
} }
/********************************************************************* /*********************************************************************
* fopen (MSVCRT.@) * _fsopen (MSVCRT.@)
*/ */
MSVCRT_FILE* CDECL MSVCRT_fopen(const char *path, const char *mode) MSVCRT_FILE * CDECL MSVCRT__fsopen(const char *path, const char *mode, int share)
{ {
MSVCRT_FILE* file; MSVCRT_FILE* file;
int open_flags, stream_flags, fd; int open_flags, stream_flags, fd;
@ -2370,7 +2370,7 @@ MSVCRT_FILE* CDECL MSVCRT_fopen(const char *path, const char *mode)
return NULL; return NULL;
LOCK_FILES(); LOCK_FILES();
fd = _open(path, open_flags, MSVCRT__S_IREAD | MSVCRT__S_IWRITE); fd = MSVCRT__sopen(path, open_flags, share, MSVCRT__S_IREAD | MSVCRT__S_IWRITE);
if (fd < 0) if (fd < 0)
file = NULL; file = NULL;
else if ((file = msvcrt_alloc_fp()) && msvcrt_init_fp(file, fd, stream_flags) else if ((file = msvcrt_alloc_fp()) && msvcrt_init_fp(file, fd, stream_flags)
@ -2390,9 +2390,9 @@ MSVCRT_FILE* CDECL MSVCRT_fopen(const char *path, const char *mode)
} }
/********************************************************************* /*********************************************************************
* _wfopen (MSVCRT.@) * _wfsopen (MSVCRT.@)
*/ */
MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode) MSVCRT_FILE * CDECL MSVCRT__wfsopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode, int share)
{ {
const unsigned int plen = strlenW(path), mlen = strlenW(mode); const unsigned int plen = strlenW(path), mlen = strlenW(mode);
char *patha = MSVCRT_calloc(plen + 1, 1); char *patha = MSVCRT_calloc(plen + 1, 1);
@ -2404,7 +2404,7 @@ MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wcha
WideCharToMultiByte(CP_ACP,0,path,plen,patha,plen,NULL,NULL) && WideCharToMultiByte(CP_ACP,0,path,plen,patha,plen,NULL,NULL) &&
WideCharToMultiByte(CP_ACP,0,mode,mlen,modea,mlen,NULL,NULL)) WideCharToMultiByte(CP_ACP,0,mode,mlen,modea,mlen,NULL,NULL))
{ {
MSVCRT_FILE *retval = MSVCRT_fopen(patha,modea); MSVCRT_FILE *retval = MSVCRT__fsopen(patha,modea,share);
MSVCRT_free(patha); MSVCRT_free(patha);
MSVCRT_free(modea); MSVCRT_free(modea);
return retval; return retval;
@ -2415,22 +2415,19 @@ MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wcha
} }
/********************************************************************* /*********************************************************************
* _fsopen (MSVCRT.@) * fopen (MSVCRT.@)
*/ */
MSVCRT_FILE* CDECL MSVCRT__fsopen(const char *path, const char *mode, int share) MSVCRT_FILE * CDECL MSVCRT_fopen(const char *path, const char *mode)
{ {
FIXME(":(%s,%s,%d),ignoring share mode!\n",path,mode,share); return MSVCRT__fsopen( path, mode, MSVCRT__SH_DENYNO );
return MSVCRT_fopen(path,mode);
} }
/********************************************************************* /*********************************************************************
* _wfsopen (MSVCRT.@) * _wfopen (MSVCRT.@)
*/ */
MSVCRT_FILE* CDECL MSVCRT__wfsopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode, int share) MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode)
{ {
FIXME(":(%s,%s,%d),ignoring share mode!\n", return MSVCRT__wfsopen( path, mode, MSVCRT__SH_DENYNO );
debugstr_w(path),debugstr_w(mode),share);
return MSVCRT__wfopen(path,mode);
} }
/* MSVCRT_fputc calls MSVCRT__flsbuf which calls MSVCRT_fputc */ /* MSVCRT_fputc calls MSVCRT__flsbuf which calls MSVCRT_fputc */