Jacek Caban : kernel32: Remove no longer needed CONSOLE_Init.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 141e53bacc7d8227f1f03192eab1b3a115f3bff4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=141e53bacc7d8227f1f03192e...

Author: Jacek Caban 
Date:   Tue Dec  1 17:25:41 2020 +0100

kernel32: Remove no longer needed CONSOLE_Init.

Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

dlls/kernel32/console.c        | 25 -------------------------
 dlls/kernel32/kernel_main.c    |  4 ----
 dlls/kernel32/kernel_private.h | 12 ------------
 3 files changed, 41 deletions(-)

diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 3171dcd8e7a..f2aa3fa6dd4 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -265,31 +265,6 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount)
     return 0;
 }

-BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params)
-{
-    /* convert value from server:
-     * + INVALID_HANDLE_VALUE => TEB: 0, STARTUPINFO: INVALID_HANDLE_VALUE
-     * + 0                    => TEB: 0, STARTUPINFO: INVALID_HANDLE_VALUE
-     * + console handle needs to be mapped
-     */
-    if (!params->hStdInput || params->hStdInput == INVALID_HANDLE_VALUE)
-        params->hStdInput = 0;
-    else if (!is_console_handle(params->hStdInput) && VerifyConsoleIoHandle(params->hStdInput))
-        params->hStdInput = console_handle_map(params->hStdInput);
-
-    if (!params->hStdOutput || params->hStdOutput == INVALID_HANDLE_VALUE)
-        params->hStdOutput = 0;
-    else if (!is_console_handle(params->hStdOutput) && VerifyConsoleIoHandle(params->hStdOutput))
-        params->hStdOutput = console_handle_map(params->hStdOutput);
-
-    if (!params->hStdError || params->hStdError == INVALID_HANDLE_VALUE)
-        params->hStdError = 0;
-    else if (!is_console_handle(params->hStdError) && VerifyConsoleIoHandle(params->hStdError))
-        params->hStdError = console_handle_map(params->hStdError);
-
-    return TRUE;
-}
-
 /* Undocumented, called by native doskey.exe */
 /* FIXME: Should use CONSOLE_GetHistory() above for full implementation */
 DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unknown3)
diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c
index 91230fc6607..e312a202db6 100644
--- a/dlls/kernel32/kernel_main.c
+++ b/dlls/kernel32/kernel_main.c
@@ -120,15 +120,11 @@ static void copy_startup_info(void)
  */
 static BOOL process_attach( HMODULE module )
 {
-    RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters;
-
     kernel32_handle = module;
     RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter );

NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL );

-    CONSOLE_Init(params);
-
     copy_startup_info();

#ifdef __i386__
diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h
index fa1dd79d0c0..7602c3b00c4 100644
--- a/dlls/kernel32/kernel_private.h
+++ b/dlls/kernel32/kernel_private.h
@@ -22,18 +22,6 @@
 #define __WINE_KERNEL_PRIVATE_H

NTSTATUS WINAPI BaseGetNamedObjectDirectory( HANDLE *dir );
-BOOL           CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) DECLSPEC_HIDDEN;
-
-static inline BOOL is_console_handle(HANDLE h)
-{
-    return h != INVALID_HANDLE_VALUE && ((UINT_PTR)h & 3) == 3;
-}
-
-/* map a real wineserver handle onto a kernel32 console handle */
-static inline HANDLE console_handle_map(HANDLE h)
-{
-    return h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE;
-}

static inline BOOL set_ntstatus( NTSTATUS status )
 {