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

kernel32: Allow non-console handles in DuplicateConsoleHandle. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-11-11 20:06:39 +01:00 committed by Alexandre Julliard
parent e460b37a25
commit 1335768f0a
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/kernel32/console.c
View File

@ -113,13 +113,9 @@ BOOL WINAPI VerifyConsoleIoHandle(HANDLE handle)
HANDLE WINAPI DuplicateConsoleHandle(HANDLE handle, DWORD access, BOOL inherit,
DWORD options)
{
HANDLE ret;
if (!is_console_handle(handle) ||
!DuplicateHandle(GetCurrentProcess(), wine_server_ptr_handle(console_handle_unmap(handle)),
GetCurrentProcess(), &ret, access, inherit, options))
return INVALID_HANDLE_VALUE;
return console_handle_map(ret);
HANDLE ret;
return DuplicateHandle(GetCurrentProcess(), handle, GetCurrentProcess(), &ret,
access, inherit, options) ? ret : INVALID_HANDLE_VALUE;
}
/******************************************************************

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

@ -1506,6 +1506,34 @@ static void test_GetSetStdHandle(void)
ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error);
}
static void test_DuplicateConsoleHandle(void)
{
HANDLE handle, event;
BOOL ret;
if (skip_nt) return;
event = CreateEventW(NULL, TRUE, FALSE, NULL);
/* duplicate an event handle with DuplicateConsoleHandle */
handle = DuplicateConsoleHandle(event, 0, FALSE, DUPLICATE_SAME_ACCESS);
ok(handle != NULL, "DuplicateConsoleHandle failed: %u\n", GetLastError());
ret = SetEvent(handle);
ok(ret, "SetEvent failed: %u\n", GetLastError());
ret = CloseConsoleHandle(handle);
todo_wine
ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError());
ret = CloseConsoleHandle(event);
todo_wine
ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError());
handle = DuplicateConsoleHandle((HANDLE)0xdeadbeef, 0, FALSE, DUPLICATE_SAME_ACCESS);
ok(handle == INVALID_HANDLE_VALUE, "DuplicateConsoleHandle failed: %u\n", GetLastError());
ok(GetLastError() == ERROR_INVALID_HANDLE, "last error = %u\n", GetLastError());
}
static void test_GetNumberOfConsoleInputEvents(HANDLE input_handle)
{
DWORD count;
@ -4387,6 +4415,7 @@ START_TEST(console)
test_OpenCON();
test_VerifyConsoleIoHandle(hConOut);
test_GetSetStdHandle();
test_DuplicateConsoleHandle();
test_GetNumberOfConsoleInputEvents(hConIn);
test_WriteConsoleInputA(hConIn);
test_WriteConsoleInputW(hConIn);