Samples update for public Windows 10 release

Fix #2 Enabling WPP Recorder in Sensors Samples causes errors
Fix #4 Add back fixed KMDOD sample
Add new BarcodeScanner sample in pos folder
Add new MagneticStripeReader sample in pos folder
Add new SynpaticsTouch sample in input folder
Add new Power Engine Plugin sample in pofx folder
Add new DeviceMft sample in avstream folder
Add new AvsCamera sample in root
Add new SimBatt sample in root
Add other pre-existing samples not yet released for Win10

8 files changed, 34 insertions, 36 deletions

diff --git a/thermal/simsensor/simsensor.inf b/thermal/simsensor/simsensor.inf
index 8ba9722d..dad037e1 100644
--- a/thermal/simsensor/simsensor.inf
+++ b/thermal/simsensor/simsensor.inf
@@ -16,7 +16,7 @@
 Signature="$WINDOWS NT$"
 Class=System
 ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}
-Provider=%MSFT%
+Provider=%ProviderString%
 DriverVer=09/02/2011, 6.02.8105
 CatalogFile=simsensor.cat
 
@@ -99,7 +99,7 @@ Default = {381B4222-F694-41F0-9685-FF5BB260DF2E}, 1, 1
 
 [Strings]
 SPSVCINST_ASSOCSERVICE= 0x00000002
-MSFT = "Microsoft"
+ProviderString = "TODO-Set-Provider"
 StdMfg = "(Standard system devices)"
 DiskId1 = "Simulate Sensor Installation Disk #1"
 simsensor.DeviceDesc = "Simulated Sensor"
diff --git a/thermal/simsensor/simsensor.sln b/thermal/simsensor/simsensor.sln
index 734db11c..8ff4936e 100644
--- a/thermal/simsensor/simsensor.sln
+++ b/thermal/simsensor/simsensor.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}") = "simsensor", "simsensor.vcxproj", "{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simsensor", "simsensor.vcxproj", "{92D79466-CE11-417A-9142-08711CDC46CA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}.Debug|Win32.Build.0 = Debug|Win32
-		{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}.Release|Win32.ActiveCfg = Release|Win32
-		{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}.Release|Win32.Build.0 = Release|Win32
-		{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}.Debug|x64.ActiveCfg = Debug|x64
-		{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}.Debug|x64.Build.0 = Debug|x64
-		{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}.Release|x64.ActiveCfg = Release|x64
-		{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}.Release|x64.Build.0 = Release|x64
+		{92D79466-CE11-417A-9142-08711CDC46CA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{92D79466-CE11-417A-9142-08711CDC46CA}.Debug|Win32.Build.0 = Debug|Win32
+		{92D79466-CE11-417A-9142-08711CDC46CA}.Release|Win32.ActiveCfg = Release|Win32
+		{92D79466-CE11-417A-9142-08711CDC46CA}.Release|Win32.Build.0 = Release|Win32
+		{92D79466-CE11-417A-9142-08711CDC46CA}.Debug|x64.ActiveCfg = Debug|x64
+		{92D79466-CE11-417A-9142-08711CDC46CA}.Debug|x64.Build.0 = Debug|x64
+		{92D79466-CE11-417A-9142-08711CDC46CA}.Release|x64.ActiveCfg = Release|x64
+		{92D79466-CE11-417A-9142-08711CDC46CA}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/thermal/simsensor/simsensor.vcxproj b/thermal/simsensor/simsensor.vcxproj
index fc01a580..b52284d5 100644
--- a/thermal/simsensor/simsensor.vcxproj
+++ b/thermal/simsensor/simsensor.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{C59FD02E-3C7E-4DC3-94C7-7E04827E0934}</ProjectGuid>
+    <ProjectGuid>{92D79466-CE11-417A-9142-08711CDC46CA}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{614E84B8-6A38-4F03-93D6-E41FEA710542}</SampleGuid>
+    <SampleGuid>{49B64D1C-D106-47F8-AEC5-499B090D53D3}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -167,7 +167,6 @@
   <ItemGroup>
     <Inf Exclude="@(Inf)" Include="*.inf" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
diff --git a/thermal/simsensor/simsensor.vcxproj.Filters b/thermal/simsensor/simsensor.vcxproj.Filters
index 135dc024..09f6d30b 100644
--- a/thermal/simsensor/simsensor.vcxproj.Filters
+++ b/thermal/simsensor/simsensor.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>{C3D02E88-9BD3-4979-BB31-99764D1517A9}</UniqueIdentifier>
+      <UniqueIdentifier>{2B24E521-83A9-4A37-85BA-E860A36A1B51}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{69FA9ACE-C62E-4ABA-A9A2-9F2C43CCDD50}</UniqueIdentifier>
+      <UniqueIdentifier>{8FB448E3-6D96-4E76-AC71-EFC10A620CE1}</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>{17C8F8C4-E1A8-404B-BEB5-1D12BD37AC27}</UniqueIdentifier>
+      <UniqueIdentifier>{C1B69A40-A8D2-4AA1-AE53-159FC7579CC4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{9DB4A799-2FC4-47D4-A5BA-F2395218E4AE}</UniqueIdentifier>
+      <UniqueIdentifier>{BAEA26B6-5151-4D81-8F72-E066C8494F2D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/thermal/thermalclient/simtc.inf b/thermal/thermalclient/simtc.inf
index c2cfe2b3..74148cad 100644
--- a/thermal/thermalclient/simtc.inf
+++ b/thermal/thermalclient/simtc.inf
@@ -16,7 +16,7 @@
 Signature="$WINDOWS NT$"
 Class=System
 ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}
-Provider=%MSFT%
+Provider=%ProviderString%
 DriverVer=07/22/2011, 6.02.8040
 CatalogFile=thermalclient.cat
 
@@ -80,7 +80,7 @@ ServiceBinary  = %12%\simtc.sys
 
 [Strings]
 SPSVCINST_ASSOCSERVICE= 0x00000002
-MSFT = "Microsoft"
+ProviderString = "TODO-Set-Provider"
 StdMfg = "(Standard system devices)"
 DiskId1 = "Simulate Thermal Client Installation Disk #1"
 SimTc.DeviceDesc = "Simulated Thermal Client"
diff --git a/thermal/thermalclient/simtc.vcxproj b/thermal/thermalclient/simtc.vcxproj
index 23b7b735..562d5224 100644
--- a/thermal/thermalclient/simtc.vcxproj
+++ b/thermal/thermalclient/simtc.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}</ProjectGuid>
+    <ProjectGuid>{673CCCD9-54E7-413B-AEA1-F237E1A270B3}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{96B796D8-F417-486F-8B8A-C1BA76C20398}</SampleGuid>
+    <SampleGuid>{47D4AB7E-D100-49F1-A993-7B71D1F1DDFF}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -167,7 +167,6 @@
   <ItemGroup>
     <Inf Exclude="@(Inf)" Include="*.inf" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
diff --git a/thermal/thermalclient/simtc.vcxproj.Filters b/thermal/thermalclient/simtc.vcxproj.Filters
index 47ec9236..c34b549a 100644
--- a/thermal/thermalclient/simtc.vcxproj.Filters
+++ b/thermal/thermalclient/simtc.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>{3F670431-8219-4202-9710-75D4686C3657}</UniqueIdentifier>
+      <UniqueIdentifier>{F22E3BDF-A139-4606-AC2F-903826B537D4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{8DE58803-401C-49AD-A147-C3F70346A0DB}</UniqueIdentifier>
+      <UniqueIdentifier>{82721B5B-1E5E-42EF-AFDB-047A5C91A45A}</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>{964EADB1-B2FC-4397-A2F0-B4C72031CC67}</UniqueIdentifier>
+      <UniqueIdentifier>{AD4AD608-3ACF-409E-BDC3-880416ECB637}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{0C7838AB-73FB-4DBB-B61F-2BAEF26FB05E}</UniqueIdentifier>
+      <UniqueIdentifier>{3D8249F0-7C5E-4714-A0E5-478DAE422E67}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/thermal/thermalclient/thermalclient.sln b/thermal/thermalclient/thermalclient.sln
index 6415ed75..e6be8e1a 100644
--- a/thermal/thermalclient/thermalclient.sln
+++ b/thermal/thermalclient/thermalclient.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}") = "simtc", "simtc.vcxproj", "{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simtc", "simtc.vcxproj", "{673CCCD9-54E7-413B-AEA1-F237E1A270B3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}.Debug|Win32.Build.0 = Debug|Win32
-		{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}.Release|Win32.ActiveCfg = Release|Win32
-		{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}.Release|Win32.Build.0 = Release|Win32
-		{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}.Debug|x64.ActiveCfg = Debug|x64
-		{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}.Debug|x64.Build.0 = Debug|x64
-		{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}.Release|x64.ActiveCfg = Release|x64
-		{8C2AD3B6-D9D6-4ECA-8D92-A714B4046119}.Release|x64.Build.0 = Release|x64
+		{673CCCD9-54E7-413B-AEA1-F237E1A270B3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{673CCCD9-54E7-413B-AEA1-F237E1A270B3}.Debug|Win32.Build.0 = Debug|Win32
+		{673CCCD9-54E7-413B-AEA1-F237E1A270B3}.Release|Win32.ActiveCfg = Release|Win32
+		{673CCCD9-54E7-413B-AEA1-F237E1A270B3}.Release|Win32.Build.0 = Release|Win32
+		{673CCCD9-54E7-413B-AEA1-F237E1A270B3}.Debug|x64.ActiveCfg = Debug|x64
+		{673CCCD9-54E7-413B-AEA1-F237E1A270B3}.Debug|x64.Build.0 = Debug|x64
+		{673CCCD9-54E7-413B-AEA1-F237E1A270B3}.Release|x64.ActiveCfg = Release|x64
+		{673CCCD9-54E7-413B-AEA1-F237E1A270B3}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE