Harden Win10 GUI startup logging path

Author: secup

include/ultra/logging.hpp

@@ -3,9 +3,14 @@
 #include <cstdio>
 #include <cstdarg>
 #include <chrono>
-#include <mutex>
 #ifdef _WIN32
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <io.h>
+#include <windows.h>
+#else
+#include <mutex>
 #endif
 
 // Windows headers define ERROR as a macro - undefine it
@@ -20,7 +25,11 @@ inline auto g_log_start_time = std::chrono::steady_clock::now();
 
 // Log output file (nullptr = stderr)
 inline FILE* g_log_file = nullptr;
+#ifdef _WIN32
+inline SRWLOCK g_log_lock = SRWLOCK_INIT;
+#else
 inline std::mutex g_log_mutex;
+#endif
 
 // Thread-local station tag for multi-station debug (e.g. "ALPHA" or "BRAVO")
 inline thread_local const char* g_log_station_tag = nullptr;
@@ -63,23 +72,27 @@ inline void setLogLevel(LogLevel level) {
 
 // Set log output file (call with nullptr to use stderr)
 inline void setLogFile(FILE* file) {
+#ifdef _WIN32
+    AcquireSRWLockExclusive(&g_log_lock);
+    g_log_file = file;
+    ReleaseSRWLockExclusive(&g_log_lock);
+#else
     std::lock_guard<std::mutex> lock(g_log_mutex);
     g_log_file = file;
+#endif
 }
 
 // Core logging function
 inline void log(LogLevel level, const char* category, const char* format, ...) {
     if (level > g_log_level) return;
 
 #ifdef _WIN32
-    // During early GUI startup on some Win10 systems, touching the shared
-    // logging mutex/CRT stream path can crash. If no explicit file sink is set,
-    // skip logging entirely.
-    FILE* out = g_log_file;
+    AcquireSRWLockShared(&g_log_lock);
+    FILE* out = g_log_file;  // No stderr fallback on GUI subsystem builds.
     if (!out) {
+        ReleaseSRWLockShared(&g_log_lock);
         return;
     }
-    std::lock_guard<std::mutex> lock(g_log_mutex);
 #else
     std::lock_guard<std::mutex> lock(g_log_mutex);
     FILE* out = g_log_file ? g_log_file : stderr;
@@ -114,6 +127,9 @@ inline void log(LogLevel level, const char* category, const char* format, ...) {
 
     fprintf(out, "\n");
     fflush(out);
+#ifdef _WIN32
+    ReleaseSRWLockShared(&g_log_lock);
+#endif
 }
 
 // Convenience macros - these compile to nothing when ULTRA_LOG_DISABLE is defined

src/gui/app.cpp

@@ -36,6 +36,53 @@ static void initLog() {
     if (g_log_initialized) return;
     g_log_initialized = true;
 
+#ifdef _WIN32
+    auto tryOpenLog = [](const char* path) -> FILE* {
+        if (!path || path[0] == '\0') {
+            return nullptr;
+        }
+
+        const char* slash_back = std::strrchr(path, '\\');
+        const char* slash_fwd = std::strrchr(path, '/');
+        const char* sep = slash_back;
+        if (!sep || (slash_fwd && slash_fwd > sep)) {
+            sep = slash_fwd;
+        }
+        if (sep) {
+            std::string dir(path, static_cast<size_t>(sep - path));
+            if (!dir.empty()) {
+                MKDIR(dir.c_str());
+            }
+        }
+
+        return std::fopen(path, "w");
+    };
+
+    if (!g_gui_log_file) {
+        g_gui_log_file = tryOpenLog("logs\\gui.log");
+        if (g_gui_log_file) {
+            g_gui_log_path = "logs\\gui.log";
+        }
+    }
+
+    if (!g_gui_log_file) {
+        g_gui_log_file = tryOpenLog("gui.log");
+        if (g_gui_log_file) {
+            g_gui_log_path = "gui.log";
+        }
+    }
+
+    if (!g_gui_log_file) {
+        const char* temp = std::getenv("TEMP");
+        if (temp && temp[0] != '\0') {
+            std::string temp_path = std::string(temp) + "\\ProjectUltra\\gui.log";
+            g_gui_log_file = tryOpenLog(temp_path.c_str());
+            if (g_gui_log_file) {
+                g_gui_log_path = temp_path;
+            }
+        }
+    }
+#else
     auto tryOpenLog = [](const std::filesystem::path& path) -> FILE* {
         std::error_code ec;
         if (!path.parent_path().empty()) {
@@ -47,16 +94,10 @@ static void initLog() {
     std::vector<std::filesystem::path> candidates;
     candidates.emplace_back(std::filesystem::path("logs") / "gui.log");
     candidates.emplace_back("gui.log");
-#ifdef _WIN32
-    if (const char* temp = std::getenv("TEMP")) {
-        candidates.emplace_back(std::filesystem::path(temp) / "ProjectUltra" / "gui.log");
-    }
-#else
     if (const char* temp = std::getenv("TMPDIR")) {
         candidates.emplace_back(std::filesystem::path(temp) / "projectultra_gui.log");
     }
     candidates.emplace_back("/tmp/projectultra_gui.log");
-#endif
 
     for (const auto& path : candidates) {
         g_gui_log_file = tryOpenLog(path);
@@ -65,6 +106,7 @@ static void initLog() {
             break;
         }
     }
+#endif
 
     if (g_gui_log_file) {
         // Redirect ALL logging (modem, protocol, etc.) to this file
@@ -186,11 +228,18 @@ static const char* adaptationDirection(Modulation from_mod, CodeRate from_rate,
 App::App() : App(Options{}) {}
 
 App::App(const Options& opts) : options_(opts), sim_ui_visible_(opts.enable_sim) {
+    ultra::gui::startupTrace("App", "ctor-body-enter");
+    ultra::gui::startupTrace("App", "gui-log-enter");
     guiLog("=== GUI Started ===");
+    ultra::gui::startupTrace("App", "gui-log-exit");
     // Load persistent settings
+    ultra::gui::startupTrace("App", "settings-load-enter");
     settings_.load();
+    ultra::gui::startupTrace("App", "settings-load-exit");
 
+    ultra::gui::startupTrace("App", "presets-balanced-enter");
     config_ = presets::balanced();
+    ultra::gui::startupTrace("App", "presets-balanced-exit");
 
     if (!options_.disable_waterfall) {
         ultra::gui::startupTrace("App", "waterfall-create-begin");