From 4ad341e63f6cb19911c90e20ac4ad34d2eacf1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Wed, 24 Aug 2022 14:04:22 +0200 Subject: [PATCH 01/15] Testing alternate compiler settings --- appveyor.yml | 1 + patches/dmf-optimizations.diff | 285 +++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+) create mode 100644 patches/dmf-optimizations.diff diff --git a/appveyor.yml b/appveyor.yml index f6c356d..c81b690 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,6 +18,7 @@ install: - ps: iwr "https://download.microsoft.com/download/c/f/8/cf80b955-d578-4635-825c-2801911f9d79/wdk/wdksetup.exe" -OutFile wdksetup.exe - cmd: .\wdksetup.exe /features + /q /norestart - cmd: git submodule -q update --init +- cmd: git apply --directory="C:\projects\DMF" "%APPVEYOR_BUILD_FOLDER%\patches\dmf-optimizations.diff - cmd: git clone -q https://github.com/microsoft/DMF.git C:\projects\DMF 2> nul || set ERRORLEVEL=0 - cmd: | cd "C:\projects\DMF" diff --git a/patches/dmf-optimizations.diff b/patches/dmf-optimizations.diff new file mode 100644 index 0000000..a5481be --- /dev/null +++ b/patches/dmf-optimizations.diff @@ -0,0 +1,285 @@ + Dmf/Solution/DmfK/DmfK.vcxproj | 8 ++++++++ + Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj | 8 ++++++++ + .../DmfKModules.Library/DmfKModules.Library.vcxproj | 8 ++++++++ + .../DmfKModules.Template/DmfKModules.Template.vcxproj | 16 ++++++++++++---- + Dmf/Solution/DmfU/DmfU.vcxproj | 8 ++++++++ + Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj | 8 ++++++++ + .../DmfUModules.Library/DmfUModules.Library.vcxproj | 8 ++++++++ + .../DmfUModules.Library.vcxproj.filters | 10 +++++----- + .../DmfUModules.Template/DmfUModules.Template.vcxproj | 12 ++++++++++-- + 9 files changed, 75 insertions(+), 11 deletions(-) + +diff --git a/Dmf/Solution/DmfK/DmfK.vcxproj b/Dmf/Solution/DmfK/DmfK.vcxproj +index 738397c..e791a99 100644 +--- a/Dmf/Solution/DmfK/DmfK.vcxproj ++++ b/Dmf/Solution/DmfK/DmfK.vcxproj +@@ -199,6 +199,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -228,6 +231,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -258,6 +264,8 @@ + .c.C.cpp.CPP.h.H + true + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) +diff --git a/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj b/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj +index 13d2475..8b8680b 100644 +--- a/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj ++++ b/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj +@@ -230,6 +230,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -257,6 +260,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -285,6 +291,8 @@ + .c.C.cpp.CPP.h.H + true + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) +diff --git a/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj b/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj +index 1ba20c5..d5426d7 100644 +--- a/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj ++++ b/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj +@@ -323,6 +323,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -352,6 +355,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -382,6 +388,8 @@ + .c.C.cpp.CPP.h.H + true + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) +diff --git a/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj b/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj +index 0d0ef4c..dab8874 100644 +--- a/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj ++++ b/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj +@@ -132,13 +132,13 @@ + OldStyle + .c.C.cpp.CPP.h.H + true +- /d2guardsignret %(AdditionalOptions) ++ /d2guardsignret %(AdditionalOptions) + + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies);setupapi.lib;cfgmgr32.lib;wpprecorder.lib; + true +- /guard:delayloadsignret %(AdditionalOptions) ++ /guard:delayloadsignret %(AdditionalOptions) + + + false +@@ -158,6 +158,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -182,6 +185,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -206,13 +212,15 @@ + OldStyle + .c.C.cpp.CPP.h.H + true +- /d2guardsignret %(AdditionalOptions) ++ /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies);setupapi.lib;cfgmgr32.lib;wpprecorder.lib; + true +- /guard:delayloadsignret %(AdditionalOptions) ++ /guard:delayloadsignret %(AdditionalOptions) + + + false +diff --git a/Dmf/Solution/DmfU/DmfU.vcxproj b/Dmf/Solution/DmfU/DmfU.vcxproj +index 9b9dd48..9357ae2 100644 +--- a/Dmf/Solution/DmfU/DmfU.vcxproj ++++ b/Dmf/Solution/DmfU/DmfU.vcxproj +@@ -83,6 +83,14 @@ + .c.C.cpp.CPP.h.H + %(AdditionalIncludeDirectories);..\..; + true ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true + + + /d2guardsignret %(AdditionalOptions) +diff --git a/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj b/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj +index 7ba02d9..bc700b8 100644 +--- a/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj ++++ b/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj +@@ -125,6 +125,14 @@ + %(AdditionalIncludeDirectories);..\..\Framework;..\..\Framework\Modules.Core + true + true ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true + + + /d2guardsignret %(AdditionalOptions) +diff --git a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj +index 214e8bb..6930f30 100644 +--- a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj ++++ b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj +@@ -141,6 +141,14 @@ + stdcpp17 + stdcpp17 + stdcpp17 ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true + + + /d2guardsignret %(AdditionalOptions) +diff --git a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj.filters b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj.filters +index b0a085b..c6ce5b1 100644 +--- a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj.filters ++++ b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj.filters +@@ -389,11 +389,8 @@ + + Modules\Targets + +- +- +- +- Documentation\Modules\Targets +- ++ ++ + + + +@@ -519,5 +516,8 @@ + + Documentation\Modules\Targets + ++ ++ ++ + + +\ No newline at end of file +diff --git a/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj b/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj +index 7c285cc..ca4455e 100644 +--- a/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj ++++ b/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj +@@ -84,9 +84,17 @@ + true + true + stdcpp17 ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true + + +- /d2guardsignret %(AdditionalOptions) ++ /d2guardsignret %(AdditionalOptions) + + + %(AdditionalDependencies);hid.lib;setupapi.lib;cfgmgr32.lib; +@@ -94,7 +102,7 @@ + + + +- /guard:delayloadsignret %(AdditionalOptions) ++ /guard:delayloadsignret %(AdditionalOptions) + + + From b613e64d8e5f8748c5a6128f83a5d2325036001b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Wed, 24 Aug 2022 14:07:04 +0200 Subject: [PATCH 02/15] Fixed syntax error --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c81b690..4fa6ee0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,11 +18,11 @@ install: - ps: iwr "https://download.microsoft.com/download/c/f/8/cf80b955-d578-4635-825c-2801911f9d79/wdk/wdksetup.exe" -OutFile wdksetup.exe - cmd: .\wdksetup.exe /features + /q /norestart - cmd: git submodule -q update --init -- cmd: git apply --directory="C:\projects\DMF" "%APPVEYOR_BUILD_FOLDER%\patches\dmf-optimizations.diff - cmd: git clone -q https://github.com/microsoft/DMF.git C:\projects\DMF 2> nul || set ERRORLEVEL=0 - cmd: | cd "C:\projects\DMF" git pull > NUL + git apply "%APPVEYOR_BUILD_FOLDER%\patches\dmf-optimizations.diff cd %appveyor_build_folder% before_build: - ps: Invoke-WebRequest "https://github.com/nefarius/vpatch/releases/latest/download/vpatch.exe" -OutFile vpatch.exe From a70960c29b7652b498bf05b357a36ffc0b019d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Wed, 24 Aug 2022 14:23:13 +0200 Subject: [PATCH 03/15] Updated project compiler settings --- sys/ViGEmBus.vcxproj | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/ViGEmBus.vcxproj b/sys/ViGEmBus.vcxproj index 315d51c..500071b 100644 --- a/sys/ViGEmBus.vcxproj +++ b/sys/ViGEmBus.vcxproj @@ -230,6 +230,9 @@ POOL_NX_OPTIN=1;POOL_ZERO_DOWN_LEVEL_SUPPORT;_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions) stdcpp17 $(SolutionDir)include;$(SolutionDir)sdk\include;$(IntDir);%(AdditionalIncludeDirectories) + MaxSpeed + Speed + true $(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies);ntstrsafe.lib;usbdex.lib @@ -261,6 +264,9 @@ POOL_NX_OPTIN=1;POOL_ZERO_DOWN_LEVEL_SUPPORT;_WIN64;_AMD64_;AMD64;%(PreprocessorDefinitions) stdcpp17 $(SolutionDir)include;$(SolutionDir)sdk\include;$(IntDir);%(AdditionalIncludeDirectories) + MaxSpeed + Speed + true $(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies);ntstrsafe.lib;usbdex.lib @@ -290,6 +296,8 @@ true $(SolutionDir)include;$(SolutionDir)sdk\include;$(IntDir);%(AdditionalIncludeDirectories) POOL_NX_OPTIN=1;POOL_ZERO_DOWN_LEVEL_SUPPORT;_ARM_;ARM;_USE_DECLSPECS_FOR_SAL=1;STD_CALL;%(PreprocessorDefinitions) + MaxSpeed + Speed %(AdditionalDependencies);ntstrsafe.lib @@ -320,6 +328,8 @@ stdcpp17 5040;4064;4627;4627;4366;%(DisableSpecificWarnings) POOL_NX_OPTIN=1;POOL_ZERO_DOWN_LEVEL_SUPPORT;_ARM64_;ARM64;_USE_DECLSPECS_FOR_SAL=1;STD_CALL;%(PreprocessorDefinitions) + MaxSpeed + Speed %(AdditionalDependencies);ntstrsafe.lib;usbdex.lib From beb05ec5e3b97f54bfac8168af2c076b1683b948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Wed, 24 Aug 2022 15:01:34 +0200 Subject: [PATCH 04/15] Bumped version --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4fa6ee0..dcaf3b0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.19.{build}.0 +version: 1.20.{build}.0 image: Visual Studio 2019 skip_commits: files: From 9ad2b37fa774fa9e5ab968f433f5eb65464e08b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Wed, 24 Aug 2022 16:24:37 +0200 Subject: [PATCH 05/15] Updated setup Updated copyright in resource file --- setup/ViGEmBus.aip | 4 ++-- sys/ViGEmBus.rc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/ViGEmBus.aip b/setup/ViGEmBus.aip index bb984d7..369d3f8 100644 --- a/setup/ViGEmBus.aip +++ b/setup/ViGEmBus.aip @@ -19,10 +19,10 @@ - + - + diff --git a/sys/ViGEmBus.rc b/sys/ViGEmBus.rc index 1332911..6b43469 100644 --- a/sys/ViGEmBus.rc +++ b/sys/ViGEmBus.rc @@ -35,7 +35,7 @@ BEGIN VALUE "FileDescription", "Virtual Gamepad Emulation Framework Bus Driver" VALUE "FileVersion", "1.16.200.0" VALUE "InternalName", "Virtual Gamepad Emulation Framework Bus Driver" - VALUE "LegalCopyright", "(C) 2016-2020 Nefarius Software Solutions e.U." + VALUE "LegalCopyright", "(C) 2016-2022 Nefarius Software Solutions e.U." VALUE "OriginalFilename", "ViGEmBus.sys" VALUE "ProductName", "Virtual Gamepad Emulation Framework Bus Driver" VALUE "ProductVersion", "1.16.200.0" From 8275e582859f607b4cde9f084a9954d75962d250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Wed, 24 Aug 2022 20:59:45 +0200 Subject: [PATCH 06/15] Removed unsupported Windows versions --- setup/ViGEmBus.aip | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup/ViGEmBus.aip b/setup/ViGEmBus.aip index 369d3f8..04ec42a 100644 --- a/setup/ViGEmBus.aip +++ b/setup/ViGEmBus.aip @@ -28,12 +28,16 @@ + + + + @@ -312,6 +316,8 @@ + + From e50d4d79158bdc2045e40d37254ec3b0872f328b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Mon, 29 Aug 2022 11:21:28 +0200 Subject: [PATCH 07/15] Set static SDK/WDK version --- appveyor.yml | 1 + patches/dmf-sdk10.0.19041.0.diff | 342 +++++++++++++++++++++++++++++++ sys/ViGEmBus.vcxproj | 2 +- 3 files changed, 344 insertions(+), 1 deletion(-) create mode 100644 patches/dmf-sdk10.0.19041.0.diff diff --git a/appveyor.yml b/appveyor.yml index dcaf3b0..f6e908e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,6 +23,7 @@ install: cd "C:\projects\DMF" git pull > NUL git apply "%APPVEYOR_BUILD_FOLDER%\patches\dmf-optimizations.diff + git apply "%APPVEYOR_BUILD_FOLDER%\patches\dmf-sdk10.0.19041.0.diff cd %appveyor_build_folder% before_build: - ps: Invoke-WebRequest "https://github.com/nefarius/vpatch/releases/latest/download/vpatch.exe" -OutFile vpatch.exe diff --git a/patches/dmf-sdk10.0.19041.0.diff b/patches/dmf-sdk10.0.19041.0.diff new file mode 100644 index 0000000..aec46df --- /dev/null +++ b/patches/dmf-sdk10.0.19041.0.diff @@ -0,0 +1,342 @@ + Dmf/Solution/DmfK/DmfK.vcxproj | 12 ++++++------ + Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj | 12 ++++++------ + Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj | 12 ++++++------ + .../DmfKModules.Template/DmfKModules.Template.vcxproj | 12 ++++++------ + Dmf/Solution/DmfU/DmfU.vcxproj | 2 +- + Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj | 12 ++++++------ + Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj | 12 ++++++------ + .../DmfUModules.Template/DmfUModules.Template.vcxproj | 8 ++++---- + 8 files changed, 41 insertions(+), 41 deletions(-) + +diff --git a/Dmf/Solution/DmfK/DmfK.vcxproj b/Dmf/Solution/DmfK/DmfK.vcxproj +index 738397c..3e3a9e2 100644 +--- a/Dmf/Solution/DmfK/DmfK.vcxproj ++++ b/Dmf/Solution/DmfK/DmfK.vcxproj +@@ -44,37 +44,37 @@ + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + DbgengKernelDebugger +diff --git a/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj b/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj +index 13d2475..5393c32 100644 +--- a/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj ++++ b/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj +@@ -80,37 +80,37 @@ + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + DbgengKernelDebugger +diff --git a/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj b/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj +index 1ba20c5..e420619 100644 +--- a/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj ++++ b/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj +@@ -167,37 +167,37 @@ + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + DbgengKernelDebugger +diff --git a/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj b/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj +index 0d0ef4c..c46ff9e 100644 +--- a/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj ++++ b/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj +@@ -44,13 +44,13 @@ + true + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + Unicode + WindowsKernelModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + DbgengKernelDebugger +@@ -132,13 +132,13 @@ + OldStyle + .c.C.cpp.CPP.h.H + true +- /d2guardsignret %(AdditionalOptions) ++ /d2guardsignret %(AdditionalOptions) + + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies);setupapi.lib;cfgmgr32.lib;wpprecorder.lib; + true +- /guard:delayloadsignret %(AdditionalOptions) ++ /guard:delayloadsignret %(AdditionalOptions) + + + false +@@ -206,13 +206,13 @@ + OldStyle + .c.C.cpp.CPP.h.H + true +- /d2guardsignret %(AdditionalOptions) ++ /d2guardsignret %(AdditionalOptions) + + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies);setupapi.lib;cfgmgr32.lib;wpprecorder.lib; + true +- /guard:delayloadsignret %(AdditionalOptions) ++ /guard:delayloadsignret %(AdditionalOptions) + + + false +diff --git a/Dmf/Solution/DmfU/DmfU.vcxproj b/Dmf/Solution/DmfU/DmfU.vcxproj +index 9b9dd48..e8c31a4 100644 +--- a/Dmf/Solution/DmfU/DmfU.vcxproj ++++ b/Dmf/Solution/DmfU/DmfU.vcxproj +@@ -46,7 +46,7 @@ + WindowsUserModeDriver10.0 + False + True +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + DbgengKernelDebugger +diff --git a/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj b/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj +index 7ba02d9..54342c8 100644 +--- a/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj ++++ b/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj +@@ -45,32 +45,32 @@ + + true + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + DbgengKernelDebugger +diff --git a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj +index 214e8bb..f11336b 100644 +--- a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj ++++ b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj +@@ -45,32 +45,32 @@ + + true + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + true + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + DbgengKernelDebugger +diff --git a/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj b/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj +index 7c285cc..c83ffe0 100644 +--- a/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj ++++ b/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj +@@ -45,12 +45,12 @@ + + true + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + false + WindowsUserModeDriver10.0 +- $(LatestTargetPlatformVersion) ++ 10.0.19041.0 + + + +@@ -86,7 +86,7 @@ + stdcpp17 + + +- /d2guardsignret %(AdditionalOptions) ++ /d2guardsignret %(AdditionalOptions) + + + %(AdditionalDependencies);hid.lib;setupapi.lib;cfgmgr32.lib; +@@ -94,7 +94,7 @@ + + + +- /guard:delayloadsignret %(AdditionalOptions) ++ /guard:delayloadsignret %(AdditionalOptions) + + + diff --git a/sys/ViGEmBus.vcxproj b/sys/ViGEmBus.vcxproj index 500071b..c9828a6 100644 --- a/sys/ViGEmBus.vcxproj +++ b/sys/ViGEmBus.vcxproj @@ -68,7 +68,7 @@ Debug Win32 ViGEmBus - $(LatestTargetPlatformVersion) + 10.0.19041.0 * $(APPVEYOR_BUILD_VERSION) From 91d14b0bfed28c8808e507a3211d6e9895989a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Mon, 29 Aug 2022 14:29:12 +0200 Subject: [PATCH 08/15] Fixed conflicting patches --- appveyor.yml | 3 +- patches/dmf-optimizations.diff | 285 -------------- .../{dmf-sdk10.0.19041.0.diff => dmf.diff} | 347 ++++++++++++++++-- 3 files changed, 327 insertions(+), 308 deletions(-) delete mode 100644 patches/dmf-optimizations.diff rename patches/{dmf-sdk10.0.19041.0.diff => dmf.diff} (50%) diff --git a/appveyor.yml b/appveyor.yml index f6e908e..ac61107 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,8 +22,7 @@ install: - cmd: | cd "C:\projects\DMF" git pull > NUL - git apply "%APPVEYOR_BUILD_FOLDER%\patches\dmf-optimizations.diff - git apply "%APPVEYOR_BUILD_FOLDER%\patches\dmf-sdk10.0.19041.0.diff + git apply "%APPVEYOR_BUILD_FOLDER%\patches\dmf.diff cd %appveyor_build_folder% before_build: - ps: Invoke-WebRequest "https://github.com/nefarius/vpatch/releases/latest/download/vpatch.exe" -OutFile vpatch.exe diff --git a/patches/dmf-optimizations.diff b/patches/dmf-optimizations.diff deleted file mode 100644 index a5481be..0000000 --- a/patches/dmf-optimizations.diff +++ /dev/null @@ -1,285 +0,0 @@ - Dmf/Solution/DmfK/DmfK.vcxproj | 8 ++++++++ - Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj | 8 ++++++++ - .../DmfKModules.Library/DmfKModules.Library.vcxproj | 8 ++++++++ - .../DmfKModules.Template/DmfKModules.Template.vcxproj | 16 ++++++++++++---- - Dmf/Solution/DmfU/DmfU.vcxproj | 8 ++++++++ - Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj | 8 ++++++++ - .../DmfUModules.Library/DmfUModules.Library.vcxproj | 8 ++++++++ - .../DmfUModules.Library.vcxproj.filters | 10 +++++----- - .../DmfUModules.Template/DmfUModules.Template.vcxproj | 12 ++++++++++-- - 9 files changed, 75 insertions(+), 11 deletions(-) - -diff --git a/Dmf/Solution/DmfK/DmfK.vcxproj b/Dmf/Solution/DmfK/DmfK.vcxproj -index 738397c..e791a99 100644 ---- a/Dmf/Solution/DmfK/DmfK.vcxproj -+++ b/Dmf/Solution/DmfK/DmfK.vcxproj -@@ -199,6 +199,9 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -+ MaxSpeed -+ Speed -+ true - - - %(AdditionalLibraryDirectories) -@@ -228,6 +231,9 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -+ MaxSpeed -+ Speed -+ true - - - %(AdditionalLibraryDirectories) -@@ -258,6 +264,8 @@ - .c.C.cpp.CPP.h.H - true - /d2guardsignret %(AdditionalOptions) -+ MaxSpeed -+ Speed - - - %(AdditionalLibraryDirectories) -diff --git a/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj b/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj -index 13d2475..8b8680b 100644 ---- a/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj -+++ b/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj -@@ -230,6 +230,9 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -+ MaxSpeed -+ Speed -+ true - - - %(AdditionalLibraryDirectories) -@@ -257,6 +260,9 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -+ MaxSpeed -+ Speed -+ true - - - %(AdditionalLibraryDirectories) -@@ -285,6 +291,8 @@ - .c.C.cpp.CPP.h.H - true - /d2guardsignret %(AdditionalOptions) -+ MaxSpeed -+ Speed - - - %(AdditionalLibraryDirectories) -diff --git a/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj b/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj -index 1ba20c5..d5426d7 100644 ---- a/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj -+++ b/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj -@@ -323,6 +323,9 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -+ MaxSpeed -+ Speed -+ true - - - %(AdditionalLibraryDirectories) -@@ -352,6 +355,9 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -+ MaxSpeed -+ Speed -+ true - - - %(AdditionalLibraryDirectories) -@@ -382,6 +388,8 @@ - .c.C.cpp.CPP.h.H - true - /d2guardsignret %(AdditionalOptions) -+ MaxSpeed -+ Speed - - - %(AdditionalLibraryDirectories) -diff --git a/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj b/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj -index 0d0ef4c..dab8874 100644 ---- a/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj -+++ b/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj -@@ -132,13 +132,13 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -- /d2guardsignret %(AdditionalOptions) -+ /d2guardsignret %(AdditionalOptions) - - - %(AdditionalLibraryDirectories) - %(AdditionalDependencies);setupapi.lib;cfgmgr32.lib;wpprecorder.lib; - true -- /guard:delayloadsignret %(AdditionalOptions) -+ /guard:delayloadsignret %(AdditionalOptions) - - - false -@@ -158,6 +158,9 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -+ MaxSpeed -+ Speed -+ true - - - %(AdditionalLibraryDirectories) -@@ -182,6 +185,9 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -+ MaxSpeed -+ Speed -+ true - - - %(AdditionalLibraryDirectories) -@@ -206,13 +212,15 @@ - OldStyle - .c.C.cpp.CPP.h.H - true -- /d2guardsignret %(AdditionalOptions) -+ /d2guardsignret %(AdditionalOptions) -+ MaxSpeed -+ Speed - - - %(AdditionalLibraryDirectories) - %(AdditionalDependencies);setupapi.lib;cfgmgr32.lib;wpprecorder.lib; - true -- /guard:delayloadsignret %(AdditionalOptions) -+ /guard:delayloadsignret %(AdditionalOptions) - - - false -diff --git a/Dmf/Solution/DmfU/DmfU.vcxproj b/Dmf/Solution/DmfU/DmfU.vcxproj -index 9b9dd48..9357ae2 100644 ---- a/Dmf/Solution/DmfU/DmfU.vcxproj -+++ b/Dmf/Solution/DmfU/DmfU.vcxproj -@@ -83,6 +83,14 @@ - .c.C.cpp.CPP.h.H - %(AdditionalIncludeDirectories);..\..; - true -+ MaxSpeed -+ Speed -+ MaxSpeed -+ Speed -+ true -+ MaxSpeed -+ Speed -+ true - - - /d2guardsignret %(AdditionalOptions) -diff --git a/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj b/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj -index 7ba02d9..bc700b8 100644 ---- a/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj -+++ b/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj -@@ -125,6 +125,14 @@ - %(AdditionalIncludeDirectories);..\..\Framework;..\..\Framework\Modules.Core - true - true -+ MaxSpeed -+ Speed -+ MaxSpeed -+ Speed -+ true -+ MaxSpeed -+ Speed -+ true - - - /d2guardsignret %(AdditionalOptions) -diff --git a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj -index 214e8bb..6930f30 100644 ---- a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj -+++ b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj -@@ -141,6 +141,14 @@ - stdcpp17 - stdcpp17 - stdcpp17 -+ MaxSpeed -+ Speed -+ MaxSpeed -+ Speed -+ true -+ MaxSpeed -+ Speed -+ true - - - /d2guardsignret %(AdditionalOptions) -diff --git a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj.filters b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj.filters -index b0a085b..c6ce5b1 100644 ---- a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj.filters -+++ b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj.filters -@@ -389,11 +389,8 @@ - - Modules\Targets - -- -- -- -- Documentation\Modules\Targets -- -+ -+ - - - -@@ -519,5 +516,8 @@ - - Documentation\Modules\Targets - -+ -+ -+ - - -\ No newline at end of file -diff --git a/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj b/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj -index 7c285cc..ca4455e 100644 ---- a/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj -+++ b/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj -@@ -84,9 +84,17 @@ - true - true - stdcpp17 -+ MaxSpeed -+ Speed -+ MaxSpeed -+ Speed -+ true -+ MaxSpeed -+ Speed -+ true - - -- /d2guardsignret %(AdditionalOptions) -+ /d2guardsignret %(AdditionalOptions) - - - %(AdditionalDependencies);hid.lib;setupapi.lib;cfgmgr32.lib; -@@ -94,7 +102,7 @@ - - - -- /guard:delayloadsignret %(AdditionalOptions) -+ /guard:delayloadsignret %(AdditionalOptions) - - - diff --git a/patches/dmf-sdk10.0.19041.0.diff b/patches/dmf.diff similarity index 50% rename from patches/dmf-sdk10.0.19041.0.diff rename to patches/dmf.diff index aec46df..ebe49f2 100644 --- a/patches/dmf-sdk10.0.19041.0.diff +++ b/patches/dmf.diff @@ -1,15 +1,15 @@ - Dmf/Solution/DmfK/DmfK.vcxproj | 12 ++++++------ - Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj | 12 ++++++------ - Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj | 12 ++++++------ - .../DmfKModules.Template/DmfKModules.Template.vcxproj | 12 ++++++------ - Dmf/Solution/DmfU/DmfU.vcxproj | 2 +- - Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj | 12 ++++++------ - Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj | 12 ++++++------ - .../DmfUModules.Template/DmfUModules.Template.vcxproj | 8 ++++---- - 8 files changed, 41 insertions(+), 41 deletions(-) + Dmf/Solution/DmfK/DmfK.vcxproj | 28 +++++++++++++++++----- + Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj | 28 +++++++++++++++++----- + .../DmfKModules.Library.vcxproj | 28 +++++++++++++++++----- + .../DmfKModules.Template.vcxproj | 28 +++++++++++++++++----- + Dmf/Solution/DmfU/DmfU.vcxproj | 18 +++++++++++++- + Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj | 28 +++++++++++++++++----- + .../DmfUModules.Library.vcxproj | 28 +++++++++++++++++----- + .../DmfUModules.Template.vcxproj | 24 +++++++++++++++---- + 8 files changed, 169 insertions(+), 41 deletions(-) diff --git a/Dmf/Solution/DmfK/DmfK.vcxproj b/Dmf/Solution/DmfK/DmfK.vcxproj -index 738397c..3e3a9e2 100644 +index 738397c..de0b165 100644 --- a/Dmf/Solution/DmfK/DmfK.vcxproj +++ b/Dmf/Solution/DmfK/DmfK.vcxproj @@ -44,37 +44,37 @@ @@ -56,8 +56,66 @@ index 738397c..3e3a9e2 100644 DbgengKernelDebugger +@@ -110,6 +110,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -139,6 +142,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -169,6 +175,8 @@ + .c.C.cpp.CPP.h.H + true + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) +@@ -199,6 +207,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -228,6 +239,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -258,6 +272,8 @@ + .c.C.cpp.CPP.h.H + true + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) diff --git a/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj b/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj -index 13d2475..5393c32 100644 +index 13d2475..b2d481c 100644 --- a/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj +++ b/Dmf/Solution/DmfKFramework/DmfKFramework.vcxproj @@ -80,37 +80,37 @@ @@ -104,8 +162,66 @@ index 13d2475..5393c32 100644 DbgengKernelDebugger +@@ -147,6 +147,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -174,6 +177,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -202,6 +208,8 @@ + .c.C.cpp.CPP.h.H + true + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) +@@ -230,6 +238,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -257,6 +268,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -285,6 +299,8 @@ + .c.C.cpp.CPP.h.H + true + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) diff --git a/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj b/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj -index 1ba20c5..e420619 100644 +index 1ba20c5..ec7dbed 100644 --- a/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj +++ b/Dmf/Solution/DmfKModules.Library/DmfKModules.Library.vcxproj @@ -167,37 +167,37 @@ @@ -152,8 +268,66 @@ index 1ba20c5..e420619 100644 DbgengKernelDebugger +@@ -234,6 +234,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -263,6 +266,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -293,6 +299,8 @@ + .c.C.cpp.CPP.h.H + true + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) +@@ -323,6 +331,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -352,6 +363,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -382,6 +396,8 @@ + .c.C.cpp.CPP.h.H + true + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed + + + %(AdditionalLibraryDirectories) diff --git a/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj b/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj -index 0d0ef4c..c46ff9e 100644 +index 0d0ef4c..ce1f791 100644 --- a/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj +++ b/Dmf/Solution/DmfKModules.Template/DmfKModules.Template.vcxproj @@ -44,13 +44,13 @@ @@ -172,12 +346,34 @@ index 0d0ef4c..c46ff9e 100644 DbgengKernelDebugger -@@ -132,13 +132,13 @@ +@@ -84,6 +84,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -108,6 +111,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -132,13 +138,15 @@ OldStyle .c.C.cpp.CPP.h.H true - /d2guardsignret %(AdditionalOptions) + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed %(AdditionalLibraryDirectories) @@ -188,12 +384,34 @@ index 0d0ef4c..c46ff9e 100644 false -@@ -206,13 +206,13 @@ +@@ -158,6 +166,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -182,6 +193,9 @@ + OldStyle + .c.C.cpp.CPP.h.H + true ++ MaxSpeed ++ Speed ++ true + + + %(AdditionalLibraryDirectories) +@@ -206,13 +220,15 @@ OldStyle .c.C.cpp.CPP.h.H true - /d2guardsignret %(AdditionalOptions) + /d2guardsignret %(AdditionalOptions) ++ MaxSpeed ++ Speed %(AdditionalLibraryDirectories) @@ -205,7 +423,7 @@ index 0d0ef4c..c46ff9e 100644 false diff --git a/Dmf/Solution/DmfU/DmfU.vcxproj b/Dmf/Solution/DmfU/DmfU.vcxproj -index 9b9dd48..e8c31a4 100644 +index 9b9dd48..521b273 100644 --- a/Dmf/Solution/DmfU/DmfU.vcxproj +++ b/Dmf/Solution/DmfU/DmfU.vcxproj @@ -46,7 +46,7 @@ @@ -217,8 +435,31 @@ index 9b9dd48..e8c31a4 100644 DbgengKernelDebugger +@@ -83,6 +83,22 @@ + .c.C.cpp.CPP.h.H + %(AdditionalIncludeDirectories);..\..; + true ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true + + + /d2guardsignret %(AdditionalOptions) diff --git a/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj b/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj -index 7ba02d9..54342c8 100644 +index 7ba02d9..cc174c6 100644 --- a/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj +++ b/Dmf/Solution/DmfUFramework/DmfUFramework.vcxproj @@ -45,32 +45,32 @@ @@ -260,8 +501,31 @@ index 7ba02d9..54342c8 100644 DbgengKernelDebugger +@@ -125,6 +125,22 @@ + %(AdditionalIncludeDirectories);..\..\Framework;..\..\Framework\Modules.Core + true + true ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true + + + /d2guardsignret %(AdditionalOptions) diff --git a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj -index 214e8bb..f11336b 100644 +index 214e8bb..d863a9b 100644 --- a/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj +++ b/Dmf/Solution/DmfUModules.Library/DmfUModules.Library.vcxproj @@ -45,32 +45,32 @@ @@ -303,8 +567,31 @@ index 214e8bb..f11336b 100644 DbgengKernelDebugger +@@ -141,6 +141,22 @@ + stdcpp17 + stdcpp17 + stdcpp17 ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true + + + /d2guardsignret %(AdditionalOptions) diff --git a/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj b/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj -index 7c285cc..c83ffe0 100644 +index 7c285cc..436bf4f 100644 --- a/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj +++ b/Dmf/Solution/DmfUModules.Template/DmfUModules.Template.vcxproj @@ -45,12 +45,12 @@ @@ -322,8 +609,26 @@ index 7c285cc..c83ffe0 100644 -@@ -86,7 +86,7 @@ +@@ -84,9 +84,25 @@ + true + true stdcpp17 ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true ++ MaxSpeed ++ Speed ++ true - /d2guardsignret %(AdditionalOptions) @@ -331,7 +636,7 @@ index 7c285cc..c83ffe0 100644 %(AdditionalDependencies);hid.lib;setupapi.lib;cfgmgr32.lib; -@@ -94,7 +94,7 @@ +@@ -94,7 +110,7 @@ From fb5424d39c87ac2fc73bccaa14d18cdb2ad2ea77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Mon, 29 Aug 2022 14:30:21 +0200 Subject: [PATCH 09/15] Invalidated build cache --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ac61107..46f6003 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ skip_commits: files: - '**/*.md' cache: -- C:\projects\DMF +- C:\projects\DMF -> appveyor.yml - C:\projects\ViGEmBus\vpatch.exe platform: - x86 From 1061feada47bcf3b902f66c1da9f2471ec87f9e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Mon, 29 Aug 2022 15:21:46 +0200 Subject: [PATCH 10/15] Added git argument to suppress error message --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 46f6003..a3a77d9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ install: - cmd: | cd "C:\projects\DMF" git pull > NUL - git apply "%APPVEYOR_BUILD_FOLDER%\patches\dmf.diff + git apply --reject "%APPVEYOR_BUILD_FOLDER%\patches\dmf.diff cd %appveyor_build_folder% before_build: - ps: Invoke-WebRequest "https://github.com/nefarius/vpatch/releases/latest/download/vpatch.exe" -OutFile vpatch.exe From f387b3c3c8d1b269ad3df4d218949a43bb97d7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Mon, 29 Aug 2022 16:28:35 +0200 Subject: [PATCH 11/15] Cleaned up appveyor.yml --- appveyor.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a3a77d9..dfcbf16 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,9 @@ -version: 1.20.{build}.0 +version: 1.21.{build}.0 image: Visual Studio 2019 skip_commits: files: - '**/*.md' + - '**/*.aip' cache: - C:\projects\DMF -> appveyor.yml - C:\projects\ViGEmBus\vpatch.exe @@ -15,14 +16,12 @@ configuration: environment: DmfRootPath: C:\projects\DMF install: -- ps: iwr "https://download.microsoft.com/download/c/f/8/cf80b955-d578-4635-825c-2801911f9d79/wdk/wdksetup.exe" -OutFile wdksetup.exe -- cmd: .\wdksetup.exe /features + /q /norestart - cmd: git submodule -q update --init - cmd: git clone -q https://github.com/microsoft/DMF.git C:\projects\DMF 2> nul || set ERRORLEVEL=0 - cmd: | cd "C:\projects\DMF" git pull > NUL - git apply --reject "%APPVEYOR_BUILD_FOLDER%\patches\dmf.diff + git apply --reject "%APPVEYOR_BUILD_FOLDER%\patches\dmf.diff > NUL cd %appveyor_build_folder% before_build: - ps: Invoke-WebRequest "https://github.com/nefarius/vpatch/releases/latest/download/vpatch.exe" -OutFile vpatch.exe @@ -37,7 +36,6 @@ artifacts: - path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.sys' - path: 'bin**\*.pdb' - path: 'disk1\*.cab' -- path: 'bin**\*.msi' deploy: - provider: Environment name: BUILDBOT From 093fc4aa8d8516d312aaef301c798e7f4e9727d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Mon, 29 Aug 2022 16:31:12 +0200 Subject: [PATCH 12/15] Minor fix --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dfcbf16..7a3549e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ skip_commits: - '**/*.md' - '**/*.aip' cache: -- C:\projects\DMF -> appveyor.yml +- C:\projects\DMF - C:\projects\ViGEmBus\vpatch.exe platform: - x86 @@ -21,7 +21,7 @@ install: - cmd: | cd "C:\projects\DMF" git pull > NUL - git apply --reject "%APPVEYOR_BUILD_FOLDER%\patches\dmf.diff > NUL + git apply --reject "%APPVEYOR_BUILD_FOLDER%\patches\dmf.diff 2> NUL cd %appveyor_build_folder% before_build: - ps: Invoke-WebRequest "https://github.com/nefarius/vpatch/releases/latest/download/vpatch.exe" -OutFile vpatch.exe From d2ba1096d48983c5c8a9a98f5f05878d0f0eb478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Mon, 29 Aug 2022 16:42:25 +0200 Subject: [PATCH 13/15] Unfixed the fix, ugh --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7a3549e..f3a377a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,7 +21,7 @@ install: - cmd: | cd "C:\projects\DMF" git pull > NUL - git apply --reject "%APPVEYOR_BUILD_FOLDER%\patches\dmf.diff 2> NUL + git apply --reject "%APPVEYOR_BUILD_FOLDER%\patches\dmf.diff cd %appveyor_build_folder% before_build: - ps: Invoke-WebRequest "https://github.com/nefarius/vpatch/releases/latest/download/vpatch.exe" -OutFile vpatch.exe From fc4e2f041382ff3db4da37dad5851be7620444bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Tue, 30 Aug 2022 12:47:18 +0200 Subject: [PATCH 14/15] Updated setup --- setup/ViGEmBus.aip | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/setup/ViGEmBus.aip b/setup/ViGEmBus.aip index 04ec42a..8d0b86f 100644 --- a/setup/ViGEmBus.aip +++ b/setup/ViGEmBus.aip @@ -19,10 +19,10 @@ - + - + @@ -52,9 +52,9 @@ - - - + + + @@ -69,28 +69,28 @@ - + - - - + + + @@ -237,17 +237,17 @@ - - - - + + + + @@ -350,7 +350,7 @@ - + From 8ffa5a6d425ead9861e0e62593190e77a97c3124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Sun, 9 Oct 2022 22:05:06 +0200 Subject: [PATCH 15/15] Bumped setup version --- setup/ViGEmBus.aip | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/setup/ViGEmBus.aip b/setup/ViGEmBus.aip index 8d0b86f..d66728a 100644 --- a/setup/ViGEmBus.aip +++ b/setup/ViGEmBus.aip @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -23,7 +23,6 @@ - @@ -96,7 +95,7 @@ - +