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

7 files changed, 14 insertions, 36 deletions

diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.inx b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
index b6c650ff..067ca605 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.inx
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj
index e580d540..65b00def 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}</ProjectGuid>
+    <ProjectGuid>{FCF21B34-353D-4F85-9EA0-C29978C12DBF}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{70A815C1-5D9C-419C-8379-F61A04BA3DD1}</SampleGuid>
+    <SampleGuid>{E74D4F4D-7209-4A02-BD2C-3BB528618D2E}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters
index bdfdc4f9..7a394e09 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{4C00BD29-A08C-48FF-9326-65CB99A38B85}</UniqueIdentifier>
+      <UniqueIdentifier>{B8C9DC5B-7C98-4A49-93F3-E3442CBF75A5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{588F07FC-8AC0-4132-B7D8-A2C7C589CBA1}</UniqueIdentifier>
+      <UniqueIdentifier>{14D2CA4B-89D1-4EBA-9189-6488CD5FA53B}</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>{F07FF097-C35A-47EB-A0F6-1B7AF7677990}</UniqueIdentifier>
+      <UniqueIdentifier>{9E64748C-D7C7-4161-9D23-8F53507ECDDA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{AEBC341B-92EB-4BFD-980F-F69DD9AEC99C}</UniqueIdentifier>
+      <UniqueIdentifier>{13A3B2C6-C1C7-4A41-8F08-27011CD7C327}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdffeaturedum.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="power.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/umdf2/func/shared/toaster.h b/general/toaster/umdf2/func/shared/toaster.h
index 006166e7..87ddcd54 100644
--- a/general/toaster/umdf2/func/shared/toaster.h
+++ b/general/toaster/umdf2/func/shared/toaster.h
@@ -28,8 +28,8 @@ Environment:
 #include <wudfwdm.h>
 #include <wdf.h>
 #include <initguid.h>
-#include "..\inc\driver.h"
-#include "..\inc\public.h"
+#include "driver.h"
+#include "public.h"
 
 #define TOASTER_POOL_TAG (ULONG) 'saoT'
 
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.inx b/general/toaster/umdf2/func/simple/wdfsimpleum.inx
index 0cd117e2..18576c76 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.inx
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.inx
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj
index f947f97e..6ed5cc6b 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2FB86AE0-CD30-4E4E-93D1-306A8982263C}</ProjectGuid>
+    <ProjectGuid>{31C45025-FDA4-4CB5-B55E-81F934382654}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{DDC9A998-E2C4-47F7-AB33-D0F4C54E1A07}</SampleGuid>
+    <SampleGuid>{7D92DB42-741A-42C9-87E5-E9EC492CCC0D}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -102,17 +102,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -121,17 +118,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -140,17 +134,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -159,17 +150,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters
index fb8738bb..1fbc9c7b 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{DC7382CC-718D-4177-8EBD-6A3AAA546FA2}</UniqueIdentifier>
+      <UniqueIdentifier>{1A3802F5-383A-403F-B84E-5CC40D20B8B2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{0B35AC27-FBA9-482C-AB2D-A0B9A44DFBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{68D48BB7-AE50-491B-9EBF-C9DADA0FC35F}</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>{648AB4A2-DE81-48B3-9E36-5A767F698567}</UniqueIdentifier>
+      <UniqueIdentifier>{E8112111-3C61-4671-83B0-B97F62F8CAEA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{73524C9E-B6C0-4702-B212-55BDE5F61FFB}</UniqueIdentifier>
+      <UniqueIdentifier>{22FDD2D2-7FE2-4575-9FDB-91166ED98B18}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdfsimpleum.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="toaster.c">
       <Filter>Source Files</Filter>
     </ClCompile>