From 586a40df5c02e01ff2b1914447f025ddf483a7c9 Mon Sep 17 00:00:00 2001
From: lvjunjie <lvjunjie@abc.com>
Date: Mon, 7 Sep 2026 17:03:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(numerical):=20=E6=8D=95=E8=8E=B7=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E8=AE=BF=E9=97=AE=E8=BF=9D=E4=BE=8B=20-=20=E4=B8=BA?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=20DLL=20=E8=B0=83=E7=94=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E8=BF=9D=E4=BE=8B=E6=8D=95=E8=8E=B7=EF=BC=8C?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=B6=E8=BF=94=E5=9B=9E=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=20-=20=E5=A4=B1=E8=B4=A5=E6=97=B6=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E4=B8=B4=E6=97=B6=E7=BD=91=E6=A0=BC=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=B9=B6=E9=87=8A=E6=94=BE=20DLL=EF=BC=8C=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E5=B7=B2=E6=9C=89=E6=88=90=E6=9E=9C=20-=20=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=20LM=20=E6=8B=9F=E5=90=88=E8=AF=8A=E6=96=AD=E8=BD=A8=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nmCalculation/nmCalculationAutoFitLM.cpp  |  6 +--
 .../nmCalculation/nmCalculationPebiGrid.cpp   | 46 +++++++++++++++----
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/Src/nmNum/nmCalculation/nmCalculationAutoFitLM.cpp b/Src/nmNum/nmCalculation/nmCalculationAutoFitLM.cpp
index 8422c13..48f40da 100644
--- a/Src/nmNum/nmCalculation/nmCalculationAutoFitLM.cpp
+++ b/Src/nmNum/nmCalculation/nmCalculationAutoFitLM.cpp
@@ -26,11 +26,7 @@
 #define DEBUG_OUT(msg) OutputDebugStringA(QString("[AutoFitLM] %1\n").arg(msg).toLocal8Bit().data())
 #endif
 
-#ifdef QT_NO_DEBUG
-static const bool kAutoFitDiagnosticTraceEnabled = false;
-#else
 static const bool kAutoFitDiagnosticTraceEnabled = true;
-#endif
 
 static inline bool isFiniteNumber(double value)
 {
@@ -687,7 +683,7 @@ void nmCalculationAutoFitLM::initializeTraceFile()
         return;
     }
 
-    // 诊断轨迹仅在 Debug 构建中启用，并与源码、安装目录完全分离。
+    // 诊断轨迹在所有构建中启用，并与源码、安装目录完全分离。
     if(m_traceRunId.isEmpty()) {
         m_traceRunId = QString("%1-%2")
             .arg(QString::number(QCoreApplication::applicationPid()))
diff --git a/Src/nmNum/nmCalculation/nmCalculationPebiGrid.cpp b/Src/nmNum/nmCalculation/nmCalculationPebiGrid.cpp
index added2b..7b50c22 100644
--- a/Src/nmNum/nmCalculation/nmCalculationPebiGrid.cpp
+++ b/Src/nmNum/nmCalculation/nmCalculationPebiGrid.cpp
@@ -36,6 +36,36 @@ namespace {
 
 const int CONST_PVT_POINT_COUNT = 200;
 
+typedef void (*HX_NWTM_GRID_Func)(
+        HX_NWTM_GRID_OUTPUT1&,
+        HX_NWTM_GRID_OUTPUT2&,
+        const HX_NWTM_GRID_INPUT&,
+        std::string);
+
+__declspec(noinline) void invokePebiGridDll(
+        HX_NWTM_GRID_Func pfnGenerateGrid,
+        const nmPebiGridInputSnapshot& oSnapshot,
+        nmPebiGridResult& oResult)
+{
+    // 单独调用网格 DLL，避免字符串参数的构造、析构与异常捕获放在同一函数中导致编译错误。
+    pfnGenerateGrid(oResult.m_oGridOutput1, oResult.m_oGridOutput2,
+                    oSnapshot.m_oGridInput, oSnapshot.m_sLicensePath.toStdString());
+}
+
+bool invokePebiGridDllGuarded(HX_NWTM_GRID_Func pfnGenerateGrid,
+                              const nmPebiGridInputSnapshot& oSnapshot,
+                              nmPebiGridResult& oResult)
+{
+    // 仅拦截已复现的访问违例；普通 C++ 异常继续交给外层 catch，堆损坏不在此恢复。
+    __try {
+        invokePebiGridDll(pfnGenerateGrid, oSnapshot, oResult);
+    } __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION
+               ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) {
+        return false;
+    }
+    return true;
+}
+
 // 该锁只保护 PEBI 网格单例缓存；HX_NWTM.dll 的所有入口由独立进程级锁保护。
 // 保留递归锁以兼容可能在持锁网格入口中调用缓存查询的旧代码路径。
 QMutex s_oPebiGridMutex(QMutex::Recursive);
@@ -1660,11 +1690,6 @@ bool nmCalculationPebiGrid::calculateSnapshot(
         return false;
     }
 
-    typedef void (*HX_NWTM_GRID_Func)(
-            HX_NWTM_GRID_OUTPUT1&,
-            HX_NWTM_GRID_OUTPUT2&,
-            const HX_NWTM_GRID_INPUT&,
-            std::string);
     typedef int (*GetIntValueFunc)();
 
     HX_NWTM_GRID_Func pfnGenerateGrid =
@@ -1687,10 +1712,13 @@ bool nmCalculationPebiGrid::calculateSnapshot(
         }
 
         // 第二步：DLL 输出先落在局部结果，失败时不清空单例缓存和已有成果。
-        pfnGenerateGrid(oResult.m_oGridOutput1,
-                        oResult.m_oGridOutput2,
-                        oSnapshot.m_oGridInput,
-                        oSnapshot.m_sLicensePath.toStdString());
+        if(!invokePebiGridDllGuarded(pfnGenerateGrid, oSnapshot, oResult)) {
+            // 本轮结果不再用于显示或求解，沿用现有失败通知保留旧成果。
+            nmCalculationUtils::cleanupPebiGridDebugFiles();
+            FreeLibrary(hGridModule);
+            hGridModule = nullptr;
+            return false;
+        }
         nmCalculationUtils::cleanupPebiGridDebugFiles();
         oResult.m_nPebiCount = pfnGetPebiCount();