From afa69cdeeb4644e8cd9a1a567dc91a7f29947a5b Mon Sep 17 00:00:00 2001 From: mvillalpando06 <116905813+mvillalpando06@users.noreply.github.com> Date: Fri, 24 Mar 2023 12:31:24 -0700 Subject: 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 --- pofx/PEP/acpi/sampleacpipep.inx | Bin 4238 -> 4270 bytes pofx/PEP/acpi/sampleacpipep.vcxproj | 8 +- simbatt/func/simbatt-wdfcoinstall.inx | 109 ---------------------------- simbatt/func/simbatt.inx | Bin 3892 -> 3944 bytes simbatt/func/simbatt.vcxproj | 10 +-- simbatt/func/simbatt.vcxproj.Filters | 5 +- thermal/simsensor/simsensor.inf | 20 ++--- thermal/simsensor/simsensor.vcxproj | 3 + thermal/simsensor/simsensor.vcxproj.Filters | 10 +++ thermal/thermalclient/simtc.inf | 20 ++--- thermal/thermalclient/simtc.vcxproj | 20 ++++- thermal/thermalclient/simtc.vcxproj.Filters | 10 +++ 12 files changed, 69 insertions(+), 146 deletions(-) delete mode 100644 simbatt/func/simbatt-wdfcoinstall.inx diff --git a/pofx/PEP/acpi/sampleacpipep.inx b/pofx/PEP/acpi/sampleacpipep.inx index 4dfa0a29..9f93ad5b 100644 Binary files a/pofx/PEP/acpi/sampleacpipep.inx and b/pofx/PEP/acpi/sampleacpipep.inx differ diff --git a/pofx/PEP/acpi/sampleacpipep.vcxproj b/pofx/PEP/acpi/sampleacpipep.vcxproj index 77709aa2..357b2205 100644 --- a/pofx/PEP/acpi/sampleacpipep.vcxproj +++ b/pofx/PEP/acpi/sampleacpipep.vcxproj @@ -30,7 +30,7 @@ Windows10 False - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -38,7 +38,7 @@ Windows10 True - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -46,7 +46,7 @@ Windows10 False - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -54,7 +54,7 @@ Windows10 True - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver diff --git a/simbatt/func/simbatt-wdfcoinstall.inx b/simbatt/func/simbatt-wdfcoinstall.inx deleted file mode 100644 index 15c596ab..00000000 --- a/simbatt/func/simbatt-wdfcoinstall.inx +++ /dev/null @@ -1,109 +0,0 @@ -;/*++ -; -;Copyright (c) Microsoft Corporation All rights Reserved -; -;Module Name: -; -; simbatt.inf -; -;Abstract: -; -; INF file for installing Simulated Battery WDF driver. -; -; N.B. Search the file for TODO comments and make necessary changes to make -; this INF file functional. -; -; N.B. Place the WdfCoInstaller files in the same directory as this file to -; make this INF file functional. -; -;--*/ - -[Version] -Signature="$WINDOWS NT$" -Class=Battery -ClassGuid={72631e54-78a4-11d0-bcf7-00aa00b7b32a} -Provider=%ProviderName% -DriverVer=04/30/2008, 6.01.6598 -CatalogFile=simbatt-wdfcoinstall.cat ; TODO: Add a signed catalog file -PnpLockdown=1 - -[DestinationDirs] -DefaultDestDir = 12 -SimBatt_Device_CoInstaller_CopyFiles = 11 - -[SourceDisksNames] -1 = %DiskId1%,,,"" - -[SourceDisksFiles] -simbatt.sys = 1 -WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1 - -;***************************************** -; Simulated Battery Install Section -;***************************************** - -[Manufacturer] -%StdMfg%=Standard,NT$ARCH$ - -[Standard.NT$ARCH$] -%SimBatt.DeviceDesc% = SimBatt_Device,{6B34C467-CE1F-4c0d-A3E4-F98A5718A9D6}\SimBatt - -[SimBatt_Device.NT] -CopyFiles=SimBatt_Device_Drivers -Include=battery.inf -Needs=Battery_Inst - -[SimBatt_Device.NT.HW] -AddReg=SimBatt_Device.NT.AddReg - -[SimBatt_Device.NT.AddReg] -HKR,,Security,,"D:P(A;;GA;;;AU)(A;;GA;;;S-1-15-2-1)" ; Allow generic-all users and appcontainers - -[SimBatt_Device_Drivers] -simbatt.sys - -;-------------- Service installation - -[SimBatt_Device.NT.Services] -AddService = simbatt,%SPSVCINST_ASSOCSERVICE%,SimBatt_Service_Inst - -; -------------- simbatt driver install sections - -[SimBatt_Service_Inst] -DisplayName = %SimBatt.SVCDESC% -ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START -ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %12%\simbatt.sys - -;***************************************** -; WDF CoInstaller -;***************************************** - -[SimBatt_Device.NT.CoInstallers] -AddReg=SimBatt_Device_CoInstaller_AddReg -CopyFiles=SimBatt_Device_CoInstaller_CopyFiles - -[SimBatt_Device_CoInstaller_AddReg] -HKR,,CoInstallers32,0x00010000, "WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller" - -[SimBatt_Device_CoInstaller_CopyFiles] -WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll - -[SimBatt_Device.NT.Wdf] -KmdfService = SimBatt, SimBatt_wdfsect - -[SimBatt_wdfsect] -KmdfLibraryVersion = $KMDFVERSION$ - -;***************************************** -; Literals -;***************************************** - -[Strings] -SPSVCINST_ASSOCSERVICE= 0x00000002 -ProviderName = "TODO-Set-Provider" -StdMfg = "TODO-Set-Manufacturer" -DiskId1 = "Simulated Battery Installation Disk" -SimBatt.DeviceDesc = "Simulated Battery" -SimBatt.SVCDESC = "Simulated Battery" diff --git a/simbatt/func/simbatt.inx b/simbatt/func/simbatt.inx index 3b138e05..02163c10 100644 Binary files a/simbatt/func/simbatt.inx and b/simbatt/func/simbatt.inx differ diff --git a/simbatt/func/simbatt.vcxproj b/simbatt/func/simbatt.vcxproj index a9ab3b9b..342480fb 100644 --- a/simbatt/func/simbatt.vcxproj +++ b/simbatt/func/simbatt.vcxproj @@ -30,7 +30,7 @@ Windows10 False - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -38,7 +38,7 @@ Windows10 True - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -46,7 +46,7 @@ Windows10 False - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -54,7 +54,7 @@ Windows10 True - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -190,7 +190,7 @@ - + diff --git a/simbatt/func/simbatt.vcxproj.Filters b/simbatt/func/simbatt.vcxproj.Filters index 42b85d1a..bef5fc96 100644 --- a/simbatt/func/simbatt.vcxproj.Filters +++ b/simbatt/func/simbatt.vcxproj.Filters @@ -43,10 +43,7 @@ - - Driver Files - - + Driver Files 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);DRIVER=1;STRICT=1 %(AdditionalIncludeDirectories);..\inc\ + + SHA256 + 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 @@ Resource Files + + + Header Files + + + + + Driver Files + + \ 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 @@ Windows10 False - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -38,7 +38,7 @@ Windows10 True - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -46,7 +46,7 @@ Windows10 False - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -54,7 +54,7 @@ Windows10 True - Universal + Windows Driver KMDF WindowsKernelModeDriver10.0 Driver @@ -105,6 +105,9 @@ %(PreprocessorDefinitions);DRIVER=1 %(AdditionalIncludeDirectories) + + SHA256 + @@ -123,6 +126,9 @@ %(PreprocessorDefinitions);DRIVER=1 %(AdditionalIncludeDirectories) + + SHA256 + @@ -141,6 +147,9 @@ %(PreprocessorDefinitions);DRIVER=1 %(AdditionalIncludeDirectories) + + SHA256 + @@ -159,6 +168,9 @@ %(PreprocessorDefinitions);DRIVER=1 %(AdditionalIncludeDirectories) + + SHA256 + 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 @@ Resource Files + + + Header Files + + + + + Driver Files + + \ No newline at end of file -- cgit v1.3.1