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

6 files changed, 33 insertions, 58 deletions

diff --git a/pofx/UMDF2/App/PowerFxApp.vcxproj b/pofx/UMDF2/App/PowerFxApp.vcxproj
index 2c986956..2f099791 100644
--- a/pofx/UMDF2/App/PowerFxApp.vcxproj
+++ b/pofx/UMDF2/App/PowerFxApp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{21ED4A9A-E9AA-4337-A59A-118571AE54D9}</ProjectGuid>
+    <ProjectGuid>{9212218E-EEA2-4169-BC4E-5014107F9D05}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{A97E9D3C-41CB-4AD7-9E98-11D0397FF579}</SampleGuid>
+    <SampleGuid>{CA79FBF2-DCA5-409D-ADB7-3F4E71D71960}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -93,19 +93,16 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);mincore.lib</AdditionalDependencies>
@@ -117,19 +114,16 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);mincore.lib</AdditionalDependencies>
@@ -141,19 +135,16 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);mincore.lib</AdditionalDependencies>
@@ -165,19 +156,16 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""PowerFxApp.PROGRAM"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);mincore.lib</AdditionalDependencies>
diff --git a/pofx/UMDF2/App/PowerFxApp.vcxproj.Filters b/pofx/UMDF2/App/PowerFxApp.vcxproj.Filters
index 60cbcf7b..0046875b 100644
--- a/pofx/UMDF2/App/PowerFxApp.vcxproj.Filters
+++ b/pofx/UMDF2/App/PowerFxApp.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>{DDF47081-1E94-4138-8A95-3B83CFE8F7EF}</UniqueIdentifier>
+      <UniqueIdentifier>{8FFA3EFF-8B24-4BA1-96EC-D9FE2A5A83E6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{E7D702DC-830A-4133-A615-169A82296264}</UniqueIdentifier>
+      <UniqueIdentifier>{A6CBC53B-9C43-4986-BF08-D1278D4AD529}</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>{CEC1B556-1599-4C29-9E19-52CA57C39F2B}</UniqueIdentifier>
+      <UniqueIdentifier>{A308E394-BF98-4F3C-87EA-746989D7E560}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx
index 2d412064..09ce986d 100644
--- a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx
+++ b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx
diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj
index 66e7ef57..cb4351ad 100644
--- a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj
+++ b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B1406B05-136D-40B7-AE20-4F38D724A219}</ProjectGuid>
+    <ProjectGuid>{151FA61D-859F-4496-B1EC-021EB9E9330C}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{A7C29AAB-AA74-4214-8DD8-5F6F98AD3BE2}</SampleGuid>
+    <SampleGuid>{EAB36B80-D708-481B-96F3-DF168641C28B}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -82,11 +82,6 @@
       <WppScanConfigurationData>driver.h</WppScanConfigurationData>
       <WppTraceFunction>TraceEvents(LEVEL,FLAGS,MSG,...)</WppTraceFunction>
     </ClCompile>
-    <Inf Include=".\SingleComponentSingleStateUm.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\SingleComponentSingleStateUm.inf</CopyOutput>
-    </Inf>
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>SingleComponentSingleStateUm</TargetName>
diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj.Filters b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj.Filters
index 06b92c7d..551a44b3 100644
--- a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj.Filters
+++ b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.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>{E7E0A430-9CF0-4086-A0C7-41EE8E78549E}</UniqueIdentifier>
+      <UniqueIdentifier>{D542D946-5BCB-42C6-8316-C1A58B2CADED}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{AD32486E-D07C-46E3-ADB8-F2402155F314}</UniqueIdentifier>
+      <UniqueIdentifier>{01CBE58C-FA8A-462F-80D3-3CA10D723DF3}</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>{FD85F7C5-1B90-451A-9FA2-1C9866B76D2A}</UniqueIdentifier>
+      <UniqueIdentifier>{673BF1D2-A0CA-4A73-908D-9EC0557B287A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{3920BA60-B0CF-461F-AC28-961B58798303}</UniqueIdentifier>
+      <UniqueIdentifier>{C3A35595-0E5F-494C-A8F5-2ED77ABC9FBA}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -26,9 +26,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Inf Include=".\SingleComponentSingleStateUm.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/pofx/UMDF2/pofx.sln b/pofx/UMDF2/pofx.sln
index 133119d4..857adade 100644
--- a/pofx/UMDF2/pofx.sln
+++ b/pofx/UMDF2/pofx.sln
@@ -3,15 +3,13 @@ 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", "{731A0A49-3729-494E-8418-F40171C91480}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{A6AD9758-D0FE-4F01-986A-5F7C39B66F76}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleComp", "SingleComp", "{D9E043A6-6577-4BCA-B9F0-56ABD68A9480}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleCompDriver", "SingleCompDriver", "{1F70E679-418A-4814-A9CF-21D5676BD252}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{7E8F4CDD-DC14-4362-8380-C7725C743960}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerFxApp", "App\PowerFxApp.vcxproj", "{9212218E-EEA2-4169-BC4E-5014107F9D05}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerFxApp", "App\PowerFxApp.vcxproj", "{21ED4A9A-E9AA-4337-A59A-118571AE54D9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SingleComponentSingleStateUm", "Driver\SingleComp\SingleComponentSingleStateUm.vcxproj", "{B1406B05-136D-40B7-AE20-4F38D724A219}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SingleComponentSingleStateUm", "Driver\SingleComp\SingleComponentSingleStateUm.vcxproj", "{151FA61D-859F-4496-B1EC-021EB9E9330C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,29 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{21ED4A9A-E9AA-4337-A59A-118571AE54D9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21ED4A9A-E9AA-4337-A59A-118571AE54D9}.Debug|Win32.Build.0 = Debug|Win32
-		{21ED4A9A-E9AA-4337-A59A-118571AE54D9}.Release|Win32.ActiveCfg = Release|Win32
-		{21ED4A9A-E9AA-4337-A59A-118571AE54D9}.Release|Win32.Build.0 = Release|Win32
-		{21ED4A9A-E9AA-4337-A59A-118571AE54D9}.Debug|x64.ActiveCfg = Debug|x64
-		{21ED4A9A-E9AA-4337-A59A-118571AE54D9}.Debug|x64.Build.0 = Debug|x64
-		{21ED4A9A-E9AA-4337-A59A-118571AE54D9}.Release|x64.ActiveCfg = Release|x64
-		{21ED4A9A-E9AA-4337-A59A-118571AE54D9}.Release|x64.Build.0 = Release|x64
-		{B1406B05-136D-40B7-AE20-4F38D724A219}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B1406B05-136D-40B7-AE20-4F38D724A219}.Debug|Win32.Build.0 = Debug|Win32
-		{B1406B05-136D-40B7-AE20-4F38D724A219}.Release|Win32.ActiveCfg = Release|Win32
-		{B1406B05-136D-40B7-AE20-4F38D724A219}.Release|Win32.Build.0 = Release|Win32
-		{B1406B05-136D-40B7-AE20-4F38D724A219}.Debug|x64.ActiveCfg = Debug|x64
-		{B1406B05-136D-40B7-AE20-4F38D724A219}.Debug|x64.Build.0 = Debug|x64
-		{B1406B05-136D-40B7-AE20-4F38D724A219}.Release|x64.ActiveCfg = Release|x64
-		{B1406B05-136D-40B7-AE20-4F38D724A219}.Release|x64.Build.0 = Release|x64
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Debug|Win32.Build.0 = Debug|Win32
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Release|Win32.ActiveCfg = Release|Win32
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Release|Win32.Build.0 = Release|Win32
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Debug|x64.ActiveCfg = Debug|x64
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Debug|x64.Build.0 = Debug|x64
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Release|x64.ActiveCfg = Release|x64
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Release|x64.Build.0 = Release|x64
+		{151FA61D-859F-4496-B1EC-021EB9E9330C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{151FA61D-859F-4496-B1EC-021EB9E9330C}.Debug|Win32.Build.0 = Debug|Win32
+		{151FA61D-859F-4496-B1EC-021EB9E9330C}.Release|Win32.ActiveCfg = Release|Win32
+		{151FA61D-859F-4496-B1EC-021EB9E9330C}.Release|Win32.Build.0 = Release|Win32
+		{151FA61D-859F-4496-B1EC-021EB9E9330C}.Debug|x64.ActiveCfg = Debug|x64
+		{151FA61D-859F-4496-B1EC-021EB9E9330C}.Debug|x64.Build.0 = Debug|x64
+		{151FA61D-859F-4496-B1EC-021EB9E9330C}.Release|x64.ActiveCfg = Release|x64
+		{151FA61D-859F-4496-B1EC-021EB9E9330C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{21ED4A9A-E9AA-4337-A59A-118571AE54D9} = {731A0A49-3729-494E-8418-F40171C91480}
-		{B1406B05-136D-40B7-AE20-4F38D724A219} = {D9E043A6-6577-4BCA-B9F0-56ABD68A9480}
-		{D9E043A6-6577-4BCA-B9F0-56ABD68A9480} = {7E8F4CDD-DC14-4362-8380-C7725C743960}
+		{9212218E-EEA2-4169-BC4E-5014107F9D05} = {A6AD9758-D0FE-4F01-986A-5F7C39B66F76}
+		{151FA61D-859F-4496-B1EC-021EB9E9330C} = {1F70E679-418A-4814-A9CF-21D5676BD252}
 	EndGlobalSection
 EndGlobal