diff options
| author | karlf <[email protected]> | 2016-08-11 13:28:13 -0700 |
|---|---|---|
| committer | karlf <[email protected]> | 2016-08-11 13:28:13 -0700 |
| commit | 96eb96dfb613e4c745db6bd1f53a92fe7e2290fc (patch) | |
| tree | ad5f3ede5cbcd6b598677ce41bcf8318471bdd92 /hid | |
| parent | 687b274aa38fd05c8c26e3068932121876d7f745 (diff) | |
Updated for "Windows 10 Anniversary Update" (Version 1607)
Diffstat (limited to 'hid')
39 files changed, 361 insertions, 299 deletions
diff --git a/hid/firefly/app/flicker.vcxproj b/hid/firefly/app/flicker.vcxproj index a8007a99..3e9cc043 100644 --- a/hid/firefly/app/flicker.vcxproj +++ b/hid/firefly/app/flicker.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{BC8A0B60-3D51-403C-838F-DBDB7FDB2154}</ProjectGuid> + <ProjectGuid>{BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{4734AE46-4244-46F9-BB43-9EF5D8DE879E}</SampleGuid> + <SampleGuid>{AABE5BC4-2222-4142-9718-FE4204E7BE50}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/hid/firefly/app/flicker.vcxproj.Filters b/hid/firefly/app/flicker.vcxproj.Filters index a6525150..40dfdf7e 100644 --- a/hid/firefly/app/flicker.vcxproj.Filters +++ b/hid/firefly/app/flicker.vcxproj.Filters @@ -3,15 +3,15 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{7827BF1D-B424-4A2B-8404-408D7F878257}</UniqueIdentifier> + <UniqueIdentifier>{844309B3-43F3-46C1-BBC4-F3F40576CDF5}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{1131E412-C497-467D-938B-A032FF253D2B}</UniqueIdentifier> + <UniqueIdentifier>{518FA1B2-CE9A-4D7A-80F3-0C52EC77273D}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{0F63A61D-7CA9-4EC4-BEC0-448A54A7A2B6}</UniqueIdentifier> + <UniqueIdentifier>{8C0619FF-D266-4591-94CF-93867CD72B52}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/hid/firefly/driver/device.c b/hid/firefly/driver/device.c index c6bae721..6ffb648f 100644 --- a/hid/firefly/driver/device.c +++ b/hid/firefly/driver/device.c @@ -106,7 +106,7 @@ Return Value: status = WdfDeviceAllocAndQueryProperty(device, DevicePropertyPhysicalDeviceObjectName, - NonPagedPool, + NonPagedPoolNx, &attributes, &memory); diff --git a/hid/firefly/driver/firefly.inx b/hid/firefly/driver/firefly.inx Binary files differindex ad800da9..fb03d695 100644 --- a/hid/firefly/driver/firefly.inx +++ b/hid/firefly/driver/firefly.inx diff --git a/hid/firefly/driver/firefly.vcxproj b/hid/firefly/driver/firefly.vcxproj index 1f23a2da..05c03248 100644 --- a/hid/firefly/driver/firefly.vcxproj +++ b/hid/firefly/driver/firefly.vcxproj @@ -19,12 +19,12 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}</ProjectGuid> + <ProjectGuid>{FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{3BBB9A3C-6D04-44EA-94CD-1BCBB6785ABE}</SampleGuid> + <SampleGuid>{2DD1A137-CFE3-476C-B434-CE31733A7325}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -76,11 +76,6 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> </ImportGroup> <ItemGroup Label="WrappedTaskItems"> - <Inf Include=".\firefly.inx"> - <Architecture>$(InfArch)</Architecture> - <SpecifyArchitecture>true</SpecifyArchitecture> - <CopyOutput>.\$(IntDir)\firefly.inf</CopyOutput> - </Inf> <MofComp Include="firefly.mof"> <CreateBinaryMofFile>".\$(IntDir)\firefly.bmf"</CreateBinaryMofFile> </MofComp> diff --git a/hid/firefly/driver/firefly.vcxproj.Filters b/hid/firefly/driver/firefly.vcxproj.Filters index 0ebb7840..8f75e32f 100644 --- a/hid/firefly/driver/firefly.vcxproj.Filters +++ b/hid/firefly/driver/firefly.vcxproj.Filters @@ -3,25 +3,22 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{E4869018-74E3-4289-AD22-20F70C981AE2}</UniqueIdentifier> + <UniqueIdentifier>{849BE81A-B9DC-4096-AC00-2D7D742FB0E8}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{1F21272C-56E1-4F3E-9CCC-6B4A3A4C789B}</UniqueIdentifier> + <UniqueIdentifier>{29531875-8C9E-4110-BBE3-1CFC9D282A6B}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{22D17D30-9550-4068-801A-6533F5191361}</UniqueIdentifier> + <UniqueIdentifier>{AE3E2BD7-4200-448A-8100-6C69BE4720FE}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{3970B561-8552-40C0-89DC-8AE1A82F3034}</UniqueIdentifier> + <UniqueIdentifier>{617E5D49-6208-482D-BEA6-DCF17EDD8033}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> - <Inf Include=".\firefly.inx"> - <Filter>Driver Files</Filter> - </Inf> <MofComp Include="firefly.mof"> <Filter>Driver Files</Filter> </MofComp> diff --git a/hid/firefly/driver/vfeature.c b/hid/firefly/driver/vfeature.c index 8b76db1f..5919a5e9 100644 --- a/hid/firefly/driver/vfeature.c +++ b/hid/firefly/driver/vfeature.c @@ -138,7 +138,7 @@ Return Value: } preparsedData = (PHIDP_PREPARSED_DATA) ExAllocatePoolWithTag( - NonPagedPool, collectionInformation.DescriptorSize, 'ffly'); + NonPagedPoolNx, collectionInformation.DescriptorSize, 'ffly'); if (preparsedData == NULL) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -178,7 +178,7 @@ Return Value: // Create a report to send to the device. // report = (PCHAR) ExAllocatePoolWithTag( - NonPagedPool, caps.FeatureReportByteLength, 'ffly'); + NonPagedPoolNx, caps.FeatureReportByteLength, 'ffly'); if (report == NULL) { goto ExitAndFree; diff --git a/hid/firefly/firefly.sln b/hid/firefly/firefly.sln index b78d86c8..fe9d8c89 100644 --- a/hid/firefly/firefly.sln +++ b/hid/firefly/firefly.sln @@ -3,26 +3,26 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{4F25A8F2-2B4F-49C5-AA10-51610C5E6F1D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{545BC71C-BF98-4C12-AA8C-F9724AB15784}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{E194EF42-DCCA-45F0-8C95-BCA0BF229BEB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{05844338-5178-4ED8-ABDC-E3645F51C376}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{C86EDC2A-0353-4B65-9429-5A7161C37728}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{484B7AA0-E373-45FD-8FA2-C666B5167541}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sauron", "Sauron", "{623654E2-2950-4FD1-A2DB-C16EABC46175}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sauron", "Sauron", "{5BD593E2-4D86-42E8-8C4D-9079143C9D8A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Luminous", "lib\Luminous.vcxproj", "{B77AD939-7683-4EB8-A724-319959963AE2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Luminous", "lib\Luminous.vcxproj", "{2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flicker", "app\flicker.vcxproj", "{BC8A0B60-3D51-403C-838F-DBDB7FDB2154}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flicker", "app\flicker.vcxproj", "{BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}" ProjectSection(ProjectDependencies) = postProject - {B77AD939-7683-4EB8-A724-319959963AE2} = {B77AD939-7683-4EB8-A724-319959963AE2} + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1} = {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "firefly", "driver\firefly.vcxproj", "{72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "firefly", "driver\firefly.vcxproj", "{FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SAURON", "sauron\SAURON.vcxproj", "{4CAAD2A0-0151-45F6-A742-0591E33070ED}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SAURON", "sauron\SAURON.vcxproj", "{571518A8-F812-42E0-A538-31183C3ED059}" ProjectSection(ProjectDependencies) = postProject - {B77AD939-7683-4EB8-A724-319959963AE2} = {B77AD939-7683-4EB8-A724-319959963AE2} + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1} = {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1} EndProjectSection EndProject Global @@ -33,46 +33,46 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B77AD939-7683-4EB8-A724-319959963AE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {B77AD939-7683-4EB8-A724-319959963AE2}.Debug|Win32.Build.0 = Debug|Win32 - {B77AD939-7683-4EB8-A724-319959963AE2}.Release|Win32.ActiveCfg = Release|Win32 - {B77AD939-7683-4EB8-A724-319959963AE2}.Release|Win32.Build.0 = Release|Win32 - {B77AD939-7683-4EB8-A724-319959963AE2}.Debug|x64.ActiveCfg = Debug|x64 - {B77AD939-7683-4EB8-A724-319959963AE2}.Debug|x64.Build.0 = Debug|x64 - {B77AD939-7683-4EB8-A724-319959963AE2}.Release|x64.ActiveCfg = Release|x64 - {B77AD939-7683-4EB8-A724-319959963AE2}.Release|x64.Build.0 = Release|x64 - {BC8A0B60-3D51-403C-838F-DBDB7FDB2154}.Debug|Win32.ActiveCfg = Debug|Win32 - {BC8A0B60-3D51-403C-838F-DBDB7FDB2154}.Debug|Win32.Build.0 = Debug|Win32 - {BC8A0B60-3D51-403C-838F-DBDB7FDB2154}.Release|Win32.ActiveCfg = Release|Win32 - {BC8A0B60-3D51-403C-838F-DBDB7FDB2154}.Release|Win32.Build.0 = Release|Win32 - {BC8A0B60-3D51-403C-838F-DBDB7FDB2154}.Debug|x64.ActiveCfg = Debug|x64 - {BC8A0B60-3D51-403C-838F-DBDB7FDB2154}.Debug|x64.Build.0 = Debug|x64 - {BC8A0B60-3D51-403C-838F-DBDB7FDB2154}.Release|x64.ActiveCfg = Release|x64 - {BC8A0B60-3D51-403C-838F-DBDB7FDB2154}.Release|x64.Build.0 = Release|x64 - {72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}.Debug|Win32.ActiveCfg = Debug|Win32 - {72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}.Debug|Win32.Build.0 = Debug|Win32 - {72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}.Release|Win32.ActiveCfg = Release|Win32 - {72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}.Release|Win32.Build.0 = Release|Win32 - {72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}.Debug|x64.ActiveCfg = Debug|x64 - {72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}.Debug|x64.Build.0 = Debug|x64 - {72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}.Release|x64.ActiveCfg = Release|x64 - {72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}.Release|x64.Build.0 = Release|x64 - {4CAAD2A0-0151-45F6-A742-0591E33070ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {4CAAD2A0-0151-45F6-A742-0591E33070ED}.Debug|Win32.Build.0 = Debug|Win32 - {4CAAD2A0-0151-45F6-A742-0591E33070ED}.Release|Win32.ActiveCfg = Release|Win32 - {4CAAD2A0-0151-45F6-A742-0591E33070ED}.Release|Win32.Build.0 = Release|Win32 - {4CAAD2A0-0151-45F6-A742-0591E33070ED}.Debug|x64.ActiveCfg = Debug|x64 - {4CAAD2A0-0151-45F6-A742-0591E33070ED}.Debug|x64.Build.0 = Debug|x64 - {4CAAD2A0-0151-45F6-A742-0591E33070ED}.Release|x64.ActiveCfg = Release|x64 - {4CAAD2A0-0151-45F6-A742-0591E33070ED}.Release|x64.Build.0 = Release|x64 + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}.Debug|Win32.ActiveCfg = Debug|Win32 + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}.Debug|Win32.Build.0 = Debug|Win32 + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}.Release|Win32.ActiveCfg = Release|Win32 + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}.Release|Win32.Build.0 = Release|Win32 + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}.Debug|x64.ActiveCfg = Debug|x64 + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}.Debug|x64.Build.0 = Debug|x64 + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}.Release|x64.ActiveCfg = Release|x64 + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}.Release|x64.Build.0 = Release|x64 + {BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}.Debug|Win32.ActiveCfg = Debug|Win32 + {BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}.Debug|Win32.Build.0 = Debug|Win32 + {BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}.Release|Win32.ActiveCfg = Release|Win32 + {BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}.Release|Win32.Build.0 = Release|Win32 + {BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}.Debug|x64.ActiveCfg = Debug|x64 + {BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}.Debug|x64.Build.0 = Debug|x64 + {BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}.Release|x64.ActiveCfg = Release|x64 + {BB81C655-EEF5-434F-BB2A-4B8D1358ECE4}.Release|x64.Build.0 = Release|x64 + {FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}.Debug|Win32.ActiveCfg = Debug|Win32 + {FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}.Debug|Win32.Build.0 = Debug|Win32 + {FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}.Release|Win32.ActiveCfg = Release|Win32 + {FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}.Release|Win32.Build.0 = Release|Win32 + {FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}.Debug|x64.ActiveCfg = Debug|x64 + {FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}.Debug|x64.Build.0 = Debug|x64 + {FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}.Release|x64.ActiveCfg = Release|x64 + {FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}.Release|x64.Build.0 = Release|x64 + {571518A8-F812-42E0-A538-31183C3ED059}.Debug|Win32.ActiveCfg = Debug|Win32 + {571518A8-F812-42E0-A538-31183C3ED059}.Debug|Win32.Build.0 = Debug|Win32 + {571518A8-F812-42E0-A538-31183C3ED059}.Release|Win32.ActiveCfg = Release|Win32 + {571518A8-F812-42E0-A538-31183C3ED059}.Release|Win32.Build.0 = Release|Win32 + {571518A8-F812-42E0-A538-31183C3ED059}.Debug|x64.ActiveCfg = Debug|x64 + {571518A8-F812-42E0-A538-31183C3ED059}.Debug|x64.Build.0 = Debug|x64 + {571518A8-F812-42E0-A538-31183C3ED059}.Release|x64.ActiveCfg = Release|x64 + {571518A8-F812-42E0-A538-31183C3ED059}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {B77AD939-7683-4EB8-A724-319959963AE2} = {4F25A8F2-2B4F-49C5-AA10-51610C5E6F1D} - {BC8A0B60-3D51-403C-838F-DBDB7FDB2154} = {E194EF42-DCCA-45F0-8C95-BCA0BF229BEB} - {72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA} = {C86EDC2A-0353-4B65-9429-5A7161C37728} - {4CAAD2A0-0151-45F6-A742-0591E33070ED} = {623654E2-2950-4FD1-A2DB-C16EABC46175} + {2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1} = {545BC71C-BF98-4C12-AA8C-F9724AB15784} + {BB81C655-EEF5-434F-BB2A-4B8D1358ECE4} = {05844338-5178-4ED8-ABDC-E3645F51C376} + {FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5} = {484B7AA0-E373-45FD-8FA2-C666B5167541} + {571518A8-F812-42E0-A538-31183C3ED059} = {5BD593E2-4D86-42E8-8C4D-9079143C9D8A} EndGlobalSection EndGlobal diff --git a/hid/firefly/lib/Luminous.vcxproj b/hid/firefly/lib/Luminous.vcxproj index 4d15bee0..83515b31 100644 --- a/hid/firefly/lib/Luminous.vcxproj +++ b/hid/firefly/lib/Luminous.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{B77AD939-7683-4EB8-A724-319959963AE2}</ProjectGuid> + <ProjectGuid>{2CA2838E-CE8B-4506-80B3-AAB7F19A3AD1}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{AD6E90BF-22BC-4775-968A-CF709A0ACA6E}</SampleGuid> + <SampleGuid>{7212F808-2326-4222-A353-03FA393A47C6}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/hid/firefly/lib/Luminous.vcxproj.Filters b/hid/firefly/lib/Luminous.vcxproj.Filters index 5214e4a6..6c83d98b 100644 --- a/hid/firefly/lib/Luminous.vcxproj.Filters +++ b/hid/firefly/lib/Luminous.vcxproj.Filters @@ -3,15 +3,15 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{5E1EEE07-49F3-4A37-99A5-404AA140C949}</UniqueIdentifier> + <UniqueIdentifier>{F98E2A0C-FCB6-4A33-967B-893F13213E3F}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{927CE0D7-A6F6-406C-A38A-4B579C4B31AA}</UniqueIdentifier> + <UniqueIdentifier>{0FE2A08F-1AF6-4A88-BB97-8F46A78F2CAA}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{40EDECEC-06EE-4C46-8048-46A257FF4852}</UniqueIdentifier> + <UniqueIdentifier>{47FFDA1B-98A1-40FB-BA50-C3BFBFC01459}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/hid/firefly/sauron/SAURON.vcxproj b/hid/firefly/sauron/SAURON.vcxproj index 1c915a7c..4fc980dd 100644 --- a/hid/firefly/sauron/SAURON.vcxproj +++ b/hid/firefly/sauron/SAURON.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{4CAAD2A0-0151-45F6-A742-0591E33070ED}</ProjectGuid> + <ProjectGuid>{571518A8-F812-42E0-A538-31183C3ED059}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{4E744468-3511-4BC0-9924-62253F1EA525}</SampleGuid> + <SampleGuid>{DA4B348B-46C9-4C3F-BF3B-1E0A9A4C93A6}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/hid/firefly/sauron/SAURON.vcxproj.Filters b/hid/firefly/sauron/SAURON.vcxproj.Filters index 4bdee15c..1fd63869 100644 --- a/hid/firefly/sauron/SAURON.vcxproj.Filters +++ b/hid/firefly/sauron/SAURON.vcxproj.Filters @@ -3,15 +3,15 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{FA3DB6F7-580F-4E8E-93FB-E6DA0E745578}</UniqueIdentifier> + <UniqueIdentifier>{DF6BAE9B-EAD1-4D29-AE5B-2F59A68F1FC0}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{CE2E7ACF-15AF-4CB2-ADE3-FE868EF27CAE}</UniqueIdentifier> + <UniqueIdentifier>{AAE60DE1-A451-420E-9474-6F579DE73237}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{DD3A68F1-5287-4D8B-A890-AC37234B2BEC}</UniqueIdentifier> + <UniqueIdentifier>{960C6FDD-993E-4B60-AC47-2B6D92D2ED0D}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/hid/hclient/ecdisp.c b/hid/hclient/ecdisp.c index 5d25aa4c..0d15774f 100644 --- a/hid/hclient/ecdisp.c +++ b/hid/hclient/ecdisp.c @@ -650,6 +650,7 @@ bExtCallDlgProc( static INT nFeatureReportIDs; static HANDLE ReadThread; static READ_THREAD_CONTEXT readContext; + static HID_DEVICE device; INT iIndex; ECDISPLAY_PARAMS params; @@ -770,9 +771,25 @@ bExtCallDlgProc( if (NULL == ReadThread) { - readContext.HidDevice = pDevice; + if (!OpenHidDevice(pDevice->DevicePath, + TRUE, + FALSE, + (LOWORD(wParam) == IDC_READ_SYNCH) ? FALSE : TRUE, + FALSE, + &device)) + { + MessageBox(hDlg, + "Failed opening the device for read.", + HCLIENT_ERROR, + MB_ICONEXCLAMATION); + break; + } + + SendDlgItemMessage(hDlg, IDC_CALLOUTPUT, LB_RESETCONTENT, 0, 0); + + readContext.HidDevice = &device; readContext.TerminateThread = FALSE; - readContext.NumberOfReads = 1; + readContext.NumberOfReads = INFINITE_READS; readContext.DisplayEvent = NULL; readContext.DisplayWindow = hDlg; @@ -792,7 +809,7 @@ bExtCallDlgProc( HCLIENT_ERROR, MB_ICONEXCLAMATION); } - else + else { EnableWindow(GetDlgItem(hDlg, IDC_READ_SYNCH), (LOWORD(wParam) == IDC_READ_SYNCH)); @@ -802,16 +819,18 @@ bExtCallDlgProc( SetWindowText(GetDlgItem(hDlg, LOWORD(wParam)), "Stop Read Thread"); - + EnableWindow(GetDlgItem(hDlg, IDC_CANCEL), FALSE); } } - else + else { readContext.TerminateThread = TRUE; WaitForSingleObject(ReadThread, INFINITE); + CloseHidDevice(&device); + ReadThread = NULL; SetWindowText(GetDlgItem(hDlg, IDC_READ_SYNCH), @@ -820,11 +839,11 @@ bExtCallDlgProc( SetWindowText(GetDlgItem(hDlg, IDC_READ_ASYNCH), "Start Asynchronous Read Thread"); - EnableWindow(GetDlgItem(hDlg, IDC_READ_SYNCH), TRUE); - EnableWindow(GetDlgItem(hDlg, IDC_READ_ASYNCH), TRUE); - EnableWindow(GetDlgItem(hDlg, IDC_CANCEL), TRUE); - } - break; + EnableWindow(GetDlgItem(hDlg, IDC_READ_SYNCH), TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_READ_ASYNCH), TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_CANCEL), TRUE); + } + break; case IDC_CANCEL: BufferDisplay_Destroy(pInputDisplay); @@ -2643,7 +2662,6 @@ RoutineDescription: ¶ms -> ListLength); free(params -> szListString); params->szListString = NULL; - params->ListLength = 0; if (!ExecuteStatus) { diff --git a/hid/hclient/hclient.c b/hid/hclient/hclient.c index 09114bf3..62ca83fd 100644 --- a/hid/hclient/hclient.c +++ b/hid/hclient/hclient.c @@ -752,7 +752,7 @@ CLM_AsyncRead( FALSE, &asyncDevice)) { - printf("Failed opening the device for synchronous read.\n"); + printf("Failed opening the device for asynchronous read.\n"); return; } @@ -2328,7 +2328,7 @@ bReadDlgProc( EnableWindow(GetDlgItem(hDlg, IDOK), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_READ_SYNCH), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_READ_ASYNCH_ONCE), FALSE); - EnableWindow(GetDlgItem(hDlg, IDC_READ_ASYNCH_CONT), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_READ_ASYNCH_CONT), FALSE); Read(&syncDevice); @@ -2379,7 +2379,7 @@ bReadDlgProc( IDC_READ_ASYNCH_ONCE == LOWORD(wParam)); EnableWindow(GetDlgItem(hDlg, IDC_READ_ASYNCH_CONT), - IDC_READ_ASYNCH_CONT == LOWORD(wParam)); + IDC_READ_ASYNCH_CONT == LOWORD(wParam)); SetWindowText(GetDlgItem(hDlg, LOWORD(wParam)), "Stop Asynchronous Read"); @@ -2394,7 +2394,7 @@ bReadDlgProc( readContext.TerminateThread = TRUE; WaitForSingleObject(readThread, INFINITE); - } + } break; case IDCANCEL: @@ -2402,8 +2402,9 @@ bReadDlgProc( WaitForSingleObject(readThread, INFINITE); //Fall through!!! - case IDOK: - CloseHidDevice(&asyncDevice); + case IDOK: + CloseHidDevice(&asyncDevice); + CloseHidDevice(&syncDevice); EndDialog(hDlg,0); break; } @@ -3697,9 +3698,12 @@ AsynchReadThreadProc( ) { HANDLE completionEvent; - BOOL readStatus; + BOOL readResult; DWORD waitStatus; ULONG numReadsDone; + OVERLAPPED overlap; + DWORD bytesTransferred; + // // Create the completion event to send to the the OverlappedRead routine @@ -3743,10 +3747,10 @@ AsynchReadThreadProc( // exit // - readStatus = ReadOverlapped( Context -> HidDevice, completionEvent ); + readResult = ReadOverlapped( Context->HidDevice, completionEvent, &overlap ); - - if (!readStatus) + + if (!readResult) { break; } @@ -3761,11 +3765,12 @@ AsynchReadThreadProc( // // If completionEvent was signaled, then a read just completed - // so let's leave this loop and process the data + // so let's get the status and leave this loop and process the data // if ( WAIT_OBJECT_0 == waitStatus) - { + { + readResult = GetOverlappedResult(Context->HidDevice->HidDevice, &overlap, &bytesTransferred, TRUE); break; } } @@ -3788,8 +3793,8 @@ AsynchReadThreadProc( Context -> HidDevice -> InputDataLength, Context -> HidDevice -> Ppd); - if (NULL != Context -> DisplayEvent) - { + if (NULL != Context -> DisplayEvent) + { PostMessage(Context -> DisplayWindow, WM_DISPLAY_READ_DATA, 0, @@ -3797,6 +3802,37 @@ AsynchReadThreadProc( WaitForSingleObject( Context -> DisplayEvent, INFINITE ); } + else if (NULL != Context->DisplayWindow) + { + CHAR szTempBuff[1024]; + PHID_DEVICE pDevice; + PHID_DATA pData; + UINT uLoop; + + pDevice = (PHID_DEVICE)Context->HidDevice; + + // + // Display all the data stored in the Input data field for the device + // + pData = pDevice->InputData; + + SendMessage(GetDlgItem(Context->DisplayWindow, IDC_CALLOUTPUT), + LB_ADDSTRING, + 0, + (LPARAM)"-------------------------------------------"); + + for (uLoop = 0; uLoop < pDevice->InputDataLength; uLoop++) + { + ReportToString(pData, szTempBuff, sizeof(szTempBuff)); + + SendMessage(GetDlgItem(Context->DisplayWindow, IDC_CALLOUTPUT), + LB_ADDSTRING, + 0, + (LPARAM)szTempBuff); + + pData++; + } + } else if (NULL == Context -> DisplayWindow) { // Running in console mode @@ -3804,9 +3840,10 @@ AsynchReadThreadProc( CLM_PrintInputReport(Context -> HidDevice); } } - } while ( !Context -> TerminateThread && + } while ( readResult && + !Context->TerminateThread && (INFINITE_READS == Context -> NumberOfReads || - numReadsDone < Context -> NumberOfReads)); + numReadsDone < Context -> NumberOfReads)); AsyncRead_End: @@ -3825,7 +3862,11 @@ SynchReadThreadProc( do { Read(Context -> HidDevice); - + + if (Context->TerminateThread) { + break; + } + numReadsDone ++; UnpackReport(Context -> HidDevice -> InputReportBuffer, @@ -3844,13 +3885,46 @@ SynchReadThreadProc( WaitForSingleObject( Context -> DisplayEvent, INFINITE ); } - - if (INFINITE_READS != Context -> NumberOfReads && - numReadsDone == Context -> NumberOfReads) + else if (NULL != Context->DisplayWindow) { - break; + CHAR szTempBuff[1024]; + PHID_DEVICE pDevice; + PHID_DATA pData; + UINT uLoop; + + pDevice = (PHID_DEVICE)Context->HidDevice; + + // + // Display all the data stored in the Input data field for the device + // + pData = pDevice->InputData; + + SendMessage(GetDlgItem(Context->DisplayWindow, IDC_CALLOUTPUT), + LB_ADDSTRING, + 0, + (LPARAM)"-------------------------------------------"); + + for (uLoop = 0; uLoop < pDevice->InputDataLength; uLoop++) + { + ReportToString(pData, szTempBuff, sizeof(szTempBuff)); + + SendMessage(GetDlgItem(Context->DisplayWindow, IDC_CALLOUTPUT), + LB_ADDSTRING, + 0, + (LPARAM)szTempBuff); + + pData++; + } + } + else if (NULL == Context->DisplayWindow) + { + // Running in console mode + printf("Read #%d\n", numReadsDone); + CLM_PrintInputReport(Context->HidDevice); } - } while ( !Context -> TerminateThread); + } while (!Context->TerminateThread && + (INFINITE_READS == Context->NumberOfReads || + numReadsDone < Context->NumberOfReads)); PostMessage( Context -> DisplayWindow, WM_READ_DONE, 0, 0); ExitThread(0); diff --git a/hid/hclient/hclient.sln b/hid/hclient/hclient.sln index a2ed0c44..994bc4e9 100644 --- a/hid/hclient/hclient.sln +++ b/hid/hclient/hclient.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hclient", "hclient.vcxproj", "{7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hclient", "hclient.vcxproj", "{1C842832-07EF-4A86-B46F-8CE77446E7FE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +13,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}.Debug|Win32.ActiveCfg = Debug|Win32 - {7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}.Debug|Win32.Build.0 = Debug|Win32 - {7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}.Release|Win32.ActiveCfg = Release|Win32 - {7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}.Release|Win32.Build.0 = Release|Win32 - {7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}.Debug|x64.ActiveCfg = Debug|x64 - {7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}.Debug|x64.Build.0 = Debug|x64 - {7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}.Release|x64.ActiveCfg = Release|x64 - {7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}.Release|x64.Build.0 = Release|x64 + {1C842832-07EF-4A86-B46F-8CE77446E7FE}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C842832-07EF-4A86-B46F-8CE77446E7FE}.Debug|Win32.Build.0 = Debug|Win32 + {1C842832-07EF-4A86-B46F-8CE77446E7FE}.Release|Win32.ActiveCfg = Release|Win32 + {1C842832-07EF-4A86-B46F-8CE77446E7FE}.Release|Win32.Build.0 = Release|Win32 + {1C842832-07EF-4A86-B46F-8CE77446E7FE}.Debug|x64.ActiveCfg = Debug|x64 + {1C842832-07EF-4A86-B46F-8CE77446E7FE}.Debug|x64.Build.0 = Debug|x64 + {1C842832-07EF-4A86-B46F-8CE77446E7FE}.Release|x64.ActiveCfg = Release|x64 + {1C842832-07EF-4A86-B46F-8CE77446E7FE}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/hid/hclient/hclient.vcxproj b/hid/hclient/hclient.vcxproj index 1ad38b14..e2983fd4 100644 --- a/hid/hclient/hclient.vcxproj +++ b/hid/hclient/hclient.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{7A7D6960-DBAA-4A93-8C8C-833FD9F31D44}</ProjectGuid> + <ProjectGuid>{1C842832-07EF-4A86-B46F-8CE77446E7FE}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{D88F2866-9D6E-437A-8F8D-056B18E851AF}</SampleGuid> + <SampleGuid>{8CC30BF0-571B-467D-83C8-3B11A862C64F}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/hid/hclient/hclient.vcxproj.Filters b/hid/hclient/hclient.vcxproj.Filters index b2f5d62f..0ed5fb00 100644 --- a/hid/hclient/hclient.vcxproj.Filters +++ b/hid/hclient/hclient.vcxproj.Filters @@ -3,15 +3,15 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{55093100-B347-4736-B0EC-F835DDA0D98D}</UniqueIdentifier> + <UniqueIdentifier>{EB720146-929F-413C-B049-B32470411E52}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{43D41B7E-82A6-4508-B577-4B2702FA8C8C}</UniqueIdentifier> + <UniqueIdentifier>{6586AAE7-53D0-4A11-8109-C63A954F3160}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{2B0259E8-4B79-49E6-BAEE-57D0FB83FFC8}</UniqueIdentifier> + <UniqueIdentifier>{C96865A4-45B5-443D-9669-8FB25940EEED}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/hid/hclient/hid.h b/hid/hclient/hid.h index af149ba7..e9a8b09e 100644 --- a/hid/hclient/hid.h +++ b/hid/hclient/hid.h @@ -158,7 +158,8 @@ Read ( BOOLEAN ReadOverlapped ( PHID_DEVICE HidDevice, - HANDLE CompletionEvent + HANDLE CompletionEvent, + LPOVERLAPPED Overlap ); BOOLEAN diff --git a/hid/hclient/report.c b/hid/hclient/report.c index 6734092f..f1d9ee55 100644 --- a/hid/hclient/report.c +++ b/hid/hclient/report.c @@ -8,8 +8,8 @@ Module Name: Abstract: - This module contains the code for reading/writing hid reports and - translating those HID reports into useful information. + This module contains the code for reading/writing hid reports and + translating those HID reports into useful information. Environment: @@ -64,7 +64,8 @@ Done: BOOLEAN ReadOverlapped ( PHID_DEVICE HidDevice, - HANDLE CompletionEvent + HANDLE CompletionEvent, + LPOVERLAPPED Overlap ) /*++ RoutineDescription: @@ -72,7 +73,6 @@ RoutineDescription: into the InputData array. --*/ { - static OVERLAPPED overlap; DWORD bytesRead; BOOL readStatus; @@ -81,10 +81,10 @@ RoutineDescription: // to use for signalling the completion of the Read */ - memset(&overlap, 0, sizeof(OVERLAPPED)); - - overlap.hEvent = CompletionEvent; - + memset(Overlap, 0, sizeof(OVERLAPPED)); + + Overlap->hEvent = CompletionEvent; + /* // Execute the read call saving the return code to determine how to // proceed (ie. the read completed synchronously or not). @@ -94,20 +94,20 @@ RoutineDescription: HidDevice -> InputReportBuffer, HidDevice -> Caps.InputReportByteLength, &bytesRead, - &overlap); - + Overlap); + /* - // If the readStatus is FALSE, then one of two cases occurred. + // If the readStatus is FALSE, then one of two cases occurred. // 1) ReadFile call succeeded but the Read is an overlapped one. Here, // we should return TRUE to indicate that the Read succeeded. However, // the calling thread should be blocked on the completion event // which means it won't continue until the read actually completes - // + // // 2) The ReadFile call failed for some unknown reason...In this case, // the return code will be FALSE - */ + */ - if (!readStatus) + if (!readStatus) { return (ERROR_IO_PENDING == GetLastError()); } @@ -149,7 +149,7 @@ RoutineDescription: pData = HidDevice -> OutputData; - for (Index = 0; Index < HidDevice -> OutputDataLength; Index++, pData++) + for (Index = 0; Index < HidDevice -> OutputDataLength; Index++, pData++) { pData -> IsDataSet = FALSE; } @@ -164,14 +164,14 @@ RoutineDescription: Status = TRUE; pData = HidDevice -> OutputData; - for (Index = 0; Index < HidDevice -> OutputDataLength; Index++, pData++) + for (Index = 0; Index < HidDevice -> OutputDataLength; Index++, pData++) { if (!pData -> IsDataSet) { /* // Package the report for this data structure. PackReport will - // set the IsDataSet fields of this structure and any other + // set the IsDataSet fields of this structure and any other // structures that it includes in the report with this structure */ @@ -192,7 +192,7 @@ RoutineDescription: &bytesWritten, NULL) && (bytesWritten == HidDevice -> Caps.OutputReportByteLength); - Status = Status && WriteStatus; + Status = Status && WriteStatus; } } return (Status); diff --git a/hid/hidusbfx2/Package/package.VcxProj b/hid/hidusbfx2/Package/package.VcxProj index 779e4aad..00314af6 100644 --- a/hid/hidusbfx2/Package/package.VcxProj +++ b/hid/hidusbfx2/Package/package.VcxProj @@ -20,10 +20,10 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="..\hidkmdf\hidkmdf.vcxproj"> - <Project>{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}</Project> + <Project>{EC5DCAF5-3514-4E61-8201-10F5F060E096}</Project> </ProjectReference> <ProjectReference Include="..\sys\hidusbfx2.vcxproj"> - <Project>{0C56E492-CEB9-49C4-B127-FE437B55A879}</Project> + <Project>{831A5B8C-BA01-4783-8A86-A289730FF224}</Project> </ProjectReference> </ItemGroup> <PropertyGroup Label="PropertySheets"> @@ -35,8 +35,8 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Globals"> - <ProjectGuid>{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}</ProjectGuid> - <SampleGuid>{065BAC02-7D5D-4099-AB61-0A2F323D7131}</SampleGuid> + <ProjectGuid>{D32BA7A3-463D-472E-B414-BE9EA92A508E}</ProjectGuid> + <SampleGuid>{F51D99A4-2A65-4406-AA40-A045BC0CCFF4}</SampleGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> diff --git a/hid/hidusbfx2/Package/package.VcxProj.Filters b/hid/hidusbfx2/Package/package.VcxProj.Filters index 5452b632..98969eae 100644 --- a/hid/hidusbfx2/Package/package.VcxProj.Filters +++ b/hid/hidusbfx2/Package/package.VcxProj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{FB119E32-2776-4AAA-AE28-BB0915F08F14}</UniqueIdentifier> + <UniqueIdentifier>{521B9C68-4545-4F66-AAA1-8354E7C8FB1D}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{A272D3D1-380E-485F-9B54-2C4890966EF6}</UniqueIdentifier> + <UniqueIdentifier>{22B4244F-2E85-43D7-8554-CE175F1F92AC}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{37428764-C503-4DAC-A17E-ECE3A971BD91}</UniqueIdentifier> + <UniqueIdentifier>{2C759DCE-C6C9-48FE-B5E7-898B16C060E8}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{C8FCCCAD-C2B7-4697-8144-3FB5D565425E}</UniqueIdentifier> + <UniqueIdentifier>{1EC783CB-1FB0-4DED-B3FD-50ECE2AA2F74}</UniqueIdentifier> </Filter> </ItemGroup> </Project>
\ No newline at end of file diff --git a/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj b/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj index 5eb7bff2..f31a5dd9 100644 --- a/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj +++ b/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj @@ -19,13 +19,13 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}</ProjectGuid> + <ProjectGuid>{EC5DCAF5-3514-4E61-8201-10F5F060E096}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <SupportsPackaging>false</SupportsPackaging> <RequiresPackageProject>true</RequiresPackageProject> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{792ED1CC-8C69-41A2-87D7-773F79512AE6}</SampleGuid> + <SampleGuid>{111FD84E-9342-42F9-8519-169121A5AD1F}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj.Filters b/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj.Filters index d84e2296..2fe80fe0 100644 --- a/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj.Filters +++ b/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{C5F48F0A-25A4-45EA-BD85-1A3D7F5F6AFC}</UniqueIdentifier> + <UniqueIdentifier>{064D2C7A-9F6D-4F79-9D8F-C982F89E5272}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{2E4FEC0E-9752-44A5-A6F3-8E74C3104B63}</UniqueIdentifier> + <UniqueIdentifier>{E3923C42-C65E-4B20-A29D-001CFE2CF5B6}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{25558E5A-CA73-4F97-B8B5-E71F91EE6D42}</UniqueIdentifier> + <UniqueIdentifier>{D9637277-FE12-4840-8B3A-3D9FF46F7A66}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{D86AF2FC-0173-48FE-A3D9-7389EAE4EB60}</UniqueIdentifier> + <UniqueIdentifier>{ABF9974D-F593-4FCD-B9CA-40B78F9B4152}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/hid/hidusbfx2/hidusbfx2.sln b/hid/hidusbfx2/hidusbfx2.sln index cd19d80f..47e5c110 100644 --- a/hid/hidusbfx2/hidusbfx2.sln +++ b/hid/hidusbfx2/hidusbfx2.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{F992E151-FEAC-4E8C-AF6A-082C91D6E54C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{A5954C4B-95E2-44F4-82C8-0AC139244744}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{6D46B6EF-E350-4AFB-8AE4-470C61F8F756}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{AC716714-8588-41DD-AF15-11F934473649}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hidkmdf", "Hidkmdf", "{9A9322D5-3F21-4358-A801-916E04F462C8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hidkmdf", "Hidkmdf", "{87FA4918-4872-4A6B-A68D-8D5324D76A9A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{D32BA7A3-463D-472E-B414-BE9EA92A508E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidusbfx2", "sys\hidusbfx2.vcxproj", "{0C56E492-CEB9-49C4-B127-FE437B55A879}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidusbfx2", "sys\hidusbfx2.vcxproj", "{831A5B8C-BA01-4783-8A86-A289730FF224}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidkmdf", "hidkmdf\hidkmdf.vcxproj", "{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidkmdf", "hidkmdf\hidkmdf.vcxproj", "{EC5DCAF5-3514-4E61-8201-10F5F060E096}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,37 +23,37 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Debug|Win32.Build.0 = Debug|Win32 - {01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Release|Win32.ActiveCfg = Release|Win32 - {01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Release|Win32.Build.0 = Release|Win32 - {01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Debug|x64.ActiveCfg = Debug|x64 - {01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Debug|x64.Build.0 = Debug|x64 - {01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Release|x64.ActiveCfg = Release|x64 - {01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Release|x64.Build.0 = Release|x64 - {0C56E492-CEB9-49C4-B127-FE437B55A879}.Debug|Win32.ActiveCfg = Debug|Win32 - {0C56E492-CEB9-49C4-B127-FE437B55A879}.Debug|Win32.Build.0 = Debug|Win32 - {0C56E492-CEB9-49C4-B127-FE437B55A879}.Release|Win32.ActiveCfg = Release|Win32 - {0C56E492-CEB9-49C4-B127-FE437B55A879}.Release|Win32.Build.0 = Release|Win32 - {0C56E492-CEB9-49C4-B127-FE437B55A879}.Debug|x64.ActiveCfg = Debug|x64 - {0C56E492-CEB9-49C4-B127-FE437B55A879}.Debug|x64.Build.0 = Debug|x64 - {0C56E492-CEB9-49C4-B127-FE437B55A879}.Release|x64.ActiveCfg = Release|x64 - {0C56E492-CEB9-49C4-B127-FE437B55A879}.Release|x64.Build.0 = Release|x64 - {213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Debug|Win32.Build.0 = Debug|Win32 - {213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Release|Win32.ActiveCfg = Release|Win32 - {213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Release|Win32.Build.0 = Release|Win32 - {213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Debug|x64.ActiveCfg = Debug|x64 - {213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Debug|x64.Build.0 = Debug|x64 - {213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Release|x64.ActiveCfg = Release|x64 - {213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Release|x64.Build.0 = Release|x64 + {D32BA7A3-463D-472E-B414-BE9EA92A508E}.Debug|Win32.ActiveCfg = Debug|Win32 + {D32BA7A3-463D-472E-B414-BE9EA92A508E}.Debug|Win32.Build.0 = Debug|Win32 + {D32BA7A3-463D-472E-B414-BE9EA92A508E}.Release|Win32.ActiveCfg = Release|Win32 + {D32BA7A3-463D-472E-B414-BE9EA92A508E}.Release|Win32.Build.0 = Release|Win32 + {D32BA7A3-463D-472E-B414-BE9EA92A508E}.Debug|x64.ActiveCfg = Debug|x64 + {D32BA7A3-463D-472E-B414-BE9EA92A508E}.Debug|x64.Build.0 = Debug|x64 + {D32BA7A3-463D-472E-B414-BE9EA92A508E}.Release|x64.ActiveCfg = Release|x64 + {D32BA7A3-463D-472E-B414-BE9EA92A508E}.Release|x64.Build.0 = Release|x64 + {831A5B8C-BA01-4783-8A86-A289730FF224}.Debug|Win32.ActiveCfg = Debug|Win32 + {831A5B8C-BA01-4783-8A86-A289730FF224}.Debug|Win32.Build.0 = Debug|Win32 + {831A5B8C-BA01-4783-8A86-A289730FF224}.Release|Win32.ActiveCfg = Release|Win32 + {831A5B8C-BA01-4783-8A86-A289730FF224}.Release|Win32.Build.0 = Release|Win32 + {831A5B8C-BA01-4783-8A86-A289730FF224}.Debug|x64.ActiveCfg = Debug|x64 + {831A5B8C-BA01-4783-8A86-A289730FF224}.Debug|x64.Build.0 = Debug|x64 + {831A5B8C-BA01-4783-8A86-A289730FF224}.Release|x64.ActiveCfg = Release|x64 + {831A5B8C-BA01-4783-8A86-A289730FF224}.Release|x64.Build.0 = Release|x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Debug|Win32.ActiveCfg = Debug|Win32 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Debug|Win32.Build.0 = Debug|Win32 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Release|Win32.ActiveCfg = Release|Win32 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Release|Win32.Build.0 = Release|Win32 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Debug|x64.ActiveCfg = Debug|x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Debug|x64.Build.0 = Debug|x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Release|x64.ActiveCfg = Release|x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {01899CCE-8A2B-4134-85E6-F81E7A9D30BE} = {F992E151-FEAC-4E8C-AF6A-082C91D6E54C} - {0C56E492-CEB9-49C4-B127-FE437B55A879} = {6D46B6EF-E350-4AFB-8AE4-470C61F8F756} - {213466E9-93D3-4D42-9BEE-F6DFBDC290BD} = {9A9322D5-3F21-4358-A801-916E04F462C8} + {D32BA7A3-463D-472E-B414-BE9EA92A508E} = {A5954C4B-95E2-44F4-82C8-0AC139244744} + {831A5B8C-BA01-4783-8A86-A289730FF224} = {AC716714-8588-41DD-AF15-11F934473649} + {EC5DCAF5-3514-4E61-8201-10F5F060E096} = {87FA4918-4872-4A6B-A68D-8D5324D76A9A} EndGlobalSection EndGlobal diff --git a/hid/hidusbfx2/sys/driver.c b/hid/hidusbfx2/sys/driver.c index 8aaaf294..825c803f 100644 --- a/hid/hidusbfx2/sys/driver.c +++ b/hid/hidusbfx2/sys/driver.c @@ -86,7 +86,7 @@ Return Value: WPP_INIT_TRACING( DriverObject, RegistryPath ); TraceEvents(TRACE_LEVEL_INFORMATION, DBG_INIT, - "HIDUSBFX2 Driver Sample Built %s %s\n", __DATE__, __TIME__); + "HIDUSBFX2 Driver Sample\n"); WDF_DRIVER_CONFIG_INIT(&config, HidFx2EvtDeviceAdd); diff --git a/hid/hidusbfx2/sys/hidusbfx2.inx b/hid/hidusbfx2/sys/hidusbfx2.inx Binary files differindex da8e8831..e8c28f32 100644 --- a/hid/hidusbfx2/sys/hidusbfx2.inx +++ b/hid/hidusbfx2/sys/hidusbfx2.inx diff --git a/hid/hidusbfx2/sys/hidusbfx2.vcxproj b/hid/hidusbfx2/sys/hidusbfx2.vcxproj index 41260039..65cb0d6e 100644 --- a/hid/hidusbfx2/sys/hidusbfx2.vcxproj +++ b/hid/hidusbfx2/sys/hidusbfx2.vcxproj @@ -19,14 +19,14 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{0C56E492-CEB9-49C4-B127-FE437B55A879}</ProjectGuid> + <ProjectGuid>{831A5B8C-BA01-4783-8A86-A289730FF224}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR> <SupportsPackaging>false</SupportsPackaging> <RequiresPackageProject>true</RequiresPackageProject> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{FFEC78A4-6826-4649-94F7-7886ABCAA11A}</SampleGuid> + <SampleGuid>{E8A0DAC7-C9B1-4606-A518-046158990EE3}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,11 +84,6 @@ <WppTraceFunction>TraceEvents(LEVEL,FLAGS,MSG,...)</WppTraceFunction> <WppGenerateUsingTemplateFile>{km-WdfDefault.tpl}*.tmh</WppGenerateUsingTemplateFile> </ClCompile> - <Inf Include=".\hidusbfx2.inx"> - <Architecture>$(InfArch)</Architecture> - <SpecifyArchitecture>true</SpecifyArchitecture> - <CopyOutput>.\$(IntDir)\hidusbfx2.inf</CopyOutput> - </Inf> <OtherWpp Include="hidusbfx2.rc"> <WppEnabled>true</WppEnabled> <WppKernelMode>true</WppKernelMode> diff --git a/hid/hidusbfx2/sys/hidusbfx2.vcxproj.Filters b/hid/hidusbfx2/sys/hidusbfx2.vcxproj.Filters index 82e40241..f15cb23e 100644 --- a/hid/hidusbfx2/sys/hidusbfx2.vcxproj.Filters +++ b/hid/hidusbfx2/sys/hidusbfx2.vcxproj.Filters @@ -3,19 +3,19 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{962D8603-CE23-4D62-A83B-90CEFA6AC176}</UniqueIdentifier> + <UniqueIdentifier>{DB53288F-E176-4DC0-8F73-39456F6F740A}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{538F2C38-4B67-4B18-BBC4-35B05919B868}</UniqueIdentifier> + <UniqueIdentifier>{C730C6E8-C5FF-4224-AE1D-ADD4FE7D0712}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{53D44B18-A36F-437E-8732-300635680D6F}</UniqueIdentifier> + <UniqueIdentifier>{AF7A8D98-A63D-4901-8362-F4921505042E}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{942D8837-E92B-4E87-8730-98BC45059E2D}</UniqueIdentifier> + <UniqueIdentifier>{A71AE4B4-6581-48A8-9734-E02C32F71580}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -30,11 +30,6 @@ </ClCompile> </ItemGroup> <ItemGroup> - <Inf Include=".\hidusbfx2.inx"> - <Filter>Driver Files</Filter> - </Inf> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="hidusbfx2.rc"> <Filter>Resource Files</Filter> </ResourceCompile> diff --git a/hid/hidusbfx2/sys/usb.c b/hid/hidusbfx2/sys/usb.c index ca5feff0..50f1a03b 100644 --- a/hid/hidusbfx2/sys/usb.c +++ b/hid/hidusbfx2/sys/usb.c @@ -147,7 +147,7 @@ Return Value: attributes.ParentObject = Device; status = WdfMemoryCreate( &attributes, - NonPagedPool, + NonPagedPoolNx, 0, sizeof(USB_DEVICE_DESCRIPTOR), &devContext->DeviceDescriptor, diff --git a/hid/vhidmini2/app/testvhid.vcxproj b/hid/vhidmini2/app/testvhid.vcxproj index 3e000d1e..70054a01 100644 --- a/hid/vhidmini2/app/testvhid.vcxproj +++ b/hid/vhidmini2/app/testvhid.vcxproj @@ -19,11 +19,11 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}</ProjectGuid> + <ProjectGuid>{36B830C1-B73B-4CEE-B872-FD7D09268BD0}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{0C5D2471-0E43-4210-8174-8165AA2D514A}</SampleGuid> + <SampleGuid>{6BB48D47-D9A5-489B-AB44-E2ED9DAD6999}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> diff --git a/hid/vhidmini2/app/testvhid.vcxproj.Filters b/hid/vhidmini2/app/testvhid.vcxproj.Filters index f43619c2..5b9af3f2 100644 --- a/hid/vhidmini2/app/testvhid.vcxproj.Filters +++ b/hid/vhidmini2/app/testvhid.vcxproj.Filters @@ -3,15 +3,15 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{33CB7352-5B0B-4FFD-90AA-C71D97B42B9B}</UniqueIdentifier> + <UniqueIdentifier>{2733A3E1-4A73-4F7E-944E-DA692FE66D49}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{BEC094B2-A429-4464-B266-5A5A38C318B0}</UniqueIdentifier> + <UniqueIdentifier>{35A49C1A-4868-41B5-A509-5E51CD179B23}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{78368937-093B-4F35-A915-C0D74A6F5602}</UniqueIdentifier> + <UniqueIdentifier>{92E5DFB8-6411-4F40-BE18-AC8F243A9E66}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.inx b/hid/vhidmini2/driver/kmdf/vhidmini.inx Binary files differindex 8189e407..3e709ef6 100644 --- a/hid/vhidmini2/driver/kmdf/vhidmini.inx +++ b/hid/vhidmini2/driver/kmdf/vhidmini.inx diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.vcxproj b/hid/vhidmini2/driver/kmdf/vhidmini.vcxproj index fc65fd10..91db487f 100644 --- a/hid/vhidmini2/driver/kmdf/vhidmini.vcxproj +++ b/hid/vhidmini2/driver/kmdf/vhidmini.vcxproj @@ -19,12 +19,12 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}</ProjectGuid> + <ProjectGuid>{64048006-1C5F-4262-823B-54310D7F3869}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{FBE937B8-E7D3-4F76-AEE5-8E21378A6E64}</SampleGuid> + <SampleGuid>{F4244CE1-9E5D-4F04-A978-D40F825B22F8}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -75,13 +75,7 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> </ImportGroup> - <ItemGroup Label="WrappedTaskItems"> - <Inf Include="vhidmini.inx"> - <Architecture>$(InfArch)</Architecture> - <SpecifyArchitecture>true</SpecifyArchitecture> - <CopyOutput>.\$(IntDir)\vhidmini.inf</CopyOutput> - </Inf> - </ItemGroup> + <ItemGroup Label="WrappedTaskItems" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <TargetName>vhidmini</TargetName> </PropertyGroup> @@ -96,65 +90,65 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> <ExceptionHandling> </ExceptionHandling> </ClCompile> <Midl> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> </Midl> <ResourceCompile> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> <ExceptionHandling> </ExceptionHandling> </ClCompile> <Midl> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> </Midl> <ResourceCompile> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> <ExceptionHandling> </ExceptionHandling> </ClCompile> <Midl> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> </Midl> <ResourceCompile> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> <ExceptionHandling> </ExceptionHandling> </ClCompile> <Midl> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> </Midl> <ResourceCompile> - <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions> + <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE;POOL_NX_OPTIN=1</PreprocessorDefinitions> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..</AdditionalIncludeDirectories> </ResourceCompile> </ItemDefinitionGroup> diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.vcxproj.Filters b/hid/vhidmini2/driver/kmdf/vhidmini.vcxproj.Filters index 00c9879a..e1f3511c 100644 --- a/hid/vhidmini2/driver/kmdf/vhidmini.vcxproj.Filters +++ b/hid/vhidmini2/driver/kmdf/vhidmini.vcxproj.Filters @@ -3,27 +3,22 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{ACC3297A-03C9-45B6-B62C-0A0A3E089CD0}</UniqueIdentifier> + <UniqueIdentifier>{EEA9A0D2-B8ED-4A83-9FD8-86D012F2A3DD}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{7BBF913C-90ED-455D-9A8D-EB2ACA2113FB}</UniqueIdentifier> + <UniqueIdentifier>{DE5B128E-EFF9-4660-B21A-9D0826098B5B}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{04EBC112-1A1A-4383-91F9-823EEF5FE3B4}</UniqueIdentifier> + <UniqueIdentifier>{0E54D562-2778-48B8-AEDB-F604CED7ED97}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{7FD6281F-9EA9-46FF-9767-C95E9A9FEEBB}</UniqueIdentifier> + <UniqueIdentifier>{662CD683-2177-4B49-ACF5-1D536E8595F4}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> - <Inf Include="vhidmini.inx"> - <Filter>Driver Files</Filter> - </Inf> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\vhidmini.c"> <Filter>Source Files</Filter> </ClCompile> diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx Binary files differindex 9c4872c5..73bf251c 100644 --- a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx +++ b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.vcxproj b/hid/vhidmini2/driver/umdf2/VhidminiUm.vcxproj index fc8d27ca..654dc525 100644 --- a/hid/vhidmini2/driver/umdf2/VhidminiUm.vcxproj +++ b/hid/vhidmini2/driver/umdf2/VhidminiUm.vcxproj @@ -19,12 +19,12 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}</ProjectGuid> + <ProjectGuid>{EEECA421-064D-4E2E-8832-B0F43A9B394C}</ProjectGuid> <RootNamespace>$(MSBuildProjectName)</RootNamespace> <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <SampleGuid>{35F5415D-57BD-487A-BB64-040C2B51C1A9}</SampleGuid> + <SampleGuid>{1F3C5D0E-2636-4FC0-946E-F3B967B2715D}</SampleGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -75,13 +75,7 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> </ImportGroup> - <ItemGroup Label="WrappedTaskItems"> - <Inf Include="VhidminiUm.inx"> - <Architecture>$(InfArch)</Architecture> - <SpecifyArchitecture>true</SpecifyArchitecture> - <CopyOutput>.\$(IntDir)\VhidminiUm.inf</CopyOutput> - </Inf> - </ItemGroup> + <ItemGroup Label="WrappedTaskItems" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <TargetName>VhidminiUm</TargetName> </PropertyGroup> diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.vcxproj.Filters b/hid/vhidmini2/driver/umdf2/VhidminiUm.vcxproj.Filters index 6ebaf483..cf1ceae9 100644 --- a/hid/vhidmini2/driver/umdf2/VhidminiUm.vcxproj.Filters +++ b/hid/vhidmini2/driver/umdf2/VhidminiUm.vcxproj.Filters @@ -3,27 +3,22 @@ <ItemGroup> <Filter Include="Source Files"> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions> - <UniqueIdentifier>{BF2270C6-A805-4981-BA76-511CA736A185}</UniqueIdentifier> + <UniqueIdentifier>{5E8FFB43-EAED-4E7B-B3FB-F07D5E007FB9}</UniqueIdentifier> </Filter> <Filter Include="Header Files"> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - <UniqueIdentifier>{557A560B-8241-4573-BE5A-FC0B1CF86C1F}</UniqueIdentifier> + <UniqueIdentifier>{D8864470-23E9-4C3B-8ED0-394EABC43745}</UniqueIdentifier> </Filter> <Filter Include="Resource Files"> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions> - <UniqueIdentifier>{8456BF4B-1629-491B-851E-F56B8F4C9DD1}</UniqueIdentifier> + <UniqueIdentifier>{923B77E9-A80C-48EC-88B0-CF700BB1D99C}</UniqueIdentifier> </Filter> <Filter Include="Driver Files"> <Extensions>inf;inv;inx;mof;mc;</Extensions> - <UniqueIdentifier>{161882E3-1C88-4B50-A3E4-AC0513E42847}</UniqueIdentifier> + <UniqueIdentifier>{0FC06B74-1E9A-4467-8098-08280033C42A}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> - <Inf Include="VhidminiUm.inx"> - <Filter>Driver Files</Filter> - </Inf> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\vhidmini.c"> <Filter>Source Files</Filter> </ClCompile> diff --git a/hid/vhidmini2/driver/vhidmini.c b/hid/vhidmini2/driver/vhidmini.c index f1aa4fc8..7d01840f 100644 --- a/hid/vhidmini2/driver/vhidmini.c +++ b/hid/vhidmini2/driver/vhidmini.c @@ -101,6 +101,14 @@ Return Value: KdPrint(("DriverEntry for VHidMini\n")); +#ifdef _KERNEL_MODE + // + // Opt-in to using non-executable pool memory on Windows 8 and later. + // https://msdn.microsoft.com/en-us/library/windows/hardware/hh920402(v=vs.85).aspx + // + ExInitializeDriverRuntime(DrvRtPoolNxOptIn); +#endif + WDF_DRIVER_CONFIG_INIT(&config, EvtDeviceAdd); status = WdfDriverCreate(DriverObject, @@ -1063,7 +1071,8 @@ Return Value: WDF_REQUEST_PARAMETERS_INIT(&requestParameters); WdfRequestGetParameters(Request, &requestParameters); - inputValue = (ULONG)requestParameters.Parameters.DeviceIoControl.Type3InputBuffer; + inputValue = PtrToUlong( + requestParameters.Parameters.DeviceIoControl.Type3InputBuffer); status = STATUS_SUCCESS; diff --git a/hid/vhidmini2/vhidmini2.sln b/hid/vhidmini2/vhidmini2.sln index 19823048..6a8e150c 100644 --- a/hid/vhidmini2/vhidmini2.sln +++ b/hid/vhidmini2/vhidmini2.sln @@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{A0CA14C5-80C0-4782-B7A5-0F7AADAA97E0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{744A43A0-C177-412C-A0F7-C875B9C5C5B5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umdf2", "Umdf2", "{C6FE2D11-F8D0-4B8B-9243-FFF05ABA95E7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umdf2", "Umdf2", "{8F9E6911-FDD4-4D28-9821-8A3AC44EBC82}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{0759E509-C2B6-4C7D-A6E1-832150847530}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{837BF49F-1143-4D82-A340-99AAFAE83F72}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{0E53ABAA-6885-47FE-95A0-7ED6585A1FE9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{6E61CD28-FEB2-4D68-9E47-006C401881F6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testvhid", "app\testvhid.vcxproj", "{52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testvhid", "app\testvhid.vcxproj", "{36B830C1-B73B-4CEE-B872-FD7D09268BD0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VhidminiUm", "driver\umdf2\VhidminiUm.vcxproj", "{CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VhidminiUm", "driver\umdf2\VhidminiUm.vcxproj", "{EEECA421-064D-4E2E-8832-B0F43A9B394C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vhidmini", "driver\kmdf\vhidmini.vcxproj", "{E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vhidmini", "driver\kmdf\vhidmini.vcxproj", "{64048006-1C5F-4262-823B-54310D7F3869}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,39 +25,39 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}.Debug|Win32.ActiveCfg = Debug|Win32 - {52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}.Debug|Win32.Build.0 = Debug|Win32 - {52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}.Release|Win32.ActiveCfg = Release|Win32 - {52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}.Release|Win32.Build.0 = Release|Win32 - {52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}.Debug|x64.ActiveCfg = Debug|x64 - {52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}.Debug|x64.Build.0 = Debug|x64 - {52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}.Release|x64.ActiveCfg = Release|x64 - {52B4AF60-09E2-4C74-804C-08E5BF7ACA1E}.Release|x64.Build.0 = Release|x64 - {CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}.Debug|Win32.Build.0 = Debug|Win32 - {CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}.Release|Win32.ActiveCfg = Release|Win32 - {CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}.Release|Win32.Build.0 = Release|Win32 - {CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}.Debug|x64.ActiveCfg = Debug|x64 - {CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}.Debug|x64.Build.0 = Debug|x64 - {CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}.Release|x64.ActiveCfg = Release|x64 - {CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1}.Release|x64.Build.0 = Release|x64 - {E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}.Debug|Win32.ActiveCfg = Debug|Win32 - {E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}.Debug|Win32.Build.0 = Debug|Win32 - {E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}.Release|Win32.ActiveCfg = Release|Win32 - {E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}.Release|Win32.Build.0 = Release|Win32 - {E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}.Debug|x64.ActiveCfg = Debug|x64 - {E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}.Debug|x64.Build.0 = Debug|x64 - {E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}.Release|x64.ActiveCfg = Release|x64 - {E6FB12D0-E6DD-447C-844D-B6B3B5F5693F}.Release|x64.Build.0 = Release|x64 + {36B830C1-B73B-4CEE-B872-FD7D09268BD0}.Debug|Win32.ActiveCfg = Debug|Win32 + {36B830C1-B73B-4CEE-B872-FD7D09268BD0}.Debug|Win32.Build.0 = Debug|Win32 + {36B830C1-B73B-4CEE-B872-FD7D09268BD0}.Release|Win32.ActiveCfg = Release|Win32 + {36B830C1-B73B-4CEE-B872-FD7D09268BD0}.Release|Win32.Build.0 = Release|Win32 + {36B830C1-B73B-4CEE-B872-FD7D09268BD0}.Debug|x64.ActiveCfg = Debug|x64 + {36B830C1-B73B-4CEE-B872-FD7D09268BD0}.Debug|x64.Build.0 = Debug|x64 + {36B830C1-B73B-4CEE-B872-FD7D09268BD0}.Release|x64.ActiveCfg = Release|x64 + {36B830C1-B73B-4CEE-B872-FD7D09268BD0}.Release|x64.Build.0 = Release|x64 + {EEECA421-064D-4E2E-8832-B0F43A9B394C}.Debug|Win32.ActiveCfg = Debug|Win32 + {EEECA421-064D-4E2E-8832-B0F43A9B394C}.Debug|Win32.Build.0 = Debug|Win32 + {EEECA421-064D-4E2E-8832-B0F43A9B394C}.Release|Win32.ActiveCfg = Release|Win32 + {EEECA421-064D-4E2E-8832-B0F43A9B394C}.Release|Win32.Build.0 = Release|Win32 + {EEECA421-064D-4E2E-8832-B0F43A9B394C}.Debug|x64.ActiveCfg = Debug|x64 + {EEECA421-064D-4E2E-8832-B0F43A9B394C}.Debug|x64.Build.0 = Debug|x64 + {EEECA421-064D-4E2E-8832-B0F43A9B394C}.Release|x64.ActiveCfg = Release|x64 + {EEECA421-064D-4E2E-8832-B0F43A9B394C}.Release|x64.Build.0 = Release|x64 + {64048006-1C5F-4262-823B-54310D7F3869}.Debug|Win32.ActiveCfg = Debug|Win32 + {64048006-1C5F-4262-823B-54310D7F3869}.Debug|Win32.Build.0 = Debug|Win32 + {64048006-1C5F-4262-823B-54310D7F3869}.Release|Win32.ActiveCfg = Release|Win32 + {64048006-1C5F-4262-823B-54310D7F3869}.Release|Win32.Build.0 = Release|Win32 + {64048006-1C5F-4262-823B-54310D7F3869}.Debug|x64.ActiveCfg = Debug|x64 + {64048006-1C5F-4262-823B-54310D7F3869}.Debug|x64.Build.0 = Debug|x64 + {64048006-1C5F-4262-823B-54310D7F3869}.Release|x64.ActiveCfg = Release|x64 + {64048006-1C5F-4262-823B-54310D7F3869}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {52B4AF60-09E2-4C74-804C-08E5BF7ACA1E} = {A0CA14C5-80C0-4782-B7A5-0F7AADAA97E0} - {CD1D0FA6-08E7-46FC-B119-D65B8D52C2E1} = {C6FE2D11-F8D0-4B8B-9243-FFF05ABA95E7} - {E6FB12D0-E6DD-447C-844D-B6B3B5F5693F} = {0E53ABAA-6885-47FE-95A0-7ED6585A1FE9} - {C6FE2D11-F8D0-4B8B-9243-FFF05ABA95E7} = {0759E509-C2B6-4C7D-A6E1-832150847530} - {0E53ABAA-6885-47FE-95A0-7ED6585A1FE9} = {0759E509-C2B6-4C7D-A6E1-832150847530} + {36B830C1-B73B-4CEE-B872-FD7D09268BD0} = {744A43A0-C177-412C-A0F7-C875B9C5C5B5} + {EEECA421-064D-4E2E-8832-B0F43A9B394C} = {8F9E6911-FDD4-4D28-9821-8A3AC44EBC82} + {64048006-1C5F-4262-823B-54310D7F3869} = {6E61CD28-FEB2-4D68-9E47-006C401881F6} + {8F9E6911-FDD4-4D28-9821-8A3AC44EBC82} = {837BF49F-1143-4D82-A340-99AAFAE83F72} + {6E61CD28-FEB2-4D68-9E47-006C401881F6} = {837BF49F-1143-4D82-A340-99AAFAE83F72} EndGlobalSection EndGlobal |