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

author: karlf <[email protected]> 2016-08-11 13:28:13 -0700
committer: karlf <[email protected]> 2016-08-11 13:28:13 -0700
commit: 96eb96dfb613e4c745db6bd1f53a92fe7e2290fc (patch)
tree: ad5f3ede5cbcd6b598677ce41bcf8318471bdd92 /pofx
parent: 687b274aa38fd05c8c26e3068932121876d7f745 (diff)
30 files changed, 160 insertions, 243 deletions
diff --git a/pofx/PEP/acpi/sampleacpipep.inx b/pofx/PEP/acpi/sampleacpipep.inx
index 95ec332a..158fed33 100644
--- a/pofx/PEP/acpi/sampleacpipep.inx
+++ b/pofx/PEP/acpi/sampleacpipep.inx
diff --git a/pofx/PEP/acpi/sampleacpipep.vcxproj b/pofx/PEP/acpi/sampleacpipep.vcxproj
index 6f827afd..5fcc1c30 100644
--- a/pofx/PEP/acpi/sampleacpipep.vcxproj
+++ b/pofx/PEP/acpi/sampleacpipep.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{EF47791C-9559-4F0F-867F-A0E055054058}</ProjectGuid>
+    <ProjectGuid>{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{4ABAAE16-AA0F-41FC-91FF-086A659D2992}</SampleGuid>
+    <SampleGuid>{E583EE6C-2C0B-419D-AAA6-6C564DE45F57}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/pofx/PEP/acpi/sampleacpipep.vcxproj.Filters b/pofx/PEP/acpi/sampleacpipep.vcxproj.Filters
index 9f34a488..2982bdc8 100644
--- a/pofx/PEP/acpi/sampleacpipep.vcxproj.Filters
+++ b/pofx/PEP/acpi/sampleacpipep.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>{A57CB1F4-9530-4851-8C3E-570F22B7FD51}</UniqueIdentifier>
+      <UniqueIdentifier>{D4DD964D-9A3A-4D35-B819-C932E9C8553D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A5639709-5FAC-4C0B-9540-FEED78ECAB9D}</UniqueIdentifier>
+      <UniqueIdentifier>{F04DA4E6-29CF-4270-8B34-96A3BB5965B3}</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>{E30CD127-ACB4-487E-B0F8-A356EBD657AD}</UniqueIdentifier>
+      <UniqueIdentifier>{627A3F0C-6B56-4AA3-838B-E7EEC7BC8805}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{699DA905-BD41-4310-B92C-DF62A6AF87B9}</UniqueIdentifier>
+      <UniqueIdentifier>{B3148496-F358-4552-8B3D-B1FABDA3945D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/pofx/PEP/acpi/testdevice.c b/pofx/PEP/acpi/testdevice.c
index 2eb8e072..a6f89b9d 100644
--- a/pofx/PEP/acpi/testdevice.c
+++ b/pofx/PEP/acpi/testdevice.c
@@ -172,7 +172,7 @@ Tst3CreateSelfManagedCidRequest (
 
 VOID
 Tst3SelfManagedCidRequestWorkerWrapper (
-    __in WDFWORKITEM WorkItem
+    _In_ WDFWORKITEM WorkItem
     );
 
 VOID
@@ -1476,7 +1476,7 @@ Tst3CreateSelfManagedCidRequestEnd:
 
 VOID
 Tst3SelfManagedCidRequestWorkerWrapper (
-    __in WDFWORKITEM WorkItem
+    _In_ WDFWORKITEM WorkItem
     )
 
 /*++
diff --git a/pofx/PEP/common/acpinotify.c b/pofx/PEP/common/acpinotify.c
index f9d524ad..ed5fd2b6 100644
--- a/pofx/PEP/common/acpinotify.c
+++ b/pofx/PEP/common/acpinotify.c
@@ -190,7 +190,7 @@ Return Value:
                  RegisterDevice->AcpiDeviceName->Length +
                  sizeof(WCHAR);
 
-    PepInternalDevice = ExAllocatePoolWithTag(NonPagedPool,
+    PepInternalDevice = ExAllocatePoolWithTag(NonPagedPoolNx,
                                               SizeNeeded,
                                               PEP_POOL_TAG);
 
@@ -714,3 +714,4 @@ Return Value:
     PepProcessCompleteWorkRequests(Data);
     return;
 }
+
diff --git a/pofx/PEP/common/driver.c b/pofx/PEP/common/driver.c
index 3a8b1239..d2768b52 100644
--- a/pofx/PEP/common/driver.c
+++ b/pofx/PEP/common/driver.c
@@ -52,8 +52,8 @@ DRIVER_INITIALIZE DriverEntry;
 
 NTSTATUS
 DriverEntry (
-    __in PDRIVER_OBJECT DriverObject,
-    __in PUNICODE_STRING RegistryPath
+    _In_ PDRIVER_OBJECT DriverObject,
+    _In_ PUNICODE_STRING RegistryPath
     )
 
 /*++
@@ -289,7 +289,7 @@ DeviceAddEnd:
 
 VOID
 PepEvtDriverUnload (
-    __in WDFDRIVER Driver
+    _In_ WDFDRIVER Driver
     )
 
 /*++
diff --git a/pofx/PEP/common/pep.c b/pofx/PEP/common/pep.c
index 4204ef16..a80d7953 100644
--- a/pofx/PEP/common/pep.c
+++ b/pofx/PEP/common/pep.c
@@ -21,8 +21,8 @@ Environment:
 //-------------------------------------------------------------------- Includes
 //
 
-#include <initguid.h>
 #include "pch.h"
+#include <initguid.h>
 
 #if defined(EVENT_TRACING)
 #include "pep.tmh"
diff --git a/pofx/PEP/common/pepcommon.vcxproj b/pofx/PEP/common/pepcommon.vcxproj
index 7593fccb..be38697a 100644
--- a/pofx/PEP/common/pepcommon.vcxproj
+++ b/pofx/PEP/common/pepcommon.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{AD3FF770-602D-4C51-B349-5A04033971EB}</ProjectGuid>
+    <ProjectGuid>{76C6ECD6-3794-441E-AFED-2997246045A1}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{D443CDF0-F81C-4D0A-A117-63ADBD6AC9C8}</SampleGuid>
+    <SampleGuid>{9510EEBB-CC1E-4339-96B5-C2632896CBBB}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/pofx/PEP/common/pepcommon.vcxproj.Filters b/pofx/PEP/common/pepcommon.vcxproj.Filters
index 2c3e5ecc..9e44ab71 100644
--- a/pofx/PEP/common/pepcommon.vcxproj.Filters
+++ b/pofx/PEP/common/pepcommon.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>{6DEB6F91-5CCF-4138-B486-6BD5D8886632}</UniqueIdentifier>
+      <UniqueIdentifier>{0AD110A0-D8E0-4993-83D0-1E6DABB6D11B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A73A5236-6C28-49F3-B08E-F25A7563B75E}</UniqueIdentifier>
+      <UniqueIdentifier>{1B12B4E9-F3AC-429C-AC10-B270A69B7E0D}</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>{7CE23150-AE2E-4E12-9575-83512D0FCC07}</UniqueIdentifier>
+      <UniqueIdentifier>{6632D093-C4E5-4D75-8CCD-E13D1D085DDF}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{CE952DA3-FA63-434D-AE32-B870D7C7F0FB}</UniqueIdentifier>
+      <UniqueIdentifier>{27874003-12E4-446F-96AF-EC9D26774021}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/pofx/PEP/common/util.c b/pofx/PEP/common/util.c
index cced8fb1..12be758d 100644
--- a/pofx/PEP/common/util.c
+++ b/pofx/PEP/common/util.c
@@ -835,7 +835,7 @@ Return Value:
                     (ULONG)RequiredSizeAugmented,
                     (ULONG)(*BiosResourcesSize));
 
-        BiosResource = ExAllocatePoolWithTag(NonPagedPool,
+        BiosResource = ExAllocatePoolWithTag(NonPagedPoolNx,
                                              RequiredSize,
                                              PEP_POOL_TAG);
 
diff --git a/pofx/PEP/common/work.c b/pofx/PEP/common/work.c
index 036efc24..0677afde 100644
--- a/pofx/PEP/common/work.c
+++ b/pofx/PEP/common/work.c
@@ -22,8 +22,8 @@ Environment:
 //-------------------------------------------------------------------- Includes
 //
 
-#include <initguid.h>
 #include "pch.h"
+#include <initguid.h>
 
 #if defined(EVENT_TRACING)
 #include "work.tmh"
diff --git a/pofx/PEP/pepsamples.sln b/pofx/PEP/pepsamples.sln
index 3c5054cf..ff0d2a00 100644
--- a/pofx/PEP/pepsamples.sln
+++ b/pofx/PEP/pepsamples.sln
@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{44A59CCA-30D5-4C80-B52D-1AAF629FA621}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{15A40ECE-60A8-44D5-A30F-F96745156720}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Acpi", "Acpi", "{548347FF-B381-420B-A607-AE23FDD8E376}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Acpi", "Acpi", "{66E84C99-FE35-42A3-9FDA-6544CE7DE0AB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pepcommon", "common\pepcommon.vcxproj", "{AD3FF770-602D-4C51-B349-5A04033971EB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pepcommon", "common\pepcommon.vcxproj", "{76C6ECD6-3794-441E-AFED-2997246045A1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sampleacpipep", "acpi\sampleacpipep.vcxproj", "{EF47791C-9559-4F0F-867F-A0E055054058}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sampleacpipep", "acpi\sampleacpipep.vcxproj", "{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{AD3FF770-602D-4C51-B349-5A04033971EB} = {AD3FF770-602D-4C51-B349-5A04033971EB}
+		{76C6ECD6-3794-441E-AFED-2997246045A1} = {76C6ECD6-3794-441E-AFED-2997246045A1}
 	EndProjectSection
 EndProject
 Global
@@ -22,28 +22,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AD3FF770-602D-4C51-B349-5A04033971EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD3FF770-602D-4C51-B349-5A04033971EB}.Debug|Win32.Build.0 = Debug|Win32
-		{AD3FF770-602D-4C51-B349-5A04033971EB}.Release|Win32.ActiveCfg = Release|Win32
-		{AD3FF770-602D-4C51-B349-5A04033971EB}.Release|Win32.Build.0 = Release|Win32
-		{AD3FF770-602D-4C51-B349-5A04033971EB}.Debug|x64.ActiveCfg = Debug|x64
-		{AD3FF770-602D-4C51-B349-5A04033971EB}.Debug|x64.Build.0 = Debug|x64
-		{AD3FF770-602D-4C51-B349-5A04033971EB}.Release|x64.ActiveCfg = Release|x64
-		{AD3FF770-602D-4C51-B349-5A04033971EB}.Release|x64.Build.0 = Release|x64
-		{EF47791C-9559-4F0F-867F-A0E055054058}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EF47791C-9559-4F0F-867F-A0E055054058}.Debug|Win32.Build.0 = Debug|Win32
-		{EF47791C-9559-4F0F-867F-A0E055054058}.Release|Win32.ActiveCfg = Release|Win32
-		{EF47791C-9559-4F0F-867F-A0E055054058}.Release|Win32.Build.0 = Release|Win32
-		{EF47791C-9559-4F0F-867F-A0E055054058}.Debug|x64.ActiveCfg = Debug|x64
-		{EF47791C-9559-4F0F-867F-A0E055054058}.Debug|x64.Build.0 = Debug|x64
-		{EF47791C-9559-4F0F-867F-A0E055054058}.Release|x64.ActiveCfg = Release|x64
-		{EF47791C-9559-4F0F-867F-A0E055054058}.Release|x64.Build.0 = Release|x64
+		{76C6ECD6-3794-441E-AFED-2997246045A1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{76C6ECD6-3794-441E-AFED-2997246045A1}.Debug|Win32.Build.0 = Debug|Win32
+		{76C6ECD6-3794-441E-AFED-2997246045A1}.Release|Win32.ActiveCfg = Release|Win32
+		{76C6ECD6-3794-441E-AFED-2997246045A1}.Release|Win32.Build.0 = Release|Win32
+		{76C6ECD6-3794-441E-AFED-2997246045A1}.Debug|x64.ActiveCfg = Debug|x64
+		{76C6ECD6-3794-441E-AFED-2997246045A1}.Debug|x64.Build.0 = Debug|x64
+		{76C6ECD6-3794-441E-AFED-2997246045A1}.Release|x64.ActiveCfg = Release|x64
+		{76C6ECD6-3794-441E-AFED-2997246045A1}.Release|x64.Build.0 = Release|x64
+		{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}.Debug|Win32.Build.0 = Debug|Win32
+		{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}.Release|Win32.ActiveCfg = Release|Win32
+		{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}.Release|Win32.Build.0 = Release|Win32
+		{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}.Debug|x64.ActiveCfg = Debug|x64
+		{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}.Debug|x64.Build.0 = Debug|x64
+		{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}.Release|x64.ActiveCfg = Release|x64
+		{B8F967C3-7E76-484C-B0A2-E55FE1A2240B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{AD3FF770-602D-4C51-B349-5A04033971EB} = {44A59CCA-30D5-4C80-B52D-1AAF629FA621}
-		{EF47791C-9559-4F0F-867F-A0E055054058} = {548347FF-B381-420B-A607-AE23FDD8E376}
+		{76C6ECD6-3794-441E-AFED-2997246045A1} = {15A40ECE-60A8-44D5-A30F-F96745156720}
+		{B8F967C3-7E76-484C-B0A2-E55FE1A2240B} = {66E84C99-FE35-42A3-9FDA-6544CE7DE0AB}
 	EndGlobalSection
 EndGlobal
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
diff --git a/pofx/WDF/App/PowerFxApp.vcxproj b/pofx/WDF/App/PowerFxApp.vcxproj
index db7c20d3..2f099791 100644
--- a/pofx/WDF/App/PowerFxApp.vcxproj
+++ b/pofx/WDF/App/PowerFxApp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{8F8494D9-52B9-44B8-80C4-0D0053716870}</ProjectGuid>
+    <ProjectGuid>{9212218E-EEA2-4169-BC4E-5014107F9D05}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{C24C6508-5E4D-4755-B9C9-2B96218CC7DB}</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/WDF/App/PowerFxApp.vcxproj.Filters b/pofx/WDF/App/PowerFxApp.vcxproj.Filters
index 13a8b406..0046875b 100644
--- a/pofx/WDF/App/PowerFxApp.vcxproj.Filters
+++ b/pofx/WDF/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>{8639B1FA-39F3-4BAE-85C0-36083D05DAF1}</UniqueIdentifier>
+      <UniqueIdentifier>{8FFA3EFF-8B24-4BA1-96EC-D9FE2A5A83E6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{727CB0E5-A5F9-419E-89BA-F38B39BB3DBF}</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>{B6122C14-06F7-4395-8C2D-3C240EF14875}</UniqueIdentifier>
+      <UniqueIdentifier>{A308E394-BF98-4F3C-87EA-746989D7E560}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx
index 84d82535..3a02e75f 100644
--- a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx
+++ b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx
diff --git a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.vcxproj b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.vcxproj
index 584585e4..9bee0e4a 100644
--- a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.vcxproj
+++ b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}</ProjectGuid>
+    <ProjectGuid>{2F8C935C-D957-421D-820B-B08C8E1053B0}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9F669764-A62B-46FE-B708-C9EEA2B7A6D3}</SampleGuid>
+    <SampleGuid>{64C0F854-FD90-49F1-B814-CADDF8C9955E}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -81,11 +81,6 @@
       <WppKernelMode>true</WppKernelMode>
       <WppScanConfigurationData>WdfMultiComp.h</WppScanConfigurationData>
     </ClCompile>
-    <Inf Include="WdfMultiComp.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\WdfMultiComp.inf</CopyOutput>
-    </Inf>
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>WdfMultiComp</TargetName>
@@ -104,17 +99,14 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);.\..\lib\$(IntDir)\WdfPoFx.lib</AdditionalDependencies>
@@ -125,17 +117,14 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);.\..\lib\$(IntDir)\WdfPoFx.lib</AdditionalDependencies>
@@ -146,17 +135,14 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);.\..\lib\$(IntDir)\WdfPoFx.lib</AdditionalDependencies>
@@ -167,17 +153,14 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc;..\..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""WdfMultiComp.DRIVER"""</PreprocessorDefinitions>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);.\..\lib\$(IntDir)\WdfPoFx.lib</AdditionalDependencies>
diff --git a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.vcxproj.Filters b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.vcxproj.Filters
index 3e633a86..cdbc8c78 100644
--- a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.vcxproj.Filters
+++ b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.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>{EA2B4AA3-6F74-4B21-8D79-F7F95D68E11D}</UniqueIdentifier>
+      <UniqueIdentifier>{F88DAAF6-8B9E-42AB-A744-17D9E9418EB9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{17A66FDC-27CC-4BE2-98B3-FADA23D7A0C0}</UniqueIdentifier>
+      <UniqueIdentifier>{955303ED-F1AA-4DC0-9A5A-634D4F3226C5}</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>{E53B8D43-3637-4AF9-BF63-19646FD67F74}</UniqueIdentifier>
+      <UniqueIdentifier>{4CF588AC-AE0A-4D31-A818-82CDE19768AD}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{A926CCE1-F819-433D-9478-3EE8A0AFF8CA}</UniqueIdentifier>
+      <UniqueIdentifier>{1F6BC8E6-DEE9-478D-9409-D5234ABB8FB2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -26,9 +26,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Inf Include="WdfMultiComp.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/pofx/WDF/Driver/MultiComp/lib/WdfPoFx.vcxproj b/pofx/WDF/Driver/MultiComp/lib/WdfPoFx.vcxproj
index 04b9675a..7f389173 100644
--- a/pofx/WDF/Driver/MultiComp/lib/WdfPoFx.vcxproj
+++ b/pofx/WDF/Driver/MultiComp/lib/WdfPoFx.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}</ProjectGuid>
+    <ProjectGuid>{448E805C-169F-42A1-BF4D-CA3490FE5F5F}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{D6580125-3CC1-4E07-8BF3-BEF7C714FD13}</SampleGuid>
+    <SampleGuid>{CE20E85F-61A5-47D9-8408-4269A22297E7}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/pofx/WDF/Driver/MultiComp/lib/WdfPoFx.vcxproj.Filters b/pofx/WDF/Driver/MultiComp/lib/WdfPoFx.vcxproj.Filters
index 46754208..e3dac64e 100644
--- a/pofx/WDF/Driver/MultiComp/lib/WdfPoFx.vcxproj.Filters
+++ b/pofx/WDF/Driver/MultiComp/lib/WdfPoFx.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>{FEA07780-0554-4950-A6AA-EC74D647F750}</UniqueIdentifier>
+      <UniqueIdentifier>{A622FD27-96E2-4E8C-8C13-C509DDE3264F}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{E923B5FD-33B2-488E-B3DF-D77981752321}</UniqueIdentifier>
+      <UniqueIdentifier>{CD43B2B0-DBED-427A-85D8-3EA473B78F05}</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>{7306C4A1-F2CC-4150-B6DF-1857BAD0D0EC}</UniqueIdentifier>
+      <UniqueIdentifier>{F0DF1836-9E2E-4C0A-B097-1D69D349982D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{C2725E02-5167-47AA-8A56-27B3C7A94B84}</UniqueIdentifier>
+      <UniqueIdentifier>{CEE0D8C7-227D-442A-908F-3360EB6AA60D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/pofx/WDF/Driver/MultiComp/lib/init.c b/pofx/WDF/Driver/MultiComp/lib/init.c
index 57ad7744..27d30bb7 100644
--- a/pofx/WDF/Driver/MultiComp/lib/init.c
+++ b/pofx/WDF/Driver/MultiComp/lib/init.c
@@ -392,7 +392,7 @@ Return value:
     //       
     #pragma warning(suppress:28160)
     status = WdfMemoryCreate(&objectAttributes,
-                             NonPagedPool,
+                             NonPagedPoolNx,
                              0, // PoolTag
                              memorySize,
                              &memory, 
@@ -733,7 +733,7 @@ Return value:
     WDF_OBJECT_ATTRIBUTES_INIT(&objectAttributes);
     objectAttributes.ParentObject = Device; // auto-delete when parent deleted
     status = WdfMemoryCreate(&objectAttributes,
-                             NonPagedPool,
+                             NonPagedPoolNx,
                              0, // PoolTag
                              powerIrpPreprocessInfoSize,
                              &memory, 
@@ -977,7 +977,7 @@ PfhInitializePowerFrameworkSettings(
     WDF_OBJECT_ATTRIBUTES_INIT(&objectAttributes);
     objectAttributes.ParentObject = Device; // auto-delete when parent deleted
     status = WdfMemoryCreate(&objectAttributes,
-                             NonPagedPool,
+                             NonPagedPoolNx,
                              0, // PoolTag
                              pofxDeviceInfoSize,
                              &memory, 
@@ -1065,7 +1065,7 @@ PfhInitializePowerFrameworkSettings(
         WDF_OBJECT_ATTRIBUTES_INIT(&objectAttributes);
         objectAttributes.ParentObject = Device;//auto-delete when parent deleted
         status = WdfMemoryCreate(&objectAttributes,
-                                 NonPagedPool,
+                                 NonPagedPoolNx,
                                  0, // PoolTag
                                  idleStatesSize,
                                  &memory,
@@ -1121,7 +1121,7 @@ PfhInitializePowerFrameworkSettings(
     WDF_OBJECT_ATTRIBUTES_INIT(&objectAttributes);
     objectAttributes.ParentObject = Device; // auto-delete when parent deleted
     status = WdfMemoryCreate(&objectAttributes,
-                             NonPagedPool,
+                             NonPagedPoolNx,
                              0, // PoolTag
                              componentInfoSize,
                              &memory, 
diff --git a/pofx/WDF/Driver/SingleComp/SingleComponentFStateDriver.vcxproj b/pofx/WDF/Driver/SingleComp/SingleComponentFStateDriver.vcxproj
index 10a599d2..c8992a26 100644
--- a/pofx/WDF/Driver/SingleComp/SingleComponentFStateDriver.vcxproj
+++ b/pofx/WDF/Driver/SingleComp/SingleComponentFStateDriver.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{BFB8BE60-7C1E-416D-B561-5700DCC94082}</ProjectGuid>
+    <ProjectGuid>{B67C0486-37ED-4B5F-BC2D-D43580212E12}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{440D7A5B-44B1-492A-91B4-F80489B06979}</SampleGuid>
+    <SampleGuid>{471889BF-87B5-40C6-8CBF-1CCE2F79A55E}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -81,11 +81,6 @@
       <WppKernelMode>true</WppKernelMode>
       <WppScanConfigurationData>driver.h</WppScanConfigurationData>
     </ClCompile>
-    <Inf Include=".\SingleComponentFStateSample.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\SingleComponentFStateSample.inf</CopyOutput>
-    </Inf>
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>SingleComponentFStateDriver</TargetName>
@@ -104,17 +99,14 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -122,17 +114,14 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -140,17 +129,14 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -158,17 +144,14 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""SingleComponentFStateDriver.DRIVER"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pofx/WDF/Driver/SingleComp/SingleComponentFStateDriver.vcxproj.Filters b/pofx/WDF/Driver/SingleComp/SingleComponentFStateDriver.vcxproj.Filters
index 27f70a04..b01eb918 100644
--- a/pofx/WDF/Driver/SingleComp/SingleComponentFStateDriver.vcxproj.Filters
+++ b/pofx/WDF/Driver/SingleComp/SingleComponentFStateDriver.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>{713090E4-DAA7-4D43-A866-96D227F3D9CD}</UniqueIdentifier>
+      <UniqueIdentifier>{EDD2C5B9-427F-4CEB-B703-4E8C15A5792C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{1C1A15C9-A910-4A09-A5B0-3DFD481936F2}</UniqueIdentifier>
+      <UniqueIdentifier>{955B224B-526C-4C97-B61C-346C0E4E2018}</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>{EF791C28-4DA1-42F3-81E8-9A2ACA703A98}</UniqueIdentifier>
+      <UniqueIdentifier>{D74AD0E5-4488-42AB-8FB7-4B77D335E1C4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{8313F96A-1A6F-419B-8600-ED4496199E9E}</UniqueIdentifier>
+      <UniqueIdentifier>{C4D52125-51E5-49E0-BA2B-B46502ADC556}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -26,9 +26,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Inf Include=".\SingleComponentFStateSample.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx b/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx
index bf0522d7..e0400f52 100644
--- a/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx
+++ b/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx
diff --git a/pofx/WDF/pofx.sln b/pofx/WDF/pofx.sln
index 1293a347..090ddc67 100644
--- a/pofx/WDF/pofx.sln
+++ b/pofx/WDF/pofx.sln
@@ -1,83 +1,80 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{90FC8FAB-4FB4-445E-B20D-A18E37DE0E53}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{A6AD9758-D0FE-4F01-986A-5F7C39B66F76}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{86E47CFB-2B89-4229-B5DC-DD4291CC7A77}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleComp", "SingleComp", "{1F70E679-418A-4814-A9CF-21D5676BD252}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MultiComp", "MultiComp", "{B54A12F3-7473-4302-BA54-DCCF31733B6E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drivers", "Drivers", "{E25F3D46-6B1D-4A4A-9AF6-A3DE17F0384E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{B99E540E-91B3-499C-AF59-4465A03A69B0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerFxApp", "App\PowerFxApp.vcxproj", "{9212218E-EEA2-4169-BC4E-5014107F9D05}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{307FA296-9F9D-4D17-ADD5-728463581ADC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SingleComponentFStateDriver", "Driver\SingleComp\SingleComponentFStateDriver.vcxproj", "{B67C0486-37ED-4B5F-BC2D-D43580212E12}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleComp", "SingleComp", "{370534AF-5018-4005-928F-EF246DF92567}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerFxApp", "App\PowerFxApp.vcxproj", "{8F8494D9-52B9-44B8-80C4-0D0053716870}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WdfPoFx", "Driver\MultiComp\lib\WdfPoFx.vcxproj", "{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WdfMultiComp", "Driver\MultiComp\driver\WdfMultiComp.vcxproj", "{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WdfMultiComp", "Driver\MultiComp\driver\WdfMultiComp.vcxproj", "{2F8C935C-D957-421D-820B-B08C8E1053B0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34} = {6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F} = {448E805C-169F-42A1-BF4D-CA3490FE5F5F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SingleComponentFStateDriver", "Driver\SingleComp\SingleComponentFStateDriver.vcxproj", "{BFB8BE60-7C1E-416D-B561-5700DCC94082}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WdfPoFx", "Driver\MultiComp\lib\WdfPoFx.vcxproj", "{448E805C-169F-42A1-BF4D-CA3490FE5F5F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MultiComp", "MultiComp", "{611A6B4B-AF70-4883-83BC-5EEF1FA2CFCC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{A1408FD2-DC7D-4421-BD9F-EA8D02D716F4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
 		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8F8494D9-52B9-44B8-80C4-0D0053716870}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F8494D9-52B9-44B8-80C4-0D0053716870}.Debug|Win32.Build.0 = Debug|Win32
-		{8F8494D9-52B9-44B8-80C4-0D0053716870}.Release|Win32.ActiveCfg = Release|Win32
-		{8F8494D9-52B9-44B8-80C4-0D0053716870}.Release|Win32.Build.0 = Release|Win32
-		{8F8494D9-52B9-44B8-80C4-0D0053716870}.Debug|x64.ActiveCfg = Debug|x64
-		{8F8494D9-52B9-44B8-80C4-0D0053716870}.Debug|x64.Build.0 = Debug|x64
-		{8F8494D9-52B9-44B8-80C4-0D0053716870}.Release|x64.ActiveCfg = Release|x64
-		{8F8494D9-52B9-44B8-80C4-0D0053716870}.Release|x64.Build.0 = Release|x64
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}.Debug|Win32.Build.0 = Debug|Win32
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}.Release|Win32.ActiveCfg = Release|Win32
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}.Release|Win32.Build.0 = Release|Win32
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}.Debug|x64.ActiveCfg = Debug|x64
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}.Debug|x64.Build.0 = Debug|x64
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}.Release|x64.ActiveCfg = Release|x64
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34}.Release|x64.Build.0 = Release|x64
-		{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}.Debug|Win32.Build.0 = Debug|Win32
-		{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}.Release|Win32.ActiveCfg = Release|Win32
-		{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}.Release|Win32.Build.0 = Release|Win32
-		{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}.Debug|x64.ActiveCfg = Debug|x64
-		{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}.Debug|x64.Build.0 = Debug|x64
-		{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}.Release|x64.ActiveCfg = Release|x64
-		{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB}.Release|x64.Build.0 = Release|x64
-		{BFB8BE60-7C1E-416D-B561-5700DCC94082}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BFB8BE60-7C1E-416D-B561-5700DCC94082}.Debug|Win32.Build.0 = Debug|Win32
-		{BFB8BE60-7C1E-416D-B561-5700DCC94082}.Release|Win32.ActiveCfg = Release|Win32
-		{BFB8BE60-7C1E-416D-B561-5700DCC94082}.Release|Win32.Build.0 = Release|Win32
-		{BFB8BE60-7C1E-416D-B561-5700DCC94082}.Debug|x64.ActiveCfg = Debug|x64
-		{BFB8BE60-7C1E-416D-B561-5700DCC94082}.Debug|x64.Build.0 = Debug|x64
-		{BFB8BE60-7C1E-416D-B561-5700DCC94082}.Release|x64.ActiveCfg = Release|x64
-		{BFB8BE60-7C1E-416D-B561-5700DCC94082}.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}.Debug|x64.ActiveCfg = Debug|x64
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Debug|x64.Build.0 = Debug|x64
+		{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}.Release|x64.ActiveCfg = Release|x64
+		{9212218E-EEA2-4169-BC4E-5014107F9D05}.Release|x64.Build.0 = Release|x64
+		{B67C0486-37ED-4B5F-BC2D-D43580212E12}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B67C0486-37ED-4B5F-BC2D-D43580212E12}.Debug|Win32.Build.0 = Debug|Win32
+		{B67C0486-37ED-4B5F-BC2D-D43580212E12}.Debug|x64.ActiveCfg = Debug|x64
+		{B67C0486-37ED-4B5F-BC2D-D43580212E12}.Debug|x64.Build.0 = Debug|x64
+		{B67C0486-37ED-4B5F-BC2D-D43580212E12}.Release|Win32.ActiveCfg = Release|Win32
+		{B67C0486-37ED-4B5F-BC2D-D43580212E12}.Release|Win32.Build.0 = Release|Win32
+		{B67C0486-37ED-4B5F-BC2D-D43580212E12}.Release|x64.ActiveCfg = Release|x64
+		{B67C0486-37ED-4B5F-BC2D-D43580212E12}.Release|x64.Build.0 = Release|x64
+		{2F8C935C-D957-421D-820B-B08C8E1053B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2F8C935C-D957-421D-820B-B08C8E1053B0}.Debug|Win32.Build.0 = Debug|Win32
+		{2F8C935C-D957-421D-820B-B08C8E1053B0}.Debug|x64.ActiveCfg = Debug|x64
+		{2F8C935C-D957-421D-820B-B08C8E1053B0}.Debug|x64.Build.0 = Debug|x64
+		{2F8C935C-D957-421D-820B-B08C8E1053B0}.Release|Win32.ActiveCfg = Release|Win32
+		{2F8C935C-D957-421D-820B-B08C8E1053B0}.Release|Win32.Build.0 = Release|Win32
+		{2F8C935C-D957-421D-820B-B08C8E1053B0}.Release|x64.ActiveCfg = Release|x64
+		{2F8C935C-D957-421D-820B-B08C8E1053B0}.Release|x64.Build.0 = Release|x64
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F}.Debug|Win32.Build.0 = Debug|Win32
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F}.Debug|x64.ActiveCfg = Debug|x64
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F}.Debug|x64.Build.0 = Debug|x64
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F}.Release|Win32.ActiveCfg = Release|Win32
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F}.Release|Win32.Build.0 = Release|Win32
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F}.Release|x64.ActiveCfg = Release|x64
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{8F8494D9-52B9-44B8-80C4-0D0053716870} = {90FC8FAB-4FB4-445E-B20D-A18E37DE0E53}
-		{6F5CB5B9-470D-49F1-8C84-3BBD828E7F34} = {86E47CFB-2B89-4229-B5DC-DD4291CC7A77}
-		{188D1CB3-96AB-43B5-8BCA-70D6115DC2EB} = {307FA296-9F9D-4D17-ADD5-728463581ADC}
-		{BFB8BE60-7C1E-416D-B561-5700DCC94082} = {370534AF-5018-4005-928F-EF246DF92567}
-		{86E47CFB-2B89-4229-B5DC-DD4291CC7A77} = {B54A12F3-7473-4302-BA54-DCCF31733B6E}
-		{B54A12F3-7473-4302-BA54-DCCF31733B6E} = {B99E540E-91B3-499C-AF59-4465A03A69B0}
-		{307FA296-9F9D-4D17-ADD5-728463581ADC} = {B54A12F3-7473-4302-BA54-DCCF31733B6E}
-		{370534AF-5018-4005-928F-EF246DF92567} = {B99E540E-91B3-499C-AF59-4465A03A69B0}
+		{1F70E679-418A-4814-A9CF-21D5676BD252} = {E25F3D46-6B1D-4A4A-9AF6-A3DE17F0384E}
+		{9212218E-EEA2-4169-BC4E-5014107F9D05} = {A6AD9758-D0FE-4F01-986A-5F7C39B66F76}
+		{B67C0486-37ED-4B5F-BC2D-D43580212E12} = {1F70E679-418A-4814-A9CF-21D5676BD252}
+		{2F8C935C-D957-421D-820B-B08C8E1053B0} = {611A6B4B-AF70-4883-83BC-5EEF1FA2CFCC}
+		{448E805C-169F-42A1-BF4D-CA3490FE5F5F} = {A1408FD2-DC7D-4421-BD9F-EA8D02D716F4}
+		{611A6B4B-AF70-4883-83BC-5EEF1FA2CFCC} = {E25F3D46-6B1D-4A4A-9AF6-A3DE17F0384E}
+		{A1408FD2-DC7D-4421-BD9F-EA8D02D716F4} = {E25F3D46-6B1D-4A4A-9AF6-A3DE17F0384E}
 	EndGlobalSection
 EndGlobal
author	karlf <[email protected]>	2016-08-11 13:28:13 -0700
committer	karlf <[email protected]>	2016-08-11 13:28:13 -0700
commit	96eb96dfb613e4c745db6bd1f53a92fe7e2290fc (patch)
tree	ad5f3ede5cbcd6b598677ce41bcf8318471bdd92 /pofx
parent	687b274aa38fd05c8c26e3068932121876d7f745 (diff)