Resolve issues with resource and message compiler

winsiderss · Oct 19, 2024 · 6492b18 · 6492b18
1 parent eee176f
commit 6492b18
Show file tree

Hide file tree

Showing 12 changed files with 133 additions and 8,699 deletions.
diff --git a/KSystemInformer/KSystemInformer.sln b/KSystemInformer/KSystemInformer.sln
@@ -12,6 +12,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kphlib", "..\kphlib\kphlib_km.vcxproj", "{B1863396-A667-42DB-97AC-C5E033CEE321}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ksidll", "ksidll.vcxproj", "{B385D394-19CC-48BC-827E-AF9ADCE559E0}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B1863396-A667-42DB-97AC-C5E033CEE321} = {B1863396-A667-42DB-97AC-C5E033CEE321}
+ EndProjectSection
 EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/KSystemInformer/KSystemInformer.vcxproj b/KSystemInformer/KSystemInformer.vcxproj
@@ -111,7 +111,7 @@
  <LanguageStandard>stdcpplatest</LanguageStandard>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &lt; '17.11'">stdc17</LanguageStandard_C>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &gt;= '17.11'">stdclatest</LanguageStandard_C>
- <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK /d2guardretpoline %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK /d1nodatetime /d2guardretpoline %(AdditionalOptions)</AdditionalOptions>
  <CallingConvention>StdCall</CallingConvention>
  <StringPooling>true</StringPooling>
  <SupportJustMyCode>false</SupportJustMyCode>
@@ -123,6 +123,7 @@
  <DisableSpecificWarnings>4201</DisableSpecificWarnings>
  <GuardEHContMetadata>true</GuardEHContMetadata>
  <BuildStlModules>false</BuildStlModules>
+ <ConformanceMode>true</ConformanceMode>
  </ClCompile>
  <Link>
  <AdditionalDependencies>ksi.lib;Netio.lib;FltMgr.lib;ksecdd.lib;kphlib_km.lib;volatileaccessk.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -148,7 +149,7 @@
  <LanguageStandard>stdcpplatest</LanguageStandard>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &lt; '17.11'">stdc17</LanguageStandard_C>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &gt;= '17.11'">stdclatest</LanguageStandard_C>
- <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK /d1nodatetime %(AdditionalOptions)</AdditionalOptions>
  <CallingConvention>StdCall</CallingConvention>
  <StringPooling>true</StringPooling>
  <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -160,6 +161,7 @@
  <GuardSignedReturns>true</GuardSignedReturns>
  <BuildStlModules>false</BuildStlModules>
  <WholeProgramOptimization>false</WholeProgramOptimization>
+ <ConformanceMode>true</ConformanceMode>
  </ClCompile>
  <Link>
  <AdditionalDependencies>ksi.lib;Netio.lib;FltMgr.lib;ksecdd.lib;kphlib_km.lib;volatileaccessk.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -200,6 +202,7 @@
  <IntrinsicFunctions>true</IntrinsicFunctions>
  <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
  <WholeProgramOptimization>true</WholeProgramOptimization>
+ <ConformanceMode>true</ConformanceMode>
  </ClCompile>
  <Link>
  <AdditionalDependencies>ksi.lib;Netio.lib;FltMgr.lib;ksecdd.lib;kphlib_km.lib;volatileaccessk.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -240,6 +243,7 @@
  <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
  <IntrinsicFunctions>true</IntrinsicFunctions>
  <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <ConformanceMode>true</ConformanceMode>
  </ClCompile>
  <Link>
  <AdditionalDependencies>ksi.lib;Netio.lib;FltMgr.lib;ksecdd.lib;kphlib_km.lib;volatileaccessk.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/KSystemInformer/include/ntfill.h b/KSystemInformer/include/ntfill.h
@@ -401,6 +401,8 @@ typedef struct _REG_SAVE_MERGED_KEY_INFORMATION
 
 #define VS_FFI_SIGNATURE 0xFEEF04BDL
 
+typedef struct _IMAGE_RESOURCE_DATA_ENTRY IMAGE_RESOURCE_DATA_ENTRY, *PIMAGE_RESOURCE_DATA_ENTRY;
+
 NTKERNELAPI
 NTSTATUS
 NTAPI
@@ -458,6 +460,8 @@ typedef struct _FIXEDFILEINFO
  DWORD dwFileDateLS;
 } VS_FIXEDFILEINFO, *PVS_FIXEDFILEINFO;
 
+typedef struct _NON_PAGED_DEBUG_INFO NON_PAGED_DEBUG_INFO, *PNON_PAGED_DEBUG_INFO;
+
 typedef struct _KLDR_DATA_TABLE_ENTRY
 {
  LIST_ENTRY InLoadOrderLinks;

diff --git a/KSystemInformer/ksidll.vcxproj b/KSystemInformer/ksidll.vcxproj
@@ -112,7 +112,7 @@
  <LanguageStandard>stdcpplatest</LanguageStandard>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &lt; '17.11'">stdc17</LanguageStandard_C>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &gt;= '17.11'">stdclatest</LanguageStandard_C>
- <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK /d2guardretpoline %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK /d1nodatetime /d2guardretpoline %(AdditionalOptions)</AdditionalOptions>
  <CallingConvention>StdCall</CallingConvention>
  <StringPooling>true</StringPooling>
  <SupportJustMyCode>false</SupportJustMyCode>
@@ -123,6 +123,7 @@
  <DisableSpecificWarnings>4201</DisableSpecificWarnings>
  <GuardEHContMetadata>true</GuardEHContMetadata>
  <BuildStlModules>false</BuildStlModules>
+ <ConformanceMode>true</ConformanceMode>
  </ClCompile>
  <Link>
  <RandomizedBaseAddress>true</RandomizedBaseAddress>
@@ -149,7 +150,7 @@
  <LanguageStandard>stdcpplatest</LanguageStandard>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &lt; '17.11'">stdc17</LanguageStandard_C>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &gt;= '17.11'">stdclatest</LanguageStandard_C>
- <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK /d1nodatetime %(AdditionalOptions)</AdditionalOptions>
  <CallingConvention>StdCall</CallingConvention>
  <StringPooling>true</StringPooling>
  <WppEnabled>true</WppEnabled>
@@ -160,6 +161,7 @@
  <GuardSignedReturns>true</GuardSignedReturns>
  <BuildStlModules>false</BuildStlModules>
  <WholeProgramOptimization>false</WholeProgramOptimization>
+ <ConformanceMode>true</ConformanceMode>
  </ClCompile>
  <Link>
  <RandomizedBaseAddress>true</RandomizedBaseAddress>
@@ -185,7 +187,7 @@
  <LanguageStandard>stdcpplatest</LanguageStandard>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &lt; '17.11'">stdc17</LanguageStandard_C>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &gt;= '17.11'">stdclatest</LanguageStandard_C>
- <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK /d2guardretpoline %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK /d1nodatetime /d2guardretpoline %(AdditionalOptions)</AdditionalOptions>
  <GuardEHContMetadata>true</GuardEHContMetadata>
  <CallingConvention>StdCall</CallingConvention>
  <StringPooling>true</StringPooling>
@@ -200,6 +202,7 @@
  <IntrinsicFunctions>true</IntrinsicFunctions>
  <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
  <WholeProgramOptimization>true</WholeProgramOptimization>
+ <ConformanceMode>true</ConformanceMode>
  </ClCompile>
  <Link>
  <RandomizedBaseAddress>true</RandomizedBaseAddress>
@@ -226,7 +229,7 @@
  <LanguageStandard>stdcpplatest</LanguageStandard>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &lt; '17.11'">stdc17</LanguageStandard_C>
  <LanguageStandard_C Condition="'$(MSBuildVersion)' &gt;= '17.11'">stdclatest</LanguageStandard_C>
- <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/kernel /utf-8 /INTEGRITYCHECK /d1nodatetime %(AdditionalOptions)</AdditionalOptions>
  <CallingConvention>StdCall</CallingConvention>
  <StringPooling>true</StringPooling>
  <WppEnabled>true</WppEnabled>
@@ -240,6 +243,7 @@
  <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
  <IntrinsicFunctions>true</IntrinsicFunctions>
  <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <ConformanceMode>true</ConformanceMode>
  </ClCompile>
  <Link>
  <RandomizedBaseAddress>true</RandomizedBaseAddress>

diff --git a/KSystemInformer/resource.rc b/KSystemInformer/resource.rc
@@ -1,39 +1,49 @@
+// Microsoft Visual C++ generated resource script.
+//
 #pragma code_page(65001)
 
 #include <windows.h>
 #include <sistatus.rc>
 
-#define VER_COMMA 3,2,1,0
-#define VER_STR "3.2\0"
+#define VER_FILEVERSION  3,2,1,0
+#define VER_FILEVERSION_STR  "3.2\0"
 
-#define VER_FILEVERSION VER_COMMA
-#define VER_FILEVERSION_STR VER_STR
-#define VER_PRODUCTVERSION VER_COMMA
-#define VER_PRODUCTVERSION_STR VER_STR
+#define VER_PRODUCTVERSION VER_FILEVERSION
+#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR
 
-#ifndef DEBUG
-#define VER_DEBUG 0
+#if DEBUG
+#define VER_DEBUG VS_FF_DEBUG
+#define VER_PRERELEASE VS_FF_PRERELEASE
+#define VER_PRIVATE VS_FF_PRIVATEBUILD
 #else
-#define VER_DEBUG VS_FF_DEBUG
+#define VER_DEBUG 0
+#define VER_PRERELEASE 0
+#define VER_PRIVATE 0
 #endif
 
-#define VER_PRIVATEBUILD 0
-#define VER_PRERELEASE 0
+#define VER_FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#define VER_FILEFLAGS (VER_PRERELEASE | VER_DEBUG | VER_PRIVATE)
+#define VER_FILEOS VOS_NT_WINDOWS32
 
-#define VER_COMPANYNAME_STR "System Informer\0"
-#define VER_FILEDESCRIPTION_STR "System Informer\0"
-#define VER_LEGALCOPYRIGHT_STR "Copyright (c) Winsider Seminars & Solutions, Inc. All rights reserved.\0"
-#define VER_ORIGINALFILENAME_STR "SystemInformer.sys\0"
-#define VER_PRODUCTNAME_STR "System Informer\0"
+#define VER_FILETYPE VFT_DRV
+#define VER_FILESUBTYPE VFT2_DRV_SYSTEM
 
+#define VER_COMPANYNAME_STR "System Informer\0"
+#define VER_FILEDESCRIPTION_STR "System Informer\0"
+#define VER_LEGALCOPYRIGHT_STR "Copyright (c) Winsider Seminars & Solutions, Inc. All rights reserved.\0"
+#define VER_ORIGINALFILENAME_STR "SystemInformer.sys\0"
+#define VER_INTERNALNAME_STR "SystemInformer.sys\0"
+#define VER_PRODUCTNAME_STR "System Informer\0"
+
+#if !defined(DEFAULT_VERSIONINFO)
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION  VER_FILEVERSION
-PRODUCTVERSION  VER_PRODUCTVERSION
-FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
-FILEFLAGS  (VER_PRIVATEBUILD | VER_PRERELEASE | VER_DEBUG)
-FILEOS  VOS__WINDOWS32
-FILETYPE  VFT_DRV
-FILESUBTYPE  VFT2_DRV_SYSTEM
+FILEVERSION  VER_FILEVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
+FILEFLAGSMASK  VER_FILEFLAGSMASK
+FILEFLAGS  VER_FILEFLAGS
+FILEOS  VER_FILEOS
+FILETYPE  VER_FILETYPE
+FILESUBTYPE  VER_FILESUBTYPE
 BEGIN
  BLOCK "StringFileInfo"
  BEGIN
@@ -42,16 +52,19 @@ BEGIN
  VALUE "CompanyName", VER_COMPANYNAME_STR
  VALUE "FileDescription", VER_FILEDESCRIPTION_STR
  VALUE "FileVersion", VER_FILEVERSION_STR
- VALUE "InternalName", VER_ORIGINALFILENAME_STR
+ VALUE "InternalName", VER_INTERNALNAME_STR
  VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
  VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
  VALUE "ProductName", VER_PRODUCTNAME_STR
  VALUE "ProductVersion", VER_PRODUCTVERSION_STR
  END
  END
-
  BLOCK "VarFileInfo"
  BEGIN
  VALUE "Translation", 0x409, 1252
  END
 END
+#else
+#include <ntverp.h>
+#include "common.ver"
+#endif
diff --git a/kphlib/include/sistatus.rc b/kphlib/include/sistatus.rc
@@ -1,49 +1,2 @@
-// Microsoft Visual C++ generated resource script.
-//
-#pragma code_page(65001)
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""winres.h""\r\n"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-1 RT_MESSAGETABLE "sistatus_MSG00001.bin"
-
-#endif // English resources
-/////////////////////////////////////////////////////////////////////////////
-
+LANGUAGE 0x9,0x1
+1 11 "sistatus_MSG00001.bin"
diff --git a/kphlib/include/sistatus_MSG00001.bin b/kphlib/include/sistatus_MSG00001.bin
diff --git a/kphlib/kphdyndata.c b/kphlib/kphdyndata.c
@@ -13,7 +13,7 @@
 #include <kphdyndata.h>
 
 #ifndef _KERNEL_MODE
-#include "../tools/thirdparty/winsdk/ntintsafe.h"
+#include <ntintsafe.h>
 #ifndef Add2Ptr
 #define Add2Ptr(P,I) ((PVOID)((PUCHAR)(P) + (I)))
 #endif