ihateninjas/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher synced 2026-04-23 09:05:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Revert "[Backport release-10.x] refactor(console): attach console early""

Browse source
This commit is contained in:
Alexandru Ionut Tripon 2026-02-13 08:37:36 +02:00 committed by GitHub
parent 4ff026560a
commit e2952b878d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 79 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
launcher/Application.cpp
View file

@ -158,7 +158,6 @@
#endif
#include <windows.h>
#include <QStyleHints>
#include "console/WindowsConsole.h"
#endif
#include "console/Console.h"
@ -292,21 +291,9 @@ std::tuple<QDateTime, QString, QString, QString, QString> read_lock_File(const Q
Application::Application(int& argc, char** argv) : QApplication(argc, argv)
{
#if defined Q_OS_WIN32
// attach the parent console if stdout not already captured
if (AttachWindowsConsole()) {
consoleAttached = true;
if (auto err = EnableAnsiSupport(); !err) {
isANSIColorConsole = true;
} else {
std::cout << "Error setting up ansi console" << err.message() << std::endl;
}
}
#else
if (console::isConsole()) {
isANSIColorConsole = true;
}
#endif
setOrganizationName(BuildConfig.LAUNCHER_NAME);
setOrganizationDomain(BuildConfig.LAUNCHER_DOMAIN);
@ -1418,16 +1405,6 @@ Application::~Application()
{
// Shut down logger by setting the logger function to nothing
qInstallMessageHandler(nullptr);
#if defined Q_OS_WIN32
// Detach from Windows console
if (consoleAttached) {
fclose(stdout);
fclose(stdin);
fclose(stderr);
FreeConsole();
}
#endif
}
void Application::messageReceived(const QByteArray& message)

5
launcher/Application.h
View file

@ -271,11 +271,6 @@ class Application : public QApplication {
Qt::ApplicationState m_prevAppState = Qt::ApplicationInactive;
#endif
#if defined Q_OS_WIN32
// used on Windows to attach the standard IO streams
bool consoleAttached = false;
#endif
// FIXME: attach to instances instead.
struct InstanceXtras {
InstanceWindow* window = nullptr;

32
launcher/console/WindowsConsole.cpp
View file

@ -24,12 +24,16 @@
#endif
#include <windows.h>
#include <consoleapi.h>
#include <fcntl.h>
#include <fileapi.h>
#include <io.h>
#include <stdio.h>
#include <cstddef>
#include <iostream>
namespace console {
void RedirectHandle(DWORD handle, FILE* stream, const char* mode)
{
HANDLE stdHandle = GetStdHandle(handle);
@ -157,3 +161,31 @@ std::error_code EnableAnsiSupport()
return {};
}
void FreeWindowsConsole()
{
fclose(stdout);
fclose(stdin);
fclose(stderr);
FreeConsole();
}
WindowsConsoleGuard::WindowsConsoleGuard() : m_consoleAttached(false)
{
if (console::AttachWindowsConsole()) {
m_consoleAttached = true;
if (auto err = console::EnableAnsiSupport(); err) {
std::cout << "Error setting up ansi console" << err.message() << std::endl;
}
}
}
WindowsConsoleGuard::~WindowsConsoleGuard()
{
// Detach from Windows console
if (m_consoleAttached) {
console::FreeWindowsConsole();
}
}
} // namespace console

18
launcher/console/WindowsConsole.h
View file

@ -21,8 +21,24 @@
#pragma once
#include <system_error>
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <system_error>
namespace console {
void BindCrtHandlesToStdHandles(bool bindStdIn, bool bindStdOut, bool bindStdErr);
bool AttachWindowsConsole();
std::error_code EnableAnsiSupport();
void FreeWindowsConsole();
class WindowsConsoleGuard {
public:
WindowsConsoleGuard();
~WindowsConsoleGuard();
private:
bool m_consoleAttached;
};
} // namespace console

24
launcher/filelink/FileLink.cpp
View file

@ -34,26 +34,11 @@
#include <DesktopServices.h>
#include <sys.h>
#if defined Q_OS_WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include "console/WindowsConsole.h"
#endif
#include <filesystem>
namespace fs = std::filesystem;
FileLinkApp::FileLinkApp(int& argc, char** argv) : QCoreApplication(argc, argv), socket(new QLocalSocket(this))
{
#if defined Q_OS_WIN32
// attach the parent console
if (AttachWindowsConsole()) {
consoleAttached = true;
}
#endif
setOrganizationName(BuildConfig.LAUNCHER_NAME);
setOrganizationDomain(BuildConfig.LAUNCHER_DOMAIN);
setApplicationName(BuildConfig.LAUNCHER_NAME + "FileLink");
@ -236,13 +221,4 @@ FileLinkApp::~FileLinkApp()
qDebug() << "link program shutting down";
// Shut down logger by setting the logger function to nothing
qInstallMessageHandler(nullptr);
#if defined Q_OS_WIN32
// Detach from Windows console
if (consoleAttached) {
fclose(stdout);
fclose(stdin);
fclose(stderr);
}
#endif
}

4
launcher/filelink/FileLink.h
View file

@ -64,8 +64,4 @@ class FileLinkApp : public QCoreApplication {
QList<FS::LinkPair> m_links_to_make;
QList<FS::LinkResult> m_path_results;
#if defined Q_OS_WIN32
// used on Windows to attach the standard IO streams
bool consoleAttached = false;
#endif
};

9
launcher/filelink/filelink_main.cpp
View file

@ -22,8 +22,17 @@
#include "FileLink.h"
#if defined Q_OS_WIN32
#include "console/WindowsConsole.h"
#endif
int main(int argc, char* argv[])
{
#if defined Q_OS_WIN32
// attach the parent console
console::WindowsConsoleGuard _consoleGuard;
#endif
FileLinkApp ldh(argc, argv);
switch (ldh.status()) {

12
launcher/main.cpp
View file

@ -33,13 +33,23 @@
* limitations under the License.
*/
#include <iostream>
#include "Application.h"
#if defined Q_OS_WIN32
#include "console/WindowsConsole.h"
#endif
int main(int argc, char* argv[])
{
#if defined Q_OS_WIN32
// used on Windows to attach the standard IO streams
console::WindowsConsoleGuard _consoleGuard;
#endif
// initialize Qt
Application app(argc, argv);
switch (app.status()) {
case Application::StartingUp:
case Application::Initialized: {

26
launcher/updater/prismupdater/PrismUpdater.cpp
View file

@ -40,16 +40,6 @@
#include <QProgressDialog>
#include <memory>
#include <sys.h>
#if defined Q_OS_WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include "console/WindowsConsole.h"
#endif
#include <filesystem>
namespace fs = std::filesystem;
@ -86,12 +76,6 @@ void appDebugOutput(QtMsgType type, const QMessageLogContext& context, const QSt
PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, argv)
{
#if defined Q_OS_WIN32
// attach the parent console if stdout not already captured
if (AttachWindowsConsole()) {
consoleAttached = true;
}
#endif
setOrganizationName(BuildConfig.LAUNCHER_NAME);
setOrganizationDomain(BuildConfig.LAUNCHER_DOMAIN);
setApplicationName(BuildConfig.LAUNCHER_NAME + "Updater");
@ -382,16 +366,6 @@ PrismUpdaterApp::~PrismUpdaterApp()
qDebug() << "updater shutting down";
// Shut down logger by setting the logger function to nothing
qInstallMessageHandler(nullptr);
#if defined Q_OS_WIN32
// Detach from Windows console
if (consoleAttached) {
fclose(stdout);
fclose(stdin);
fclose(stderr);
FreeConsole();
}
#endif
}
void PrismUpdaterApp::fail(const QString& reason)

10
launcher/updater/prismupdater/updater_main.cpp
View file

@ -21,8 +21,18 @@
*/
#include "PrismUpdater.h"
#if defined Q_OS_WIN32
#include "console/WindowsConsole.h"
#endif
int main(int argc, char* argv[])
{
#if defined Q_OS_WIN32
// attach the parent console if stdout not already captured
console::WindowsConsoleGuard _consoleGuard;
#endif
PrismUpdaterApp wUpApp(argc, argv);
switch (wUpApp.status()) {