Add a console failback option in case the GUI does not work

Author: lambda-pixel

3rdparty/imgui/CMakeLists.txt

@@ -7,7 +7,7 @@ add_library(imgui
     imgui/imgui_widgets.cpp
     imgui/backends/imgui_impl_win32.cpp
     imgui/backends/imgui_impl_vulkan.cpp
-    imgui/imgui_demo.cpp
+    #imgui/imgui_demo.cpp
 )
 
 target_include_directories(imgui PUBLIC imgui)

src/CMakeLists.txt

@@ -1,14 +1,9 @@
-add_executable(EDVoice WIN32
+set(EDVOICE_SOURCES
     main.cpp
     EDVoiceApp.cpp
     util/EliteFileUtil.cpp
     watchers/JournalWatcher.cpp
     watchers/StatusWatcher.cpp
-    
-    GUI/EDVoiceGUI.cpp
-    GUI/Vulkan/VkAdapter.cpp
-    GUI/Vulkan/Swapchain.cpp
-    GUI/Vulkan/VkUtil.cpp
 
     voicepack/Enum.cpp
     voicepack/AudioPlayer.cpp
@@ -21,19 +16,41 @@ add_executable(EDVoice WIN32
     ../assets/edvoice.rc
 )
 
+set(EDVOICE_SOURCES_GUI
+    GUI/EDVoiceGUI.cpp
+    GUI/Vulkan/VkAdapter.cpp
+    GUI/Vulkan/Swapchain.cpp
+    GUI/Vulkan/VkUtil.cpp
+)
+
+# GUI version
+add_executable(EDVoice WIN32 ${EDVOICE_SOURCES} ${EDVOICE_SOURCES_GUI})
+
+target_compile_definitions(EDVoice PRIVATE GUI_MODE)
+
 target_include_directories(EDVoice PRIVATE ../3rdparty)
 target_include_directories(EDVoice PRIVATE ../plugins/include)
 
 target_link_libraries(EDVoice PRIVATE imgui)
 target_compile_definitions(EDVoice PRIVATE UNICODE _UNICODE)
 
+# CLI version without GUI
+add_executable(EDVoice-cli WIN32 ${EDVOICE_SOURCES})
+
+target_include_directories(EDVoice-cli PRIVATE ../3rdparty)
+target_include_directories(EDVoice-cli PRIVATE ../plugins/include)
+
+target_compile_definitions(EDVoice-cli PRIVATE UNICODE _UNICODE)
+
 if (BUILD_MEDICORP)
-    target_compile_definitions(EDVoice PRIVATE BUILD_MEDICORP)
     message(STATUS "Building with MediCorp support")
+
+    target_compile_definitions(EDVoice PRIVATE BUILD_MEDICORP)
+    target_compile_definitions(EDVoice-cli PRIVATE BUILD_MEDICORP)
 endif()
 
 # target_compile_definitions(EDVoice PRIVATE BUILD_MEDICORP)
 # target_compile_definitions(EDVoice PRIVATE VULKAN_DEBUG_LAYER)
 
-install(TARGETS EDVoice
+install(TARGETS EDVoice EDVoice-cli
         RUNTIME DESTINATION .)

src/main.cpp

@@ -2,14 +2,22 @@
 #include <filesystem>
 
 #include "EDVoiceApp.h"
-#include "GUI/EDVoiceGUI.h"
+
+#include <conio.h>
+#include <windows.h>
+
+void run_failback_cli(
+    const std::filesystem::path& execPath,
+    const std::filesystem::path& configFile);
+
+#ifdef GUI_MODE
 
 // ----------------------------------------------------------------------------
 // GUI
 // ----------------------------------------------------------------------------
 
-#if 1
-#include <windows.h>
+#include <sstream>
+#include "GUI/EDVoiceGUI.h"
 
 int WINAPI wWinMain(
     _In_ HINSTANCE hInstance,
@@ -24,76 +32,111 @@ int WINAPI wWinMain(
     const std::filesystem::path execPath = std::filesystem::path(szArgList[0]).parent_path();
     const std::filesystem::path configFile = execPath / "config" / "default.json";
 
-    EDVoiceGUI gui(execPath, configFile, hInstance, nShowCmd);
+    std::ostringstream local;
+    std::cout.rdbuf(local.rdbuf());
+    std::cerr.rdbuf(local.rdbuf());
+
+    bool failbackMode = false;
+
+    try {
+        EDVoiceGUI gui(execPath, configFile, hInstance, nShowCmd);
+        gui.run();
+    } catch (const std::exception& e) {
+        std::cerr << "[FATAL ] Exception: " << e.what() << std::endl;
+        failbackMode = true;
+    } catch (...) {
+        std::cerr << "[FATAL ] Exception unknown" << std::endl;
+        failbackMode = true;
+    }
+
+    if (failbackMode) {
+        std::ofstream out("EDVoiceCrash.log", std::ios::app);
+        out << local.str();
+        out.close();
+
+        // Clear WM_QUIT messages
+        MSG msg;
+
+        while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+            if (msg.message == WM_QUIT) continue;
+
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+        }
+
+        MessageBoxA(NULL, "Could not load the GUI. A Log file EDVoiceCrash.log was created. Please send it for bug review.\nTrying to launch in failback mode...\no7", "EDVoice", MB_OK | MB_ICONERROR);
+        
+        run_failback_cli(execPath, configFile);
+    }
 
-    gui.run();
-    
     return 0;
 }
 
-#else
-#include <windows.h>
-#include <fcntl.h>
-#include <io.h>
+#else // !GUI_MODE
+
+// ----------------------------------------------------------------------------
+// Console mode
+// ----------------------------------------------------------------------------
 
 int WINAPI wWinMain(
     _In_ HINSTANCE hInstance,
     _In_opt_ HINSTANCE hPrevInstance,
     _In_ LPWSTR lpCmdLine,
     _In_ int nShowCmd)
 {
-    // --- Créer une console ---
-    AllocConsole();
-
-    // Rediriger stdout, stderr et stdin vers la console
-    FILE* fp;
-    freopen_s(&fp, "CONOUT$", "w", stdout);
-    freopen_s(&fp, "CONOUT$", "w", stderr);
-    freopen_s(&fp, "CONIN$", "r", stdin);
-
-    std::cout << "Console initialized ✅" << std::endl;
-
-    // --- Parsing arguments ---
     LPWSTR* szArgList;
     int argCount;
     szArgList = CommandLineToArgvW(GetCommandLine(), &argCount);
 
     const std::filesystem::path execPath = std::filesystem::path(szArgList[0]).parent_path();
     const std::filesystem::path configFile = execPath / "config" / "default.json";
 
-    // --- Lancer ton GUI ---
-    EDVoiceGUI gui(execPath, configFile, hInstance, nShowCmd);
-    gui.run();
+    run_failback_cli(execPath, configFile);
 
-    // --- Libérer la console à la fermeture ---
-    FreeConsole();
     return 0;
 }
 
-#endif 
+#endif
 
-// ----------------------------------------------------------------------------
 
-#if 0
+LRESULT CALLBACK w32WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    switch (msg) {
+        case WM_CLOSE:
+            ::DestroyWindow(hWnd);
+            return 0;
+
+        case WM_DESTROY:
+            ::PostQuitMessage(0);
+            return 0;
+    }
+
+    return ::DefWindowProcW(hWnd, msg, wParam, lParam);
+}
 
-int main(int argc, char* argv[])
+
+void run_failback_cli(
+    const std::filesystem::path& execPath,
+    const std::filesystem::path& configFile)
 {
-    const std::filesystem::path execPath = std::filesystem::path(argv[0]).parent_path();
-    // Load default config or the one specified in command line
-    std::filesystem::path configFile;
+    AllocConsole();
 
-    if (argc < 2) {
-        std::cout << "Using default configuration" << std::endl;
-        configFile = std::filesystem::current_path() / "config" / "default.json";
-    }
-    else {
-        configFile = argv[1];
-    }
+    FILE* fp;
+    freopen_s(&fp, "CONOUT$", "w", stdout);
+    freopen_s(&fp, "CONOUT$", "w", stderr);
+    freopen_s(&fp, "CONIN$", "r", stdin);
 
     EDVoiceApp app(execPath, configFile);
 
-    app.run();
+    MSG msg;
+    HWND hConsole = GetConsoleWindow();
 
-    return 0;
+    while (IsWindow(hConsole) && GetMessage(&msg, NULL, 0, 0)) {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+        hConsole = GetConsoleWindow(); // Update in case the console is closed
+    }
+
+    FreeConsole();
 }
-#endif
+