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

ntdll: Use send(2) instead of write(2) for zero-byte writes to sockets.

Browse Source
This commit is contained in:
Alexandre Julliard 2007-04-09 12:21:24 +02:00
parent d57872567d
commit c915215ba6
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/kernel32/tests/mailslot.c
View File

@ -258,8 +258,8 @@ static int mailslot_test(void)
dwNext = dwMsgCount = 0; dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ), ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
"getmailslotinfo failed\n"); "getmailslotinfo failed\n");
todo_wine {
ok( dwNext == 0, "dwNext incorrect\n"); ok( dwNext == 0, "dwNext incorrect\n");
todo_wine {
ok( dwMsgCount == 1, "dwMsgCount incorrect\n"); ok( dwMsgCount == 1, "dwMsgCount incorrect\n");
} }

17
dlls/ntdll/file.c
View File

@ -668,6 +668,7 @@ static void WINAPI FILE_AsyncWriteService(void *ovp, IO_STATUS_BLOCK *iosb, ULON
{ {
async_fileio *fileio = (async_fileio *) ovp; async_fileio *fileio = (async_fileio *) ovp;
int result, fd, needs_close; int result, fd, needs_close;
enum server_fd_type type;
TRACE("(%p %p 0x%x)\n",iosb, fileio->buffer, status); TRACE("(%p %p 0x%x)\n",iosb, fileio->buffer, status);
@ -676,12 +677,16 @@ static void WINAPI FILE_AsyncWriteService(void *ovp, IO_STATUS_BLOCK *iosb, ULON
case STATUS_ALERTED: case STATUS_ALERTED:
/* write some data (non-blocking) */ /* write some data (non-blocking) */
if ((status = server_get_unix_fd( fileio->handle, FILE_WRITE_DATA, &fd, if ((status = server_get_unix_fd( fileio->handle, FILE_WRITE_DATA, &fd,
&needs_close, NULL, NULL ))) &needs_close, &type, NULL )))
{ {
fileio_terminate(fileio, iosb, status); fileio_terminate(fileio, iosb, status);
break; break;
} }
result = write(fd, &fileio->buffer[fileio->already], fileio->count - fileio->already); if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET))
result = send( fd, fileio->buffer, 0, 0 );
else
result = write( fd, &fileio->buffer[fileio->already], fileio->count - fileio->already );
if (needs_close) close( fd ); if (needs_close) close( fd );
if (result < 0) if (result < 0)
@ -772,7 +777,13 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent,
for (;;) for (;;)
{ {
if ((result = write( unix_handle, (const char *)buffer + total, length - total )) >= 0) /* zero-length writes on sockets may not work with plain write(2) */
if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET))
result = send( unix_handle, buffer, 0, 0 );
else
result = write( unix_handle, (const char *)buffer + total, length - total );
if (result >= 0)
{ {
total += result; total += result;
if (total == length) if (total == length)