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

ntdll: Remember to set the iosb status if using a worker thread for serial wait.

This commit is contained in:
Mike Kaplinskiy 2009-09-03 21:47:32 -04:00 committed by Alexandre Julliard
parent 6cde75646a
commit 3f232785d3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/ntdll/serial.c
View File

@ -851,6 +851,7 @@ typedef struct async_commio
{ {
HANDLE hDevice; HANDLE hDevice;
DWORD* events; DWORD* events;
IO_STATUS_BLOCK* iosb;
HANDLE hEvent; HANDLE hEvent;
DWORD evtmask; DWORD evtmask;
DWORD mstat; DWORD mstat;
@ -985,12 +986,13 @@ static DWORD CALLBACK wait_for_event(LPVOID arg)
} }
if (needs_close) close( fd ); if (needs_close) close( fd );
} }
if (commio->iosb) commio->iosb->u.Status = *commio->events ? STATUS_SUCCESS : STATUS_CANCELLED;
if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL);
RtlFreeHeap(GetProcessHeap(), 0, commio); RtlFreeHeap(GetProcessHeap(), 0, commio);
return 0; return 0;
} }
static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, DWORD* events) static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK piosb, DWORD* events)
{ {
async_commio* commio; async_commio* commio;
NTSTATUS status; NTSTATUS status;
@ -1003,6 +1005,7 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, DWORD* events)
commio->hDevice = hDevice; commio->hDevice = hDevice;
commio->events = events; commio->events = events;
commio->iosb = piosb;
commio->hEvent = hEvent; commio->hEvent = hEvent;
get_wait_mask(commio->hDevice, &commio->evtmask); get_wait_mask(commio->hDevice, &commio->evtmask);
@ -1301,7 +1304,7 @@ static inline NTSTATUS io_control(HANDLE hDevice,
case IOCTL_SERIAL_WAIT_ON_MASK: case IOCTL_SERIAL_WAIT_ON_MASK:
if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) if (lpOutBuffer && nOutBufferSize == sizeof(DWORD))
{ {
if (!(status = wait_on(hDevice, fd, hEvent, lpOutBuffer))) if (!(status = wait_on(hDevice, fd, hEvent, piosb, lpOutBuffer)))
sz = sizeof(DWORD); sz = sizeof(DWORD);
} }
else else