Merge branch 'spice2x' into spice22x

2026-02-19 16:05:17 +09:00
parent 0834646097 1d7fe00703
commit 78621e5dca
211 changed files with 26320 additions and 19061 deletions
@@ -3,12 +3,14 @@
 #include <memory>
 #include <vector>

+#include <assert.h>
 #include <shlwapi.h>
 #include <cfg/configurator.h>

 #include "api/modules/capture.h"
 #include "acio/acio.h"
 #include "acio/icca/icca.h"
+#include "acio/mdxf/mdxf.h"
 #include "api/controller.h"
 #include "avs/automap.h"
 #include "avs/core.h"
@@ -20,7 +22,9 @@
 #include "cfg/screen_resize.h"
 #include "easrv/easrv.h"
 #include "external/cardio/cardio_runner.h"
+#ifndef NO_SCARD
 #include "external/scard/scard.h"
+#endif
 #include "games/game.h"
 #include "games/io.h"
 #include "games/bbc/bbc.h"
@@ -87,6 +91,7 @@
 #include "misc/device.h"
 #include "misc/eamuse.h"
 #include "misc/extdev.h"
+#include "misc/ami2000.h"
 #include "misc/sciunit.h"
 #include "misc/sde.h"
 #include "misc/wintouchemu.h"
@@ -105,6 +110,7 @@
 #include "util/libutils.h"
 #include "util/logging.h"
 #include "util/peb.h"
+#include "util/socd_cleaner.h"
 #include "util/sysutils.h"
 #include "util/tapeled.h"
 #include "util/time.h"
@@ -194,6 +200,7 @@ int main_implementation(int argc, char *argv[]) {
    bool attach_icca = false;
    bool attach_device = false;
    bool attach_extdev = false;
+    bool attach_ami2000 = false;
    bool attach_sciunit = false;
    bool attach_cpusbxpkm_printer = false;
    bool attach_iidx = false;
@@ -266,7 +273,8 @@ int main_implementation(int argc, char *argv[]) {

    // detect model used to load option overrides
    auto options_version = launcher::detect_gameversion(
-            LAUNCHER_OPTIONS->at(launcher::Options::PathToEa3Config).value
+            LAUNCHER_OPTIONS->at(launcher::Options::PathToEa3Config).value,
+            LAUNCHER_OPTIONS->at(launcher::Options::PathToBootstrap).value
    );
    if (!options_version.model.empty() && options_version.model.size() < 4) {
        if (options_version.dest.size() == 1) {
@@ -300,25 +308,13 @@ int main_implementation(int argc, char *argv[]) {
        cfg_run = true;
    }

+    // -ea, but ignored if -url is set
    if (options[launcher::Options::EAmusementEmulation].value_bool() &&
-        options[launcher::Options::ServiceURL].is_active() &&
-        !cfg::CONFIGURATOR_STANDALONE) {
-        log_fatal(
-            "launcher",
-            "BAD EAMUSE SETTINGS ERROR\n\n\n"
-            "-------------------------------------------------------------------\n"
-            "WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-            "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
-            "A service URL is set **AND** E-Amusement emulation is enabled.\n"
-            "Either remove the service URL, or disable E-Amusement emulation.\n"
-            "Otherwise you may experience problems logging in.\n"
-            "-------------------------------------------------------------------\n\n\n"
-            );
-    }
-    if (options[launcher::Options::EAmusementEmulation].value_bool()) {
+        !options[launcher::Options::ServiceURL].is_active()) {
        avs::ea3::URL_SLASH = 1;
        easrv_port = 8080;
    }
+
    if (options[launcher::Options::SmartEAmusement].value_bool()) {
        easrv_smart = true;
    }
@@ -334,6 +330,10 @@ int main_implementation(int argc, char *argv[]) {
    if (options[launcher::Options::GraphicsForceRefresh].is_active()) {
        GRAPHICS_FORCE_REFRESH = options[launcher::Options::GraphicsForceRefresh].value_uint32();
    }
+    if (options[launcher::Options::FullscreenSubRefreshRate].is_active()) {
+        GRAPHICS_FORCE_REFRESH_SUB =
+            options[launcher::Options::FullscreenSubRefreshRate].value_uint32();
+    }
    if (options[launcher::Options::GraphicsForceSingleAdapter].value_bool()) {
        GRAPHICS_FORCE_SINGLE_ADAPTER = true;
    }
@@ -354,8 +354,13 @@ int main_implementation(int argc, char *argv[]) {
        GRAPHICS_FORCE_SINGLE_ADAPTER = true;
        GRAPHICS_PREVENT_SECONDARY_WINDOW = true;
    }
-    if (options[launcher::Options::DisplayAdapter].is_active()) {
+    if (options[launcher::Options::DisplayAdapter].is_active() && 
+        options[launcher::Options::DisplayAdapter].value_uint32() != D3DADAPTER_DEFAULT) {
        D3D9_ADAPTER = options[launcher::Options::DisplayAdapter].value_uint32();
+
+        // when we fix up adapter numbers, we only fix the first adapter, and not any subsequent
+        // adapters, so we can't deal with multi-monitor games
+        GRAPHICS_FORCE_SINGLE_ADAPTER = true;
    }
    if (options[launcher::Options::CaptureCursor].value_bool()) {
        GRAPHICS_CAPTURE_CURSOR = true;
@@ -433,8 +438,8 @@ int main_implementation(int argc, char *argv[]) {
    if (options[launcher::Options::EnableEXTDEVModule].value_bool()) {
        attach_extdev = true;
    }
-    if (options[launcher::Options::EnableSCIUNITModule].value_bool()) {
-        attach_sciunit = true;
+    if (options[launcher::Options::EnableAMI2000Module].value_bool()) {
+        attach_ami2000 = true;
    }
    if (options[launcher::Options::EnableDevicePassthrough].value_bool()) {
        hooks::device::ENABLE = false;
@@ -474,14 +479,26 @@ int main_implementation(int argc, char *argv[]) {
    if (options[launcher::Options::IIDXCameraOrderFlip].value_bool()) {
        games::iidx::FLIP_CAMS = true;
    }
+
+    // IIDX CONNECT_CAMERA logic here for cases where user is running without -iidx module
+    // for now, we assume that user may be running on a cab
+    // (games::iidx::DISABLE_CAMS starts out as false unless user overrides)
+    // we will check again in IIDX module with a different default
+    assert(!games::iidx::DISABLE_CAMS.has_value());
    if (options[launcher::Options::IIDXDisableCameras].value_bool()) {
        games::iidx::DISABLE_CAMS = true;
    }
+    if (options[launcher::Options::IIDXCabCamAccess].is_active() &&
+        options[launcher::Options::IIDXCabCamAccess].value_text() == "off") {
+        games::iidx::DISABLE_CAMS = true;
+    }
    if (options[launcher::Options::IIDXCamHook].value_bool()) {
        games::iidx::TDJ_CAMERA = true;
        // Disable legacy behaviour to avoid conflict
        games::iidx::DISABLE_CAMS = true;
    }
+    // CONNECT_CAMERA env var will be set once logging is enabled
+
    if (options[launcher::Options::IIDXCamHookOverride].is_active()) {
        games::iidx::TDJ_CAMERA_OVERRIDE = options[launcher::Options::IIDXCamHookOverride].value_text();
    }
@@ -521,6 +538,9 @@ int main_implementation(int argc, char *argv[]) {
        overlay::windows::IIDX_SEGMENT_LOCATION =
            options[launcher::Options::spice2x_IIDXLEDPos].value_text();
    }
+    if (options[launcher::Options::IIDXLEDBorderless].value_bool()) {
+        overlay::windows::IIDX_SEGMENT_BORDERLESS = true;
+    }
    if (options[launcher::Options::spice2x_IIDXNoESpec].value_bool()) {
        games::iidx::DISABLE_ESPEC_IO = true;
    }
@@ -538,6 +558,9 @@ int main_implementation(int argc, char *argv[]) {
    if (options[launcher::Options::IIDXRecQuality].is_active()) {
        nvenc_hook::VIDEO_CQP_STRING_OVERRIDE = options[launcher::Options::IIDXRecQuality].value_text();
    }
+    if (options[launcher::Options::IIDXRecDisable].value_bool()) {
+        nvenc_hook::FORCE_DISABLE = true;
+    }
 #endif
    if (options[launcher::Options::LoadJubeatModule].value_bool()) {
        attach_jb = true;
@@ -569,6 +592,25 @@ int main_implementation(int argc, char *argv[]) {
    if (options[launcher::Options::GitaDoraCabinetType].is_active()) {
        games::gitadora::CAB_TYPE = options[launcher::Options::GitaDoraCabinetType].value_uint32();
    }
+    if (options[launcher::Options::GitaDoraArenaSingleWindow].value_bool() && GRAPHICS_WINDOWED) {
+        games::gitadora::ARENA_SINGLE_WINDOW = true;
+    }
+    if (options[launcher::Options::GitaDoraWailHold].is_active()) {
+        socd::TILT_HOLD_MS = options[launcher::Options::GitaDoraWailHold].value_uint32();
+    }
+    if (options[launcher::Options::GitaDoraPickAlgo].is_active()) {
+        const auto text = options[launcher::Options::GitaDoraPickAlgo].value_text();
+        if (text == "legacy") {
+            games::gitadora::PICK_ALGO.reset();
+        } else if (text == "neutral") {
+            games::gitadora::PICK_ALGO = socd::SocdAlgorithm::Neutral;
+        } else if (text == "raw") {
+            games::gitadora::PICK_ALGO = socd::SocdAlgorithm::None;
+        }
+    }
+    if (options[launcher::Options::GitaDoraSubOverlaySize].is_active()) {
+        games::gitadora::SUBSCREEN_OVERLAY_SIZE = options[launcher::Options::GitaDoraSubOverlaySize].value_text();
+    }
    if (options[launcher::Options::LoadNostalgiaModule].value_bool()) {
        attach_nostalgia = true;
    }
@@ -590,6 +632,17 @@ int main_implementation(int argc, char *argv[]) {
    if (options[launcher::Options::GitaDoraTwoChannelAudio].value_bool()) {
        games::gitadora::TWOCHANNEL = true;
    }
+    if (options[launcher::Options::GitaDoraLefty].is_active()) {
+        const auto text = options[launcher::Options::GitaDoraLefty].value_text();
+        if (text == "p1") {
+            games::gitadora::P1_LEFTY = true;
+        } else if (text == "p2") {
+            games::gitadora::P2_LEFTY = true;
+        } else if (text == "both") {
+            games::gitadora::P1_LEFTY = true;
+            games::gitadora::P2_LEFTY = true;
+        }
+    }
    if (options[launcher::Options::LoadDDRModule].value_bool()) {
        attach_ddr = true;
    }
@@ -739,6 +792,9 @@ int main_implementation(int argc, char *argv[]) {
    if (options[launcher::Options::DisableAvsVfsDriveMountRedirection].is_active()) {
        hooks::avs::config::DISABLE_VFS_DRIVE_REDIRECTION = true;
    }
+    if (options[launcher::Options::DisableAvsCache].is_active()) {
+        hooks::avs::config::DISABLE_CACHE = true;
+    }
    if (options[launcher::Options::ScreenResizeConfigPath].is_active()) {
        cfg::SCREEN_RESIZE_CFG_PATH_OVERRIDE =
            options[launcher::Options::ScreenResizeConfigPath].value_text();
@@ -819,6 +875,7 @@ int main_implementation(int argc, char *argv[]) {
    for (auto &sextet : options[launcher::Options::SextetStreamPort].values_text()) {
        sextet_devices.emplace_back(sextet);
    }
+#ifndef NO_SCARD
    if (options[launcher::Options::HIDSmartCard].value_bool()) {
        WINSCARD_CONFIG.cardinfo_callback = eamuse_scard_callback;
        scard_threadstart();
@@ -838,6 +895,7 @@ int main_implementation(int argc, char *argv[]) {
            WINSCARD_CONFIG.add_padding_to_felica = true;
        }
    }
+#endif
    if (options[launcher::Options::CardIOHIDReaderOrderFlip].value_bool()) {
        CARDIO_RUNNER_FLIP = true;
    }
@@ -939,8 +997,19 @@ int main_implementation(int argc, char *argv[]) {
    if (options[launcher::Options::DisableOverlay].value_bool()) {
        overlay::ENABLED = false;
    }
+    if (options[launcher::Options::OverlayScaling].is_active() && !cfg::CONFIGURATOR_STANDALONE && !cfg_run) {
+        const auto val = options[launcher::Options::OverlayScaling].value_uint32();
+        if (10 <= val && val <= 400 && val != 100) {
+            overlay::UI_SCALE_PERCENT = options[launcher::Options::OverlayScaling].value_uint32();
+        }
+    }
    if (options[launcher::Options::DisableAudioHooks].value_bool()) {
        hooks::audio::ENABLED = false;
+        deferredlogs::defer_error_messages({
+            "audio hooks are forcibly disabled by user (-audiohookdisable)",
+            "    having hooks disabled means some required audio fixes are not being applied",
+            "    if you have audio-related crashes, you should try again after clearing this option"
+            });
    }
    if (options[launcher::Options::spice2x_DisableVolumeHook].value_bool()) {
        hooks::audio::VOLUME_HOOK_ENABLED = false;
@@ -1017,8 +1086,8 @@ int main_implementation(int argc, char *argv[]) {
        std::pair<uint32_t, uint32_t> result;
        if (parse_width_height(options[launcher::Options::spice2x_WindowSize].value_text(), result)) {
            GRAPHICS_WINDOW_SIZE = result;
-        } else {
-            log_warning("launcher", "failed to parse -windowsize");
+        } else if (!cfg_run && !cfg::CONFIGURATOR_STANDALONE) {
+            log_fatal("launcher", "failed to parse -windowsize");
        }
    }
    if (options[launcher::Options::spice2x_WindowPosition].is_active()) {
@@ -1062,6 +1131,9 @@ int main_implementation(int argc, char *argv[]) {
    if (options[launcher::Options::spice2x_DRSTransposeTouch].value_bool()) {
        games::drs::TRANSPOSE_TOUCH = true;
    }
+    if (options[launcher::Options::DRSRGBCameraHook].value_bool()) {
+        games::drs::RGB_CAMERA_HOOK = true;
+    }
    if (options[launcher::Options::spice2x_AutoCard].is_active()) {
        const auto text = options[launcher::Options::spice2x_AutoCard].value_text();
        if (text == "p1") {
@@ -1138,6 +1210,13 @@ int main_implementation(int argc, char *argv[]) {
            rawinput::RAWINPUT_REQUIRE_FOCUS = false;
        }
    }
+    if (options[launcher::Options::DDRP4IOBufferMode].is_active()) {
+        if (options[launcher::Options::DDRP4IOBufferMode].value_text() == "thread") {
+            acio::MDXF_BUFFER_FILL_MODE = acio::MDXFBufferFillMode::THREAD_MODE;
+        } else if (options[launcher::Options::DDRP4IOBufferMode].value_text() == "backfill") {
+            acio::MDXF_BUFFER_FILL_MODE = acio::MDXFBufferFillMode::BACKFILL_MODE;
+        } 
+    }

    if (options[launcher::Options::MidiAlgoVer].is_active()) {
        if (options[launcher::Options::MidiAlgoVer].value_text() == "legacy") {
@@ -1203,15 +1282,28 @@ int main_implementation(int argc, char *argv[]) {
    }

    // log
-#ifdef SPICE64
-    log_info("launcher", "SpiceTools Bootstrap (x64) (spice2x)");
-#elif SPICE32_LARGE_ADDRESS_AWARE
-    log_info("launcher", "SpiceTools Bootstrap (x32) (Large Address Aware) (spice2x)");
+#ifndef SPICE_LINUX
+    #ifdef SPICE64
+        log_info("launcher", "SpiceTools Bootstrap (x64) (spice2x)");
+    #elif SPICE32_LARGE_ADDRESS_AWARE
+        log_info("launcher", "SpiceTools Bootstrap (x32 - Large Address Aware) (spice2x)");
+    #else
+        log_info("launcher", "SpiceTools Bootstrap (x32) (spice2x)");
+    #endif
 #else
-    log_info("launcher", "SpiceTools Bootstrap (x32) (spice2x)");
+    #ifdef SPICE64
+        log_info("launcher", "SpiceTools Bootstrap (x64) (spice2x) for Linux");
+    #else
+        log_info("launcher", "SpiceTools Bootstrap (x32) (spice2x) for Linux");
+    #endif
 #endif
+
    log_info("launcher", "{}", VERSION_STRING);

+    // note: distribution of modified version of this software without providing source is GPLv3 license violation.
+    log_info("launcher", "spice2x is free & open source; if you paid money for it, you got scammed");
+    log_info("launcher", "visit https://spice2x.github.io to download the latest version for free");
+
    // log command line arguments
    std::ostringstream arguments;
    for (auto &root_option : options) {
@@ -1255,18 +1347,19 @@ int main_implementation(int argc, char *argv[]) {
    for (const auto &option : options) {
        if (option.conflicting && option.get_definition().type != OptionType::Bool) {
            conflicts += 1;
+            const auto& value = option.get_definition().sensitive ? "*****" : option.value;
            if (launcher::USE_CMD_OVERRIDE) {
                log_warning(
                    "launcher",
                    "multiple values for -{}, command line args take precedence: {}",
                    option.get_definition().name, 
-                    option.value);
+                    value);
            } else {
                log_warning(
                    "launcher",
                    "multiple values for -{}, spicecfg values take precedence: {}",
                    option.get_definition().name,
-                    option.value);
+                    value);
            }
        }
    }
@@ -1295,18 +1388,39 @@ int main_implementation(int argc, char *argv[]) {
            );
    }

+    if (launcher::signal::DISABLE && !cfg::CONFIGURATOR_STANDALONE) {
+        log_warning(
+            "launcher",
+            "WARNING - user specified -signaldisable option\n\n\n"
+            "!!!                                                              !!!\n"
+            "!!! Using -signaldisable option disables all exception handling, !!!\n"
+            "!!! which means when the game crashes it will likely just vanish !!!\n"
+            "!!! without troubleshooting information in the logs.             !!!\n"
+            "!!!                                                              !!!\n"
+            );
+    }
+
    if (options[launcher::Options::FullscreenResolution].is_active()) {
        std::pair<uint32_t, uint32_t> result;
        if (parse_width_height(options[launcher::Options::FullscreenResolution].value_text(), result)) {
            GRAPHICS_FS_CUSTOM_RESOLUTION = result;
-        } else {
-            log_warning("launcher", "failed to parse -forceres");
+        } else if (!cfg_run && !cfg::CONFIGURATOR_STANDALONE) {
+            log_fatal("launcher", "failed to parse -forceres");
+        }
+    }
+
+    if (options[launcher::Options::FullscreenSubResolution].is_active()) {
+        std::pair<uint32_t, uint32_t> result;
+        if (parse_width_height(options[launcher::Options::FullscreenSubResolution].value_text(), result)) {
+            GRAPHICS_FS_CUSTOM_RESOLUTION_SUB = result;
+        } else if (!cfg_run && !cfg::CONFIGURATOR_STANDALONE) {
+            log_fatal("launcher", "failed to parse -forceressub");
        }
    }

    // SDVXFullscreenLandscape disabled due to it messing with in-game camera angle
    // FullscreenOrientationFlip continues to live on, however.
-    if (options[launcher::Options::SDVXFullscreenLandscape].value_bool()) {
+    if (options[launcher::Options::SDVXFullscreenLandscape].value_bool() && !cfg::CONFIGURATOR_STANDALONE) {
        log_fatal("launcher", "-sdvxlandscape removed due to a camera bug in SDVX!");
    }
 //  if (options[launcher::Options::SDVXFullscreenLandscape].value_bool() && !GRAPHICS_WINDOWED) {
@@ -1321,8 +1435,15 @@ int main_implementation(int argc, char *argv[]) {
        GRAPHICS_FS_ORIENTATION_SWAP = true;
    }

+    if (games::iidx::DISABLE_CAMS.has_value() &&
+        games::iidx::DISABLE_CAMS.value() &&
+        !cfg::CONFIGURATOR_STANDALONE) {
+        log_misc("launcher", "CONNECT_CAMERA env var set to 0");
+        SetEnvironmentVariable("CONNECT_CAMERA", "0");
+    }
+
    // deleted options
-    if (options[launcher::Options::OpenKFControl].value_bool()) {
+    if (options[launcher::Options::OpenKFControl].value_bool() && !cfg::CONFIGURATOR_STANDALONE) {
        log_fatal("launcher", "KFControl has been removed from spice2x; please use an older version.");
    }
    if (options[launcher::Options::VREnable].value_bool()) {
@@ -1589,6 +1710,7 @@ int main_implementation(int argc, char *argv[]) {
                attach_io = true;
                attach_device = true;
                attach_extdev = true;
+                attach_ami2000 = true;
                attach_gitadora = true;
                break;
            }
@@ -1650,6 +1772,14 @@ int main_implementation(int argc, char *argv[]) {
                attach_io = true;
                attach_mfc = true;
                break;
+
+            // Mahjong Fight Club - 2025?
+            // they removed allinone.dll and moved i/o into system.dll
+            } else if (check_dll("system.dll") && fileutils::file_exists("data/mfc.ini")) {
+                avs::game::DLL_NAME = "system.dll";
+                attach_io = true;
+                attach_mfc = true;
+                break;
            }

            // FutureTomTom
@@ -1761,7 +1891,7 @@ int main_implementation(int argc, char *argv[]) {
            }

            // Polaris Chord
-            if (check_dll("kamunity.dll") && fileutils::dir_exists("game/svm_Data")) {
+            if (check_dll("kamunity.dll") && fileutils::file_exists("game/svm.exe")) {
                avs::game::DLL_NAME = "kamunity.dll";
                attach_io = true;
                attach_pc = true;
@@ -1794,14 +1924,16 @@ int main_implementation(int argc, char *argv[]) {
            // usage error
            if (!cfg::CONFIGURATOR_STANDALONE
            && (!CHECK_DLL_IGNORE_ARCH)) {
-                log_fatal(
+                log_warning(
                    "launcher",
                    "module auto detection failed!\n\n"
                    "This usually means one of the following:\n\n"
                    "  1. You put spice executables in the wrong place, or\n"
                    "  2. XML files in prop directory are malformed or missing, or\n"
-                    "  3. You passed in invalid options (usually, path overrides like -exec)\n\n"
+                    "  3. You passed in invalid options (do not specify -exec or -modules if you don't know what you're doing)\n\n"
                );
+
+                log_fatal("launcher", "module auto detection failed, see log.txt for troubleshooting");
            }
            break;

@@ -2149,6 +2281,11 @@ int main_implementation(int argc, char *argv[]) {
        extdev_attach();
    }

+    // ami 2000 card reader attach
+    if (attach_io || attach_ami2000) {
+        ami2000_attach();
+    }
+
    // sci unit attach
    if (attach_io || attach_sciunit) {
        sciunit_attach();
@@ -2327,8 +2464,10 @@ int main_implementation(int argc, char *argv[]) {
    // debug hook
    debughook::detach();

+#ifndef NO_SCARD
    // scard
    scard_fini();
+#endif

    // stop reader thread in case it was running
    stop_reader_thread();
@@ -2447,7 +2586,7 @@ void dump_button_bindings(std::vector<Button> *buttons) {
                button->getName(),
                button->getDeviceIdentifier(),
                button->getVKey(),
-                button->getAnalogType()
+                static_cast<uint32_t>(button->getAnalogType())
                );
        }

@@ -2460,7 +2599,7 @@ void dump_button_bindings(std::vector<Button> *buttons) {
                button->getName(),
                alt.isNaive() ? "Naive" : alt.getDeviceIdentifier(),
                alt.getVKey(),
-                alt.getAnalogType()
+                static_cast<uint32_t>(alt.getAnalogType())
                );
        }
    }
@@ -12,9 +12,11 @@
 #include "launcher/launcher.h"
 #include "util/utils.h"

-#define FOREGROUND_GREY   (8)
-#define FOREGROUND_WHITE  (FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN)
-#define FOREGROUND_YELLOW (FOREGROUND_RED | FOREGROUND_GREEN)
+#define FOREGROUND_GREY    (8)
+#define FOREGROUND_WHITE   (FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN)
+#define FOREGROUND_YELLOW  (FOREGROUND_RED | FOREGROUND_GREEN)
+#define FOREGROUND_CYAN    (FOREGROUND_GREEN | FOREGROUND_BLUE)
+#define FOREGROUND_MAGENTA (FOREGROUND_RED | FOREGROUND_BLUE)

 namespace logger {

@@ -103,9 +105,6 @@ namespace logger {
                last_style = content.second;

                switch (content.second) {
-                    case Style::DEFAULT:
-                        set_console_color(hTerminal, FOREGROUND_WHITE);
-                        break;
                    case Style::GREY:
                        set_console_color(hTerminal, FOREGROUND_GREY);
                        break;
@@ -115,6 +114,13 @@ namespace logger {
                    case Style::RED:
                        set_console_color(hTerminal, FOREGROUND_RED);
                        break;
+                    case Style::SPECIAL:
+                        set_console_color(hTerminal, FOREGROUND_CYAN);
+                        break;
+                    case Style::DEFAULT:
+                    default:
+                        set_console_color(hTerminal, FOREGROUND_WHITE);
+                        break;
                }
            }

@@ -12,7 +12,8 @@ namespace logger {
        DEFAULT = 0,
        GREY = 1,
        YELLOW = 2,
-        RED = 3
+        RED = 3,
+        SPECIAL = 4,
    };

    void start();
@@ -31,6 +31,8 @@ namespace launcher {
            GraphicsForceRefresh,
            FullscreenResolution,
            FullscreenOrientationFlip,
+            FullscreenSubResolution,
+            FullscreenSubRefreshRate,
            Graphics9On12,
            spice2x_Dx9On12,
            NoLegacy,
@@ -47,6 +49,7 @@ namespace launcher {
            SOFTID,
            VREnable,
            DisableOverlay,
+            OverlayScaling,
            spice2x_FpsAutoShow,
            spice2x_FpsOpposite,
            spice2x_SubScreenAutoShow,
@@ -55,6 +58,7 @@ namespace launcher {
            LoadIIDXModule,
            IIDXCameraOrderFlip,
            IIDXDisableCameras,
+            IIDXCabCamAccess,
            IIDXCamHook,
            IIDXCamHookRatio,
            IIDXCamHookOverride,
@@ -65,11 +69,13 @@ namespace launcher {
            IIDXBIO2FW,
            IIDXTDJMode,
            spice2x_IIDXDigitalTTSensitivity,
+            IIDXDigitalTTSocd,
            spice2x_IIDXLDJForce720p,
            spice2x_IIDXTDJSubSize,
            spice2x_IIDXLEDFontSize,
            spice2x_IIDXLEDColor,
            spice2x_IIDXLEDPos,
+            IIDXLEDBorderless,
            LoadSoundVoltexModule,
            SDVXForce720p,
            SDVXPrinterEmulation,
@@ -80,10 +86,11 @@ namespace launcher {
            SDVXPrinterJPGQuality,
            SDVXDisableCameras,
            SDVXNativeTouch,
+            spice2x_SDVXSubRedraw,
            spice2x_SDVXDigitalKnobSensitivity,
+            SDVXDigitalKnobSocd,
            spice2x_SDVXAsioDriver,
            spice2x_SDVXSubPos,
-            spice2x_SDVXSubRedraw,
            LoadDDRModule,
            DDR43Mode,
            DDRSkipCodecRegisteration,
@@ -94,6 +101,11 @@ namespace launcher {
            LoadGitaDoraModule,
            GitaDoraTwoChannelAudio,
            GitaDoraCabinetType,
+            GitaDoraArenaSingleWindow,
+            GitaDoraLefty,
+            GitaDoraWailHold,
+            GitaDoraPickAlgo,
+            GitaDoraSubOverlaySize,
            LoadJubeatModule,
            LoadReflecBeatModule,
            LoadShogikaiModule,
@@ -145,6 +157,7 @@ namespace launcher {
            EnableICCAModule,
            EnableDEVICEModule,
            EnableEXTDEVModule,
+            EnableAMI2000Module,
            EnableSCIUNITModule,
            EnableDevicePassthrough,
            ForceWinTouch,
@@ -194,6 +207,7 @@ namespace launcher {
            DisableSignalHandling,
            DisableDebugHooks,
            DisableAvsVfsDriveMountRedirection,
+            DisableAvsCache,
            OutputPEB,
            DumpSystemInfo,
            QKSArgs,
@@ -224,6 +238,7 @@ namespace launcher {
            spice2x_IIDXWindowedTDJ,
            spice2x_DRSDisableTouch,
            spice2x_DRSTransposeTouch,
+            DRSRGBCameraHook,
            spice2x_IIDXNativeTouch,
            spice2x_IIDXNoSub,
            spice2x_IIDXEmulateSubscreenKeypadTouch,
@@ -237,8 +252,10 @@ namespace launcher {
            spice2x_EnableSMXStage,
            spice2x_EnableSMXDedicab,
            IIDXRecQuality,
+            IIDXRecDisable,
            MidiAlgoVer,
            MidiNoteSustain,
+            DDRP4IOBufferMode,
            InputRequiresFocus,
            NostalgiaPoke,
            ForceBackBufferCount,
@@ -279,6 +296,6 @@ namespace launcher {
        std::string ext;
    };

-    std::string detect_bootstrap_release_code();
-    GameVersion detect_gameversion(const std::string& ea3_user);
+    std::string detect_bootstrap_release_code(const std::string& bootstrap_user);
+    GameVersion detect_gameversion(const std::string& ea3_user, const std::string& bootstrap_user);
 }
@@ -1,5 +1,6 @@
 #include "signal.h"

+#include <future>
 #include <exception>

 #include <windows.h>
@@ -174,6 +175,9 @@ static LONG WINAPI TopLevelExceptionFilter(struct _EXCEPTION_POINTERS *Exception
            log_warning("signal", "minidump creation function not available, skipping");
        }

+        // this will stall all UI threads for this process
+        show_popup_for_crash();
+
        log_fatal("signal", "end");
    }

@@ -181,21 +185,30 @@ static LONG WINAPI TopLevelExceptionFilter(struct _EXCEPTION_POINTERS *Exception
 }

 static BOOL WINAPI SetConsoleCtrlHandler_hook(PHANDLER_ROUTINE pHandlerRoutine, BOOL Add) {
-    log_misc("signal", "SetConsoleCtrlHandler hook hit");
+    static std::once_flag printed;
+    std::call_once(printed, []() {
+        log_misc("signal", "SetConsoleCtrlHandler hook hit (printing once)");
+    });

    return TRUE;
 }

 static LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter_hook(
-    LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter)
-{
-    log_info("signal", "SetUnhandledExceptionFilter hook hit");
+    LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter) {
+
+    static std::once_flag printed;
+    std::call_once(printed, []() {
+        log_info("signal", "SetUnhandledExceptionFilter hook hit (printing once)");
+    });

    return nullptr;
 }

 static PVOID WINAPI AddVectoredExceptionHandler_hook(ULONG First, PVECTORED_EXCEPTION_HANDLER Handler) {
-    log_info("signal", "AddVectoredExceptionHandler hook hit");
+    static std::once_flag printed;
+    std::call_once(printed, []() {
+        log_info("signal", "AddVectoredExceptionHandler hook hit (printing once)");
+    });

    return launcher::signal::USE_VEH_WORKAROUND ? INVALID_HANDLE_VALUE : nullptr;
 }