Update DV-FailDriver-WDM sample to correctly create a driver package.

3 files changed, 96 insertions, 7 deletions

diff --git a/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.inf b/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.inf
new file mode 100644
index 00000000..7be4d774
--- /dev/null
+++ b/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.inf
@@ -0,0 +1,89 @@
+;/*++
+;
+;Copyright (c) 1990-2017 Microsoft Corporation All rights Reserved
+;
+;Module Name:
+;
+;    Defect_ToastMon.INF
+;
+;Abstract:
+;    INF file for installing sample buggy toastmon driver
+;
+;--*/
+
+[Version]
+Signature="$WINDOWS NT$"
+Class=System
+ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318}
+Provider="Sample Provider"
+DriverVer=12/12/2017,10.0.0.1
+CatalogFile=Defect_Toastmon.cat
+
+[DestinationDirs]
+DefaultDestDir = 12
+
+
+; ================= Device Install section =====================
+
+[Manufacturer]
+%ManufacturerString%=Sample_Manufacturer,NTx86, NTamd64, NTARM, NTARM64
+
+; For XP and later
+[Sample_Manufacturer.NTx86]
+%Defect_ToastMon.DRVDESC%=Defect_ToastMon_Inst,root\defect_toastmon
+
+[Sample_Manufacturer.NTARM]
+%Defect_ToastMon.DRVDESC%=Defect_ToastMon_Inst,root\defect_toastmon
+
+[Sample_Manufacturer.NTARM64]
+%Defect_ToastMon.DRVDESC%=Defect_ToastMon_Inst,root\defect_toastmon
+
+[Sample_Manufacturer.NTamd64]
+%Defect_ToastMon.DRVDESC%=Defect_ToastMon_Inst,root\defect_toastmon
+
+[Defect_ToastMon_Inst.NT]
+CopyFiles=Defect_ToastMon.CopyFiles
+
+[Defect_ToastMon.CopyFiles]
+defect_toastmon.sys
+
+[Defect_ToastMon_Inst.NT.Services]
+AddService=Defect_ToastMon,0x00000002,Defect_ToastMon_Service 
+
+[Defect_ToastMon_Service]
+DisplayName    = %Defect_ToastMon.SVCDESC%                            
+ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
+StartType      = 1                  ; SERVICE_SYSTEM_START
+ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
+ServiceBinary  = %12%\defect_toastmon.sys                            
+
+[DeviceInstall32]
+AddDevice=ROOT\Samples\0001,,ToastMonbuggy
+
+[ToastMonBuggy]
+HardwareIds=root\defect_toastmon
+
+; ================= Source Media Section =====================
+
+[SourceDisksFiles]
+defect_toastmon.sys=1
+
+[SourceDisksNames.x86]
+1 = %DISK_NAME%,,,
+
+[SourceDisksNames.amd64]
+1 = %DISK_NAME%,,,
+
+[SourceDisksNames.ARM]
+1 = %DISK_NAME%,,,
+
+[SourceDisksNames.ARM64]
+1 = %DISK_NAME%,,,
+
+[Strings]
+ManufacturerString = "Sample Manufacturer"
+ClassName = "Sample Drivers"
+Defect_ToastMon.SVCDESC = "Sample ToastMon Buggy Service"
+Defect_ToastMon.DRVDESC = "Sample ToastMon Buggy Driver"
+DISK_NAME = "Toastmon Install Disk"
+
diff --git a/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.vcxproj b/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.vcxproj
index 3bbfc913..dd677f88 100644
--- a/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.vcxproj
+++ b/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{50D75FD5-F47F-4289-98ED-B4AF87F5074D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <SupportsPackaging>false</SupportsPackaging>
+    <SupportsPackaging>true</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
@@ -90,7 +90,7 @@
     <TargetName>defect_toastmon</TargetName>
   </PropertyGroup>
   <ItemGroup>
-    <FilesToPackage Include="..\defect_toastmon.inf" />
+    <FilesToPackage Include=".\defect_toastmon.inf" />
   </ItemGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
diff --git a/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.vcxproj.Filters b/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.vcxproj.Filters
index 54b3292a..e2f2343e 100644
--- a/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.vcxproj.Filters
+++ b/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.vcxproj.Filters
@@ -19,11 +19,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include="..\defect_toastmon.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="..\defect_toastmon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -36,4 +31,9 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Inf Include="*.inf">
+      <Filter>Driver Files</Filter>
+    </Inf>
+  </ItemGroup>
 </Project>
\ No newline at end of file