From 9f4e557d94283f4a42e7107e40ec09c571f6b10d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Thu, 14 May 2020 19:18:15 +0200 Subject: [PATCH] Updated cabinet creation Removed unused files --- .gitignore | 5 +- ViGEmBus_x64.ddf | 20 ++++--- ViGEmBus_x86.ddf | 20 ++++--- appveyor.yml | 3 +- sys/RCa08996 | Bin 2812 -> 0 bytes sys/ViGEmBus.inf | 9 +--- sys/ViGEmBus.vcxproj | 1 - sys/ViGEmBus.vcxproj.filters | 3 -- sys/ViGEmBus_SingleArch.inf | 100 ----------------------------------- 9 files changed, 26 insertions(+), 135 deletions(-) delete mode 100644 sys/RCa08996 delete mode 100644 sys/ViGEmBus_SingleArch.inf diff --git a/.gitignore b/.gitignore index f804316..e819a9f 100644 --- a/.gitignore +++ b/.gitignore @@ -357,4 +357,7 @@ MigrationBackup/ .ionide/ # Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file +FodyWeavers.xsd +/disk1/ViGEmBus_x64.cab +/setup.inf +/setup.rpt diff --git a/ViGEmBus_x64.ddf b/ViGEmBus_x64.ddf index 082412e..d8a55d9 100644 --- a/ViGEmBus_x64.ddf +++ b/ViGEmBus_x64.ddf @@ -1,3 +1,4 @@ +; ViGEmBus cab file for attestation submission .OPTION EXPLICIT .Set CabinetFileCountThreshold=0 .Set FolderFileCountThreshold=0 @@ -8,14 +9,11 @@ .Set CompressionType=MSZIP .Set Cabinet=on .Set Compress=on -.Set CabinetNameTemplate=ViGEmBus.cab -.Set DestinationDir=ViGEmBus -.\artifacts\ViGEmBus.inf -.Set DestinationDir=ViGEmBus\x64 -.\artifacts\x64\ViGEmBus.sys -.\artifacts\x64\ViGEmBus.pdb -.\artifacts\x64\WdfCoinstaller01009.dll -.Set DestinationDir=ViGEmBus\x86 -.\artifacts\x86\ViGEmBus.sys -.\artifacts\x86\ViGEmBus.pdb -.\artifacts\x86\WdfCoinstaller01009.dll \ No newline at end of file +; x64 +.Set CabinetNameTemplate=ViGEmBus_x64.cab +.Set DestinationDir=ViGEmBus_x64 +LICENSE +bin\x64\ViGEmBus.pdb +bin\x64\ViGEmBus\ViGEmBus.inf +bin\x64\ViGEmBus\ViGEmBus.sys +bin\x64\ViGEmBus\WdfCoinstaller01009.dll \ No newline at end of file diff --git a/ViGEmBus_x86.ddf b/ViGEmBus_x86.ddf index 082412e..b24406a 100644 --- a/ViGEmBus_x86.ddf +++ b/ViGEmBus_x86.ddf @@ -1,3 +1,4 @@ +; ViGEmBus cab file for attestation submission .OPTION EXPLICIT .Set CabinetFileCountThreshold=0 .Set FolderFileCountThreshold=0 @@ -8,14 +9,11 @@ .Set CompressionType=MSZIP .Set Cabinet=on .Set Compress=on -.Set CabinetNameTemplate=ViGEmBus.cab -.Set DestinationDir=ViGEmBus -.\artifacts\ViGEmBus.inf -.Set DestinationDir=ViGEmBus\x64 -.\artifacts\x64\ViGEmBus.sys -.\artifacts\x64\ViGEmBus.pdb -.\artifacts\x64\WdfCoinstaller01009.dll -.Set DestinationDir=ViGEmBus\x86 -.\artifacts\x86\ViGEmBus.sys -.\artifacts\x86\ViGEmBus.pdb -.\artifacts\x86\WdfCoinstaller01009.dll \ No newline at end of file +; x86 +.Set CabinetNameTemplate=ViGEmBus_x86.cab +.Set DestinationDir=ViGEmBus_x86 +LICENSE +bin\x86\ViGEmBus.pdb +bin\x86\ViGEmBus\ViGEmBus.inf +bin\x86\ViGEmBus\ViGEmBus.sys +bin\x86\ViGEmBus\WdfCoinstaller01009.dll \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index b819d82..c1e4496 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,12 +14,13 @@ before_build: build: project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln after_build: -#- cmd: makecab.exe /f ViGEmBus.ddf +- cmd: makecab.exe /f ViGEmBus_%PLATFORM%.ddf artifacts: - path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.inf' - path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.sys' - path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.dll' - path: 'bin**\*.pdb' +- path: 'disk1\*.cab' deploy: - provider: Environment name: BUILDBOT diff --git a/sys/RCa08996 b/sys/RCa08996 deleted file mode 100644 index e1da2b48482a9ac10774b8448e65a0464d538764..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2812 zcmchZZEw<06vxkN6Td@K-e|HRTNV{#Ohg7QZeyXW$r6)=J%Gdsq%F>Udw=KN-nN$& z^o1@>xliZee;)3?G~`ZZGM8HkWKTlr$~*bW(`Dx;@0~1UDLJTMrI{9245!M%&2Iuc~hP- z_8!2VnDqi#wXbK+j`gH5R&BkPdlR?Dm`D@LA975OB{gzIF!AKdyuB$jC%If8L-{0^ zL~tsx4CD*>>E=?UUfaW{u?G_2Cu3ZZ^}txWVm@WAxF%F1A=6`IX3XcFg$8>QB)e3i zpL?^oRaYw%?X+?!?UEaV!fKVV?#bH%YaqMc z6PQj*@MdEwV_lc@_5S^89reE0$ZVc$_9Ch}psu#MJ?1X2?nJAu`)aL+^f8(Bbpv$j zpFP>(9=_&ReYY4bf-~wiphoBP)#xv*ZL;I=^g#8IT1Rri7}25ic*+hrGM!?hd8}QH zwLGo2>302YtXdd=$VqJ*^=@egpOTZR{zxw5jI3|d)w7uTj7;wjnO7}DWV*xIpX^u* z`-P25@LceY@P1+}c9``I6R7B$|oK<~|nCc!Ai{>K4?*jI4Y@V{SQheWttI0PYi0WtCnXOB z;7@X?d&5%Sk+WX}Wh9N#a;=T44wqV=!{(>Copp2}C(6Rg`7`{dc!=;d0qMQjRgTjg z{bo3ZRH<8-`<%DVx66AMsg!So+Flmg4#U&u#Nmp;RdS=l<2pNpEt-ZgnmJ=Mi%#%! ztbLUkTXS-Cw;{_hX=ueoKBC_EQ$r@234`D$kZE%2|V|RsWy-26!@q A%>V!Z diff --git a/sys/ViGEmBus.inf b/sys/ViGEmBus.inf index 14494ea..1785ddc 100644 --- a/sys/ViGEmBus.inf +++ b/sys/ViGEmBus.inf @@ -35,13 +35,8 @@ DriverVer= ; DefaultDestDir = 12 ViGEmBus_Device_CoInstaller_CopyFiles = 11 -; ================= Class section ===================== - -[SourceDisksNames.amd64] -1 = %DiskName%,,,"\x64" - -[SourceDisksNames.x86] -1 = %DiskName%,,,"\x86" +[SourceDisksNames] +1 = %DiskName%,,, [SourceDisksFiles] ViGEmBus.sys = 1,, diff --git a/sys/ViGEmBus.vcxproj b/sys/ViGEmBus.vcxproj index bd58440..7a6d373 100644 --- a/sys/ViGEmBus.vcxproj +++ b/sys/ViGEmBus.vcxproj @@ -179,7 +179,6 @@ - diff --git a/sys/ViGEmBus.vcxproj.filters b/sys/ViGEmBus.vcxproj.filters index 66f8fd6..2016129 100644 --- a/sys/ViGEmBus.vcxproj.filters +++ b/sys/ViGEmBus.vcxproj.filters @@ -31,9 +31,6 @@ Driver Files - - Driver Files - diff --git a/sys/ViGEmBus_SingleArch.inf b/sys/ViGEmBus_SingleArch.inf deleted file mode 100644 index 1785ddc..0000000 --- a/sys/ViGEmBus_SingleArch.inf +++ /dev/null @@ -1,100 +0,0 @@ -; Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver -; -; MIT License -; -; Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors -; -; Permission is hereby granted, free of charge, to any person obtaining a copy -; of this software and associated documentation files (the "Software"), to deal -; in the Software without restriction, including without limitation the rights -; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -; copies of the Software, and to permit persons to whom the Software is -; furnished to do so, subject to the following conditions: -; -; The above copyright notice and this permission notice shall be included in all -; copies or substantial portions of the Software. -; -; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -; SOFTWARE. - - -[Version] -Signature="$WINDOWS NT$" -Class=System -ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318} -Provider=%ManufacturerName% -CatalogFile=ViGEmBus.cat -DriverVer= ; - -[DestinationDirs] -DefaultDestDir = 12 -ViGEmBus_Device_CoInstaller_CopyFiles = 11 - -[SourceDisksNames] -1 = %DiskName%,,, - -[SourceDisksFiles] -ViGEmBus.sys = 1,, -WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1 - -;***************************************** -; Install Section -;***************************************** - -[Manufacturer] -%ManufacturerName%=Standard,NTamd64,NTx86 - -[Standard.NTamd64] -%ViGEmBus.DeviceDesc%=ViGEmBus_Device, Nefarius\ViGEmBus\Gen1 - -[Standard.NTx86] -%ViGEmBus.DeviceDesc%=ViGEmBus_Device, Nefarius\ViGEmBus\Gen1 - -[ViGEmBus_Device.NT] -CopyFiles=Drivers_Dir - -[Drivers_Dir] -ViGEmBus.sys - -;-------------- Service installation -[ViGEmBus_Device.NT.Services] -AddService = ViGEmBus,%SPSVCINST_ASSOCSERVICE%, ViGEmBus_Service_Inst - -; -------------- ViGEmBus driver install sections -[ViGEmBus_Service_Inst] -DisplayName = %ViGEmBus.SVCDESC% -ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START -ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %12%\ViGEmBus.sys - -; -;--- ViGEmBus_Device Coinstaller installation ------ -; - -[ViGEmBus_Device.NT.CoInstallers] -AddReg=ViGEmBus_Device_CoInstaller_AddReg -CopyFiles=ViGEmBus_Device_CoInstaller_CopyFiles - -[ViGEmBus_Device_CoInstaller_AddReg] -HKR,,CoInstallers32,0x00010000, "WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller" - -[ViGEmBus_Device_CoInstaller_CopyFiles] -WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll - -[ViGEmBus_Device.NT.Wdf] -KmdfService = ViGEmBus, ViGEmBus_wdfsect -[ViGEmBus_wdfsect] -KmdfLibraryVersion = $KMDFVERSION$ - -[Strings] -SPSVCINST_ASSOCSERVICE= 0x00000002 -ManufacturerName="Nefarius Software Solutions e.U." -DiskName = "ViGEmBus Installation Disk" -ViGEmBus.DeviceDesc = "Virtual Gamepad Emulation Bus" -ViGEmBus.SVCDESC = "Virtual Gamepad Emulation Service"