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

msvcrt: Reuse standard file descriptors after closing them.

This commit is contained in:
Piotr Caban 2013-03-01 15:04:21 +01:00 committed by Alexandre Julliard
parent f565e4a315
commit db92137f83
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/msvcrt/file.c
View File

@ -251,40 +251,37 @@ static HANDLE msvcrt_fdtoh(int fd)
/* INTERNAL: free a file entry fd */ /* INTERNAL: free a file entry fd */
static void msvcrt_free_fd(int fd) static void msvcrt_free_fd(int fd)
{ {
HANDLE old_handle;
ioinfo *fdinfo; ioinfo *fdinfo;
LOCK_FILES(); LOCK_FILES();
fdinfo = msvcrt_get_ioinfo(fd); fdinfo = msvcrt_get_ioinfo(fd);
old_handle = fdinfo->handle;
if(fdinfo != &MSVCRT___badioinfo) if(fdinfo != &MSVCRT___badioinfo)
{ {
fdinfo->handle = INVALID_HANDLE_VALUE; fdinfo->handle = INVALID_HANDLE_VALUE;
fdinfo->wxflag = 0; fdinfo->wxflag = 0;
} }
TRACE(":fd (%d) freed\n",fd); TRACE(":fd (%d) freed\n",fd);
if (fd < 3) /* don't use 0,1,2 for user files */
if (fd < 3)
{ {
switch (fd) switch (fd)
{ {
case 0: case 0:
if (GetStdHandle(STD_INPUT_HANDLE) == old_handle) SetStdHandle(STD_INPUT_HANDLE, 0); SetStdHandle(STD_INPUT_HANDLE, 0);
break; break;
case 1: case 1:
if (GetStdHandle(STD_OUTPUT_HANDLE) == old_handle) SetStdHandle(STD_OUTPUT_HANDLE, 0); SetStdHandle(STD_OUTPUT_HANDLE, 0);
break; break;
case 2: case 2:
if (GetStdHandle(STD_ERROR_HANDLE) == old_handle) SetStdHandle(STD_ERROR_HANDLE, 0); SetStdHandle(STD_ERROR_HANDLE, 0);
break; break;
} }
} }
else
{
if (fd == MSVCRT_fdend - 1) if (fd == MSVCRT_fdend - 1)
MSVCRT_fdend--; MSVCRT_fdend--;
if (fd < MSVCRT_fdstart) if (fd < MSVCRT_fdstart)
MSVCRT_fdstart = fd; MSVCRT_fdstart = fd;
}
UNLOCK_FILES(); UNLOCK_FILES();
} }