Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CRT] Update file descriptor handling to match Wine (5/7). CORE-14504

Browse source 
Import Wine commits by Piotr Caban:
* 86baccc9ae9 msvcrt: Get rid of fdtoh helper.
* bd6eaf918c5 msvcrt: Get rid of is_valid_fd helper.
This commit is contained in:
Thomas Faber 2018-03-25 17:02:53 +02:00
parent bffd8201d0
commit 53864fcc5f
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sdk/lib/crt/stdio/file.c
View file

@ -221,31 +221,6 @@ static inline FILE* msvcrt_get_file(int i)
return &ret->file;
}
static inline BOOL is_valid_fd(int fd)
{
return fd >= 0 && fd < fdend && (get_ioinfo_nolock(fd)->wxflag & WX_OPEN);
}
/* INTERNAL: Get the HANDLE for a fd
* This doesn't lock the table, because a failure will result in
* INVALID_HANDLE_VALUE being returned, which should be handled correctly. If
* it returns a valid handle which is about to be closed, a subsequent call
* will fail, most likely in a sane way.
*/
/*static*/ HANDLE fdtoh(int fd)
{
if (!is_valid_fd(fd))
{
WARN(":fd (%d) - no handle!\n",fd);
*__doserrno() = 0;
*_errno() = EBADF;
return INVALID_HANDLE_VALUE;
}
//if (get_ioinfo_nolock(fd)->handle == INVALID_HANDLE_VALUE)
//FIXME("returning INVALID_HANDLE_VALUE for %d\n", fd);
return get_ioinfo_nolock(fd)->handle;
}
/* INTERNAL: free a file entry fd */
static void msvcrt_free_fd(int fd)
{
@ -383,7 +358,7 @@ static FILE* msvcrt_alloc_fp(void)
static int msvcrt_init_fp(FILE* file, int fd, unsigned stream_flags)
{
TRACE(":fd (%d) allocating FILE*\n",fd);
if (!is_valid_fd(fd))
if (!(get_ioinfo_nolock(fd)->wxflag & WX_OPEN))
{
WARN(":invalid fd %d\n",fd);
*__doserrno() = 0;
@ -1581,9 +1556,11 @@ int CDECL _fileno(FILE* file)
*/
intptr_t CDECL _get_osfhandle(int fd)
{
HANDLE hand = fdtoh(fd);
HANDLE hand = get_ioinfo_nolock(fd)->handle;
TRACE(":fd (%d) handle (%p)\n",fd,hand);
if(hand == INVALID_HANDLE_VALUE)
*_errno() = EBADF;
return (intptr_t)hand;
}