diff --git a/src/Build.cmd b/src/Build.cmd
index ae3e46f..0a9056e 100644
--- a/src/Build.cmd
+++ b/src/Build.cmd
@@ -27,7 +27,7 @@ goto:eof
cl /O1 /Os /Oi /GS- /arch:IA32 /Z7 /MT /Fo"objs\\%Platform%\\%1" /Zl /c /D "NDEBUG" /D "YY_Thunks_Support_Version=%2" "%~dp0Thunks\YY_Thunks.cpp"
::进行函数名称进行修正 __imp__%s_%u -> __imp__%s@%u
-LibMaker.exe FixObj "%~dp0..\\objs\\%Platform%\\%1" /WeakExternFix:__security_cookie=%PointType% /WeakExternFix:__YY_Thunks_Process_Terminating=4
+LibMaker.exe FixObj "%~dp0..\\objs\\%Platform%\\%1" /WeakExternFix:__security_cookie=%PointType% /WeakExternFix:__YY_Thunks_Process_Terminating=4 /WeakExternFix:__acrt_atexit_table=%PointType%
LibMaker.exe AppendWeak /MACHINE:%Platform% /DEF:"%~dp0def\\%Platform%\\PSAPI2Kernel32.def" /OUT:"%~dp0..\\objs\\%Platform%\\%1"
diff --git a/src/Thunks/YY_Thunks.h b/src/Thunks/YY_Thunks.h
index 2b187dc..8d724a5 100644
--- a/src/Thunks/YY_Thunks.h
+++ b/src/Thunks/YY_Thunks.h
@@ -396,8 +396,16 @@ static void* __fastcall try_get_function(
#undef _APPLY
+static bool g_bUninitialize/* = false*/;
+
static void __cdecl __YY_uninitialize_winapi_thunks()
{
+ // 鍊煎弽鍒濆鍖栦竴娆
+ if (g_bUninitialize)
+ return;
+
+ g_bUninitialize = true;
+
//褰揇LL琚己琛屽嵏杞芥椂锛屾垜浠粈涔堥兘涓嶅仛銆
if (auto pRtlDllShutdownInProgress = (decltype(RtlDllShutdownInProgress)*)GetProcAddress(try_get_module_ntdll(), "RtlDllShutdownInProgress"))
{
@@ -466,19 +474,37 @@ static int __cdecl _YY_initialize_winapi_thunks()
return 0;
}
+// 澶栭儴weak绗﹀彿锛岀敤浜庡垽鏂綋鍓嶆槸鍚﹂潤鎬
+EXTERN_C extern void* __acrt_atexit_table;
+
static int __cdecl __YY_initialize_winapi_thunks()
{
_YY_initialize_winapi_thunks();
- //鍙湪鑺傜偣浣嶇疆鎻掑叆 atexit 娴佺▼锛岄伩鍏岰RT杩樻病瀹屽叏鍒濆鍖栧ソ鍑虹幇闂銆
- atexit(__YY_uninitialize_winapi_thunks);
+ // 濡傛灉 == null锛岄偅涔堟湁2绉嶆儏鍐碉細
+ // 1. 闈濽CRT锛屾瘮濡2008锛孷C6锛岃繖鏃讹紝璋冪敤 atexit鏄畨鍏ㄧ殑锛屽洜涓篴texit鍦 XIA鍒濆鍖栧畬鎴愪簡銆
+ // 2. UCRT 骞朵笖澶勪簬MD鐘舵併傝繖鏃 atexit鍒濆鍖 浼氭彁涓 XIA锛岃繖鏃朵篃鏄病鏈夐棶棰樼殑銆
+ // 濡傛灉 != null锛
+ // 閭ｄ箞璇存槑UCRT澶勪簬闈欐佺姸鎬侊紙CRT DLL鍏跺疄涔熸槸闈欐佺殑涓绉嶏級
+ // 杩欐椂锛孹TY鏄彲浠ユ纭墽琛岀殑锛岃繖鏃跺氨涓嶇敤璋冪敤atexit浜
+ // 鐢变簬XTY鏅氫簬onexit锛屾墍浠ュ畠鏄彲闈犵殑銆
+ if (__acrt_atexit_table == nullptr)
+ {
+ atexit(__YY_uninitialize_winapi_thunks);
+ }
return 0;
}
typedef int(__cdecl* _PIFV)(void);
+typedef void(__cdecl* _PVFV)(void);
-#pragma section(".CRT$XID", long, read) // CRT C Initializers
+// CRT C Initializers
+#pragma section(".CRT$XID", long, read)
+// CRT C Terminators锛堜粎绋嶅井涔嬪悗浜嶺TZ锛夛紝杩欐槸鏁呮剰鐨勩
+// YY-Thunks灞炰簬API搴曞眰鐞嗗簲灏藉彲鑳界殑婊炲悗锛屼笖鍙嶅垵濮嬪寲宸ヤ綔涓嶄緷璧栦笌CRT
+#pragma section(".CRT$XTY", long, read)
__declspec(allocate(".CRT$XID")) static _PIFV ___Initialization = __YY_initialize_winapi_thunks;
+__declspec(allocate(".CRT$XTY")) static _PVFV ___Uninitialization = __YY_uninitialize_winapi_thunks;
diff --git a/src/YY-Thunks.UnitTest/YY-Thunks.UnitTest.vcxproj b/src/YY-Thunks.UnitTest/YY-Thunks.UnitTest.vcxproj
index 92232ec..bf3d61e 100644
--- a/src/YY-Thunks.UnitTest/YY-Thunks.UnitTest.vcxproj
+++ b/src/YY-Thunks.UnitTest/YY-Thunks.UnitTest.vcxproj
@@ -116,7 +116,7 @@
true
pch.h
Use
- MultiThreadedDebug
+ MultiThreadedDebugDLL
false
@@ -132,7 +132,7 @@
true
pch.h
Use
- MultiThreadedDebug
+ MultiThreadedDebugDLL
false
@@ -176,6 +176,12 @@
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
NotUsing
diff --git a/src/YY-Thunks.UnitTest/YY-Thunks.UnitTest.vcxproj.filters b/src/YY-Thunks.UnitTest/YY-Thunks.UnitTest.vcxproj.filters
index 085a225..493974a 100644
--- a/src/YY-Thunks.UnitTest/YY-Thunks.UnitTest.vcxproj.filters
+++ b/src/YY-Thunks.UnitTest/YY-Thunks.UnitTest.vcxproj.filters
@@ -66,6 +66,9 @@
婧愭枃浠禱UnitTest
+
+ 婧愭枃浠
+
diff --git a/src/YY-Thunks.UnitTest/pch.cpp b/src/YY-Thunks.UnitTest/pch.cpp
index 8799ee5..781d282 100644
--- a/src/YY-Thunks.UnitTest/pch.cpp
+++ b/src/YY-Thunks.UnitTest/pch.cpp
@@ -2,6 +2,4 @@
#include "pch.h"
-// 褰撲娇鐢ㄩ缂栬瘧鐨勫ご鏃讹紝闇瑕佷娇鐢ㄦ婧愭枃浠讹紝缂栬瘧鎵嶈兘鎴愬姛銆
-
-EXTERN_C BOOL __YY_Thunks_Process_Terminating = 0;
\ No newline at end of file
+// 褰撲娇鐢ㄩ缂栬瘧鐨勫ご鏃讹紝闇瑕佷娇鐢ㄦ婧愭枃浠讹紝缂栬瘧鎵嶈兘鎴愬姛銆
\ No newline at end of file
diff --git a/src/YY-Thunks.UnitTest/weak.c b/src/YY-Thunks.UnitTest/weak.c
new file mode 100644
index 0000000..d5e8855
--- /dev/null
+++ b/src/YY-Thunks.UnitTest/weak.c
@@ -0,0 +1,4 @@
+锘
+const int __YY_Thunks_Process_Terminating;
+
+const void* __acrt_atexit_table;