Skip to content

Instantly share code, notes, and snippets.

@Ryochan7

Ryochan7/hidguardian_changes_20171103.diff

Created November 3, 2017 07:56
Show Gist options
  • Save Ryochan7/94e1f73631b637e46f62f3a791520d28 to your computer and use it in GitHub Desktop.
Save Ryochan7/94e1f73631b637e46f62f3a791520d28 to your computer and use it in GitHub Desktop.
Download ZIP
Some minor changes being tested for HidGuardian
Raw
hidguardian_changes_20171103.diff
diff --git a/Sys/HidGuardian/Device.c b/Sys/HidGuardian/Device.c
index 7f49c8c..8e17fdc 100644
--- a/Sys/HidGuardian/Device.c
+++ b/Sys/HidGuardian/Device.c
@@ -141,6 +141,7 @@ VOID EvtDeviceFileCreate(
WDF_REQUEST_SEND_OPTIONS options;
NTSTATUS status;
BOOLEAN ret;
+ WDF_REQUEST_PARAMETERS params;
UNREFERENCED_PARAMETER(FileObject);
@@ -156,6 +157,15 @@ VOID EvtDeviceFileCreate(
WDF_REQUEST_SEND_OPTIONS_INIT(&options,
WDF_REQUEST_SEND_OPTION_SEND_AND_FORGET);
+ WDF_REQUEST_PARAMETERS_INIT(&params);
+
+ WdfRequestGetParameters(
+ Request,
+ &params
+ );
+
+ WdfRequestFormatRequestUsingCurrentType(Request);
+
ret = WdfRequestSend(Request, WdfDeviceGetIoTarget(Device), &options);
if (ret == FALSE) {
diff --git a/Sys/HidGuardian/HidGuardian.vcxproj b/Sys/HidGuardian/HidGuardian.vcxproj
index 1d0b7eb..69e418d 100644
--- a/Sys/HidGuardian/HidGuardian.vcxproj
+++ b/Sys/HidGuardian/HidGuardian.vcxproj
@@ -57,6 +57,7 @@
<Configuration>Debug</Configuration>
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
<RootNamespace>HidGuardian</RootNamespace>
+ <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -102,6 +103,7 @@
<KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
<KMDF_VERSION_MINOR>9</KMDF_VERSION_MINOR>
<ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<TargetVersion>Windows7</TargetVersion>
@@ -235,12 +237,13 @@
<WppRecorderEnabled>true</WppRecorderEnabled>
<WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
<WppKernelMode>true</WppKernelMode>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
</ClCompile>
<Link>
<AdditionalDependencies>$(DDK_LIB_PATH)ntstrsafe.lib;%(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(KMDF_LIB_PATH)$(KMDF_VER_PATH)\WdfLdr.lib;$(KMDF_LIB_PATH)$(KMDF_VER_PATH)\WdfDriverEntry.lib</AdditionalDependencies>
</Link>
<Inf>
- <TimeStamp>1.13.8.0</TimeStamp>
+ <TimeStamp>1.13.8.1</TimeStamp>
</Inf>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
diff --git a/Sys/HidGuardian/Queue.c b/Sys/HidGuardian/Queue.c
index e49be61..061749f 100644
--- a/Sys/HidGuardian/Queue.c
+++ b/Sys/HidGuardian/Queue.c
@@ -76,12 +76,22 @@ VOID HidGuardianEvtIoDefault(
WDF_REQUEST_SEND_OPTIONS options;
NTSTATUS status;
BOOLEAN ret;
+ WDF_REQUEST_PARAMETERS params;
KdPrint((DRIVERNAME "HidGuardianEvtIoDefault called\n"));
WDF_REQUEST_SEND_OPTIONS_INIT(&options,
WDF_REQUEST_SEND_OPTION_SEND_AND_FORGET);
+ WDF_REQUEST_PARAMETERS_INIT(&params);
+
+ WdfRequestGetParameters(
+ Request,
+ &params
+ );
+
+ WdfRequestFormatRequestUsingCurrentType(Request);
+
ret = WdfRequestSend(Request, WdfDeviceGetIoTarget(WdfIoQueueGetDevice(Queue)), &options);
if (ret == FALSE) {
diff --git a/ViGEm.sln b/ViGEm.sln
index 5c269bb..90d59ef 100644
--- a/ViGEm.sln
+++ b/ViGEm.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+VisualStudioVersion = 15.0.27004.2006
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{33690A14-2B0D-474F-B551-6C6F3E10FC3B}"
EndProject
@@ -76,8 +76,6 @@ Global
{2BF69CDF-FCB9-478C-9D5D-10779846936F}.Release|ARM64.Build.0 = Release|ARM64
{2BF69CDF-FCB9-478C-9D5D-10779846936F}.Release|ARM64.Deploy.0 = Release|ARM64
{2BF69CDF-FCB9-478C-9D5D-10779846936F}.Release|x64.ActiveCfg = Release|x64
- {2BF69CDF-FCB9-478C-9D5D-10779846936F}.Release|x64.Build.0 = Release|x64
- {2BF69CDF-FCB9-478C-9D5D-10779846936F}.Release|x64.Deploy.0 = Release|x64
{2BF69CDF-FCB9-478C-9D5D-10779846936F}.Release|x86.ActiveCfg = Release|Win32
{2BF69CDF-FCB9-478C-9D5D-10779846936F}.Release|x86.Build.0 = Release|Win32
{2BF69CDF-FCB9-478C-9D5D-10779846936F}.Release|x86.Deploy.0 = Release|Win32
@@ -90,7 +88,6 @@ Global
{7B900631-0BFC-434B-846E-9484F7C691E3}.Release|ARM.ActiveCfg = Release|Win32
{7B900631-0BFC-434B-846E-9484F7C691E3}.Release|ARM64.ActiveCfg = Release|Win32
{7B900631-0BFC-434B-846E-9484F7C691E3}.Release|x64.ActiveCfg = Release|x64
- {7B900631-0BFC-434B-846E-9484F7C691E3}.Release|x64.Build.0 = Release|x64
{7B900631-0BFC-434B-846E-9484F7C691E3}.Release|x86.ActiveCfg = Release|Win32
{7B900631-0BFC-434B-846E-9484F7C691E3}.Release|x86.Build.0 = Release|Win32
{1424EC75-6D0C-4F0B-B231-D2D77107802B}.Debug|ARM.ActiveCfg = Debug|Win32
@@ -102,7 +99,6 @@ Global
{1424EC75-6D0C-4F0B-B231-D2D77107802B}.Release|ARM.ActiveCfg = Release|Win32
{1424EC75-6D0C-4F0B-B231-D2D77107802B}.Release|ARM64.ActiveCfg = Release|Win32
{1424EC75-6D0C-4F0B-B231-D2D77107802B}.Release|x64.ActiveCfg = Release|x64
- {1424EC75-6D0C-4F0B-B231-D2D77107802B}.Release|x64.Build.0 = Release|x64
{1424EC75-6D0C-4F0B-B231-D2D77107802B}.Release|x86.ActiveCfg = Release|Win32
{1424EC75-6D0C-4F0B-B231-D2D77107802B}.Release|x86.Build.0 = Release|Win32
{EE069A81-E257-45A5-8BE5-8BB6D539EC2E}.Debug|ARM.ActiveCfg = Debug|ARM
@@ -124,8 +120,6 @@ Global
{EE069A81-E257-45A5-8BE5-8BB6D539EC2E}.Release|ARM64.Build.0 = Release|ARM64
{EE069A81-E257-45A5-8BE5-8BB6D539EC2E}.Release|ARM64.Deploy.0 = Release|ARM64
{EE069A81-E257-45A5-8BE5-8BB6D539EC2E}.Release|x64.ActiveCfg = Release|x64
- {EE069A81-E257-45A5-8BE5-8BB6D539EC2E}.Release|x64.Build.0 = Release|x64
- {EE069A81-E257-45A5-8BE5-8BB6D539EC2E}.Release|x64.Deploy.0 = Release|x64
{EE069A81-E257-45A5-8BE5-8BB6D539EC2E}.Release|x86.ActiveCfg = Release|Win32
{EE069A81-E257-45A5-8BE5-8BB6D539EC2E}.Release|x86.Build.0 = Release|Win32
{EE069A81-E257-45A5-8BE5-8BB6D539EC2E}.Release|x86.Deploy.0 = Release|Win32
@@ -138,7 +132,6 @@ Global
{32FE870D-793B-4567-B7AD-927B5AD2FC9E}.Release|ARM.ActiveCfg = Release|Win32
{32FE870D-793B-4567-B7AD-927B5AD2FC9E}.Release|ARM64.ActiveCfg = Release|Win32
{32FE870D-793B-4567-B7AD-927B5AD2FC9E}.Release|x64.ActiveCfg = Release|x64
- {32FE870D-793B-4567-B7AD-927B5AD2FC9E}.Release|x64.Build.0 = Release|x64
{32FE870D-793B-4567-B7AD-927B5AD2FC9E}.Release|x86.ActiveCfg = Release|Win32
{32FE870D-793B-4567-B7AD-927B5AD2FC9E}.Release|x86.Build.0 = Release|Win32
{473DB71A-EBC1-47F0-AD4D-E472ED9AFA4D}.Debug|ARM.ActiveCfg = Debug|Win32
@@ -150,7 +143,6 @@ Global
{473DB71A-EBC1-47F0-AD4D-E472ED9AFA4D}.Release|ARM.ActiveCfg = Release|Win32
{473DB71A-EBC1-47F0-AD4D-E472ED9AFA4D}.Release|ARM64.ActiveCfg = Release|Win32
{473DB71A-EBC1-47F0-AD4D-E472ED9AFA4D}.Release|x64.ActiveCfg = Release|x64
- {473DB71A-EBC1-47F0-AD4D-E472ED9AFA4D}.Release|x64.Build.0 = Release|x64
{473DB71A-EBC1-47F0-AD4D-E472ED9AFA4D}.Release|x86.ActiveCfg = Release|Win32
{473DB71A-EBC1-47F0-AD4D-E472ED9AFA4D}.Release|x86.Build.0 = Release|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug|ARM.ActiveCfg = Debug (dynamic)|Win32
@@ -166,7 +158,6 @@ Global
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|ARM64.ActiveCfg = Debug (dynamic)|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|ARM64.Build.0 = Debug (dynamic)|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x64.ActiveCfg = Release (static)|x64
- {7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x64.Build.0 = Release (static)|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x86.ActiveCfg = Release (dynamic)|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x86.Build.0 = Release (dynamic)|Win32
{B2F186E5-FD05-4434-8A7F-23B03CA2B20F}.Debug|ARM.ActiveCfg = Debug|Win32
@@ -178,7 +169,6 @@ Global
{B2F186E5-FD05-4434-8A7F-23B03CA2B20F}.Release|ARM.ActiveCfg = Release|Win32
{B2F186E5-FD05-4434-8A7F-23B03CA2B20F}.Release|ARM64.ActiveCfg = Release|Win32
{B2F186E5-FD05-4434-8A7F-23B03CA2B20F}.Release|x64.ActiveCfg = Release|x64
- {B2F186E5-FD05-4434-8A7F-23B03CA2B20F}.Release|x64.Build.0 = Release|x64
{B2F186E5-FD05-4434-8A7F-23B03CA2B20F}.Release|x86.ActiveCfg = Release|Win32
{B2F186E5-FD05-4434-8A7F-23B03CA2B20F}.Release|x86.Build.0 = Release|Win32
{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Debug|ARM.ActiveCfg = Debug|ARM
@@ -200,8 +190,6 @@ Global
{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|ARM64.Build.0 = Release|ARM64
{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|ARM64.Deploy.0 = Release|ARM64
{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|x64.ActiveCfg = Release|x64
- {040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|x64.Build.0 = Release|x64
- {040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|x64.Deploy.0 = Release|x64
{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|x86.ActiveCfg = Release|Win32
{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|x86.Build.0 = Release|Win32
{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|x86.Deploy.0 = Release|Win32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment