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

conhost: Implement IOCTL_CONDRV_GET_MODE. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-08-20 23:51:17 +02:00 committed by Alexandre Julliard
parent 8231dbf049
commit 3c9d10d756
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4121,9 +4121,7 @@ START_TEST(console)
DWORD mode;
ret = GetConsoleMode(hConIn, &mode);
todo_wine
ok(ret, "GetConsoleMode failed: %u\n", GetLastError());
todo_wine
ok(mode == (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT |
ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION),
"mode = %x\n", mode);

24
programs/conhost/conhost.c
View File

@ -25,6 +25,7 @@
#include <winuser.h>
#include <winternl.h>
#include "wine/condrv.h"
#include "wine/server.h"
#include "wine/debug.h"
@ -33,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(conhost);
struct console
{
HANDLE server; /* console server handle */
unsigned int mode; /* input mode */
};
static void *ioctl_buffer;
@ -53,8 +55,22 @@ static void *alloc_ioctl_buffer( size_t size )
static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data,
size_t in_size, size_t *out_size )
{
FIXME( "unsupported ioctl %x\n", code );
return STATUS_NOT_SUPPORTED;
switch (code)
{
case IOCTL_CONDRV_GET_MODE:
{
DWORD *mode;
TRACE( "returning mode %x\n", console->mode );
if (in_size || *out_size != sizeof(*mode)) return STATUS_INVALID_PARAMETER;
if (!(mode = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY;
*mode = console->mode;
return STATUS_SUCCESS;
}
default:
FIXME( "unsupported ioctl %x\n", code );
return STATUS_NOT_SUPPORTED;
}
}
static NTSTATUS process_console_ioctls( struct console *console )
@ -162,6 +178,10 @@ int __cdecl wmain(int argc, WCHAR *argv[])
for (i = 0; i < argc; i++) TRACE("%s ", wine_dbgstr_w(argv[i]));
TRACE("\n");
console.mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT |
ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE |
ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION;
for (i = 1; i < argc; i++)
{
if (!wcscmp( argv[i], L"--headless"))