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

server: Implement IOCTL_SERIAL_GET_WAIT_MASK as an ioctl on the server side. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2017-05-05 12:34:16 +02:00
parent b7b9c4eaa6
commit e77873da73
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/ntdll/serial.c
View File

@ -1111,6 +1111,7 @@ static inline NTSTATUS io_control(HANDLE hDevice,
{ {
case IOCTL_SERIAL_GET_TIMEOUTS: case IOCTL_SERIAL_GET_TIMEOUTS:
case IOCTL_SERIAL_SET_TIMEOUTS: case IOCTL_SERIAL_SET_TIMEOUTS:
case IOCTL_SERIAL_GET_WAIT_MASK:
case IOCTL_SERIAL_SET_WAIT_MASK: case IOCTL_SERIAL_SET_WAIT_MASK:
/* these are handled on the server side */ /* these are handled on the server side */
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
@ -1195,15 +1196,6 @@ static inline NTSTATUS io_control(HANDLE hDevice,
} }
else status = STATUS_INVALID_PARAMETER; else status = STATUS_INVALID_PARAMETER;
break; break;
case IOCTL_SERIAL_GET_WAIT_MASK:
if (lpOutBuffer && nOutBufferSize == sizeof(DWORD))
{
if (!(status = get_wait_mask(hDevice, lpOutBuffer, NULL, NULL, FALSE)))
sz = sizeof(DWORD);
}
else
status = STATUS_INVALID_PARAMETER;
break;
case IOCTL_SERIAL_IMMEDIATE_CHAR: case IOCTL_SERIAL_IMMEDIATE_CHAR:
if (lpInBuffer && nInBufferSize == sizeof(CHAR)) if (lpInBuffer && nInBufferSize == sizeof(CHAR))
status = xmit_immediate(hDevice, fd, lpInBuffer); status = xmit_immediate(hDevice, fd, lpInBuffer);

7
server/serial.c
View File

@ -220,6 +220,13 @@ static obj_handle_t serial_ioctl( struct fd *fd, ioctl_code_t code, struct async
else set_error( STATUS_BUFFER_TOO_SMALL ); else set_error( STATUS_BUFFER_TOO_SMALL );
return 0; return 0;
case IOCTL_SERIAL_GET_WAIT_MASK:
if (get_reply_max_size() >= sizeof(serial->eventmask))
set_reply_data( &serial->eventmask, sizeof(serial->eventmask) );
else
set_error( STATUS_BUFFER_TOO_SMALL );
return 0;
case IOCTL_SERIAL_SET_WAIT_MASK: case IOCTL_SERIAL_SET_WAIT_MASK:
if (get_req_data_size() >= sizeof(serial->eventmask)) if (get_req_data_size() >= sizeof(serial->eventmask))
{ {

1
server/trace.c
View File

@ -120,6 +120,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code )
CASE(FSCTL_PIPE_PEEK); CASE(FSCTL_PIPE_PEEK);
CASE(FSCTL_PIPE_WAIT); CASE(FSCTL_PIPE_WAIT);
CASE(IOCTL_SERIAL_GET_TIMEOUTS); CASE(IOCTL_SERIAL_GET_TIMEOUTS);
CASE(IOCTL_SERIAL_GET_WAIT_MASK);
CASE(IOCTL_SERIAL_SET_TIMEOUTS); CASE(IOCTL_SERIAL_SET_TIMEOUTS);
CASE(IOCTL_SERIAL_SET_WAIT_MASK); CASE(IOCTL_SERIAL_SET_WAIT_MASK);
CASE(WS_SIO_ADDRESS_LIST_CHANGE); CASE(WS_SIO_ADDRESS_LIST_CHANGE);