August 2020 - Wine-Commits - list.winehq.org

Paul Gofman : kernel32: Implement InitializeContext[2]().
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 2d544ff8a038ac20c278d0e8f2de4c5478ff6d95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d544ff8a038ac20c278d0e8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 31 12:31:57 2020 +0300 kernel32: Implement InitializeContext[2](). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- .../api-ms-win-core-xstate-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 3 +- dlls/kernelbase/kernelbase.spec | 3 +- dlls/kernelbase/memory.c | 49 +++ dlls/ntdll/exception.c | 76 ++++- dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/exception.c | 361 +++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + include/ddk/wdm.h | 2 + include/winbase.h | 2 + 11 files changed, 462 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d544ff8a038ac20c278…

1 0

Carlos Rivera : kernel32/tests: Use debugstr_an to show contents of buffer.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 13e81421b7f1c9cfe1d6a5a7738ac728c662788c URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e81421b7f1c9cfe1d6a5a7… Author: Carlos Rivera <carlos(a)superkaos.org> Date: Mon Aug 31 11:37:23 2020 +0200 kernel32/tests: Use debugstr_an to show contents of buffer. In the tests modified the buffer to show is expected to contain strings separated by \0. So that passing the buffer to the ok macro will only print the first string. Showing the whole returned buffer gives more information when the test fails. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2fba26542f..c077f8b35b 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -591,8 +591,10 @@ static void test_GetPrivateProfileString(const char *content, const char *descri buf, MAX_PATH, filename); ok(ret == 18, "Expected 18, got %d\n", ret); len = lstrlenA("section1") + sizeof(CHAR) + lstrlenA("section2") + 2 * sizeof(CHAR); - ok(!memcmp(buf, "section1\0section2\0\0", len), - "Expected \"section1\\0section2\\0\\0\", got \"%s\"\n", buf); + + ok(!memcmp(buf, "section1\0section2\0", len), + "Expected \"section1\\x00section2\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= MAX_PATH ? MAX_PATH : ret + 1))); /* lpAppName is empty */ memset(buf, 0xc, sizeof(buf)); @@ -667,7 +669,8 @@ static void test_GetPrivateProfileString(const char *content, const char *descri buf, MAX_PATH, filename); ok(ret == 18, "Expected 18, got %d\n", ret); ok(!memcmp(buf, "name1\0name2\0name4\0", ret + 1), - "Expected \"name1\\0name2\\0name4\\0\", got \"%s\"\n", buf); + "Expected \"name1\\x00name2\\x00name4\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= MAX_PATH ? MAX_PATH : ret + 1))); /* lpKeyName is empty */ memset(buf, 0xc,sizeof(buf)); @@ -794,8 +797,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ok(ret == 14, "Expected 14, got %d\n", ret); len = lstrlenA("section1") + 2 * sizeof(CHAR); todo_wine - ok(!memcmp(buf, "section1\0secti\0\0", ret + 2), - "Expected \"section1\\0secti\\0\\0\", got \"%s\"\n", buf); + ok(!memcmp(buf, "section1\0secti\0", ret + 2), + "Expected \"section1\\x00secti\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= 16 ? 16 : ret + 1))); /* lpKeyName is NULL, not enough room for final key name */ memset(buf, 0xc,sizeof(buf)); @@ -804,8 +808,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri buf, 16, filename); ok(ret == 14, "Expected 14, got %d\n", ret); todo_wine - ok(!memcmp(buf, "name1\0name2\0na\0\0", ret + 2), - "Expected \"name1\\0name2\\0na\\0\\0\", got \"%s\"\n", buf); + ok(!memcmp(buf, "name1\0name2\0na\0", ret + 2), + "Expected \"name1\\x00name2\\x00na\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= 16 ? 16 : ret + 1))); /* key value has quotation marks which are stripped */ memset(buf, 0xc,sizeof(buf));

1 0

Biswapriyo Nath : include/d3dcommon.idl: Add D3DDestructionNotifier interface.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: fbabb7c77e61f47130cf0e80435620b9b51a77aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbabb7c77e61f47130cf0e80… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 28 00:14:25 2020 +0530 include/d3dcommon.idl: Add D3DDestructionNotifier interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcommon.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 7d1c0d25cf..586dec29ed 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -43,6 +43,26 @@ typedef ID3D10Blob ID3DBlob; typedef ID3DBlob* LPD3DBLOB; cpp_quote("#define IID_ID3DBlob IID_ID3D10Blob") +typedef void(__stdcall *PFN_DESTRUCTION_CALLBACK)(void *data); + +[ + object, + local, + uuid(a06eb39a-50da-425b-8c31-4eecd6c270f3), + pointer_default(unique) +] +interface ID3DDestructionNotifier : IUnknown +{ + HRESULT RegisterDestructionCallback( + [in] PFN_DESTRUCTION_CALLBACK callback_func, + [in] void *data, + [out] UINT *callback_id + ); + HRESULT UnregisterDestructionCallback( + [in] UINT callback_id + ); +} + typedef enum _D3D_INCLUDE_TYPE { D3D_INCLUDE_LOCAL = 0,

1 0

Alexandre Julliard : Wine release 5.16
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: website Branch: master Commit: 012d08f2ce57382f4c429f306a8c026fe68a6394 URL: https://source.winehq.org/git/website.git/?a=commit;h=012d08f2ce57382f4c429… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 22:18:11 2020 +0200 Wine release 5.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020082801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2020082801.xml b/news/en/2020082801.xml new file mode 100644 index 00000000..a8894390 --- /dev/null +++ b/news/en/2020082801.xml @@ -0,0 +1,15 @@ +<news> +<date>August 28, 2020</date> +<title>Wine 5.16 Released</title> +<body> + The Wine development release 5.16 is now available. + <a href="{$root}/announce/5.16">What's new</a> in this release: +<ul> + <li>Support for x86 AVX registers.</li> + <li>Some ARM64 fixes for macOS.</li> + <li>Still more restructuration of the console support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.16.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-5.16 : Alexandre Julliard : Release 5.16
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: refs/tags/wine-5.16 Tag: a21db066d8ff579bcc0d3dd6a06d03855b8fda26 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a21db066d8ff579bcc0d3dd6a06… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 22:16:24 2020 +0200 Release 5.16

1 0

Alexandre Julliard : Release 5.16.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 5bb27d1edb2b6c8c04991cc88e54f161f0c41625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb27d1edb2b6c8c04991cc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 22:16:24 2020 +0200 Release 5.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 712 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 337 insertions(+), 396 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bb27d1edb2b6c8c0499…

1 0

Alexandre Julliard : Revert "ntdll: Get rid of the server_init_process_done() Unix library callback."
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 2b9a0550bcda166afdf852370397e1041c096f5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b9a0550bcda166afdf85237… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 21:05:37 2020 +0200 Revert "ntdll: Get rid of the server_init_process_done() Unix library callback." This partially reverts commit 1581fb619b879b58a402bc64ad81bde265b926e8. Steam wants Eip to be valid even before LdrInitializeThunk. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ++---- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/server.c | 4 ++-- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 5 ++++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d3ade9555b..8e76e39fa5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3426,16 +3426,12 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR #ifdef __i386__ entry = (void **)&context->Eax; - if (!context->Eip) context->Eip = (DWORD_PTR)kernel32_start_process; #elif defined(__x86_64__) entry = (void **)&context->Rcx; - if (!context->Rip) context->Rip = (DWORD_PTR)kernel32_start_process; #elif defined(__arm__) entry = (void **)&context->R0; - if (!context->Pc) context->Pc = (DWORD_PTR)kernel32_start_process; #elif defined(__aarch64__) entry = (void **)&context->u.s.X0; - if (!context->Pc) context->Pc = (DWORD_PTR)kernel32_start_process; #endif if (process_detaching) NtTerminateThread( GetCurrentThread(), 0 ); @@ -4053,6 +4049,8 @@ static void process_init(void) teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; + + unix_funcs->server_init_process_done( kernel32_start_process ); } /*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6f25f4ae87..ff75581286 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1368,6 +1368,7 @@ static struct unix_funcs unix_funcs = get_locales, virtual_release_address_space, exec_process, + server_init_process_done, set_show_dot_files, load_so_dll, load_builtin_dll, @@ -1400,7 +1401,6 @@ static void start_main_thread(void) init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); - server_init_process_done(); } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index cc46b02bb7..6d96f581b7 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1453,7 +1453,7 @@ void server_init_process(void) /*********************************************************************** * server_init_process_done */ -void server_init_process_done(void) +void CDECL server_init_process_done( void *relay ) { PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = get_exe_nt_header(); @@ -1486,7 +1486,7 @@ void server_init_process_done(void) SERVER_END_REQ; assert( !status ); - signal_start_thread( entry, peb, suspend, NULL, pLdrInitializeThunk, NtCurrentTeb() ); + signal_start_thread( entry, peb, suspend, relay, pLdrInitializeThunk, NtCurrentTeb() ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 813d65fc22..76410b0b2a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -117,6 +117,7 @@ extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; +extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; @@ -166,7 +167,6 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; extern void server_init_process(void) DECLSPEC_HIDDEN; -extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern size_t server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 0fa5bba4d8..4c352c0a4b 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,7 +27,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 100 +#define NTDLL_UNIXLIB_VERSION 101 struct unix_funcs { @@ -84,6 +84,9 @@ struct unix_funcs /* thread/process functions */ NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ); + /* server functions */ + void (CDECL *server_init_process_done)( void *relay ); + /* file functions */ void (CDECL *set_show_dot_files)( BOOL enable );

1 0

Alexandre Julliard : conhost: Fix some pointer cast warnings.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 58f2326410dd5574e52ab3362b67ab345674c3b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f2326410dd5574e52ab336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 21:27:12 2020 +0200 conhost: Fix some pointer cast warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index d17a8f4e68..4853a6d8b2 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -115,7 +115,7 @@ static void *alloc_ioctl_buffer( size_t size ) static int screen_buffer_compare_id( const void *key, const struct wine_rb_entry *entry ) { struct screen_buffer *screen_buffer = WINE_RB_ENTRY_VALUE( entry, struct screen_buffer, entry ); - return (unsigned int)key - screen_buffer->id; + return PtrToLong(key) - screen_buffer->id; } static struct wine_rb_tree screen_buffer_map = { screen_buffer_compare_id }; @@ -165,7 +165,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int memcpy( &screen_buffer->data[i * screen_buffer->width], screen_buffer->data, screen_buffer->width * sizeof(char_info_t) ); - if (wine_rb_put( &screen_buffer_map, (const void *)id, &screen_buffer->entry )) + if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) { ERR( "id %x already exists\n", id ); return NULL; @@ -898,7 +898,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) else { struct wine_rb_entry *entry; - if (!(entry = wine_rb_get( &screen_buffer_map, (const void *)output ))) + if (!(entry = wine_rb_get( &screen_buffer_map, LongToPtr(output) ))) { ERR( "invalid screen buffer id %x\n", output ); status = STATUS_INVALID_HANDLE;

1 0

Zebediah Figura : devenum: Correct the size of "name" in register_avicap_devices().
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: 7bae2aaf95fa2dd6eae7dc1d688e7d4a82b10dde URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bae2aaf95fa2dd6eae7dc1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 28 11:59:12 2020 -0500 devenum: Correct the size of "name" in register_avicap_devices(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index c72bb683f9..f7b53ad271 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -726,7 +726,7 @@ static void register_avicap_devices(void) REGFILTERPINS2 rgpins = {0}; REGPINTYPES rgtypes; REGFILTER2 rgf; - WCHAR name[6]; + WCHAR name[7]; VARIANT var; HRESULT hr; int i = 0;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_READ_OUTPUT.
by Alexandre Julliard Aug. 28, 2020

Aug. 28, 2020

Module: wine Branch: master Commit: f4661f1b38c479bd08baee93d9ddb1f9e93c173d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4661f1b38c479bd08baee93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:27:05 2020 +0200 conhost: Implement IOCTL_CONDRV_READ_OUTPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 4fbfc19a08..d17a8f4e68 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -545,6 +545,84 @@ static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct return STATUS_SUCCESS; } +static NTSTATUS read_output( struct screen_buffer *screen_buffer, const struct condrv_output_params *params, + size_t *out_size ) +{ + enum char_info_mode mode; + unsigned int x, y, width; + unsigned int i, count; + + x = params->x; + y = params->y; + mode = params->mode; + width = params->width; + TRACE( "(%u %u) mode %u width %u\n", x, y, mode, width ); + + switch(mode) + { + case CHAR_INFO_MODE_TEXT: + { + WCHAR *data; + char_info_t *src; + if (x >= screen_buffer->width || y >= screen_buffer->height) + { + *out_size = 0; + return STATUS_SUCCESS; + } + src = screen_buffer->data + y * screen_buffer->width + x; + count = min( screen_buffer->data + screen_buffer->height * screen_buffer->width - src, + *out_size / sizeof(*data) ); + *out_size = count * sizeof(*data); + if (!(data = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + for (i = 0; i < count; i++) data[i] = src[i].ch; + } + break; + case CHAR_INFO_MODE_ATTR: + { + unsigned short *data; + char_info_t *src; + if (x >= screen_buffer->width || y >= screen_buffer->height) + { + *out_size = 0; + return STATUS_SUCCESS; + } + src = screen_buffer->data + y * screen_buffer->width + x; + count = min( screen_buffer->data + screen_buffer->height * screen_buffer->width - src, + *out_size / sizeof(*data) ); + *out_size = count * sizeof(*data); + if (!(data = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + for (i = 0; i < count; i++) data[i] = src[i].attr; + } + break; + case CHAR_INFO_MODE_TEXTATTR: + { + SMALL_RECT *region; + char_info_t *data; + if (!width || *out_size < sizeof(*region) || x >= screen_buffer->width || y >= screen_buffer->height) + return STATUS_INVALID_PARAMETER; + count = min( (*out_size - sizeof(*region)) / (width * sizeof(*data)), screen_buffer->height - y ); + width = min( width, screen_buffer->width - x ); + *out_size = sizeof(*region) + width * count * sizeof(*data); + if (!(region = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + region->Left = x; + region->Top = y; + region->Right = x + width - 1; + region->Bottom = y + count - 1; + data = (char_info_t *)(region + 1); + for (i = 0; i < count; i++) + { + memcpy( &data[i * width], &screen_buffer->data[(y + i) * screen_buffer->width + x], + width * sizeof(*data) ); + } + } + break; + default: + return STATUS_INVALID_PARAMETER; + } + + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -599,6 +677,10 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return STATUS_INVALID_PARAMETER; return write_output( screen_buffer, in_data, in_size, out_size ); + case IOCTL_CONDRV_READ_OUTPUT: + if (in_size != sizeof(struct condrv_output_params)) return STATUS_INVALID_PARAMETER; + return read_output( screen_buffer, in_data, out_size ); + case IOCTL_CONDRV_GET_OUTPUT_INFO: if (in_size || *out_size < sizeof(struct condrv_output_info)) return STATUS_INVALID_PARAMETER; return get_output_info( screen_buffer, out_size );

1 0