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

ntdll: Avoid using RtlQueueWorkItem() in the Unix library.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-07-10 10:10:16 +02:00
parent afb1654567
commit 63b66c9955
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/ntdll/unix/serial.c
View File

@ -950,7 +950,7 @@ static DWORD check_events(int fd, DWORD mask,
* TIOCMIWAIT only checks modem status line and may not be aborted by a changing mask * TIOCMIWAIT only checks modem status line and may not be aborted by a changing mask
* *
*/ */
static DWORD CALLBACK wait_for_event(LPVOID arg) static void CALLBACK wait_for_event(LPVOID arg)
{ {
async_commio *commio = arg; async_commio *commio = arg;
int fd, needs_close; int fd, needs_close;
@ -1008,13 +1008,14 @@ static DWORD CALLBACK wait_for_event(LPVOID arg)
stop_waiting(commio->hDevice); stop_waiting(commio->hDevice);
if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL);
free( commio ); free( commio );
return 0; NtTerminateThread( GetCurrentThread(), 0 );
} }
static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK piosb, 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;
HANDLE handle;
if ((status = NtResetEvent(hEvent, NULL))) if ((status = NtResetEvent(hEvent, NULL)))
return status; return status;
@ -1086,9 +1087,12 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK
goto out_now; goto out_now;
} }
/* create the worker for the task */ /* create the worker thread for the task */
status = RtlQueueWorkItem(wait_for_event, commio, 0 /* FIXME */); /* FIXME: should use async I/O instead */
status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, GetCurrentProcess(),
wait_for_event, commio, 0, 0, 0, 0, NULL );
if (status != STATUS_SUCCESS) goto out_now; if (status != STATUS_SUCCESS) goto out_now;
NtClose( handle );
return STATUS_PENDING; return STATUS_PENDING;
#if !defined(TIOCINQ) || (!(defined(TIOCSERGETLSR) && defined(TIOCSER_TEMT)) || !defined(TIOCINQ)) || !defined(TIOCMGET) || !defined(TIOCM_CTS) ||!defined(TIOCM_DSR) || !defined(TIOCM_RNG) || !defined(TIOCM_CAR) #if !defined(TIOCINQ) || (!(defined(TIOCSERGETLSR) && defined(TIOCSER_TEMT)) || !defined(TIOCINQ)) || !defined(TIOCMGET) || !defined(TIOCM_CTS) ||!defined(TIOCM_DSR) || !defined(TIOCM_RNG) || !defined(TIOCM_CAR)