Merge branch 'master' into master

18 files changed, 141 insertions, 17 deletions

diff --git a/print/SampleOpenXPS/README.md b/print/SampleOpenXPS/README.md
index a50148e4..f939583f 100644
--- a/print/SampleOpenXPS/README.md
+++ b/print/SampleOpenXPS/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: OpenXPS Documents Print Sample
+    platform: Application
+    language: cpp
+    category: Print
+    description: Contains a set of documents that exercise a variety of features of OpenXPS.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617941
+--->
+
+
 OpenXPS Documents Print Sample
 ==============================
 
diff --git a/print/SampleXPS/README.md b/print/SampleXPS/README.md
index 18a242bb..b1c39d3e 100644
--- a/print/SampleXPS/README.md
+++ b/print/SampleXPS/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: XPS Documents Print Sample
+    platform: Application
+    language: cpp
+    category: Print
+    description: Contains a set of documents that exercise a variety of features of the XML Paper Specification.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617942
+--->
+
+
 XPS Documents Print Sample
 ==========================
 
diff --git a/print/SimplePipelineFilter/README.md b/print/SimplePipelineFilter/README.md
index 06f17b61..c7a92e48 100644
--- a/print/SimplePipelineFilter/README.md
+++ b/print/SimplePipelineFilter/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Print Pipeline Simple Filter
+    platform: DLL
+    language: cpp
+    category: Print
+    description: This sample shows how to use the print pipeline's filter interfaces.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617944
+--->
+
+
 Print Pipeline Simple Filter
 ============================
 
diff --git a/print/XPSDrvSmpl/README.md b/print/XPSDrvSmpl/README.md
index f90ae5cf..7c75a314 100644
--- a/print/XPSDrvSmpl/README.md
+++ b/print/XPSDrvSmpl/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: XPSDrv Driver and Filter Sample
+    platform: DLL
+    language: cpp
+    category: Print
+    description: Provide a starting point for developing XPSDrv printer drivers and to illustrate the facility and potential of an XPSDrv print driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617950
+--->
+
+
 XPSDrv Driver and Filter Sample
 ===============================
 
diff --git a/print/XPSDrvSmpl/src/common/pshndlr.cpp b/print/XPSDrvSmpl/src/common/pshndlr.cpp
index 868378da..90acda70 100644
--- a/print/XPSDrvSmpl/src/common/pshndlr.cpp
+++ b/print/XPSDrvSmpl/src/common/pshndlr.cpp
@@ -1259,7 +1259,7 @@ Note:
 
     The annotation for pbstrValue is intended to express that the BSTR may
     be NULL when S_FALSE is returned, but not when S_OK is returned.
-    
+
     In any case, when a failure HRESULT is returned, all out parameter
     annotations are ignored.
 
diff --git a/print/XPSDrvSmpl/src/common/ptquerybld.cpp b/print/XPSDrvSmpl/src/common/ptquerybld.cpp
index c2113932..cc7faa8a 100644
--- a/print/XPSDrvSmpl/src/common/ptquerybld.cpp
+++ b/print/XPSDrvSmpl/src/common/ptquerybld.cpp
@@ -496,7 +496,8 @@ CPTQueryBuilder::AddOption(
                 SUCCEEDED(hr = m_bstrQuery.Append(szPTQOrNodes)) &&
                 SUCCEEDED(hr = m_bstrQuery.Append(cstrQueryRoot)))
             {
-                cstrOptionQuery.Format(szPTQOptionLH, static_cast<LPCWSTR>(m_bstrFrameworkNS), bstrKeywordNS, static_cast<LPCWSTR>(m_bstrFrameworkNS));
+                cstrOptionQuery.Format(szPTQOptionLH, static_cast<LPCWSTR>(m_bstrFrameworkNS),
+                                       static_cast<LPCWSTR>(bstrKeywordNS), static_cast<LPCWSTR>(m_bstrFrameworkNS));
                 hr = m_bstrQuery.Append(cstrOptionQuery);
             }
         }
diff --git a/print/XPSDrvSmpl/src/filters/color/cmimg.cpp b/print/XPSDrvSmpl/src/filters/color/cmimg.cpp
index 5f861422..6c312629 100644
--- a/print/XPSDrvSmpl/src/filters/color/cmimg.cpp
+++ b/print/XPSDrvSmpl/src/filters/color/cmimg.cpp
@@ -537,7 +537,7 @@ CColorManagedImage::GetResURI(
                 // Create a unique name for the bitmap for this print session
                 //
                 CStringXDW cstrURI;
-                cstrURI.Format(L"%s_%u.wdp", static_cast<LPCTSTR>(cstrFileName), GetUniqueNumber());
+                cstrURI.Format(L"%s_%u.wdp", static_cast<LPCWSTR>(cstrFileName), GetUniqueNumber());
 
                 SysFreeString(*pbstrResURI);
                 *pbstrResURI = cstrURI.AllocSysString();
diff --git a/print/XPSDrvSmpl/src/filters/common/ptmanage.cpp b/print/XPSDrvSmpl/src/filters/common/ptmanage.cpp
index b1c52db2..fa50170f 100644
--- a/print/XPSDrvSmpl/src/filters/common/ptmanage.cpp
+++ b/print/XPSDrvSmpl/src/filters/common/ptmanage.cpp
@@ -178,9 +178,9 @@ CPTManager::Initialise(
                 //
                 // We couldn't revert the security context. The filter pipeline
                 // manager will clean up the thread when operation is complete,
-                // when it is determined that the security context was not 
-                // reverted. Since there are no security implications with 
-                // running this filter in an elevated context, we can 
+                // when it is determined that the security context was not
+                // reverted. Since there are no security implications with
+                // running this filter in an elevated context, we can
                 // continue to run.
                 //
             }
@@ -589,7 +589,7 @@ CPTManager::GetCapabilities(
                     {
                     }
                 }
-            
+
                 //
                 // Always revert back to the default security context
                 //
@@ -598,9 +598,9 @@ CPTManager::GetCapabilities(
                     //
                     // We couldn't revert the security context. The filter pipeline
                     // manager will clean up the thread when operation is complete,
-                    // when it is determined that the security context was not 
-                    // reverted. Since there are no security implications with 
-                    // running this filter in an elevated context, we can 
+                    // when it is determined that the security context was not
+                    // reverted. Since there are no security implications with
+                    // running this filter in an elevated context, we can
                     // continue to run.
                     //
                 }
@@ -1047,9 +1047,9 @@ CPTManager::GetMergedTicket(
                     //
                     // We couldn't revert the security context. The filter pipeline
                     // manager will clean up the thread when operation is complete,
-                    // when it is determined that the security context was not 
-                    // reverted. Since there are no security implications with 
-                    // running this filter in an elevated context, we can 
+                    // when it is determined that the security context was not
+                    // reverted. Since there are no security implications with
+                    // running this filter in an elevated context, we can
                     // continue to run.
                     //
                 }
diff --git a/print/XPSDrvSmpl/src/filters/nup/nupsax.cpp b/print/XPSDrvSmpl/src/filters/nup/nupsax.cpp
index 399b353b..6c92730c 100644
--- a/print/XPSDrvSmpl/src/filters/nup/nupsax.cpp
+++ b/print/XPSDrvSmpl/src/filters/nup/nupsax.cpp
@@ -266,7 +266,7 @@ CNUpSaxHandler::startElement(
                                     if (sizePage.Width < 1.f)
                                     {
                                         //
-                                        // According to the Xps Specification, 
+                                        // According to the Xps Specification,
                                         // FixedPage Width must be >= 1.0
                                         //
                                         hr = E_FAIL;
@@ -364,7 +364,7 @@ CNUpSaxHandler::startElement(
 
                     cstrOut.Format(L"<Canvas RenderTransform=\"%s\" Clip=\"%s\"",
                                       static_cast<LPCWSTR>(bstrMatrix),
-                                      static_cast<LPCTSTR>(strClip));
+                                      static_cast<LPCWSTR>(strClip));
 
                     //
                     // Add additional namespaces from the FixedPage
diff --git a/print/XPSDrvSmpl/src/filters/watermark/wmvect.cpp b/print/XPSDrvSmpl/src/filters/watermark/wmvect.cpp
index a7c9d595..3c73b2ba 100644
--- a/print/XPSDrvSmpl/src/filters/watermark/wmvect.cpp
+++ b/print/XPSDrvSmpl/src/filters/watermark/wmvect.cpp
@@ -159,7 +159,8 @@ CVectorWatermark::CreateXMLElement(
             try
             {
                 CStringXDW strOpenCanvas;
-                strOpenCanvas.Format(L"<Canvas Opacity=\"%s\" RenderTransform=\"%s\">", static_cast<LPCWSTR>(bstrWMOpacity), static_cast<LPCWSTR>(bstrMatrixXForm));
+                strOpenCanvas.Format(L"<Canvas Opacity=\"%s\" RenderTransform=\"%s\">",
+                                     static_cast<LPCWSTR>(bstrWMOpacity), static_cast<LPCWSTR>(bstrMatrixXForm));
 
                 IStream* pStream;
                 CComBSTR bstrContent;
diff --git a/print/XpsRasFilter/README.md b/print/XpsRasFilter/README.md
index a742f66c..344c6bf9 100644
--- a/print/XpsRasFilter/README.md
+++ b/print/XpsRasFilter/README.md
@@ -1,3 +1,14 @@
+<!---
+    name: XPS Rasterization Filter Service Sample
+    platform: DLL
+    language: cpp
+    category: Print
+    description: Implements an XPSDrv filter that rasterizes fixed pages in an XPS document.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617951
+--->
+
+
+
 XPS Rasterization Filter Service Sample
 =======================================
 
diff --git a/print/autoconfig/README.md b/print/autoconfig/README.md
index d215c36f..38a442e2 100644
--- a/print/autoconfig/README.md
+++ b/print/autoconfig/README.md
@@ -1,4 +1,14 @@
-Print auto-configuration sample test
+<!---
+    name: Print auto-configuration sample
+    platform: Utility
+    language: cpp
+    category: Print
+    description: Demonstrates how to implement auto-configuration in v4 print drivers.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617938
+--->
+
+
+Print auto-configuration sample
 ===============================
 
 This sample demonstrates how to implement auto-configuration in v4 print drivers. 
diff --git a/print/cpsuisam/README.md b/print/cpsuisam/README.md
index a4fddfb9..b289ad82 100644
--- a/print/cpsuisam/README.md
+++ b/print/cpsuisam/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Common Property Sheet User Interface (CPSUI) Sample
+    platform: Application
+    language: cpp
+    category: Print
+    description: The CPSUISAM application causes the CPSUI to call the print spooler to create property sheet pages for the default printer.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617940
+--->
+
+
 Common Property Sheet UI Sample
 ===============================
 
diff --git a/print/v4PrintDriverSamples/PrinterExtensionSample/README.md b/print/v4PrintDriverSamples/PrinterExtensionSample/README.md
index ca5f6837..c76f31d8 100644
--- a/print/v4PrintDriverSamples/PrinterExtensionSample/README.md
+++ b/print/v4PrintDriverSamples/PrinterExtensionSample/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Printer Extension Sample
+    platform: Application
+    language: cs
+    category: Print
+    description: Demonstrates how to use .NET to build a customized, desktop UI for a v4 print driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617945
+--->
+
+
 Printer Extension Sample
 ========================
 
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/README.md b/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/README.md
index 71a6f72b..f0f64424 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/README.md
+++ b/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Print Driver Constraints Sample
+    platform: Utility
+    language: js
+    category: Print
+    description: Demonstrates how to implement advanced constraint handling and PrintTicket/PrintCapabilities handling using JavaScript.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617946
+--->
+
+
 Print Driver Constraints Sample
 ===============================
 
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/README.md b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/README.md
index 6d3b77d0..09fdd30c 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/README.md
+++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/README.md
@@ -1,3 +1,14 @@
+<!---
+    name: USB Host-Based Print Driver Sample
+    platform: Utility
+    language: js
+    category: Print
+    description: Demonstrates how to support host-based devices that use the v4 print driver model and are connected via USB.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617947
+--->
+
+
+
 USB Host-Based Print Driver Sample
 ==================================
 
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/README.md b/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/README.md
index 294dee1e..cebf8145 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/README.md
+++ b/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Print Driver USB Monitor and Bidi Sample
+    platform: Utility
+    language: js xml
+    category: Print
+    description: Demonstrates how to support bidirectional (Bidi) communication over the USB bus using JavaScript and XML.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617948
+--->
+
+
 Print Driver USB Monitor and Bidi Sample
 ========================================
 
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/README.md b/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/README.md
index 6556ab25..385002c0 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/README.md
+++ b/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: WSDMon Bidi Extension Sample
+    platform: Utility
+    language: xml
+    category: Print
+    description: Demonstrates how to use an XML extension file to support bidirectional (Bidi) communication with a WSD connected printer.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617949
+--->
+
+
 WSDMon Bidi Extension Sample
 ============================