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

6 files changed, 49 insertions, 53 deletions

diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.sln b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.sln
index e08b4c01..0b2d30fd 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.sln
+++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.sln
@@ -3,11 +3,11 @@ 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", "{29C54707-CBCF-4EE7-8664-5A8809CD30D9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{E471F8AB-0B10-45C2-B788-E5E441CFCDC9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{24F15521-602D-47EF-ABFE-5765AB32E694}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HostBasedSampleDriver", "HostBasedSampleDriver.vcxproj", "{C4923416-0CA0-4D73-98F2-BC10C70C6689}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HostBasedSampleDriver", "HostBasedSampleDriver.vcxproj", "{A78FB2A6-2C70-4886-A438-FDA24E741537}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,27 +17,27 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}.Debug|Win32.Build.0 = Debug|Win32
-		{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}.Release|Win32.ActiveCfg = Release|Win32
-		{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}.Release|Win32.Build.0 = Release|Win32
-		{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}.Debug|x64.ActiveCfg = Debug|x64
-		{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}.Debug|x64.Build.0 = Debug|x64
-		{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}.Release|x64.ActiveCfg = Release|x64
-		{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}.Release|x64.Build.0 = Release|x64
-		{C4923416-0CA0-4D73-98F2-BC10C70C6689}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C4923416-0CA0-4D73-98F2-BC10C70C6689}.Debug|Win32.Build.0 = Debug|Win32
-		{C4923416-0CA0-4D73-98F2-BC10C70C6689}.Release|Win32.ActiveCfg = Release|Win32
-		{C4923416-0CA0-4D73-98F2-BC10C70C6689}.Release|Win32.Build.0 = Release|Win32
-		{C4923416-0CA0-4D73-98F2-BC10C70C6689}.Debug|x64.ActiveCfg = Debug|x64
-		{C4923416-0CA0-4D73-98F2-BC10C70C6689}.Debug|x64.Build.0 = Debug|x64
-		{C4923416-0CA0-4D73-98F2-BC10C70C6689}.Release|x64.ActiveCfg = Release|x64
-		{C4923416-0CA0-4D73-98F2-BC10C70C6689}.Release|x64.Build.0 = Release|x64
+		{24F15521-602D-47EF-ABFE-5765AB32E694}.Debug|Win32.ActiveCfg = Debug|Win32
+		{24F15521-602D-47EF-ABFE-5765AB32E694}.Debug|Win32.Build.0 = Debug|Win32
+		{24F15521-602D-47EF-ABFE-5765AB32E694}.Release|Win32.ActiveCfg = Release|Win32
+		{24F15521-602D-47EF-ABFE-5765AB32E694}.Release|Win32.Build.0 = Release|Win32
+		{24F15521-602D-47EF-ABFE-5765AB32E694}.Debug|x64.ActiveCfg = Debug|x64
+		{24F15521-602D-47EF-ABFE-5765AB32E694}.Debug|x64.Build.0 = Debug|x64
+		{24F15521-602D-47EF-ABFE-5765AB32E694}.Release|x64.ActiveCfg = Release|x64
+		{24F15521-602D-47EF-ABFE-5765AB32E694}.Release|x64.Build.0 = Release|x64
+		{A78FB2A6-2C70-4886-A438-FDA24E741537}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A78FB2A6-2C70-4886-A438-FDA24E741537}.Debug|Win32.Build.0 = Debug|Win32
+		{A78FB2A6-2C70-4886-A438-FDA24E741537}.Release|Win32.ActiveCfg = Release|Win32
+		{A78FB2A6-2C70-4886-A438-FDA24E741537}.Release|Win32.Build.0 = Release|Win32
+		{A78FB2A6-2C70-4886-A438-FDA24E741537}.Debug|x64.ActiveCfg = Debug|x64
+		{A78FB2A6-2C70-4886-A438-FDA24E741537}.Debug|x64.Build.0 = Debug|x64
+		{A78FB2A6-2C70-4886-A438-FDA24E741537}.Release|x64.ActiveCfg = Release|x64
+		{A78FB2A6-2C70-4886-A438-FDA24E741537}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61} = {29C54707-CBCF-4EE7-8664-5A8809CD30D9}
+		{24F15521-602D-47EF-ABFE-5765AB32E694} = {E471F8AB-0B10-45C2-B788-E5E441CFCDC9}
 	EndGlobalSection
 EndGlobal
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj
index 4056d79e..11b44ad0 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj
+++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{C4923416-0CA0-4D73-98F2-BC10C70C6689}</ProjectGuid>
+    <ProjectGuid>{A78FB2A6-2C70-4886-A438-FDA24E741537}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{192B3507-9B3B-4F9D-8757-FB236A173A4C}</SampleGuid>
+    <SampleGuid>{D222C8EC-FFAE-4F5B-9FF9-EC2D0D916D18}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -130,7 +130,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 Include="*.txt" Exclude="@(None)" />
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj.Filters b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj.Filters
index 32c3897e..ecebc820 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj.Filters
+++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.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>{805C7C5E-A9EF-42CA-8F3A-175C6CCDFD53}</UniqueIdentifier>
+      <UniqueIdentifier>{26A53244-E3EA-4D6F-9B29-5AAD4B47D63F}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A2CB3D9E-1732-4426-8E35-7341BE09E5BD}</UniqueIdentifier>
+      <UniqueIdentifier>{F14350A1-7C38-4AD9-B85E-7D2200E10B4D}</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>{71B188DF-173E-402E-9FB3-D936E33C3F93}</UniqueIdentifier>
+      <UniqueIdentifier>{26731250-FFAE-42F3-BD80-933169EB7B05}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{7A9313F9-BD09-46CB-8B04-D289D34FFDE0}</UniqueIdentifier>
+      <UniqueIdentifier>{9640FB3F-4A16-42E7-85C4-CC9B63A1BC84}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj
index d1f97a31..b1c76f36 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj
+++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj
@@ -18,6 +18,11 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\HostBasedSampleDriver.vcxproj">
+      <Project>{A78FB2A6-2C70-4886-A438-FDA24E741537}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Label="PropertySheets">
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Utility</ConfigurationType>
@@ -27,8 +32,8 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{F1081D0D-31B7-4B48-9AD6-6C7336ADEA61}</ProjectGuid>
-    <SampleGuid>{6D0283E4-148C-44BA-98FA-A3D4EEBF561E}</SampleGuid>
+    <ProjectGuid>{24F15521-602D-47EF-ABFE-5765AB32E694}</ProjectGuid>
+    <SampleGuid>{7B686CC4-2BC7-439F-BB22-27DC9D1EE60D}</SampleGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -73,15 +78,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <!--Inf Include="DriverInf.inv" /-->
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HostBasedSampleDriver.vcxproj">
-      <Project>{C4923416-0CA0-4D73-98F2-BC10C70C6689}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj.Filters b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj.Filters
index a9ed8cc6..f5ff27db 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj.Filters
+++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/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>{82BBB724-F089-4441-8ECE-61571F0CD9ED}</UniqueIdentifier>
+      <UniqueIdentifier>{F52AC47D-602A-4466-8B14-C1FB06EF1B63}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{24C56EA9-2A47-4CDD-ADAF-AC403C6FDDD1}</UniqueIdentifier>
+      <UniqueIdentifier>{73FCE8FA-3B30-4BFB-A03A-24194DE06E89}</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>{C7204588-58DE-470B-B532-39199F0C5930}</UniqueIdentifier>
+      <UniqueIdentifier>{EBC9E52A-4E4D-4BD8-A6D9-7586927E1DB1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{40292FDA-3C17-4357-8861-B57A7A726884}</UniqueIdentifier>
+      <UniqueIdentifier>{4A1D0022-452B-4379-AD3C-CF6F708AC3ED}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/usb_host_based_sample.inf b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/usb_host_based_sample.inf
index 4297a35a..92bf72b2 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/usb_host_based_sample.inf
+++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/usb_host_based_sample.inf
@@ -7,7 +7,7 @@
 ;
 [Version] 
 Signature="$Windows NT$"
-Provider=%MS%
+Provider=%ProviderString%
 CatalogFile=usb_host_based_sample.cat
 ClassGUID={4D36E979-E325-11CE-BFC1-08002BE10318}
 Class=Printer
@@ -21,7 +21,7 @@ ClassVer=4.0
 ; that we will display in the Dialog box
 ;
 [Manufacturer]
-%MS%=Microsoft, NTx86, NTamd64, NTarm, NTarm64
+%ManufacturerName%=Standard, NTx86, NTamd64, NTarm, NTarm64
 
 ;
 ; Model sections
@@ -31,17 +31,17 @@ ClassVer=4.0
 ; that they appear in the INF file.
 ;
 
-[Microsoft.NTx86]
-"Microsoft USB Host Based Sample Driver"     = USB_HOST_BASED_SAMPLE, DO_NOT_USE_THIS_HWID1,
+[Standard.NTx86]
+"USB Host Based Sample Driver"     = USB_HOST_BASED_SAMPLE, DO_NOT_USE_THIS_HWID1,
 
-[Microsoft.NTamd64]
-"Microsoft USB Host Based Sample Driver"     = USB_HOST_BASED_SAMPLE, DO_NOT_USE_THIS_HWID1
+[Standard.NTamd64]
+"USB Host Based Sample Driver"     = USB_HOST_BASED_SAMPLE, DO_NOT_USE_THIS_HWID1
 
-[Microsoft.NTarm]
-"Microsoft USB Host Based Sample Driver"     = USB_HOST_BASED_SAMPLE, DO_NOT_USE_THIS_HWID1
+[Standard.NTarm]
+"USB Host Based Sample Driver"     = USB_HOST_BASED_SAMPLE, DO_NOT_USE_THIS_HWID1
 
-[Microsoft.NTarm64]
-"Microsoft USB Host Based Sample Driver"     = USB_HOST_BASED_SAMPLE, DO_NOT_USE_THIS_HWID1
+[Standard.NTarm64]
+"USB Host Based Sample Driver"     = USB_HOST_BASED_SAMPLE, DO_NOT_USE_THIS_HWID1
 
 ;
 ; Installer Sections
@@ -105,4 +105,5 @@ usb_host_based_sample_events.xml            = 1
 ;
 [Strings]
 Disk1="."
-MS="Microsoft"
+ProviderString = "TODO-Set-Provider"
+ManufacturerName="TODO-Set-Manufacturer"
\ No newline at end of file