diff --git a/.gitignore b/.gitignore
index 57a1574c4..7f8fa260b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,6 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-x64/
-x86/
 build/
 bld/
 [Bb]in/
diff --git a/network/wlan/ihvfrm/x64/rc4utils.dll b/network/wlan/ihvfrm/x64/rc4utils.dll
new file mode 100644
index 000000000..a5a8228f1
Binary files /dev/null and b/network/wlan/ihvfrm/x64/rc4utils.dll differ
diff --git a/network/wlan/ihvfrm/x64/rc4utils.lib b/network/wlan/ihvfrm/x64/rc4utils.lib
new file mode 100644
index 000000000..15b4d2991
Binary files /dev/null and b/network/wlan/ihvfrm/x64/rc4utils.lib differ
diff --git a/network/wlan/ihvfrm/x86/rc4utils.dll b/network/wlan/ihvfrm/x86/rc4utils.dll
new file mode 100644
index 000000000..aebeab234
Binary files /dev/null and b/network/wlan/ihvfrm/x86/rc4utils.dll differ
diff --git a/network/wlan/ihvfrm/x86/rc4utils.lib b/network/wlan/ihvfrm/x86/rc4utils.lib
new file mode 100644
index 000000000..4de2c1746
Binary files /dev/null and b/network/wlan/ihvfrm/x86/rc4utils.lib differ
diff --git a/print/XPSDrvSmpl/.gitignore b/print/XPSDrvSmpl/.gitignore
new file mode 100644
index 000000000..4a89120b2
--- /dev/null
+++ b/print/XPSDrvSmpl/.gitignore
@@ -0,0 +1,2 @@
+# Allow tracking debug folder for this sample
+!debug/
diff --git a/print/XPSDrvSmpl/src/debug/debug.cpp b/print/XPSDrvSmpl/src/debug/debug.cpp
new file mode 100644
index 000000000..330a4a1d9
--- /dev/null
+++ b/print/XPSDrvSmpl/src/debug/debug.cpp
@@ -0,0 +1,189 @@
+/*++
+
+Copyright (c) 2005 Microsoft Corporation
+
+All rights reserved.
+
+THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
+PARTICULAR PURPOSE.
+
+File Name:
+
+   debug.cpp
+
+Abstract:
+
+   Debug implementations.
+
+--*/
+
+#include "precomp.h"
+#include "debug.h"
+#include "xdstring.h"
+
+/*++
+
+Routine Name:
+
+    RealDebugMessage
+
+Routine Description:
+
+    This routine takes a debug message and va_list and outputs the message via OutputDebugString
+
+Arguments:
+
+    dwSize     - Maximum size of the debug message in number of characters
+    pszMessage - The debug message string
+    arglist    - The arg list for the debug message string
+
+Return Value:
+
+    BOOL
+    TRUE  - On success
+    FALSE - On error
+
+--*/
+BOOL
+RealDebugMessage(
+    _In_ DWORD   dwSize,
+    _In_ PCSTR   pszMessage,
+         va_list arglist
+    )
+{
+    HRESULT hr = S_OK;
+    PSTR    pszMsgBuf;
+
+    if (NULL == pszMessage ||
+        0 == dwSize)
+    {
+        hr = E_INVALIDARG;
+    }
+
+    if (SUCCEEDED(hr))
+    {
+        //
+        // Allocate memory for message buffer.
+        //
+        pszMsgBuf = new(std::nothrow) CHAR[dwSize + 1];
+
+        if (NULL != pszMsgBuf)
+        {
+            //
+            // Pass the variable parameters to wvsprintf to be formated.
+            //
+            hr = StringCbVPrintfA(pszMsgBuf, (dwSize + 1) * sizeof(CHAR), pszMessage, arglist);
+
+            //
+            // Dump string to debug output.
+            //
+            OutputDebugStringA(pszMsgBuf);
+
+            //
+            // Clean up.
+            //
+            delete[] pszMsgBuf;
+            pszMsgBuf = NULL;
+        }
+        else
+        {
+            hr = E_OUTOFMEMORY;
+        }
+    }
+
+    return SUCCEEDED(hr);
+}
+
+/*++
+
+Routine Name:
+
+    DbgPrint
+
+Routine Description:
+
+    This routine takes a format string and arguments and outputs as a debug string
+
+Arguments:
+
+    pszFormatString - Format string for the debug message
+    ...             - argument list
+
+Return Value:
+
+    BOOL
+    TRUE  - On success
+    FALSE - On error
+
+--*/
+BOOL
+DbgPrint(
+    _In_ PCSTR pszFormatString,
+    ...
+    )
+{
+    BOOL    bResult;
+    va_list VAList;
+
+    //
+    // Pass the variable parameters to RealDebugMessage to be processed.
+    //
+    va_start(VAList, pszFormatString);
+    bResult = RealDebugMessage(0x8000, pszFormatString, VAList);
+    va_end(VAList);
+
+    return bResult;
+}
+
+/*++
+
+Routine Name:
+
+    DbgDOMDoc
+
+Routine Description:
+
+    This routine outputs an XML DOM document to the debug output stream
+
+Arguments:
+
+    pszMessage - Debug message
+    pDomDoc    - DOM document to be output
+
+Return Value:
+
+    None.
+
+--*/
+VOID
+DbgDOMDoc(
+    _In_ PCSTR             pszMessage,
+    _In_ IXMLDOMDocument2* pDomDoc
+    )
+{
+    try
+    {
+        CComBSTR xml;
+
+        if (pDomDoc != NULL &&
+            SUCCEEDED(pDomDoc->get_xml(&xml)))
+        {
+            CStringXDA ansi(xml);
+
+            if (pszMessage != NULL)
+            {
+                DbgPrint("%s%s\n", pszMessage, ansi.GetBuffer());
+            }
+            else
+            {
+                DbgPrint("%s\n", ansi.GetBuffer());
+            }
+        }
+    }
+    catch (CXDException&)
+    {
+    }
+}
+
diff --git a/print/XPSDrvSmpl/src/debug/debug.h b/print/XPSDrvSmpl/src/debug/debug.h
new file mode 100644
index 000000000..ddfdc038b
--- /dev/null
+++ b/print/XPSDrvSmpl/src/debug/debug.h
@@ -0,0 +1,186 @@
+/*++
+
+Copyright (c) 2005 Microsoft Corporation
+
+All rights reserved.
+
+THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
+PARTICULAR PURPOSE.
+
+File Name:
+
+   xdsdbg.h
+
+Abstract:
+
+   Debug definitions.
+
+--*/
+
+#pragma once
+
+//
+// These macros are used for debugging purposes. They expand
+// to white spaces on a free build. Here is a brief description
+// of what they do and how they are used:
+//
+// giDebugLevel
+//  Global variable which set the current debug level to control
+//  the amount of debug messages emitted.
+//
+// VERBOSE(msg)
+//  Display a message if the current debug level is <= DBG_VERBOSE.
+//
+// TERSE(msg)
+//  Display a message if the current debug level is <= DBG_TERSE.
+//
+// WARNING(msg)
+//  Display a message if the current debug level is <= DBG_WARNING.
+//  The message format is: WRN filename (linenumber): message
+//
+// ERR(msg)
+//  Similiar to WARNING macro above - displays a message
+//  if the current debug level is <= DBG_ERROR.
+//
+// ASSERT(cond)
+//  Verify a condition is true. If not, force a breakpoint.
+//
+// ASSERTMSG(cond, msg)
+//  Verify a condition is true. If not, display a message and
+//  force a breakpoint.
+//
+// RIP(msg)
+//  Display a message and force a breakpoint.
+//
+// Usage:
+//  These macros require extra parantheses for the msg argument
+//  example, ASSERTMSG(x > 0, ("x is less than 0\n"));
+//           WARNING(("App passed NULL pointer, ignoring...\n"));
+//
+
+#pragma once
+
+#define DBG_VERBOSE 1
+#define DBG_TERSE   2
+#define DBG_WARNING 3
+#define DBG_ERROR   4
+#define DBG_RIP     5
+
+BOOL
+RealDebugMessage(
+    _In_ DWORD   dwSize,
+    _In_ PCSTR   pszMessage,
+         va_list arglist
+    );
+
+BOOL
+DbgPrint(
+    _In_ PCSTR pszFormatString,
+    ...
+    );
+
+VOID
+DbgDOMDoc(
+    _In_ PCSTR             pszMessage,
+    _In_ IXMLDOMDocument2* pDomDoc
+    );
+
+#if DBG
+
+#ifndef MAX_DEBUG_LEVEL
+#define MAX_DEBUG_LEVEL DBG_VERBOSE
+#endif
+
+#define DBGMSG(level, prefix, msg) { \
+            INT dbgLevel = level; \
+            if (MAX_DEBUG_LEVEL <= (dbgLevel)) { \
+                DbgPrint("%s %s (%d): ", prefix, __FILE__, __LINE__); \
+                DbgPrint(msg); \
+            } \
+        }
+
+#define DBGMSG_ON_HR(level, prefix, hr) { \
+            INT dbgLevel = level; \
+            HRESULT hres = hr; \
+            if (MAX_DEBUG_LEVEL <= (dbgLevel) && FAILED(hres)) { \
+                DbgPrint("%s %s (%d): Call failed with HRESULT = 0x%x\n", prefix, __FILE__, __LINE__, hr); \
+            } \
+        }
+
+#define DBGMSG_ON_HR_EXC(level, prefix, hr, hr_exc) { \
+            INT dbgLevel = level; \
+            HRESULT hres = hr; \
+            if (MAX_DEBUG_LEVEL <= (dbgLevel) && FAILED(hres) && hres != hr_exc) { \
+            DbgPrint("%s %s (%d): Call failed with HRESULT = 0x%x\n", prefix, __FILE__, __LINE__, hr); \
+            } \
+        }
+
+#define DBGPRINT(level, msg) { \
+            INT dbgLevel = level; \
+            if (MAX_DEBUG_LEVEL <= (dbgLevel)) { \
+                DbgPrint(msg); \
+            } \
+        }
+
+#define DBGXML(msg, pDomDoc) { \
+            INT dbgLevel = DBG_VERBOSE; \
+            if (MAX_DEBUG_LEVEL <= dbgLevel) { \
+                DbgDOMDoc(msg, pDomDoc); \
+            } \
+        }
+
+#define VERBOSE(msg) DBGPRINT(DBG_VERBOSE, msg)
+#define TERSE(msg) DBGPRINT(DBG_TERSE, msg)
+#define WARNING(msg) DBGMSG(DBG_WARNING, "WRN", msg)
+#define ERR(msg) DBGMSG(DBG_ERROR, "ERR", msg)
+#define ERR_ON_HR(hr) DBGMSG_ON_HR(DBG_ERROR, "ERR", hr)
+#define ERR_ON_HR_EXC(hr, hr_exc) DBGMSG_ON_HR_EXC(DBG_ERROR, "ERR", hr, hr_exc)
+
+#define ASSERT(cond) { \
+            if (! (cond)) { \
+                RIP(("\n")); \
+            } \
+        }
+
+#define ASSERTMSG(cond, msg) { \
+            if (!(cond)) { \
+                RIP(msg); \
+            } \
+        }
+
+#define RIP(msg) { \
+            DBGMSG(DBG_RIP, "RIP", msg); \
+            DebugBreak(); \
+        }
+
+#define DBG_ONLY(p) p
+
+#else // !DBG
+
+#define VERBOSE(msg)
+#define TERSE(msg)
+#define WARNING(msg)
+#define ERR(msg)
+#define ERR_ON_HR(hr)
+#define ERR_ON_HR_EXC(hr, hr_exc)
+
+#define ASSERT(cond)
+
+#define ASSERTMSG(cond, msg)
+
+#define RIP(msg)
+
+#define DBG_ONLY(p)
+
+#define DBGMSG(level, prefix, msg)
+
+#define DBGMSG_ON_HR(level, prefix, hr)
+
+#define DBGPRINT(level, msg)
+
+#define DBGXML(msg, pDomDoc)
+
+#endif
+
diff --git a/print/XPSDrvSmpl/src/debug/precomp.h b/print/XPSDrvSmpl/src/debug/precomp.h
new file mode 100644
index 000000000..fe3809587
--- /dev/null
+++ b/print/XPSDrvSmpl/src/debug/precomp.h
@@ -0,0 +1,67 @@
+/*++
+
+Copyright (c) 2005 Microsoft Corporation
+
+All rights reserved.
+
+THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
+PARTICULAR PURPOSE.
+
+File Name:
+
+   precomp.h
+
+Abstract:
+
+   Precompiled header.
+
+--*/
+
+#pragma once
+
+//
+// Annotate this as a usermode driver for static analysis
+//
+#include <DriverSpecs.h>
+_Analysis_mode_(_Analysis_code_type_user_driver_)
+
+//
+// Standard Annotation Language include
+//
+#include <sal.h>
+
+//
+// Windows includes
+//
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif // WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+//
+// COM includes
+//
+#include <objbase.h>
+#include <oleauto.h>
+
+//
+// ATL Includes
+//
+#include <atlbase.h>
+
+//
+// STL Includes
+//
+#include <new>
+
+//
+// MSXML includes
+//
+#include <msxml6.h>
+
+#include <StrSafe.h>
+
+#include "common.ver"
+
diff --git a/print/XPSDrvSmpl/src/debug/precompsrc.cpp b/print/XPSDrvSmpl/src/debug/precompsrc.cpp
new file mode 100644
index 000000000..5944cf515
--- /dev/null
+++ b/print/XPSDrvSmpl/src/debug/precompsrc.cpp
@@ -0,0 +1 @@
+#include "precomp.h"
\ No newline at end of file
diff --git a/print/XPSDrvSmpl/src/debug/xdsdbg.vcxproj b/print/XPSDrvSmpl/src/debug/xdsdbg.vcxproj
new file mode 100644
index 000000000..5b0050497
--- /dev/null
+++ b/print/XPSDrvSmpl/src/debug/xdsdbg.vcxproj
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5DD79EE3-3778-4674-9537-70EA840F13B4}</ProjectGuid>
+    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
+    <SupportsPackaging>false</SupportsPackaging>
+    <RequiresPackageProject>true</RequiresPackageProject>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
+    <SampleGuid>{338FD8A5-95F5-403D-9637-6BE35412F9C7}</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>
+    <DriverType />
+    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>True</UseDebugLibraries>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverType />
+    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>False</UseDebugLibraries>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverType />
+    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>True</UseDebugLibraries>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverType />
+    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <OutDir>$(IntDir)</OutDir>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <ItemGroup Label="WrappedTaskItems" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>xdsdbg</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>xdsdbg</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>xdsdbg</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>xdsdbg</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='false'">MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='false'">MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='false'">MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='false'">MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.\;.\..\inc;$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="debug.cpp">
+      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
+      <PreCompiledHeader>Use</PreCompiledHeader>
+      <PreCompiledHeaderOutputFile>$(IntDir)\precomp.h.pch</PreCompiledHeaderOutputFile>
+    </ClCompile>
+    <ClCompile Include="precompsrc.cpp">
+      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
+      <PreCompiledHeader>Create</PreCompiledHeader>
+      <PreCompiledHeaderOutputFile>$(IntDir)\precomp.h.pch</PreCompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
+    <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
+    <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
\ No newline at end of file
diff --git a/print/XPSDrvSmpl/src/debug/xdsdbg.vcxproj.Filters b/print/XPSDrvSmpl/src/debug/xdsdbg.vcxproj.Filters
new file mode 100644
index 000000000..a250ce5e3
--- /dev/null
+++ b/print/XPSDrvSmpl/src/debug/xdsdbg.vcxproj.Filters
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
+      <UniqueIdentifier>{1AC0F303-AF4F-4DCA-A630-2304E2DAD1E1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <UniqueIdentifier>{84B52639-2381-44A5-94B2-CE2323343A4E}</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>{41355B51-46D2-499F-BB82-8C06DFD9DC2F}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="debug.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="precompsrc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file