Commit 725e4733 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

msvcrt: Remove no longer needed global lock from functions using fd critical sections.

parent 6ed69c10
...@@ -1009,7 +1009,6 @@ int CDECL MSVCRT__close(int fd) ...@@ -1009,7 +1009,6 @@ int CDECL MSVCRT__close(int fd)
ioinfo *info = get_ioinfo(fd); ioinfo *info = get_ioinfo(fd);
int ret; int ret;
LOCK_FILES();
TRACE(":fd (%d) handle (%p)\n", fd, info->handle); TRACE(":fd (%d) handle (%p)\n", fd, info->handle);
if (!(info->wxflag & WX_OPEN)) { if (!(info->wxflag & WX_OPEN)) {
ret = -1; ret = -1;
...@@ -1021,7 +1020,6 @@ int CDECL MSVCRT__close(int fd) ...@@ -1021,7 +1020,6 @@ int CDECL MSVCRT__close(int fd)
msvcrt_set_errno(GetLastError()); msvcrt_set_errno(GetLastError());
} }
} }
UNLOCK_FILES();
release_ioinfo(info); release_ioinfo(info);
return ret; return ret;
} }
...@@ -1039,7 +1037,6 @@ int CDECL MSVCRT__dup2(int od, int nd) ...@@ -1039,7 +1037,6 @@ int CDECL MSVCRT__dup2(int od, int nd)
int ret; int ret;
TRACE("(od=%d, nd=%d)\n", od, nd); TRACE("(od=%d, nd=%d)\n", od, nd);
LOCK_FILES();
if (od < nd) if (od < nd)
{ {
...@@ -1086,7 +1083,6 @@ int CDECL MSVCRT__dup2(int od, int nd) ...@@ -1086,7 +1083,6 @@ int CDECL MSVCRT__dup2(int od, int nd)
release_ioinfo(info_od); release_ioinfo(info_od);
release_ioinfo(info_nd); release_ioinfo(info_nd);
UNLOCK_FILES();
return ret; return ret;
} }
...@@ -2065,7 +2061,6 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode) ...@@ -2065,7 +2061,6 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode)
unsigned int wxflags = split_oflags(textmode); unsigned int wxflags = split_oflags(textmode);
int fd; int fd;
LOCK_FILES();
fd = msvcrt_alloc_fd(readHandle, wxflags|WX_PIPE); fd = msvcrt_alloc_fd(readHandle, wxflags|WX_PIPE);
if (fd != -1) if (fd != -1)
{ {
...@@ -2089,7 +2084,6 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode) ...@@ -2089,7 +2084,6 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode)
CloseHandle(writeHandle); CloseHandle(writeHandle);
*MSVCRT__errno() = MSVCRT_EMFILE; *MSVCRT__errno() = MSVCRT_EMFILE;
} }
UNLOCK_FILES();
} }
else else
msvcrt_set_errno(GetLastError()); msvcrt_set_errno(GetLastError());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment