Updated for "Windows 10 Anniversary Update" (Version 1607)

12 files changed, 70 insertions, 78 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
index 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>