mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 06:15:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Driver: Separate builds for Windows 7 & 10.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2021-09-01 12:03:20 +03:00
parent 6a4511274a
commit 27d55effba
10 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deploy/deployment.json
View File

@ -14,11 +14,11 @@
] ]
}, },
"${TARGET}/driver": { "${TARGET}/driver": {
"driver-x32 | Win7": [ "driver-x32 | win7": [
"${BUILD}-driver/fortfw32.sys" "${BUILD}-driver-${CONFIG}/fortfw32.sys"
], ],
"driver-x64": [ "driver-x64": [
"${BUILD}-driver/fortfw64.sys" "${BUILD}-driver-${CONFIG}/fortfw64.sys"
], ],
"scripts": [ "scripts": [
"${ROOT}/src/driver/scripts | *.bat *.lnk |" "${ROOT}/src/driver/scripts | *.bat *.lnk |"
@ -28,8 +28,8 @@
"qt": [ "qt": [
"${QTPATH}/plugins/platforms | qwindows.dll | *d.dll" "${QTPATH}/plugins/platforms | qwindows.dll | *d.dll"
], ],
"qt-tls | Win10": [ "qt-tls | win10": [
"${QTPATH}/plugins/tls | schannelbackend.dll | *dd.dll" "${QTPATH}/plugins/tls | qschannelbackend.dll | *dd.dll"
] ]
} }
} }

2
deploy/setup-deployment-win10.bat
View File

@ -1 +1 @@
@%~dp0setup-deployment.bat -QtPath ".\build-qt\qtbase" -Config Win10 @%~dp0setup-deployment.bat -QtPath ".\build-qt\qtbase" -Config win10

2
deploy/setup-deployment-win7.bat
View File

@ -1 +1 @@
@%~dp0setup-deployment.bat -QtPath ".\build-qt-win7\qtbase" -Config Win7 @%~dp0setup-deployment.bat -QtPath ".\build-qt-win7\qtbase" -Config win7

1
deploy/setup-deployment.ps1
View File

@ -50,6 +50,7 @@ for ($i = 0; $i -lt $targetDirs.length; $i++) {
$file = $file -replace '\${BUILD}', "$BuildPath" $file = $file -replace '\${BUILD}', "$BuildPath"
$file = $file -replace '\${ROOT}', "$RootPath" $file = $file -replace '\${ROOT}', "$RootPath"
$file = $file -replace '\${QTPATH}', "$QtPath" $file = $file -replace '\${QTPATH}', "$QtPath"
$file = $file -replace '\${CONFIG}', "$Config"
if ($file.Contains('|')) { if ($file.Contains('|')) {
$fileParts = $file.Split('|') $fileParts = $file.Split('|')

7
src/driver/common/common.h
View File

@ -5,8 +5,11 @@
# define NDIS_WDM 1 # define NDIS_WDM 1
# define NDIS630 1 # define NDIS630 1
# define WIN9X_COMPAT_SPINLOCK /* XXX: Support Windows 7: KeInitializeSpinLock() */ # if defined(FORT_WIN7_COMPAT)
# define POOL_NX_OPTIN 1 /* Enhanced protection of NX pool */ # define WIN9X_COMPAT_SPINLOCK /* XXX: Support Windows 7: KeInitializeSpinLock() */
# endif
# define POOL_NX_OPTIN 1 /* Enhanced protection of NX pool */
# include <wdm.h> # include <wdm.h>
# include <fwpmk.h> # include <fwpmk.h>

3
src/driver/fortdrv.vcxproj
View File

@ -23,11 +23,12 @@
<Configuration Condition="'$(Configuration)'==''">Release</Configuration> <Configuration Condition="'$(Configuration)'==''">Release</Configuration>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
<DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);NDEBUG</DefineConstants> <DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);NDEBUG</DefineConstants>
<DefineConstants Condition="'$(Config)'=='win7'">$(DefineConstants);FORT_WIN7_COMPAT</DefineConstants>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration-Common"> <PropertyGroup Label="Configuration-Common">
<TargetVersion>WindowsV6.3</TargetVersion> <TargetVersion>WindowsV6.3</TargetVersion>
<KernelBufferOverflowLib>$(DDK_LIB_PATH)\BufferOverflowK.lib</KernelBufferOverflowLib> <KernelBufferOverflowLib Condition="'$(Config)'=='win7'">$(DDK_LIB_PATH)\BufferOverflowK.lib</KernelBufferOverflowLib>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ConfigurationType>Driver</ConfigurationType> <ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType> <DriverType>WDM</DriverType>

1
src/driver/msvcbuild-win10.bat Normal file
View File

@ -0,0 +1 @@
@%~dp0msvcbuild.bat x64 win10

1
src/driver/msvcbuild-win7-32.bat Normal file
View File

@ -0,0 +1 @@
@%~dp0msvcbuild.bat Win32 win7

1
src/driver/msvcbuild-win7-64.bat Normal file
View File

@ -0,0 +1 @@
@%~dp0msvcbuild.bat x64 win7

17
src/driver/msvcbuild.bat
View File

@ -6,15 +6,20 @@
@rem PLAT: x64, Win32 @rem PLAT: x64, Win32
@set PLAT=%1 @set PLAT=%1
@if "%PLAT%"=="" PLAT=x64
@set OutDir=..\..\build-driver @rem CONFIG: win7, win10
@set CONFIG=%2
@if "%CONFIG%"=="" PLAT=win10
@set OutDir=..\..\build-driver-%CONFIG%
@set IntDir=%OutDir%-%PLAT% @set IntDir=%OutDir%-%PLAT%
MSBuild fortdrv.vcxproj /p:OutDir=%OutDir%\;IntDir=%IntDir%\;Platform=%PLAT% MSBuild fortdrv.vcxproj /p:OutDir=%OutDir%\;IntDir=%IntDir%\;Platform=%PLAT%;Config=%CONFIG%
@rem DumpBin /SYMBOLS %IntDir%\fortdrv.obj > symbols.txt @rem DumpBin /SYMBOLS "%IntDir%\fortdrv.obj" > symbols.txt
@rd /S /Q %IntDir% @rd /S /Q "%IntDir%"
@rd /S /Q %OutDir%\fortdrv @rd /S /Q "%OutDir%\fortdrv"
@del /Q %OutDir%\fortfw*.cer %OutDir%\fortfw*.pdb @del /Q "%OutDir%\fortfw*.cer" "%OutDir%\fortfw*.pdb"