backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adress copilot reviews

Browse source
This commit is contained in:
Merith 2026-03-04 04:37:32 -08:00
parent 5f170b68eb
commit acd67eaa75
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -62,8 +62,10 @@ if(MSVC)
# Docker and piped output in server mode). WinMainCRTStartup keeps the # Docker and piped output in server mode). WinMainCRTStartup keeps the
# WinMain entry point. Client mode calls FreeConsole() to detach. # WinMain entry point. Client mode calls FreeConsole() to detach.
target_link_options(MinecraftClient PRIVATE target_link_options(MinecraftClient PRIVATE
/SUBSYSTEM:CONSOLE /ENTRY:WinMainCRTStartup /SUBSYSTEM:CONSOLE
$<$<CONFIG:Release>:/LTCG /INCREMENTAL:NO> /ENTRY:WinMainCRTStartup
$<$<CONFIG:Release>:/LTCG>
$<$<CONFIG:Release>:/INCREMENTAL:NO>
) )
endif() endif()

26
Minecraft.Client/Windows64/Windows64_Minecraft.cpp
View file

@ -228,9 +228,29 @@ static BOOL WINAPI HeadlessServerCtrlHandler(DWORD ctrlType)
static void SetupHeadlessServerConsole() static void SetupHeadlessServerConsole()
{ {
// The exe is now linked as /SUBSYSTEM:CONSOLE, so it inherits the parent's // The exe is linked as /SUBSYSTEM:CONSOLE, so it normally inherits the
// console automatically. We just need to re-open the CRT streams so that // parent's console. However, if launched with DETACHED_PROCESS or
// printf/scanf go through the console and set up our Ctrl handler. // CREATE_NO_WINDOW the handles may be invalid. Verify before redirecting
// the CRT streams to avoid leaving them in a broken state.
HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
HANDLE hStdIn = GetStdHandle(STD_INPUT_HANDLE);
bool hasConsole =
hStdOut != NULL && hStdOut != INVALID_HANDLE_VALUE &&
hStdIn != NULL && hStdIn != INVALID_HANDLE_VALUE;
if (!hasConsole)
{
if (!AttachConsole(ATTACH_PARENT_PROCESS))
{
if (!AllocConsole())
{
// No console available at all; skip stream redirection.
SetConsoleCtrlHandler(HeadlessServerCtrlHandler, TRUE);
return;
}
}
}
FILE* stream = NULL; FILE* stream = NULL;
freopen_s(&stream, "CONIN$", "r", stdin); freopen_s(&stream, "CONIN$", "r", stdin);
freopen_s(&stream, "CONOUT$", "w", stdout); freopen_s(&stream, "CONOUT$", "w", stdout);