Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-11-13 15:27:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] windows: bind inherited output streams

Browse Source
This commit is contained in:
Geoffrey McRae
2026-10-03 10:25:28 +10:00
parent a8365716af
commit c2aa8de32b
1 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
client/platform/Windows/entry.c
View File

@@ -22,10 +22,68 @@
#include "common/win32.h" #include "common/win32.h"
#include <fcntl.h>
#include <io.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <windows.h> #include <windows.h>
#include <shellapi.h> #include <shellapi.h>
static bool bindStandardStream(FILE * stream, DWORD streamId)
{
const HANDLE handle = GetStdHandle(streamId);
if (!handle || handle == INVALID_HANDLE_VALUE)
return false;
HANDLE duplicate = NULL;
if (!DuplicateHandle(GetCurrentProcess(), handle, GetCurrentProcess(),
&duplicate, 0, FALSE, DUPLICATE_SAME_ACCESS))
return false;
const int sourceFd = _open_osfhandle((intptr_t)duplicate, _O_TEXT);
if (sourceFd < 0)
{
CloseHandle(duplicate);
return false;
}
FILE * reopened = NULL;
if (freopen_s(&reopened, "NUL", "w", stream))
{
_close(sourceFd);
return false;
}
const int targetFd = _fileno(reopened);
if (targetFd < 0 || _dup2(sourceFd, targetFd))
{
_close(sourceFd);
return false;
}
_close(sourceFd);
clearerr(reopened);
setvbuf(reopened, NULL, _IONBF, 0);
return true;
}
static void bindStandardStreams(void)
{
const bool stdoutBound = bindStandardStream(stdout, STD_OUTPUT_HANDLE);
const bool stderrBound = bindStandardStream(stderr, STD_ERROR_HANDLE);
if ((stdoutBound && stderrBound) || IsDebuggerPresent())
return;
if (!AttachConsole(ATTACH_PARENT_PROCESS))
return;
if (!stdoutBound)
bindStandardStream(stdout, STD_OUTPUT_HANDLE);
if (!stderrBound)
bindStandardStream(stderr, STD_ERROR_HANDLE);
}
static void freeArguments(int argc, char * argv[]) static void freeArguments(int argc, char * argv[])
{ {
if (!argv) if (!argv)
@@ -44,6 +102,8 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE previousInstance,
(void)commandLine; (void)commandLine;
(void)showCommand; (void)showCommand;
bindStandardStreams();
int argc = 0; int argc = 0;
wchar_t ** wideArgv = CommandLineToArgvW(GetCommandLineW(), &argc); wchar_t ** wideArgv = CommandLineToArgvW(GetCommandLineW(), &argc);
if (!wideArgv || argc < 1) if (!wideArgv || argc < 1)