From f99f88797ec549a16b8b14a438570f0d7e7c4b91 Mon Sep 17 00:00:00 2001 From: Tim Shelton Date: Fri, 18 Jan 2019 18:58:39 -0600 Subject: [PATCH 1/2] Following commit allows for WIn10Pcap to build on Visual Studio 2017 with WIndows 10 and latest WDK --- Installer/Installer.vcxproj | 243 ++++++++++++++++++++++++ Installer/Installer.vcxproj.filters | 76 ++++++++ NdisDriver/NdisDriver.h | 8 + NdisDriver/NdisDriver.vcxproj | 173 +++++++++++++++++ NdisDriver/NdisDriver.vcxproj.filters | 38 ++++ Packet_dll/Packet_dll.vcxproj | 256 ++++++++++++++++++++++++++ Packet_dll/Packet_dll.vcxproj.filters | 82 +++++++++ Win10Pcap.sln | 18 +- 8 files changed, 886 insertions(+), 8 deletions(-) create mode 100644 Installer/Installer.vcxproj create mode 100644 Installer/Installer.vcxproj.filters create mode 100644 NdisDriver/NdisDriver.vcxproj create mode 100644 NdisDriver/NdisDriver.vcxproj.filters create mode 100644 Packet_dll/Packet_dll.vcxproj create mode 100644 Packet_dll/Packet_dll.vcxproj.filters diff --git a/Installer/Installer.vcxproj b/Installer/Installer.vcxproj new file mode 100644 index 0000000..f9150c7 --- /dev/null +++ b/Installer/Installer.vcxproj @@ -0,0 +1,243 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A67E6EC7-46B9-4146-86A5-55F5B8767151} + Installer + Win32Proj + + + + Application + v141 + MultiByte + false + + + Application + v141 + MultiByte + false + + + Application + v141 + MultiByte + false + + + Application + v141 + MultiByte + false + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28127.55 + + + $(SolutionDir)bin\$(Platform)\ + $(Platform)_$(Configuration)\ + true + false + + + $(SolutionDir)bin\$(Platform)\ + $(Platform)_$(Configuration)\ + true + false + + + $(SolutionDir)bin\$(Platform)\ + $(Platform)_$(Configuration)\ + false + false + + + $(SolutionDir)bin\$(Platform)\ + $(Platform)_$(Configuration)\ + false + false + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + EnableFastChecks + MultiThreadedDebug + 8Bytes + + Level3 + EditAndContinue + CompileAsC + + + Version.lib;winmm.lib;Iphlpapi.lib;Ws2_32.lib;Setupapi.lib;%(AdditionalDependencies) + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + Windows + 100000 + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;_CONSOLE;CPU_64;%(PreprocessorDefinitions) + true + + EnableFastChecks + MultiThreadedDebug + 8Bytes + + Level3 + ProgramDatabase + CompileAsC + + + Version.lib;winmm.lib;Iphlpapi.lib;Ws2_32.lib;Setupapi.lib;%(AdditionalDependencies) + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + Windows + 100000 + MachineX64 + + + + + Disabled + AnySuitable + true + Speed + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + MultiThreaded + 8Bytes + false + + Level3 + ProgramDatabase + CompileAsC + + + Version.lib;winmm.lib;Iphlpapi.lib;Ws2_32.lib;Setupapi.lib;%(AdditionalDependencies) + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + Windows + 100000 + true + true + MachineX86 + + + + + X64 + + + Disabled + AnySuitable + true + Speed + WIN32;NDEBUG;_CONSOLE;CPU_64;%(PreprocessorDefinitions) + true + + MultiThreaded + 8Bytes + false + + Level3 + ProgramDatabase + CompileAsC + + + Version.lib;winmm.lib;Iphlpapi.lib;Ws2_32.lib;Setupapi.lib;%(AdditionalDependencies) + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + Windows + 100000 + true + true + MachineX64 + + + + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Installer/Installer.vcxproj.filters b/Installer/Installer.vcxproj.filters new file mode 100644 index 0000000..d2c527f --- /dev/null +++ b/Installer/Installer.vcxproj.filters @@ -0,0 +1,76 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Src + + + Src + + + Src + + + Src + + + Src + + + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + + + Resource + + + + + Resource + + + \ No newline at end of file diff --git a/NdisDriver/NdisDriver.h b/NdisDriver/NdisDriver.h index 1f65982..956b0f9 100644 --- a/NdisDriver/NdisDriver.h +++ b/NdisDriver/NdisDriver.h @@ -71,11 +71,17 @@ // Win32 DDK related #ifndef CPU_64 +#ifndef _X86_ #define _X86_ +#endif #else // CPU_64 #ifndef NEO_IA64 +#ifndef _AMD64_ #define _AMD64_ +#endif +#ifndef AMD64 #define AMD64 +#endif #else // NEO_IA64 #define _IA64_ #define IA64 @@ -83,6 +89,7 @@ #endif // CPU_64 #define NDIS_MINIPORT_DRIVER // NDIS 6.2 + #define NDIS620_MINIPORT #define NDIS_SUPPORT_NDIS61 1 #define NDIS_SUPPORT_NDIS620 1 @@ -90,6 +97,7 @@ #define NEO_NDIS_MINOR_VERSION 20 #define NDIS_WDM 1 + #include #include #include diff --git a/NdisDriver/NdisDriver.vcxproj b/NdisDriver/NdisDriver.vcxproj new file mode 100644 index 0000000..0c369e4 --- /dev/null +++ b/NdisDriver/NdisDriver.vcxproj @@ -0,0 +1,173 @@ + + + + + Release + Win32 + + + Release + x64 + + + + {2389346B-7672-4BC0-A3DD-0167B20F18C7} + NdisDriver + Win32Proj + 10.0.17763.0 + + + + DynamicLibrary + WindowsKernelModeDriver10.0 + MultiByte + false + Windows7 + + + Application + WindowsKernelModeDriver10.0 + MultiByte + false + Windows7 + Desktop + <_NT_TARGET_VERSION> + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28127.55 + + + $(SolutionDir)driver_out\$(Platform)\ + $(Platform)_$(Configuration)\ + true + false + false + .sys + + + $(SolutionDir)driver_out\$(Platform)\ + $(Platform)_$(Configuration)\ + true + false + false + .sys + + + + Disabled + AnySuitable + false + Speed + C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir);C:\Program Files (x86)\Windows Kits\10\Include\10.0.17763.0\km;C:\Program Files (x86)\Windows Kits\10\Include\10.0.17763.0\km\crt;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;NDISDRIVER_EXPORTS;%(PreprocessorDefinitions);_KERNEL_MODE + true + + MultiThreaded + 8Bytes + false + false + + Level3 + ProgramDatabase + StdCall + CompileAsC + + + false + + + /driver /subsystem:native,5.00 /FULLBUILD /align:0x80 /osversion:5.00 /STACK:0x40000,0x1000 /MERGE:_PAGE=PAGE /MERGE:_TEXT=.text /NODEFAULTLIB %(AdditionalOptions) + bufferoverflowK.lib;wdm.lib;ndis.lib;wdmsec.lib;ntoskrnl.lib;fwpkclnt.lib;%(AdditionalDependencies) + $(OutDir)Win10Pcap.sys + C:\WINDDK\7600.16385.0\lib\win7\i386;C:\Program Files %28x86%29\Windows Kits\10\Lib\10.0.17763.0\km\x86;%(AdditionalLibraryDirectories) + true + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + NotSet + true + true + DriverEntry + + + + false + + $(SolutionDir)tmp\lib\$(Platform)_$(Configuration)\$(ProjectName).lib + MachineX86 + + + + + X64 + + + Disabled + AnySuitable + false + Speed + C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir);C:\Program Files (x86)\Windows Kits\10\Include\10.0.17763.0\km;C:\Program Files (x86)\Windows Kits\10\Include\10.0.17763.0\km\crt;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;NDISDRIVER_EXPORTS;CPU_64;%(PreprocessorDefinitions);_KERNEL_MODE + true + + MultiThreaded + 8Bytes + false + false + + Level3 + ProgramDatabase + StdCall + CompileAsC + + + false + + + /driver /subsystem:native /FULLBUILD /align:0x80 /osversion:5.00 /STACK:0x40000,0x1000 /MERGE:_PAGE=PAGE /MERGE:_TEXT=.text /NODEFAULTLIB %(AdditionalOptions) + bufferoverflowK.lib;wdm.lib;ndis.lib;wdmsec.lib;ntoskrnl.lib;fwpkclnt.lib;%(AdditionalDependencies) + $(OutDir)Win10Pcap.sys + C:\WINDDK\7600.16385.0\lib\win7\amd64;C:\Program Files %28x86%29\Windows Kits\10\Lib\10.0.17763.0\km\x64;%(AdditionalLibraryDirectories) + true + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + NotSet + true + true + DriverEntry + + false + + $(SolutionDir)tmp\lib\$(Platform)_$(Configuration)\$(ProjectName).lib + MachineX64 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NdisDriver/NdisDriver.vcxproj.filters b/NdisDriver/NdisDriver.vcxproj.filters new file mode 100644 index 0000000..ef562a9 --- /dev/null +++ b/NdisDriver/NdisDriver.vcxproj.filters @@ -0,0 +1,38 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Src + + + + + Header + + + Header + + + Header + + + + + Resource + + + \ No newline at end of file diff --git a/Packet_dll/Packet_dll.vcxproj b/Packet_dll/Packet_dll.vcxproj new file mode 100644 index 0000000..9614782 --- /dev/null +++ b/Packet_dll/Packet_dll.vcxproj @@ -0,0 +1,256 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {BB1D6C0B-084E-4FCE-AF8D-BB3CFDC1D8EA} + Packet_dll + Win32Proj + + + + DynamicLibrary + v141 + MultiByte + false + + + DynamicLibrary + v141 + MultiByte + false + + + DynamicLibrary + v141 + MultiByte + false + + + DynamicLibrary + v141 + MultiByte + false + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28127.55 + + + $(SolutionDir)bin\$(Platform)\ + $(Platform)_$(Configuration)\ + true + false + + + $(SolutionDir)bin\$(Platform)\ + $(Platform)_$(Configuration)\ + true + false + + + $(SolutionDir)bin\$(Platform)\ + $(Platform)_$(Configuration)\ + false + false + + + $(SolutionDir)bin\$(Platform)\ + $(Platform)_$(Configuration)\ + false + false + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKET_DLL_EXPORTS;%(PreprocessorDefinitions) + true + + EnableFastChecks + MultiThreadedDebug + 8Bytes + false + + Level3 + ProgramDatabase + CompileAsC + + + Version.lib;winmm.lib;Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + $(OutDir)Packet.dll + Packet.def + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + Windows + 100000 + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKET_DLL_EXPORTS;CPU_64;%(PreprocessorDefinitions) + true + + EnableFastChecks + MultiThreadedDebug + 8Bytes + false + + Level3 + ProgramDatabase + CompileAsC + + + Version.lib;winmm.lib;Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + $(OutDir)Packet.dll + Packet.def + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + Windows + 100000 + MachineX64 + + + + + Disabled + AnySuitable + true + false + WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKET_DLL_EXPORTS;%(PreprocessorDefinitions) + true + + MultiThreaded + 8Bytes + false + + Level3 + ProgramDatabase + CompileAsC + + + Version.lib;winmm.lib;Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + $(OutDir)Packet.dll + Packet.def + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + Windows + 100000 + true + true + MachineX86 + + + + + X64 + + + Disabled + AnySuitable + true + false + WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKET_DLL_EXPORTS;CPU_64;%(PreprocessorDefinitions) + true + + MultiThreaded + 8Bytes + false + + Level3 + ProgramDatabase + CompileAsC + + + Version.lib;winmm.lib;Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + $(OutDir)Packet.dll + Packet.def + true + $(SolutionDir)DebugFiles\pdb\$(Platform)_$(Configuration)\$(ProjectName).pdb + true + $(SolutionDir)DebugFiles\map\$(Platform)_$(Configuration)\$(ProjectName).map + Windows + 100000 + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2389346b-7672-4bc0-a3dd-0167b20f18c7} + false + + + + + + \ No newline at end of file diff --git a/Packet_dll/Packet_dll.vcxproj.filters b/Packet_dll/Packet_dll.vcxproj.filters new file mode 100644 index 0000000..7a703d1 --- /dev/null +++ b/Packet_dll/Packet_dll.vcxproj.filters @@ -0,0 +1,82 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + + + Src + + + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + Header + + + + + Resource + + + \ No newline at end of file diff --git a/Win10Pcap.sln b/Win10Pcap.sln index 67b861a..2afc60b 100644 --- a/Win10Pcap.sln +++ b/Win10Pcap.sln @@ -1,14 +1,13 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NdisDriver", "NdisDriver\NdisDriver.vcproj", "{2389346B-7672-4BC0-A3DD-0167B20F18C7}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.168 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NdisDriver", "NdisDriver\NdisDriver.vcxproj", "{2389346B-7672-4BC0-A3DD-0167B20F18C7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Packet_dll", "Packet_dll\Packet_dll.vcproj", "{BB1D6C0B-084E-4FCE-AF8D-BB3CFDC1D8EA}" - ProjectSection(ProjectDependencies) = postProject - {2389346B-7672-4BC0-A3DD-0167B20F18C7} = {2389346B-7672-4BC0-A3DD-0167B20F18C7} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Packet_dll", "Packet_dll\Packet_dll.vcxproj", "{BB1D6C0B-084E-4FCE-AF8D-BB3CFDC1D8EA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Installer\Installer.vcproj", "{A67E6EC7-46B9-4146-86A5-55F5B8767151}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Installer\Installer.vcxproj", "{A67E6EC7-46B9-4146-86A5-55F5B8767151}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,4 +44,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B316FC5E-4AFA-41E6-818C-5F76E7EF37E6} + EndGlobalSection EndGlobal From 56cc8385f766b8fe9d60aee5fcdcea2296640ac4 Mon Sep 17 00:00:00 2001 From: Tim Shelton Date: Mon, 21 Jan 2019 23:18:33 -0600 Subject: [PATCH 2/2] Adds default INF support. You have to regenerate the .cat files using Inf2cat and then sign the drivers and cat file. But once completed, you can use pnputil to silent install the drivers. --- bin/Win32/drivers/win10/Win10Pcap.inf | 19 +++++++++++++++++++ bin/Win32/drivers/win78/Win10Pcap.inf | 19 +++++++++++++++++++ bin/x64/drivers/win10/Win10Pcap.inf | 20 ++++++++++++++++++++ bin/x64/drivers/win78/Win10Pcap.inf | 20 ++++++++++++++++++++ 4 files changed, 78 insertions(+) diff --git a/bin/Win32/drivers/win10/Win10Pcap.inf b/bin/Win32/drivers/win10/Win10Pcap.inf index d09f658..81e04ad 100644 --- a/bin/Win32/drivers/win10/Win10Pcap.inf +++ b/bin/Win32/drivers/win10/Win10Pcap.inf @@ -45,8 +45,27 @@ DelService = Win10Pcap, 0x200 Win10Pcap.sys = 1 [DestinationDirs] +DefaultDestDir = 12 Win10Pcap_CopyFiles = 12 + +[DefaultInstall] +OptionDesc = %ServiceDescription% +CopyFiles = Win10Pcap_CopyFiles + +[DefaultInstall.Services] +AddService = Win10Pcap, , Win10Pcap_Service_Install + +;; +;; Default uninstall sections +;; + +[DefaultUninstall] +DelFiles = Win10Pcap_CopyFiles + +[DefaultUninstall.Services] +DelService = %ServiceName%,0x200 ;Ensure service is stopped before deleting + [Win10Pcap_CopyFiles] Win10Pcap.sys, , , 2 diff --git a/bin/Win32/drivers/win78/Win10Pcap.inf b/bin/Win32/drivers/win78/Win10Pcap.inf index d09f658..81e04ad 100644 --- a/bin/Win32/drivers/win78/Win10Pcap.inf +++ b/bin/Win32/drivers/win78/Win10Pcap.inf @@ -45,8 +45,27 @@ DelService = Win10Pcap, 0x200 Win10Pcap.sys = 1 [DestinationDirs] +DefaultDestDir = 12 Win10Pcap_CopyFiles = 12 + +[DefaultInstall] +OptionDesc = %ServiceDescription% +CopyFiles = Win10Pcap_CopyFiles + +[DefaultInstall.Services] +AddService = Win10Pcap, , Win10Pcap_Service_Install + +;; +;; Default uninstall sections +;; + +[DefaultUninstall] +DelFiles = Win10Pcap_CopyFiles + +[DefaultUninstall.Services] +DelService = %ServiceName%,0x200 ;Ensure service is stopped before deleting + [Win10Pcap_CopyFiles] Win10Pcap.sys, , , 2 diff --git a/bin/x64/drivers/win10/Win10Pcap.inf b/bin/x64/drivers/win10/Win10Pcap.inf index 277843c..26b9629 100644 --- a/bin/x64/drivers/win10/Win10Pcap.inf +++ b/bin/x64/drivers/win10/Win10Pcap.inf @@ -45,8 +45,28 @@ DelService = Win10Pcap, 0x200 Win10Pcap.sys = 1 [DestinationDirs] +DefaultDestDir = 12 Win10Pcap_CopyFiles = 12 + +[DefaultInstall] +OptionDesc = %ServiceDescription% +CopyFiles = Win10Pcap_CopyFiles + +[DefaultInstall.Services] +AddService = Win10Pcap, , Win10Pcap_Service_Install + +;; +;; Default uninstall sections +;; + +[DefaultUninstall] +DelFiles = Win10Pcap_CopyFiles + +[DefaultUninstall.Services] +DelService = %ServiceName%,0x200 ;Ensure service is stopped before deleting + + [Win10Pcap_CopyFiles] Win10Pcap.sys, , , 2 diff --git a/bin/x64/drivers/win78/Win10Pcap.inf b/bin/x64/drivers/win78/Win10Pcap.inf index 277843c..26b9629 100644 --- a/bin/x64/drivers/win78/Win10Pcap.inf +++ b/bin/x64/drivers/win78/Win10Pcap.inf @@ -45,8 +45,28 @@ DelService = Win10Pcap, 0x200 Win10Pcap.sys = 1 [DestinationDirs] +DefaultDestDir = 12 Win10Pcap_CopyFiles = 12 + +[DefaultInstall] +OptionDesc = %ServiceDescription% +CopyFiles = Win10Pcap_CopyFiles + +[DefaultInstall.Services] +AddService = Win10Pcap, , Win10Pcap_Service_Install + +;; +;; Default uninstall sections +;; + +[DefaultUninstall] +DelFiles = Win10Pcap_CopyFiles + +[DefaultUninstall.Services] +DelService = %ServiceName%,0x200 ;Ensure service is stopped before deleting + + [Win10Pcap_CopyFiles] Win10Pcap.sys, , , 2