wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Rémi Bernon : dinput8/tests: Add DISCL_EXCLUSIVE / rawinput test.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 03ad3ca17a2fe81af51718a73e36e5d549245246 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03ad3ca17a2fe81af51718a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 10 11:04:14 2020 +0200 dinput8/tests: Add DISCL_EXCLUSIVE / rawinput test. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 328174e579..6fe9a63551 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -712,6 +712,26 @@ static void test_mouse_keyboard(void) todo_wine ok(raw_devices_count == 1, "Unexpected raw devices registered: %d\n", raw_devices_count); + IDirectInputDevice8_SetCooperativeLevel(di_mouse, hwnd, DISCL_FOREGROUND|DISCL_EXCLUSIVE); + IDirectInputDevice8_SetCooperativeLevel(di_keyboard, hwnd, DISCL_FOREGROUND|DISCL_EXCLUSIVE); + + hr = IDirectInputDevice8_Acquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + hr = IDirectInputDevice8_Acquire(di_mouse); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + raw_devices_count = ARRAY_SIZE(raw_devices); + memset(raw_devices, 0, sizeof(raw_devices)); + hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(hr == 3, "GetRegisteredRawInputDevices returned %d, raw_devices_count: %d\n", hr, raw_devices_count); + todo_wine + ok(raw_devices[0].dwFlags == (RIDEV_CAPTUREMOUSE|RIDEV_NOLEGACY), "Unexpected raw device flags: %x\n", raw_devices[0].dwFlags); + todo_wine + ok(raw_devices[2].dwFlags == (RIDEV_NOHOTKEYS|RIDEV_NOLEGACY), "Unexpected raw device flags: %x\n", raw_devices[1].dwFlags); + hr = IDirectInputDevice8_Unacquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + hr = IDirectInputDevice8_Unacquire(di_mouse); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + raw_devices_count = ARRAY_SIZE(raw_devices); hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); todo_wine

1 0

Rémi Bernon : user32: Implement GetRegisteredRawInputDevices.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 1e7378d80c20fc8f45a246fd043ef4e2911e94f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e7378d80c20fc8f45a246fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 10 11:04:13 2020 +0200 user32: Implement GetRegisteredRawInputDevices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 13 ----------- dlls/user32/rawinput.c | 50 ++++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/input.c | 15 ------------- include/wine/server_protocol.h | 18 ++++++++++++++- server/protocol.def | 6 +++++ server/queue.c | 21 ++++++++++++++++++ server/request.h | 5 +++++ server/trace.c | 13 +++++++++++ 8 files changed, 110 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e7378d80c20fc8f45a2…

1 0

Rémi Bernon : user32/tests: Add basic GetRegisteredRawInputDevices tests.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: a3aa9ae80a7f300d88e1a6c4194a392c44902874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3aa9ae80a7f300d88e1a6c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 10 11:04:12 2020 +0200 user32/tests: Add basic GetRegisteredRawInputDevices tests. There's already some in dinput, but this is a more appropriate location. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 79 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d4b0e34fa9..92457af01c 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1766,11 +1766,15 @@ static void test_GetRawInputData(void) static void test_RegisterRawInputDevices(void) { HWND hwnd; - RAWINPUTDEVICE raw_devices[1]; + RAWINPUTDEVICE raw_devices[2]; + UINT count, raw_devices_count; BOOL res; + memset(raw_devices, 0, sizeof(raw_devices)); raw_devices[0].usUsagePage = 0x01; raw_devices[0].usUsage = 0x05; + raw_devices[1].usUsagePage = 0x01; + raw_devices[1].usUsage = 0x04; hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowExA failed\n"); @@ -1780,9 +1784,6 @@ static void test_RegisterRawInputDevices(void) ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - raw_devices[0].dwFlags = 0; - raw_devices[0].hwndTarget = 0; - SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); @@ -1793,10 +1794,76 @@ static void test_RegisterRawInputDevices(void) ok(res == TRUE, "RegisterRawInputDevices failed\n"); ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = GetRegisteredRawInputDevices(NULL, NULL, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(count == 0, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + if (broken(count == 0) /* depends on windows versions */) + win_skip("Ignoring GetRegisteredRawInputDevices success\n"); + else + { + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + raw_devices_count = 1; + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(raw_devices, 0, sizeof(raw_devices)); + raw_devices_count = ARRAY_SIZE(raw_devices); + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == 2, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + todo_wine + ok(raw_devices[0].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 0x04, "Unexpected usage: %x\n", raw_devices[0].usUsage); + todo_wine + ok(raw_devices[1].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[1].usUsagePage); + todo_wine + ok(raw_devices[1].usUsage == 0x05, "Unexpected usage: %x\n", raw_devices[1].usUsage); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = hwnd; + raw_devices[1].dwFlags = RIDEV_REMOVE; + raw_devices[1].hwndTarget = hwnd; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1804,6 +1871,7 @@ static void test_RegisterRawInputDevices(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = 0; + raw_devices[1].hwndTarget = 0; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1814,6 +1882,8 @@ static void test_RegisterRawInputDevices(void) /* RIDEV_INPUTSINK requires hwndTarget != NULL */ raw_devices[0].dwFlags = RIDEV_INPUTSINK; raw_devices[0].hwndTarget = 0; + raw_devices[1].dwFlags = RIDEV_INPUTSINK; + raw_devices[1].hwndTarget = 0; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1821,6 +1891,7 @@ static void test_RegisterRawInputDevices(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = hwnd; + raw_devices[1].hwndTarget = hwnd; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE));

1 0

Jacek Caban : kernelbase: Use PEB ConsoleHandle to check for console connection in AllocConsole.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 1d65e474b1a5aa3ea60e6b14c7a49479b35cc7e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d65e474b1a5aa3ea60e6b14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:02:27 2020 +0200 kernelbase: Use PEB ConsoleHandle to check for console connection in AllocConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 1 + dlls/kernelbase/console.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index c7a10d233a..e856cc3af4 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -150,6 +150,7 @@ static BOOL process_attach( HMODULE module ) if (params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC) { HMODULE mod = GetModuleHandleA(0); + params->ConsoleHandle = NULL; if (RtlImageNtHeader(mod)->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) AllocConsole(); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 71dacb9ff4..484072e252 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -275,20 +275,18 @@ BOOL WINAPI AllocConsole(void) STARTUPINFOW app_si, console_si; WCHAR buffer[1024], cmd[256]; PROCESS_INFORMATION pi; - HANDLE event, std_in, console; - DWORD mode; + HANDLE event, console; BOOL ret; TRACE("()\n"); RtlEnterCriticalSection( &console_section ); - std_in = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); - if (GetConsoleMode( std_in, &mode )) + if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle) { /* we already have a console opened on this process, don't create a new one */ - CloseHandle( std_in ); RtlLeaveCriticalSection( &console_section ); + SetLastError( ERROR_ACCESS_DENIED ); return FALSE; }

1 0

Jacek Caban : kernelbase: Move CONTROL_C_EXIT handler to kernelbase.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 43ce429234a568cca6d563e0464acc3cfbbdbd50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43ce429234a568cca6d563e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:02:04 2020 +0200 kernelbase: Move CONTROL_C_EXIT handler to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 31 ------------------------------- dlls/kernel32/console_private.h | 1 - dlls/kernel32/kernel_main.c | 3 --- dlls/kernelbase/console.c | 19 +++++++++++++++++++ dlls/kernelbase/kernelbase.h | 1 + dlls/kernelbase/main.c | 1 + 6 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index ab97144e98..c38fa5d0c2 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -648,37 +648,6 @@ BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons) return TRUE; } -/****************************************************************** - * CONSOLE_HandleCtrlC - * - * Check whether the shall manipulate CtrlC events - */ -LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr ) -{ - extern DWORD WINAPI CtrlRoutine( void *arg ); - HANDLE thread; - - if (eptr->ExceptionRecord->ExceptionCode != CONTROL_C_EXIT) return EXCEPTION_CONTINUE_SEARCH; - if (!RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle) return EXCEPTION_CONTINUE_SEARCH; - - /* check if we have to ignore ctrl-C events */ - if (!(NtCurrentTeb()->Peb->ProcessParameters->ConsoleFlags & 1)) - { - /* Create a separate thread to signal all the events. - * This is needed because: - * - this function can be called in an Unix signal handler (hence on an - * different stack than the thread that's running). This breaks the - * Win32 exception mechanisms (where the thread's stack is checked). - * - since the current thread, while processing the signal, can hold the - * console critical section, we need another execution environment where - * we can wait on this critical section - */ - thread = CreateThread(NULL, 0, CtrlRoutine, (void*)CTRL_C_EVENT, 0, NULL); - if (thread) CloseHandle(thread); - } - return EXCEPTION_CONTINUE_EXECUTION; -} - /****************************************************************** * CONSOLE_WriteChars * diff --git a/dlls/kernel32/console_private.h b/dlls/kernel32/console_private.h index 2943d48a60..0b033b3550 100644 --- a/dlls/kernel32/console_private.h +++ b/dlls/kernel32/console_private.h @@ -22,7 +22,6 @@ #define __WINE_CONSOLE_PRIVATE_H /* console.c */ -extern LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr ) DECLSPEC_HIDDEN; extern int CONSOLE_GetHistory(int idx, WCHAR* buf, int buf_len) DECLSPEC_HIDDEN; extern BOOL CONSOLE_AppendHistory(const WCHAR *p) DECLSPEC_HIDDEN; extern unsigned CONSOLE_GetNumHistoryEntries(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index f7f87d2a70..c7a10d233a 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -147,9 +147,6 @@ static BOOL process_attach( HMODULE module ) LoadLibraryA( "krnl386.exe16" ); } - /* finish the process initialisation for console bits, if needed */ - RtlAddVectoredExceptionHandler( FALSE, CONSOLE_HandleCtrlC ); - if (params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC) { HMODULE mod = GetModuleHandleA(0); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index c7513601f8..71dacb9ff4 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -421,6 +421,20 @@ DWORD WINAPI CtrlRoutine( void *arg ) } +static LONG WINAPI handle_ctrl_c( EXCEPTION_POINTERS *eptr ) +{ + if (eptr->ExceptionRecord->ExceptionCode != CONTROL_C_EXIT) return EXCEPTION_CONTINUE_SEARCH; + if (!RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle) return EXCEPTION_CONTINUE_SEARCH; + + if (!(NtCurrentTeb()->Peb->ProcessParameters->ConsoleFlags & 1)) + { + HANDLE thread = CreateThread( NULL, 0, CtrlRoutine, (void*)CTRL_C_EVENT, 0, NULL ); + if (thread) CloseHandle( thread ); + } + return EXCEPTION_CONTINUE_EXECUTION; +} + + /****************************************************************************** * FillConsoleOutputAttribute (kernelbase.@) */ @@ -1626,3 +1640,8 @@ HRESULT WINAPI ResizePseudoConsole( HPCON handle, COORD size ) FIXME( "%p (%u,%u)\n", handle, size.X, size.Y ); return E_NOTIMPL; } + +void init_console( void ) +{ + RtlAddVectoredExceptionHandler( FALSE, handle_ctrl_c ); +} diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index 9fb4434fbb..59265bab2c 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -28,6 +28,7 @@ extern WCHAR *file_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN; extern void init_locale(void) DECLSPEC_HIDDEN; +extern void init_console(void) DECLSPEC_HIDDEN; extern HANDLE get_console_wait_handle( HANDLE handle ) DECLSPEC_HIDDEN; extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index f1edf8614e..e85586a075 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -47,6 +47,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) IsWow64Process( GetCurrentProcess(), &is_wow64 ); init_locale(); init_startup_info( NtCurrentTeb()->Peb->ProcessParameters ); + init_console(); } return TRUE; }

1 0

Jacek Caban : kernel32: Use PEB console handle in CONSOLE_HandleCtrlC to check console connection.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 0451e44d957325e9de348b8701058e19ce47dc57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0451e44d957325e9de348b87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:01:37 2020 +0200 kernel32: Use PEB console handle in CONSOLE_HandleCtrlC to check console connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e7894e3b02..ab97144e98 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -659,9 +659,7 @@ LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr ) HANDLE thread; if (eptr->ExceptionRecord->ExceptionCode != CONTROL_C_EXIT) return EXCEPTION_CONTINUE_SEARCH; - - /* FIXME: better test whether a console is attached to this process ??? */ - if (CONSOLE_GetNumHistoryEntries() == (unsigned)-1) return EXCEPTION_CONTINUE_SEARCH; + if (!RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle) return EXCEPTION_CONTINUE_SEARCH; /* check if we have to ignore ctrl-C events */ if (!(NtCurrentTeb()->Peb->ProcessParameters->ConsoleFlags & 1))

1 0

Jacek Caban : kernel32: Set PEB ConsoleHandle for bare console.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: ac94d8890558bcb34d28ee7c2f276bf994faa8a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac94d8890558bcb34d28ee7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:01:14 2020 +0200 kernel32: Set PEB ConsoleHandle for bare console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index c4583d1d9c..e7894e3b02 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -176,9 +176,7 @@ static BOOL restore_console_mode(HANDLE hin) close(fd); } - if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle == KERNEL32_CONSOLE_SHELL) - TERM_Exit(); - + TERM_Exit(); return ret; } @@ -1109,7 +1107,7 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) memset(&S_termios, 0, sizeof(S_termios)); if (params->ConsoleHandle == KERNEL32_CONSOLE_SHELL) { - HANDLE conin; + HANDLE conin, console; /* FIXME: to be done even if program is a GUI ? */ /* This is wine specific: we have no parent (we're started from unix) @@ -1162,6 +1160,8 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) } SERVER_END_REQ; } + console = CreateFileW( coninW, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); + if (console != INVALID_HANDLE_VALUE) params->ConsoleHandle = console; } /* convert value from server:

1 0

Jacek Caban : server: Pass console handle to the child process.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 09ff2436c4b1be1f379aec7e4f0b625c6dbc90e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09ff2436c4b1be1f379aec7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:01:08 2020 +0200 server: Pass console handle to the child process. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 - server/console.c | 8 ++++++-- server/process.c | 3 ++- server/process.h | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d66a2af668..2b70c2ffc4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3724,7 +3724,6 @@ static void test_AttachConsole_child(DWORD console_pid) ok(!res && GetLastError() == ERROR_ACCESS_DENIED, "AttachConsole returned: %x(%u)\n", res, GetLastError()); - todo_wine ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); res = FreeConsole(); ok(res, "FreeConsole failed: %u\n", GetLastError()); diff --git a/server/console.c b/server/console.c index 53910b3f46..890ea609c2 100644 --- a/server/console.c +++ b/server/console.c @@ -620,8 +620,8 @@ int free_console( struct process *process ) * 2/ parent is a renderer which launches process, and process should attach to the console * rendered by parent */ -void inherit_console( struct thread *parent_thread, struct process *parent, struct process *process, - obj_handle_t hconin ) +obj_handle_t inherit_console( struct thread *parent_thread, struct process *parent, struct process *process, + obj_handle_t hconin ) { int done = 0; @@ -652,6 +652,10 @@ void inherit_console( struct thread *parent_thread, struct process *parent, stru process->console = (struct console_input *)grab_object( parent->console ); process->console->num_proc++; } + + if (!process->console) return 0; + return alloc_handle( process, process->console, + SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, 0 ); } struct thread *console_get_renderer( struct console_input *console ) diff --git a/server/process.c b/server/process.c index 5e587b28cb..61ba1549e9 100644 --- a/server/process.c +++ b/server/process.c @@ -1224,7 +1224,8 @@ DECL_HANDLER(new_process) * like if hConOut and hConIn are console handles, then they should be on the same * physical console */ - inherit_console( parent_thread, parent, process, req->inherit_all ? info->data->hstdin : 0 ); + info->data->console = inherit_console( parent_thread, parent, + process, req->inherit_all ? info->data->hstdin : 0 ); } if (!req->inherit_all && !(req->create_flags & CREATE_NEW_CONSOLE)) diff --git a/server/process.h b/server/process.h index fb29f21cb1..3944a67d57 100644 --- a/server/process.h +++ b/server/process.h @@ -131,8 +131,8 @@ extern void detach_debugged_processes( struct thread *debugger ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); /* console functions */ -extern void inherit_console( struct thread *parent_thread, struct process *parent, - struct process *process, obj_handle_t hconin ); +extern obj_handle_t inherit_console( struct thread *parent_thread, struct process *parent, + struct process *process, obj_handle_t hconin ); extern int free_console( struct process *process ); extern struct thread *console_get_renderer( struct console_input *console );

1 0

Jacek Caban : kernelbase: Close PEB ConsoleHandle in AttachConsole.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 06c3e7e44cb40ac2e6e6c55029103d63f47f9e5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06c3e7e44cb40ac2e6e6c550… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:00:50 2020 +0200 kernelbase: Close PEB ConsoleHandle in AttachConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 - dlls/kernelbase/console.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 01c2361396..d66a2af668 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3737,7 +3737,6 @@ static void test_AttachConsole_child(DWORD console_pid) ok(res, "AttachConsole failed: %u\n", GetLastError()); ok(pipe_out != GetStdHandle(STD_ERROR_HANDLE), "std handle not set to console\n"); - todo_wine ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); console = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 7b84fc8f73..c7513601f8 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -250,7 +250,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid ) } SERVER_END_REQ; - if (ret && !(ret = init_console_std_handles())) FreeConsole(); + if (ret) + { + if ((ret = init_console_std_handles())) + { + HANDLE console = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); + if (console != INVALID_HANDLE_VALUE) RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; + else ret = FALSE; + } + if (!ret) FreeConsole(); + } RtlLeaveCriticalSection( &console_section ); return ret;

1 0

Jacek Caban : kernel32: Set PEB console handle in AllocConsole.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 57a222356cb675beec38268c2736628e0fb3d231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a222356cb675beec38268c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:00:37 2020 +0200 kernel32: Set PEB console handle in AllocConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 - dlls/kernelbase/console.c | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 32a1275e3e..01c2361396 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3592,7 +3592,6 @@ static void test_FreeConsole(void) HANDLE handle; BOOL ret; - todo_wine ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); ret = FreeConsole(); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 15153dbb6f..7b84fc8f73 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -266,7 +266,7 @@ BOOL WINAPI AllocConsole(void) STARTUPINFOW app_si, console_si; WCHAR buffer[1024], cmd[256]; PROCESS_INFORMATION pi; - HANDLE event, std_in; + HANDLE event, std_in, console; DWORD mode; BOOL ret; @@ -324,6 +324,10 @@ BOOL WINAPI AllocConsole(void) } CloseHandle( event ); if (!ret || !init_console_std_handles()) goto error; + console = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); + if (console == INVALID_HANDLE_VALUE) goto error; + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; + TRACE( "Started wineconsole pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); RtlLeaveCriticalSection( &console_section );

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020