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

msvcrt: Use fd critical section in _write.

This commit is contained in:
Piotr Caban 2015-06-04 11:25:00 +02:00 committed by Alexandre Julliard
parent eec7a565be
commit ba757eaec7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/msvcrt/file.c
View File

@ -3283,7 +3283,7 @@ int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t)
int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
{ {
DWORD num_written; DWORD num_written;
ioinfo *info = get_ioinfo_nolock(fd); ioinfo *info = get_ioinfo(fd);
HANDLE hand = info->handle; HANDLE hand = info->handle;
/* Don't trace small writes, it gets *very* annoying */ /* Don't trace small writes, it gets *very* annoying */
@ -3294,12 +3294,14 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
if (hand == INVALID_HANDLE_VALUE) if (hand == INVALID_HANDLE_VALUE)
{ {
*MSVCRT__errno() = MSVCRT_EBADF; *MSVCRT__errno() = MSVCRT_EBADF;
release_ioinfo(info);
return -1; return -1;
} }
if (((info->exflag&EF_UTF8) || (info->exflag&EF_UTF16)) && count&1) if (((info->exflag&EF_UTF8) || (info->exflag&EF_UTF16)) && count&1)
{ {
*MSVCRT__errno() = MSVCRT_EINVAL; *MSVCRT__errno() = MSVCRT_EINVAL;
release_ioinfo(info);
return -1; return -1;
} }
@ -3311,7 +3313,10 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
{ {
if (WriteFile(hand, buf, count, &num_written, NULL) if (WriteFile(hand, buf, count, &num_written, NULL)
&& (num_written == count)) && (num_written == count))
{
release_ioinfo(info);
return num_written; return num_written;
}
TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd,
hand, GetLastError()); hand, GetLastError());
*MSVCRT__errno() = MSVCRT_ENOSPC; *MSVCRT__errno() = MSVCRT_ENOSPC;
@ -3402,6 +3407,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
if(!conv_len) { if(!conv_len) {
msvcrt_set_errno(GetLastError()); msvcrt_set_errno(GetLastError());
MSVCRT_free(p); MSVCRT_free(p);
release_ioinfo(info);
return -1; return -1;
} }
@ -3433,6 +3439,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
if (!WriteFile(hand, q, size, &num_written, NULL)) if (!WriteFile(hand, q, size, &num_written, NULL))
num_written = -1; num_written = -1;
release_ioinfo(info);
if(p) if(p)
MSVCRT_free(p); MSVCRT_free(p);
if (num_written != size) if (num_written != size)
@ -3445,6 +3452,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
return count; return count;
} }
release_ioinfo(info);
return -1; return -1;
} }