fix: symbol conflict with ntdll/ntoskrnl

MiroKaku · Jul 11, 2024 · 7c1c93f · 7c1c93f
1 parent 1c3b15a
commit 7c1c93f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/Musa.Core.NuGet/Musa.Core.Config.targets b/Musa.Core.NuGet/Musa.Core.Config.targets
@@ -2,12 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemDefinitionGroup Condition="('$(MusaCoreOnlyHeader)'=='') Or ('$(MusaCoreOnlyHeader)'=='false')">
+
     <Link Condition="('$(IsKernelModeToolset)'=='') Or ('$(IsKernelModeToolset)'=='false')">
-      <AdditionalDependencies>Musa.Core.StaticLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Musa.Core.SystemCall.Stubs.obj;Musa.Core.StaticLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+
     <Link Condition="'$(IsKernelModeToolset)'=='true'">
-      <AdditionalDependencies>Musa.Core.StaticLibraryForDriver.lib;Cng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/INTEGRITYCHECK %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>Musa.Core.SystemCallForDriver.Stubs.obj;Musa.Core.StaticLibraryForDriver.lib;Cng.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+
   </ItemDefinitionGroup>
 
 </Project>
diff --git a/Musa.Core.StaticLibrary/Musa.Core.StaticLibrary.vcxproj b/Musa.Core.StaticLibrary/Musa.Core.StaticLibrary.vcxproj
@@ -35,6 +35,7 @@ xcopy /v /f /d /y "$(SolutionDir)\Musa.Core.NuGet\Musa.Core.Config.props" "$(Sol
 xcopy /v /f /d /y "$(SolutionDir)\Musa.Core.NuGet\Musa.Core.Config.targets" "$(SolutionDir)\Publish\config\"
 xcopy /v /f /d /y "$(TargetDir)$(TargetName).lib" "$(SolutionDir)\Publish\lib\$(PlatformShortName)\$(Configuration)\"
 xcopy /v /f /d /y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)\Publish\lib\$(PlatformShortName)\$(Configuration)\"
+xcopy /v /f /d /y "$(IntDirFullPath)Musa.Core.SystemCall.Stubs.obj" "$(SolutionDir)\Publish\lib\$(PlatformShortName)\$(Configuration)\"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>

diff --git a/Musa.Core.StaticLibraryForDriver/Musa.Core.StaticLibraryForDriver.vcxproj b/Musa.Core.StaticLibraryForDriver/Musa.Core.StaticLibraryForDriver.vcxproj
@@ -37,6 +37,7 @@ xcopy /v /f /d /y "$(SolutionDir)\Musa.Core.NuGet\Musa.Core.Config.props" "$(Sol
 xcopy /v /f /d /y "$(SolutionDir)\Musa.Core.NuGet\Musa.Core.Config.targets" "$(SolutionDir)\Publish\config\"
 xcopy /v /f /d /y "$(TargetDir)$(TargetName).lib" "$(SolutionDir)\Publish\lib\$(PlatformShortName)\$(Configuration)\"
 xcopy /v /f /d /y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)\Publish\lib\$(PlatformShortName)\$(Configuration)\"
+echo F | xcopy /v /f /d /y "$(IntDirFullPath)Musa.Core.SystemCall.Stubs.obj" "$(SolutionDir)\Publish\lib\$(PlatformShortName)\$(Configuration)\Musa.Core.SystemCallForDriver.Stubs.obj"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>

diff --git a/Musa.Core.Test/Musa.Core.Test.vcxproj b/Musa.Core.Test/Musa.Core.Test.vcxproj
@@ -26,12 +26,6 @@
     <IntDir>$(MileProjectObjectsPath)$(Configuration)\$(MSBuildProjectName)\$(Platform)\</IntDir>
     <GeneratedFilesDir>$(IntDir)Generated Files\</GeneratedFilesDir>
   </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalLibraryDirectories>$(OutDirFullPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Musa.Core.StaticLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <Manifest Include="Musa.Core.Test.manifest" />
   </ItemGroup>
@@ -43,5 +37,10 @@
       <Version>1.0.0</Version>
     </PackageReference>
   </ItemGroup>
+  <PropertyGroup>
+    <MusaCoreOnlyHeader>false</MusaCoreOnlyHeader>
+  </PropertyGroup>
+  <Import Project="..\Publish\config\Musa.Core.Config.props" />
+  <Import Project="..\Publish\config\Musa.Core.Config.targets" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>
diff --git a/Musa.Core.TestForDriver/Musa.Core.TestForDriver.vcxproj b/Musa.Core.TestForDriver/Musa.Core.TestForDriver.vcxproj
@@ -25,13 +25,6 @@
     <IntDir>$(MileProjectObjectsPath)$(Configuration)\$(MSBuildProjectName)\$(Platform)\</IntDir>
     <GeneratedFilesDir>$(IntDir)Generated Files\</GeneratedFilesDir>
   </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalOptions>/INTEGRITYCHECK %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalLibraryDirectories>$(OutDirFullPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Musa.Core.StaticLibraryForDriver.lib;Cng.lib%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
   </ItemGroup>
@@ -46,5 +39,10 @@
       <Version>1.0.0</Version>
     </PackageReference>
   </ItemGroup>
+  <PropertyGroup>
+    <MusaCoreOnlyHeader>false</MusaCoreOnlyHeader>
+  </PropertyGroup>
+  <Import Project="..\Publish\config\Musa.Core.Config.props" />
+  <Import Project="..\Publish\config\Musa.Core.Config.targets" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>