Fix driver violations for energy team owned drivers (#880)

* Fix driver violations for energy team owned drivers

* Address comments

* remove simbatt wdf inf

* Fix build failures

* Fix sampleacpipep inx file

* re isolate sample acpipep

* add target os

6 files changed, 59 insertions, 24 deletions

diff --git a/thermal/simsensor/simsensor.inf b/thermal/simsensor/simsensor.inf
index 63f7a368..0f8fb7cd 100644
--- a/thermal/simsensor/simsensor.inf
+++ b/thermal/simsensor/simsensor.inf
@@ -22,7 +22,7 @@ CatalogFile=simsensor.cat
 PnpLockdown=1
 
 [DestinationDirs]
-DefaultDestDir = 12
+DefaultDestDir = 13
 
 [SourceDisksNames]
 1 = %DiskId1%,,,""
@@ -35,21 +35,21 @@ simsensor.sys  = 1,,
 ;********************************************
 
 [Manufacturer]
-%StdMfg%=Standard,NTx86
-%StdMfg%=Standard,NTamd64
-%StdMfg%=Standard,NTarm
-%StdMfg%=Standard,NTarm64
+%StdMfg%=Standard,NTx86.10.0...16299
+%StdMfg%=Standard,NTamd64.10.0...16299
+%StdMfg%=Standard,NTarm.10.0...16299
+%StdMfg%=Standard,NTarm64.10.0...16299
 
-[Standard.NTx86]
+[Standard.NTx86.10.0...16299]
 %simsensor.DeviceDesc% = simsensor_Device, ACPI\MSNS0042
 
-[Standard.NTamd64]
+[Standard.NTamd64.10.0...16299]
 %simsensor.DeviceDesc% = simsensor_Device, ACPI\MSNS0042
 
-[Standard.NTarm]
+[Standard.NTarm.10.0...16299]
 %simsensor.DeviceDesc% = simsensor_Device, ACPI\MSNS0042
 
-[Standard.NTarm64]
+[Standard.NTarm64.10.0...16299]
 %simsensor.DeviceDesc% = simsensor_Device, ACPI\MSNS0042
 
 [simsensor_Device.NT]
@@ -78,7 +78,7 @@ DisplayName    = %simsensor.SVCDESC%
 ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
 StartType      = 3               ; SERVICE_DEMAND_START
 ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
-ServiceBinary  = %12%\simsensor.sys
+ServiceBinary  = %13%\simsensor.sys
 
 [Temperature_Power_Setting]
 SubGroup = {7D54AE13-7A01-469d-8AF3-6FF4662C5371}
diff --git a/thermal/simsensor/simsensor.vcxproj b/thermal/simsensor/simsensor.vcxproj
index efbdd2dc..a155d12a 100644
--- a/thermal/simsensor/simsensor.vcxproj
+++ b/thermal/simsensor/simsensor.vcxproj
@@ -105,6 +105,9 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DRIVER=1;STRICT=1</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc\</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <DriverSign>
+      <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
+    </DriverSign>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
diff --git a/thermal/simsensor/simsensor.vcxproj.Filters b/thermal/simsensor/simsensor.vcxproj.Filters
index c4d812c1..20f76bc5 100644
--- a/thermal/simsensor/simsensor.vcxproj.Filters
+++ b/thermal/simsensor/simsensor.vcxproj.Filters
@@ -28,4 +28,14 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Inf Include="*.inf">
+      <Filter>Driver Files</Filter>
+    </Inf>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/thermal/thermalclient/simtc.inf b/thermal/thermalclient/simtc.inf
index 7e607612..41d0d667 100644
--- a/thermal/thermalclient/simtc.inf
+++ b/thermal/thermalclient/simtc.inf
@@ -22,7 +22,7 @@ CatalogFile=thermalclient.cat
 PnpLockdown=1
 
 [DestinationDirs]
-DefaultDestDir = 12
+DefaultDestDir = 13
 
 [SourceDisksNames]
 1 = %DiskId1%,,,""
@@ -35,21 +35,21 @@ simtc.sys  = 1,,
 ;********************************************
 
 [Manufacturer]
-%StdMfg%=Standard,NTx86
-%StdMfg%=Standard,NTamd64
-%StdMfg%=Standard,NTarm
-%StdMfg%=Standard,NTarm64
+%StdMfg%=Standard,NTx86.10.0...16299
+%StdMfg%=Standard,NTamd64.10.0...16299
+%StdMfg%=Standard,NTarm.10.0...16299
+%StdMfg%=Standard,NTarm64.10.0...16299
 
-[Standard.NTx86]
+[Standard.NTx86.10.0...16299]
 %SimTc.DeviceDesc% = SimTc_Device, ACPI\STCL0001
 
-[Standard.NTamd64]
+[Standard.NTamd64.10.0...16299]
 %SimTc.DeviceDesc% = SimTc_Device, ACPI\STCL0001
 
-[Standard.NTarm]
+[Standard.NTarm.10.0...16299]
 %SimTc.DeviceDesc% = SimTc_Device, ACPI\STCL0001
 
-[Standard.NTarm64]
+[Standard.NTarm64.10.0...16299]
 %SimTc.DeviceDesc% = SimTc_Device, ACPI\STCL0001
 
 [SimTc_Device.NT]
@@ -77,7 +77,7 @@ DisplayName    = %SimTc.SVCDESC%
 ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
 StartType      = 3               ; SERVICE_DEMAND_START
 ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
-ServiceBinary  = %12%\simtc.sys
+ServiceBinary  = %13%\simtc.sys
 
 [Strings]
 SPSVCINST_ASSOCSERVICE= 0x00000002
diff --git a/thermal/thermalclient/simtc.vcxproj b/thermal/thermalclient/simtc.vcxproj
index b3ac6743..2ce2a1dc 100644
--- a/thermal/thermalclient/simtc.vcxproj
+++ b/thermal/thermalclient/simtc.vcxproj
@@ -30,7 +30,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -38,7 +38,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -46,7 +46,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -54,7 +54,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -105,6 +105,9 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DRIVER=1</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <DriverSign>
+      <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
+    </DriverSign>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -123,6 +126,9 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DRIVER=1</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <DriverSign>
+      <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
+    </DriverSign>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -141,6 +147,9 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DRIVER=1</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <DriverSign>
+      <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
+    </DriverSign>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -159,6 +168,9 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DRIVER=1</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <DriverSign>
+      <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
+    </DriverSign>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="simtc.c" />
diff --git a/thermal/thermalclient/simtc.vcxproj.Filters b/thermal/thermalclient/simtc.vcxproj.Filters
index efa1939f..2f8f2a5b 100644
--- a/thermal/thermalclient/simtc.vcxproj.Filters
+++ b/thermal/thermalclient/simtc.vcxproj.Filters
@@ -28,4 +28,14 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Inf Include="*.inf">
+      <Filter>Driver Files</Filter>
+    </Inf>
+  </ItemGroup>
 </Project>
\ No newline at end of file