Merge branch 'master' into master

9 files changed, 54 insertions, 5 deletions

diff --git a/wpd/WpdBasicHardwareDriver/README.md b/wpd/WpdBasicHardwareDriver/README.md
index 523d6022..cf1b6dc7 100644
--- a/wpd/WpdBasicHardwareDriver/README.md
+++ b/wpd/WpdBasicHardwareDriver/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: WPD Basic Hardware Sample Driver
+    platform: UMDF1
+    language: cpp
+    category: WDP
+    description: Supports nine sensor devices that integrate with the Parallax BS2 programmable microcontroller.           
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620318
+--->
+
+
 WPD Basic Hardware Sample Driver (UMDF Version 1)
 =================================================
 
diff --git a/wpd/WpdHelloWorldDriver/README.md b/wpd/WpdHelloWorldDriver/README.md
index 0bf883bd..e63159e3 100644
--- a/wpd/WpdHelloWorldDriver/README.md
+++ b/wpd/WpdHelloWorldDriver/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: WPD Hello World Sample 
+    platform: UMDF1
+    language: cpp
+    category: WPD
+    description: Supports four objects: a device object, a storage object, a folder object, and a file object. 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618008
+--->
+
+
 WPDHelloWorld sample driver for portable devices
 ================================================
 
diff --git a/wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.inx b/wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.inx
index 40d31f8c..f79d7810 100644
--- a/wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.inx
+++ b/wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.inx
@@ -68,6 +68,7 @@ ServiceBinary=%12%\WUDFRd.sys
 
 [DestinationDirs]
 System32Copy=12,UMDF ; copy to system32\drivers\umdf
+CoInstallers_CopyFiles= 11
 
 [System32Copy]
 WpdHelloWorldDriver.dll
diff --git a/wpd/WpdMultiTransportDriver/README.md b/wpd/WpdMultiTransportDriver/README.md
index 4e277f0a..81e6bf30 100644
--- a/wpd/WpdMultiTransportDriver/README.md
+++ b/wpd/WpdMultiTransportDriver/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: WPD multi-transport sample driver
+    platform: UMDF1
+    language: cpp
+    category: WPD
+    description: Demonstrates how to extend the WpdHelloWorldDriver for a device that supports multiple transports.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618009
+--->
+
+
 WPD multi-transport sample driver
 =================================
 
diff --git a/wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.inx b/wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.inx
index d293c9f7..5e20c4c3 100644
--- a/wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.inx
+++ b/wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.inx
@@ -69,6 +69,7 @@ ServiceBinary=%12%\WUDFRd.sys
 
 [DestinationDirs]
 System32Copy=12,UMDF ; copy to system32\drivers\umdf
+CoInstallers_CopyFiles= 11
 
 [System32Copy]
 WpdMultiTransportDriver.dll
diff --git a/wpd/WpdServiceSampleDriver/README.md b/wpd/WpdServiceSampleDriver/README.md
index 4e277f0a..d946d59d 100644
--- a/wpd/WpdServiceSampleDriver/README.md
+++ b/wpd/WpdServiceSampleDriver/README.md
@@ -1,11 +1,17 @@
-WPD multi-transport sample driver
-=================================
+<!---
+    name: WPD service sample driver
+    platform: UMDF1
+    language: cpp
+    category: WPD
+    description: Demonstrates how to extend the WpdHelloWorldDriver sample so that it supports a simulated device with a Contacts device service.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618010
+--->
 
-The WpdMultiTransportDriver sample demonstrates how you could extend the WpdHelloWorldDriver for a device that supports multiple transports. A transport is a protocol over which a portable device communicates with a computer. Example transports include Internet Protocol (IP), Bluetooth, and USB.
 
-A number of portable devices now support multiple transports. For example, a number of cell phones support both Bluetooth and USB. Windows supports a multitransport driver model that ensures that only one node appears for each device.
+WPD service sample driver
+=================================
 
-For a complete description of this sample and its underlying code and functionality, refer to the [WPD MultiTransport Driver](http://msdn.microsoft.com/en-us/library/windows/hardware/ff597709) description in the Windows Driver Kit documentation.
+Demonstrates how to extend the WpdHelloWorldDriver sample so that it supports a simulated device with a Contacts device service.
 
 Related topics
 --------------
diff --git a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.inx b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.inx
index 935a61cd..0f4365cc 100644
--- a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.inx
+++ b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.inx
@@ -65,6 +65,7 @@ ServiceBinary=%12%\WUDFRd.sys
 
 [DestinationDirs]
 System32Copy=12,UMDF ; copy to system32\drivers\umdf
+CoInstallers_CopyFiles= 11
 
 [System32Copy]
 WpdServiceSampleDriver.dll
diff --git a/wpd/WpdWudfSampleDriver/README.md b/wpd/WpdWudfSampleDriver/README.md
index 3d2f449b..f325d5da 100644
--- a/wpd/WpdWudfSampleDriver/README.md
+++ b/wpd/WpdWudfSampleDriver/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: WPD WUDF sample driver
+    platform: UMDF1
+    language: cpp
+    category: WPD
+    description: Demonstrates virtually all aspects of the WPD device driver interface (DDI).
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618011
+--->
+
+
 WPD WUDF sample driver
 ======================
 
diff --git a/wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.inx b/wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.inx
index c66eb485..a2e11b1b 100644
--- a/wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.inx
+++ b/wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.inx