Jacek Caban : kernelbase: Use NtCreateFile in CreateConsoleScreenBuffer.
Alexandre Julliard
julliard at winehq.org
Tue Jul 21 15:40:21 CDT 2020
Module: wine
Branch: master
Commit: e613d81d815d96a04eca42eea5faec71bdd459d9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e613d81d815d96a04eca42eea5faec71bdd459d9
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Jul 21 14:57:06 2020 +0200
kernelbase: Use NtCreateFile in CreateConsoleScreenBuffer.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/tests/console.c | 6 ++++++
dlls/kernelbase/console.c | 25 ++++++++++++-------------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 49869948e9..dd8cc2c188 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -3290,6 +3290,12 @@ static void test_FreeConsole(void)
(GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == ERROR_FILE_NOT_FOUND /* winxp */)),
"CreateFileA failed: %u\n", GetLastError());
+ handle = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+ CONSOLE_TEXTMODE_BUFFER, NULL);
+ ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_HANDLE,
+ "CreateConsoleScreenBuffer returned: %p (%u)\n", handle, GetLastError());
+
if (!skip_nt)
{
SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef );
diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c
index d1fc8a4de1..262db40003 100644
--- a/dlls/kernelbase/console.c
+++ b/dlls/kernelbase/console.c
@@ -326,7 +326,11 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD s
SECURITY_ATTRIBUTES *sa, DWORD flags,
void *data )
{
- HANDLE ret = INVALID_HANDLE_VALUE;
+ OBJECT_ATTRIBUTES attr = {sizeof(attr)};
+ IO_STATUS_BLOCK iosb;
+ UNICODE_STRING name;
+ HANDLE handle;
+ NTSTATUS status;
TRACE( "(%x,%x,%p,%x,%p)\n", access, share, sa, flags, data );
@@ -336,18 +340,13 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD s
return INVALID_HANDLE_VALUE;
}
- SERVER_START_REQ( create_console_output )
- {
- req->handle_in = 0;
- req->access = access;
- req->attributes = (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0;
- req->share = share;
- req->fd = -1;
- if (!wine_server_call_err( req ))
- ret = console_handle_map( wine_server_ptr_handle( reply->handle_out ));
- }
- SERVER_END_REQ;
- return ret;
+ RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\ScreenBuffer" );
+ attr.ObjectName = &name;
+ attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL;
+ if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT;
+ status = NtCreateFile( &handle, access, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN,
+ FILE_NON_DIRECTORY_FILE, NULL, 0 );
+ return set_ntstatus( status ) ? handle : INVALID_HANDLE_VALUE;
}
More information about the wine-cvs
mailing list