samples update for //build

9 files changed, 99 insertions, 141 deletions

diff --git a/pofx/UMDF2/App/PowerFxApp.cpp b/pofx/UMDF2/App/PowerFxApp.cpp
index c628d366..2ea29a33 100644
--- a/pofx/UMDF2/App/PowerFxApp.cpp
+++ b/pofx/UMDF2/App/PowerFxApp.cpp
@@ -478,115 +478,70 @@ GetDevicePath(
     _In_ size_t BufLen
     )
 {
-    HDEVINFO HardwareDeviceInfo;
-    SP_DEVICE_INTERFACE_DATA DeviceInterfaceData;
-    PSP_DEVICE_INTERFACE_DETAIL_DATA DeviceInterfaceDetailData = NULL;
-    ULONG Length, RequiredLength = 0;
-    BOOL bResult;
-    HRESULT hr;
-
-    HardwareDeviceInfo = SetupDiGetClassDevs(
-                             InterfaceGuid,
-                             NULL,
-                             NULL,
-                             (DIGCF_PRESENT | DIGCF_DEVICEINTERFACE));
+    CONFIGRET cr = CR_SUCCESS;
+    PWSTR deviceInterfaceList = NULL;
+    ULONG deviceInterfaceListLength = 0;
+    PWSTR nextInterface;
+    HRESULT hr = E_FAIL;
+    BOOL bRet = TRUE;
 
-    if (HardwareDeviceInfo == INVALID_HANDLE_VALUE) {
-        printf("SetupDiGetClassDevs failed!\n");
-        return FALSE;
+    cr = CM_Get_Device_Interface_List_Size(
+        &deviceInterfaceListLength,
+        InterfaceGuid,
+        NULL,
+        CM_GET_DEVICE_INTERFACE_LIST_PRESENT);
+    if (cr != CR_SUCCESS) {
+        printf("Error 0x%x retrieving device interface list size.\n", cr);
+        goto clean0;
     }
 
-    DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
-
-    bResult = SetupDiEnumDeviceInterfaces(HardwareDeviceInfo,
-                                              0,
-                                              InterfaceGuid,
-                                              0,
-                                              &DeviceInterfaceData);
-
-    if (bResult == FALSE) {
-
-        LPVOID lpMsgBuf;
-
-        if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                          FORMAT_MESSAGE_FROM_SYSTEM |
-                          FORMAT_MESSAGE_IGNORE_INSERTS,
-                          NULL,
-                          GetLastError(),
-                          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                          (LPWSTR) &lpMsgBuf,
-                          0,
-                          NULL
-                          )) {
-
-            printf("SetupDiEnumDeviceInterfaces failed: %ws", (LPTSTR)lpMsgBuf);
-            LocalFree(lpMsgBuf);
-        }
+    if (deviceInterfaceListLength <= 1) {
+        bRet = FALSE;
+        printf("Error: No active device interfaces found.\n"
+            " Is the sample driver loaded?");
+        goto clean0;
+    }
 
-        printf("SetupDiEnumDeviceInterfaces failed.\n");
-        SetupDiDestroyDeviceInfoList(HardwareDeviceInfo);
-        return FALSE;
+    deviceInterfaceList = (PWSTR)malloc(deviceInterfaceListLength * sizeof(WCHAR));
+    if (deviceInterfaceList == NULL) {
+        printf("Error allocating memory for device interface list.\n");
+        goto clean0;
     }
+    ZeroMemory(deviceInterfaceList, deviceInterfaceListLength * sizeof(WCHAR));
 
-    SetupDiGetDeviceInterfaceDetail(
-        HardwareDeviceInfo,
-        &DeviceInterfaceData,
+    cr = CM_Get_Device_Interface_List(
+        InterfaceGuid,
         NULL,
-        0,
-        &RequiredLength,
-        NULL
-        );
-
-    DeviceInterfaceDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA)LocalAlloc(LMEM_FIXED, RequiredLength);
-
-    if (DeviceInterfaceDetailData == NULL) {
-        SetupDiDestroyDeviceInfoList(HardwareDeviceInfo);
-        printf("Failed to allocate memory.\n");
-        return FALSE;
+        deviceInterfaceList,
+        deviceInterfaceListLength,
+        CM_GET_DEVICE_INTERFACE_LIST_PRESENT);
+    if (cr != CR_SUCCESS) {
+        printf("Error 0x%x retrieving device interface list.\n", cr);
+        goto clean0;
     }
 
-    DeviceInterfaceDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
-
-    Length = RequiredLength;
-
-    bResult = SetupDiGetDeviceInterfaceDetail(
-                  HardwareDeviceInfo,
-                  &DeviceInterfaceData,
-                  DeviceInterfaceDetailData,
-                  Length,
-                  &RequiredLength,
-                  NULL);
-
-    if (bResult == FALSE) {
-
-        LPVOID lpMsgBuf;
-
-        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                      FORMAT_MESSAGE_FROM_SYSTEM |
-                      FORMAT_MESSAGE_IGNORE_INSERTS,
-                      NULL,
-                      GetLastError(),
-                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                      (LPWSTR) &lpMsgBuf,
-                      0,
-                      NULL
-                      );
-
-        SetupDiDestroyDeviceInfoList(HardwareDeviceInfo);
-        printf("Error in SetupDiGetDeviceInterfaceDetail: %ws\n", (LPWSTR)lpMsgBuf);
-        LocalFree(DeviceInterfaceDetailData);
-        LocalFree(lpMsgBuf);
-        return FALSE;
+    nextInterface = deviceInterfaceList + wcslen(deviceInterfaceList) + 1;
+    if (*nextInterface != UNICODE_NULL) {
+        printf("Warning: More than one device interface instance found. \n"
+            "Selecting first matching device.\n\n");
     }
 
-    hr = StringCchCopy(DevicePath,
-                    BufLen,
-                    DeviceInterfaceDetailData->DevicePath) ;
+    hr = StringCchCopy(DevicePath, BufLen, deviceInterfaceList);
+    if (FAILED(hr)) {
+        bRet = FALSE;
+        printf("Error: StringCchCopy failed with HRESULT 0x%x", hr);
+        goto clean0;
+    }
 
-    SetupDiDestroyDeviceInfoList(HardwareDeviceInfo); // It must be executed in both success and failure traces
-    LocalFree(DeviceInterfaceDetailData);
+clean0:
+    if (deviceInterfaceList != NULL) {
+        free(deviceInterfaceList);
+    }
+    if (CR_SUCCESS != cr) {
+        bRet = FALSE;
+    }
 
-    return ( !FAILED(hr) ); // Result depends on StringCchCopy()
+    return bRet;
 }
 
 
diff --git a/pofx/UMDF2/App/PowerFxApp.vcxproj b/pofx/UMDF2/App/PowerFxApp.vcxproj
index 6201baec..eb59260d 100644
--- a/pofx/UMDF2/App/PowerFxApp.vcxproj
+++ b/pofx/UMDF2/App/PowerFxApp.vcxproj
@@ -19,17 +19,17 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{DA8D50B3-7692-4E79-9181-21576805D3E5}</ProjectGuid>
+    <ProjectGuid>{14E1832B-DF5A-4B4C-A079-A9446881E742}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{86082276-A94B-42CE-B3D2-1AF13BE34A92}</SampleGuid>
+    <SampleGuid>{9DB58C83-24AF-4AFE-B48E-AD1449C17B9E}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <DriverType />
     <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
     <ConfigurationType>Application</ConfigurationType>
@@ -37,7 +37,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <DriverType />
     <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
     <ConfigurationType>Application</ConfigurationType>
@@ -45,7 +45,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <DriverType />
     <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
     <ConfigurationType>Application</ConfigurationType>
@@ -53,7 +53,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <DriverType />
     <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
     <ConfigurationType>Application</ConfigurationType>
@@ -105,7 +105,7 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;user32.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);mincore.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -126,7 +126,7 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;user32.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);mincore.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -147,7 +147,7 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;user32.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);mincore.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -168,7 +168,7 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;user32.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);mincore.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pofx/UMDF2/App/PowerFxApp.vcxproj.Filters b/pofx/UMDF2/App/PowerFxApp.vcxproj.Filters
index 73e699bc..9a2f1269 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>{B5C219BE-1582-4433-8AEB-794DA8983AB0}</UniqueIdentifier>
+      <UniqueIdentifier>{20A2E7AD-88FC-4506-B935-ECBEEE1ADBA4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{86E06376-FA08-4058-A118-F8CB221B0462}</UniqueIdentifier>
+      <UniqueIdentifier>{B9BF62AC-CE9A-4203-BEF5-D3532A0B4D2F}</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>{0F043EAF-993B-4742-95AE-C40C10DD5D19}</UniqueIdentifier>
+      <UniqueIdentifier>{019B37E5-DD40-4E7A-8889-3F4D51462380}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/pofx/UMDF2/App/include.h b/pofx/UMDF2/App/include.h
index 29f0cb5e..50d7160b 100644
--- a/pofx/UMDF2/App/include.h
+++ b/pofx/UMDF2/App/include.h
@@ -9,7 +9,7 @@
     
 #include <windows.h>
 #include <strsafe.h>
-#include <setupapi.h>
+#include <cfgmgr32.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <devioctl.h>
diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx
index b5e35b21..ef4eed6f 100644
--- a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx
+++ b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx
@@ -55,7 +55,7 @@ SingleComponentSingleStateUm.dll = 1,,
 CopyFiles=UMDriverCopy
 
 [UMDriverCopy]
-SingleComponentSingleStateUm.dll
+SingleComponentSingleStateUm.dll,,,0x00004000  ; COPYFLG_IN_USE_RENAME
 
 [DestinationDirs]
 UMDriverCopy=12,UMDF ; copy to drivers\umdf
diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj
index f74a6321..fd73ebc0 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>{C2742046-68D5-46C4-8974-1523D6E81E44}</ProjectGuid>
+    <ProjectGuid>{54734149-462F-4F08-8921-8657E8244D5D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{2F2C473D-EF60-4754-A765-016CE7E59AF5}</SampleGuid>
+    <SampleGuid>{0595E788-E11C-4E8F-9E6A-BDA9CD38B976}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj.Filters b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.vcxproj.Filters
index 1acbb43d..1d74c304 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>{827A6CD7-9B1B-48EA-B00F-776EAD83C5D5}</UniqueIdentifier>
+      <UniqueIdentifier>{7C049D51-D629-4AF2-8583-A455CA3F6C83}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A90EB6DF-7C46-439E-83E4-284A2D766EA8}</UniqueIdentifier>
+      <UniqueIdentifier>{D157BB47-2A77-4F69-B485-150DF7755B16}</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>{9C2DE4D9-2409-4940-AF45-0F2E072F10A3}</UniqueIdentifier>
+      <UniqueIdentifier>{0D9C7FEA-F5BC-44BC-82E3-86171939BAE4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{62D85CBA-F225-41CA-BF89-4C98DB9363E5}</UniqueIdentifier>
+      <UniqueIdentifier>{4B52E5EA-1DD3-41C5-B7B3-6530888DA16A}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/pofx/UMDF2/ReadMe.md b/pofx/UMDF2/ReadMe.md
index 7272604e..cca46fdf 100644
--- a/pofx/UMDF2/ReadMe.md
+++ b/pofx/UMDF2/ReadMe.md
@@ -6,6 +6,9 @@ This solution demonstrates how a User-Mode Driver Framework (UMDF) version 2 dri
 ## Universal Compliant
 This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
 
+**Note**
+Due to a known bug in the current Windows Driver Kit tools, when building this sample in Debug mode, the exe project may report some ApiValidator warnings. These can be safely ignored.
+
 Related technologies
 --------------------
 For related information, see the [KMDF Power Framework (PoFx) Sample](http://code.msdn.microsoft.com/windowshardware/PoFx-1974b51c).
diff --git a/pofx/UMDF2/pofx.sln b/pofx/UMDF2/pofx.sln
index 627cffb2..ea920a24 100644
--- a/pofx/UMDF2/pofx.sln
+++ b/pofx/UMDF2/pofx.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}") = "App", "App", "{83BD6E56-4CF0-40D7-8D4B-AB8FBA52B0C6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{EE8B0086-FE51-41C2-BC68-73296D84902B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleComp", "SingleComp", "{35021FFA-A126-4138-8574-9D62921627EB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleComp", "SingleComp", "{86B4235E-0C5C-4A44-ABD0-C43595C7B39B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{72A7C89C-0E64-4C4E-BF27-BD8187423B39}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{B554B2DD-3D1D-4665-850B-BB3D3E655C69}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerFxApp", "App\PowerFxApp.vcxproj", "{DA8D50B3-7692-4E79-9181-21576805D3E5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerFxApp", "App\PowerFxApp.vcxproj", "{14E1832B-DF5A-4B4C-A079-A9446881E742}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SingleComponentSingleStateUm", "Driver\SingleComp\SingleComponentSingleStateUm.vcxproj", "{C2742046-68D5-46C4-8974-1523D6E81E44}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SingleComponentSingleStateUm", "Driver\SingleComp\SingleComponentSingleStateUm.vcxproj", "{54734149-462F-4F08-8921-8657E8244D5D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,29 +21,29 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DA8D50B3-7692-4E79-9181-21576805D3E5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA8D50B3-7692-4E79-9181-21576805D3E5}.Debug|Win32.Build.0 = Debug|Win32
-		{DA8D50B3-7692-4E79-9181-21576805D3E5}.Release|Win32.ActiveCfg = Release|Win32
-		{DA8D50B3-7692-4E79-9181-21576805D3E5}.Release|Win32.Build.0 = Release|Win32
-		{DA8D50B3-7692-4E79-9181-21576805D3E5}.Debug|x64.ActiveCfg = Debug|x64
-		{DA8D50B3-7692-4E79-9181-21576805D3E5}.Debug|x64.Build.0 = Debug|x64
-		{DA8D50B3-7692-4E79-9181-21576805D3E5}.Release|x64.ActiveCfg = Release|x64
-		{DA8D50B3-7692-4E79-9181-21576805D3E5}.Release|x64.Build.0 = Release|x64
-		{C2742046-68D5-46C4-8974-1523D6E81E44}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C2742046-68D5-46C4-8974-1523D6E81E44}.Debug|Win32.Build.0 = Debug|Win32
-		{C2742046-68D5-46C4-8974-1523D6E81E44}.Release|Win32.ActiveCfg = Release|Win32
-		{C2742046-68D5-46C4-8974-1523D6E81E44}.Release|Win32.Build.0 = Release|Win32
-		{C2742046-68D5-46C4-8974-1523D6E81E44}.Debug|x64.ActiveCfg = Debug|x64
-		{C2742046-68D5-46C4-8974-1523D6E81E44}.Debug|x64.Build.0 = Debug|x64
-		{C2742046-68D5-46C4-8974-1523D6E81E44}.Release|x64.ActiveCfg = Release|x64
-		{C2742046-68D5-46C4-8974-1523D6E81E44}.Release|x64.Build.0 = Release|x64
+		{14E1832B-DF5A-4B4C-A079-A9446881E742}.Debug|Win32.ActiveCfg = Debug|Win32
+		{14E1832B-DF5A-4B4C-A079-A9446881E742}.Debug|Win32.Build.0 = Debug|Win32
+		{14E1832B-DF5A-4B4C-A079-A9446881E742}.Release|Win32.ActiveCfg = Release|Win32
+		{14E1832B-DF5A-4B4C-A079-A9446881E742}.Release|Win32.Build.0 = Release|Win32
+		{14E1832B-DF5A-4B4C-A079-A9446881E742}.Debug|x64.ActiveCfg = Debug|x64
+		{14E1832B-DF5A-4B4C-A079-A9446881E742}.Debug|x64.Build.0 = Debug|x64
+		{14E1832B-DF5A-4B4C-A079-A9446881E742}.Release|x64.ActiveCfg = Release|x64
+		{14E1832B-DF5A-4B4C-A079-A9446881E742}.Release|x64.Build.0 = Release|x64
+		{54734149-462F-4F08-8921-8657E8244D5D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{54734149-462F-4F08-8921-8657E8244D5D}.Debug|Win32.Build.0 = Debug|Win32
+		{54734149-462F-4F08-8921-8657E8244D5D}.Release|Win32.ActiveCfg = Release|Win32
+		{54734149-462F-4F08-8921-8657E8244D5D}.Release|Win32.Build.0 = Release|Win32
+		{54734149-462F-4F08-8921-8657E8244D5D}.Debug|x64.ActiveCfg = Debug|x64
+		{54734149-462F-4F08-8921-8657E8244D5D}.Debug|x64.Build.0 = Debug|x64
+		{54734149-462F-4F08-8921-8657E8244D5D}.Release|x64.ActiveCfg = Release|x64
+		{54734149-462F-4F08-8921-8657E8244D5D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{DA8D50B3-7692-4E79-9181-21576805D3E5} = {83BD6E56-4CF0-40D7-8D4B-AB8FBA52B0C6}
-		{C2742046-68D5-46C4-8974-1523D6E81E44} = {35021FFA-A126-4138-8574-9D62921627EB}
-		{35021FFA-A126-4138-8574-9D62921627EB} = {72A7C89C-0E64-4C4E-BF27-BD8187423B39}
+		{14E1832B-DF5A-4B4C-A079-A9446881E742} = {EE8B0086-FE51-41C2-BC68-73296D84902B}
+		{54734149-462F-4F08-8921-8657E8244D5D} = {86B4235E-0C5C-4A44-ABD0-C43595C7B39B}
+		{86B4235E-0C5C-4A44-ABD0-C43595C7B39B} = {B554B2DD-3D1D-4665-850B-BB3D3E655C69}
 	EndGlobalSection
 EndGlobal