Merge pull request #19 from safing/fix/major-refactoring

Inf file fix and version increase
safing · Sep 1, 2022 · 3930460 · 3930460
2 parents b31bdd4 + 2a41379
commit 3930460
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/Version.props b/Version.props
@@ -4,7 +4,7 @@
   <PropertyGroup Label="UserMacros">
     <PM_VERSION_MAJOR>1</PM_VERSION_MAJOR>
     <PM_VERSION_MINOR>0</PM_VERSION_MINOR>
-    <PM_VERSION_REVISION>11</PM_VERSION_REVISION>
+    <PM_VERSION_REVISION>12</PM_VERSION_REVISION>
     <PM_VERSION_BUILD>0</PM_VERSION_BUILD>
   </PropertyGroup>
   <PropertyGroup />

diff --git a/pm_kext/PortmasterKext32.inx b/pm_kext/PortmasterKext32.inx
@@ -25,7 +25,6 @@ Provider = %Provider%
 CatalogFile = PortmasterKext32.Cat
 PnpLockdown=1
 
-
 [SourceDisksNames]
 1 = %DiskName%
 
@@ -36,9 +35,27 @@ PortmasterKext32.sys = 1
 DefaultDestDir = 12 ; %windir%\system32\drivers
 PortmasterKext.DriverFiles = 12 ; %windir%\system32\drivers
 
+[DefaultInstall.NTx86]
+OptionDesc = %Description%
+CopyFiles = PortmasterKext.DriverFiles
+
+[DefaultInstall.NTx86.Services]
+AddService = %ServiceName%,,PortmasterKext.Service
+
+[PortmasterKext.DriverFiles]
+PortmasterKext32.sys,,,0x00000040 ; COPYFLG_OVERWRITE_OLDER_ONLY
+
+[PortmasterKext.Service]
+DisplayName = %ServiceName%
+Description = %ServiceDesc%
+ServiceType = 1  ; SERVICE_KERNEL_DRIVER
+StartType = 0    ; SERVICE_BOOT_START
+ErrorControl = 1 ; SERVICE_ERROR_NORMAL
+ServiceBinary = %12%\PortmasterKext32.sys
+
 [Strings]
 Provider = "Safing ICS Technologies GmbH"
 DiskName = "PortmasterKext Installation Disk"
 Description = "PortmasterKext Driver"
 ServiceName = "PortmasterKext"
-ServiceDesc = "PortmasterKext Driver"
+ServiceDesc = "PortmasterKext Driver"
diff --git a/pm_kext/PortmasterKext64.inx b/pm_kext/PortmasterKext64.inx
@@ -25,7 +25,6 @@ Provider = %Provider%
 CatalogFile = PortmasterKext64.Cat
 PnpLockdown=1
 
-
 [SourceDisksNames]
 1 = %DiskName%
 
@@ -36,9 +35,27 @@ PortmasterKext64.sys = 1
 DefaultDestDir = 12 ; %windir%\system32\drivers
 PortmasterKext.DriverFiles = 12 ; %windir%\system32\drivers
 
+[DefaultInstall.NTamd64]
+OptionDesc = %Description%
+CopyFiles = PortmasterKext.DriverFiles
+
+[DefaultInstall.NTamd64.Services]
+AddService = %ServiceName%,,PortmasterKext.Service
+
+[PortmasterKext.DriverFiles]
+PortmasterKext64.sys,,,0x00000040 ; COPYFLG_OVERWRITE_OLDER_ONLY
+
+[PortmasterKext.Service]
+DisplayName = %ServiceName%
+Description = %ServiceDesc%
+ServiceType = 1  ; SERVICE_KERNEL_DRIVER
+StartType = 0    ; SERVICE_BOOT_START
+ErrorControl = 1 ; SERVICE_ERROR_NORMAL
+ServiceBinary = %12%\PortmasterKext64.sys
+
 [Strings]
 Provider = "Safing ICS Technologies GmbH"
 DiskName = "PortmasterKext Installation Disk"
 Description = "PortmasterKext Driver"
 ServiceName = "PortmasterKext"
-ServiceDesc = "PortmasterKext Driver"
+ServiceDesc = "PortmasterKext Driver"