Bug #97,解决obj模式且SDK低于10时链接失败

Chuyu-Team · Jun 15, 2024 · 45d7751 · 45d7751
1 parent d905632
commit 45d7751
Show file tree

Hide file tree

Showing 19 changed files with 192 additions and 58 deletions.
diff --git a/.github/workflows/Build&Test.yml b/.github/workflows/Build&Test.yml
@@ -17,7 +17,9 @@ jobs:
           # Procdump工具，用于单元测试崩溃诊断
           Invoke-WebRequest -Uri https://download.sysinternals.com/files/Procdump.zip  -OutFile Bin\Procdump.zip
           &7z e Bin\Procdump.zip "-o$Env:GITHUB_WORKSPACE\Bin"
-
+          
+          Invoke-WebRequest -Uri https://github.com/mingkuang-Chuyu/Visual_Studio_Platform_Toolset/releases/download/v1.0.2/Visual.Studio.2008.Platform.Toolset.v1.0.2.7z  -OutFile Bin\Visual.Studio.2008.Platform.Toolset.v1.0.2.7z
+          &7z x Bin\Visual.Studio.2008.Platform.Toolset.v1.0.2.7z "-o$Env:GITHUB_WORKSPACE\Bin"
 
           Invoke-WebRequest -Uri https://github.com/Chuyu-Team/LibMaker/releases/download/v1.0.3/LibMaker.exe -OutFile Bin\LibMaker.exe
           Invoke-WebRequest -Uri https://github.com/Chuyu-Team/YY-Thunks/releases/download/v1.0.2.8/MinimumRequiredVersionHelper.exe -OutFile Bin\MinimumRequiredVersionHelper.exe
@@ -118,6 +120,8 @@ jobs:
           # MSBuild、PROCDUMP_PATH目录更新到 Path
           $Env:Path="$Env:GITHUB_WORKSPACE\Bin;${{env.MSBuildBinPath}};${{env.LatestVisualStudioRoot}}\Common7\IDE\CommonExtensions\Microsoft\TestWindow;" + $Env:Path
           
+          $Env:WindowsSdkDir_60A_TestPath="$Env:GITHUB_WORKSPACE\Bin\Program Files\Microsoft SDKs\Windows\v6.0A"
+
           # 编译单元测试项目
           &msbuild src\YY-Thunks.UnitTest\YY-Thunks.UnitTest.vcxproj "-p:Configuration=Release;Platform=Win32;SolutionDir=$Env:GITHUB_WORKSPACE\src\\"
           if($lastexitcode -ne 0)
@@ -195,6 +199,8 @@ jobs:
             src\x64\Release\YY-Thunks.UnitTest.dll
             src\x64\Release\YY-Thunks.UnitTest.pdb
             src\x64\Release\*.log
+            src\YY-Thunks.UnitTest\TestProject\Example\Win32\Static
+            src\YY-Thunks.UnitTest\TestProject\Example\x64\Static
 
     - uses: xresloader/upload-to-github-release@v1
       env:

diff --git a/.gitignore b/.gitignore
@@ -355,3 +355,5 @@ MigrationBackup/
 /src/Thunks/YY_Thunks_List.hpp
 /objs
 /Lib
+/src/YY-Thunks.UnitTest/TestProject/Example/Win32/Static
+/src/YY-Thunks.UnitTest/TestProject/Example/x64/Static
diff --git a/ThunksList.md b/ThunksList.md
@@ -225,7 +225,6 @@
 | JetAttachDatabaseWithStreamingA            | 调用JetAttachDatabaseWithStreaming。
 | JetBackupA                                 | 调用JetBackup。
 | JetBackupInstanceA                         | 调用JetBackupInstance。
-| JetBeginDatabaseIncrementalReseedA         | 调用JetBeginDatabaseIncrementalReseed。
 | JetBeginSessionA                           | 调用JetBeginSession。
 | JetCompactA                                | 调用JetCompact。
 | JetConvertDDLA                             | 调用JetConvertDDL。
@@ -269,7 +268,6 @@
 | JetGetTableInfoA                           | 调用JetGetTableInfo。
 | JetGetTruncateLogInfoInstanceA             | 调用JetGetTruncateLogInfoInstance。
 | JetInit3A                                  | 调用JetInit3。
-| JetInit4A                                  | 调用JetInit4。
 | JetOpenDatabaseA                           | 调用JetOpenDatabase。
 | JetOpenFileA                               | 调用JetOpenFile。
 | JetOpenFileInstanceA                       | 调用JetOpenFileInstance。

diff --git a/src/Thunks/YY_Thunks.cpp b/src/Thunks/YY_Thunks.cpp
@@ -188,6 +188,9 @@ RtlCutoverTimeToSystemTime(
 
 #ifndef __FALLBACK_PREFIX
 #define __FALLBACK_PREFIX
+#define __YY_Thunks_libs 0
+#else
+#define __YY_Thunks_libs 1
 #endif
 
 //展开函数的所有的 声明 以及 try_get_ 函数

diff --git a/src/Thunks/api-ms-win-core-path.hpp b/src/Thunks/api-ms-win-core-path.hpp
@@ -2,7 +2,7 @@
 #define PATHCCH_NO_DEPRECATE
 #include <pathcch.h>
 
-#if (YY_Thunks_Support_Version < NTDDI_WIN8) && !defined(__Comment_Lib_pathcch)
+#if (YY_Thunks_Support_Version < NTDDI_WIN8) && __YY_Thunks_libs && !defined(__Comment_Lib_pathcch)
 #define __Comment_Lib_pathcch
 #pragma comment(lib, "Pathcch.lib")
 #endif

diff --git a/src/Thunks/api-ms-win-core-winrt.hpp b/src/Thunks/api-ms-win-core-winrt.hpp
@@ -1,4 +1,11 @@
-#include <roapi.h>
+#if (YY_Thunks_Support_Version < NTDDI_WIN8)
+#include <roapi.h>
+#endif
+
+#if (YY_Thunks_Support_Version < NTDDI_WIN8) && !defined(__Comment_Lib_ole32)
+#define __Comment_Lib_ole32
+#pragma comment(lib, "Ole32.lib")
+#endif
 
 namespace YY::Thunks
 {

diff --git a/src/Thunks/bcrypt.hpp b/src/Thunks/bcrypt.hpp
@@ -8,7 +8,7 @@
 #pragma comment(lib, "Advapi32.lib")
 #endif
 
-#if (YY_Thunks_Support_Version < NTDDI_WIN7) && !defined(__Comment_Lib_bcrypt)
+#if (YY_Thunks_Support_Version < NTDDI_WIN7) && (YY_Thunks_Support_Version >= NTDDI_WIN6 || __YY_Thunks_libs) && !defined(__Comment_Lib_bcrypt)
 #define __Comment_Lib_bcrypt
 #pragma comment(lib, "bcrypt.lib")
 #endif

diff --git a/src/Thunks/bluetoothapis.hpp b/src/Thunks/bluetoothapis.hpp
@@ -2,11 +2,6 @@
 #include <bluetoothleapis.h>
 #endif
 
-#if (YY_Thunks_Support_Version < NTDDI_WIN8) && !defined(__Comment_Lib_bluetoothapis)
-#define __Comment_Lib_bluetoothapis
-#pragma comment(lib, "BluetoothAPIs.lib")
-#endif
-
 namespace YY::Thunks
 {
 #if (YY_Thunks_Support_Version < NTDDI_WIN8)

diff --git a/src/Thunks/mfplat.hpp b/src/Thunks/mfplat.hpp
@@ -2,11 +2,6 @@
 #include <mfapi.h>
 #endif
 
-#if (YY_Thunks_Support_Version < NTDDI_WIN8) && !defined(__Comment_Lib_mfplat)
-#define __Comment_Lib_mfplat
-#pragma comment(lib, "Mfplat.lib")
-#endif
-
 namespace YY::Thunks
 {
 #if (YY_Thunks_Support_Version < NTDDI_WIN8)

diff --git a/src/Thunks/netapi32.hpp b/src/Thunks/netapi32.hpp
@@ -2,11 +2,6 @@
 #include <lmjoin.h>
 #endif
 
-#if (YY_Thunks_Support_Version < NTDDI_WIN10) && !defined(__Comment_Lib_netapi32)
-#define __Comment_Lib_netapi32
-#pragma comment(lib, "Netapi32.lib")
-#endif
-
 namespace YY::Thunks
 {
 #if (YY_Thunks_Support_Version < NTDDI_WIN10)

diff --git a/src/Thunks/powrprof.hpp b/src/Thunks/powrprof.hpp
@@ -2,11 +2,6 @@
 #include <powrprof.h>
 #endif
 
-#if (YY_Thunks_Support_Version < NTDDI_VISTA) && !defined(__Comment_Lib_powrProf)
-#define __Comment_Lib_powrProf
-#pragma comment(lib, "PowrProf.lib")
-#endif
-
 namespace YY::Thunks
 {
 #if (YY_Thunks_Support_Version < NTDDI_VISTA)

diff --git a/src/Thunks/shcore.hpp b/src/Thunks/shcore.hpp
@@ -2,9 +2,9 @@
 #include <ShellScalingAPI.h>
 #endif
 
-#if (YY_Thunks_Support_Version < NTDDI_WINBLUE) && !defined(__Comment_Lib_shcore)
-#define __Comment_Lib_shcore
-#pragma comment(lib, "Shcore.lib")
+#if (YY_Thunks_Support_Version < NTDDI_WINBLUE) && !defined(__Comment_Lib_user32)
+#define __Comment_Lib_user32
+#pragma comment(lib, "User32.lib")
 #endif
 
 namespace YY::Thunks

diff --git a/src/Thunks/shell32.hpp b/src/Thunks/shell32.hpp
@@ -1,5 +1,17 @@
-#include <shellapi.h>
+#if (YY_Thunks_Support_Version < NTDDI_WIN7)
+#include <shellapi.h>
 #include <Shlobj.h>
+#endif
+
+#if (YY_Thunks_Support_Version < NTDDI_WIN6) && !defined(__Comment_Lib_shell32)
+#define __Comment_Lib_shell32
+#pragma comment(lib, "Shell32.lib")
+#endif
+
+#if (YY_Thunks_Support_Version < NTDDI_WIN6) && !defined(__Comment_Lib_ole32)
+#define __Comment_Lib_ole32
+#pragma comment(lib, "Ole32.lib")
+#endif
 
 namespace YY::Thunks
 {

diff --git a/src/Thunks/user32.hpp b/src/Thunks/user32.hpp
@@ -7,11 +7,16 @@
 #pragma comment(lib, "User32.lib")
 #endif
 
-#if (YY_Thunks_Support_Version < NTDDI_WIN10_RS2) && !defined(__Comment_Lib_shcore)
+#if (YY_Thunks_Support_Version < NTDDI_WIN10_RS2) && (YY_Thunks_Support_Version >= NTDDI_WINBLUE || __YY_Thunks_libs) && !defined(__Comment_Lib_shcore)
 #define __Comment_Lib_shcore
 #pragma comment(lib, "Shcore.lib")
 #endif
 
+#if (YY_Thunks_Support_Version < NTDDI_WIN10_RS1) && !defined(__Comment_Lib_gdi32)
+#define __Comment_Lib_gdi32
+#pragma comment(lib, "Gdi32.lib")
+#endif
+
 #if defined(YY_Thunks_Implemented)
 namespace YY::Thunks::internal
 {

diff --git a/src/Thunks/userenv.hpp b/src/Thunks/userenv.hpp
@@ -2,11 +2,6 @@
 #include <userenv.h>
 #endif
 
-#if (YY_Thunks_Support_Version < NTDDI_WIN8) && !defined(__Comment_Lib_userenv)
-#define __Comment_Lib_userenv
-#pragma comment(lib, "Userenv.lib")
-#endif
-
 namespace YY::Thunks
 {
 #if (YY_Thunks_Support_Version < NTDDI_WIN8)

diff --git a/src/YY-Thunks.UnitTest/TestProject/Example/SymbolBuildTest.vcxproj b/src/YY-Thunks.UnitTest/TestProject/Example/SymbolBuildTest.vcxproj
@@ -48,11 +48,15 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SymbolsTestCppRootPathTmp)</OutDir>
     <IntDir>$(SymbolsTestCppRootPathTmp)</IntDir>
+    <LibraryPath Condition="'$(WindowsSdkDir_60A)' != ''">$(VC_LibraryPath_x86);$(WindowsSdkDir_60A)\lib</LibraryPath>
+    <LibraryPath Condition="'$(YY_Thunks_Libs)' != ''">$(YY_Thunks_Libs);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SymbolsTestCppRootPathTmp)</OutDir>
     <IntDir>$(SymbolsTestCppRootPathTmp)</IntDir>
+    <LibraryPath Condition="'$(WindowsSdkDir_60A)' != ''">$(VC_LibraryPath_x64);$(WindowsSdkDir_60A)\lib\x64</LibraryPath>
+    <LibraryPath Condition="'$(YY_Thunks_Libs)' != ''">$(YY_Thunks_Libs);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
     <ClCompile>
@@ -68,7 +72,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(YY_Thunks_File_Path)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(YY_Thunks_File_Path)' != ''">$(YY_Thunks_File_Path)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
@@ -85,7 +89,8 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(YY_Thunks_File_Path)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(YY_Thunks_File_Path)' != ''">$(YY_Thunks_File_Path)</AdditionalDependencies>
+      <ShowProgress>LinkVerboseLib</ShowProgress>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>