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

4 files changed, 19 insertions, 23 deletions

diff --git a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.inx b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.inx
index 6b9990c8..935a61cd 100644
--- a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.inx
+++ b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.inx
@@ -11,9 +11,9 @@ CatalogFile=WpdServiceSampleDriver.cat
 DriverVer=01/24/2007,1.1.1.1
 
 [Manufacturer]
-%MSFTWUDF%=Microsoft,NT$ARCH$
+%Mfg%=Standard,NT$ARCH$
 
-[Microsoft.NT$ARCH$]
+[Standard.NT$ARCH$]
 %BasicDeviceName%=Basic_Install,WUDF\WpdService
 
 [SourceDisksFiles]
@@ -73,7 +73,7 @@ WpdServiceSampleDriver.dll
 ; =================== Generic ==================================
 
 [Strings]
-MSFTWUDF="Microsoft Windows Portable Devices"
-Provider="Microsoft WPD"
+Provider="TODO-Set-Provider"
+Mfg="Windows Portable Devices"
 MediaDescription="Windows Portable Device Services Sample Driver Installation Media"
 BasicDeviceName="Windows Portable Device Services Sample Driver"
diff --git a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.sln b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.sln
index 4e97814f..287e80fe 100644
--- a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.sln
+++ b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.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}") = "WpdServiceSampleDriver", "WpdServiceSampleDriver.vcxproj", "{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WpdServiceSampleDriver", "WpdServiceSampleDriver.vcxproj", "{C5678647-23D8-428F-B6D8-F76D0DD66FED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}.Debug|Win32.Build.0 = Debug|Win32
-		{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}.Release|Win32.ActiveCfg = Release|Win32
-		{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}.Release|Win32.Build.0 = Release|Win32
-		{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}.Debug|x64.ActiveCfg = Debug|x64
-		{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}.Debug|x64.Build.0 = Debug|x64
-		{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}.Release|x64.ActiveCfg = Release|x64
-		{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}.Release|x64.Build.0 = Release|x64
+		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Debug|Win32.Build.0 = Debug|Win32
+		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Release|Win32.ActiveCfg = Release|Win32
+		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Release|Win32.Build.0 = Release|Win32
+		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Debug|x64.ActiveCfg = Debug|x64
+		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Debug|x64.Build.0 = Debug|x64
+		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Release|x64.ActiveCfg = Release|x64
+		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj
index e3538b91..6431626e 100644
--- a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj
+++ b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{060767D3-7EB1-4EC2-B2E2-6239DAEB712A}</ProjectGuid>
+    <ProjectGuid>{C5678647-23D8-428F-B6D8-F76D0DD66FED}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{632F78B7-F73E-4B6D-959D-587356021B6B}</SampleGuid>
+    <SampleGuid>{BD2E3BAC-111F-4306-AAFE-529806475FC0}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -435,7 +435,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/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj.Filters b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj.Filters
index 0b484774..7e058142 100644
--- a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj.Filters
+++ b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.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>{F5AD514F-9337-4FD2-8AF1-76095351A7A3}</UniqueIdentifier>
+      <UniqueIdentifier>{930F9018-015A-46BD-A347-171E1881999D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{E3137EB0-EA19-4B3F-AF8F-D7A0B1CCE331}</UniqueIdentifier>
+      <UniqueIdentifier>{7E56FF5F-D26D-4887-8A49-57F2FC991795}</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>{CB0E2DC6-C230-433C-BC67-FFE4DFA85526}</UniqueIdentifier>
+      <UniqueIdentifier>{66D2DFC5-B6CE-4AA6-A4C6-8E35D08B9A9A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{10D2CAE8-0888-4817-81AC-55927D716283}</UniqueIdentifier>
+      <UniqueIdentifier>{B436CE26-D450-4F04-9C6A-13067DED6AFB}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -96,9 +96,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\WpdServiceSampleDriver.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
     <Inf Include="WpdServiceSampleDriver.inx">
       <Filter>Driver Files</Filter>
     </Inf>