From a55963841973ae4fc31122c49349fe6aacc7cdee Mon Sep 17 00:00:00 2001
From: YarilaFox <102650794+YarilaFox@users.noreply.github.com>
Date: Tue, 20 Oct 2026 17:57:10 +0500
Subject: [PATCH] M7: avoid Windows GNU UIA crash

---
 .cargo/config.toml        | 7 +++++++
 apps/figcraft/build.rs    | 1 +
 apps/figcraft/src/main.rs | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index acebfe9f..8abc94d7 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -3,5 +3,12 @@
 [env]
 CRAFT_FONTS_DIR = { value = "../craft-fonts", relative = true }
 
+# The Windows UI Automation adapter can be asked about a node that disappeared in the
+# same frame. On MinGW, converting that HRESULT through windows-result's thread COM
+# error-info path has crashed in GetErrorInfo. Keep the HRESULT without that extra
+# COM lookup; this leaves the AccessKit tree and screen-reader support enabled.
+[target.x86_64-pc-windows-gnu]
+rustflags = ["--cfg=windows_slim_errors"]
+
 [alias]
 xtask = "run -q -p xtask --"
diff --git a/apps/figcraft/build.rs b/apps/figcraft/build.rs
index 64f97835..6ed8a047 100644
--- a/apps/figcraft/build.rs
+++ b/apps/figcraft/build.rs
@@ -1,6 +1,7 @@
 //! Windows: embed the icon and version info in figcraft.exe and size its main thread's stack
 //! (no-op elsewhere).
 fn main() {
+    println!("cargo::rustc-check-cfg=cfg(windows_slim_errors)");
     println!("cargo::rerun-if-changed=../../assets/app-icon/figcraft.ico");
     let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
     if target_os == "windows" {
diff --git a/apps/figcraft/src/main.rs b/apps/figcraft/src/main.rs
index 00856c5d..887db45a 100644
--- a/apps/figcraft/src/main.rs
+++ b/apps/figcraft/src/main.rs
@@ -15,6 +15,11 @@
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
 #![cfg_attr(all(target_os = "windows", not(debug_assertions)), windows_subsystem = "windows")]
 
+// A missing Windows GNU flag re-enables the COM error-info lookup that crashes while AccessKit
+// reports a removed UI Automation node. Catch build configurations that drop the workaround.
+#[cfg(all(target_os = "windows", target_env = "gnu", not(windows_slim_errors)))]
+compile_error!("Windows GNU builds must set windows_slim_errors to keep UI Automation responsive");
+
 #[cfg(target_os = "macos")]
 mod apple_events;
 mod args;