Fea #83, 为.NET Naitve AOT DLL自动修正Tls

Chuyu-Team · May 25, 2024 · 7485927 · 7485927
1 parent 67d8cfc
commit 7485927
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/NuGet/build/net8.0-windows7.0/YY-Thunks.targets b/NuGet/build/net8.0-windows7.0/YY-Thunks.targets
@@ -21,6 +21,10 @@
     </PropertyGroup>
     <ItemGroup Condition="'$(YY_Thunks_File)' != ''">
       <LinkerArg Include="$(MSBuildThisFileDirectory)..\native\objs\$(YY_Thunks_File)" />
+      <!--为早期版本的系统增强Tls支持，如果不使用DllMainCRTStartupForYY_Thunks，使用thread_local时可能发生崩溃。-->
+      <LinkerArg Condition="'$(NativeLib)' == 'Shared' and '$(OutputType)' == 'Library' and '$(YY_Thunks_File)' == 'x64\YY_Thunks_for_WinXP.obj'" Include="/ENTRY:DllMainCRTStartupForYY_Thunks" />
+      <LinkerArg Condition="'$(NativeLib)' == 'Shared' and '$(OutputType)' == 'Library' and '$(YY_Thunks_File)' == 'x86\YY_Thunks_for_WinXP.obj'" Include="/ENTRY:DllMainCRTStartupForYY_Thunks" />
+      <LinkerArg Condition="'$(NativeLib)' == 'Shared' and '$(OutputType)' == 'Library' and '$(YY_Thunks_File)' == 'x86\YY_Thunks_for_Win2K.obj'" Include="/ENTRY:DllMainCRTStartupForYY_Thunks" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/Readme.ocs.md → Readme.osc.md b/Readme.ocs.md → Readme.osc.md
diff --git a/src/YY_Thunks.sln b/src/YY_Thunks.sln
@@ -7,8 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YY-Thunks.UnitTest", "YY-Th
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D2258BCB-A66B-4928-9CF9-23D705B72DBD}"
 	ProjectSection(SolutionItems) = preProject
-		..\ReadMe.md = ..\ReadMe.md
-		..\Readme.ocs.md = ..\Readme.ocs.md
+		..\Readme.md = ..\Readme.md
+		..\Readme.osc.md = ..\Readme.osc.md
 		..\ThunksList.md = ..\ThunksList.md
 	EndProjectSection
 EndProject