Merge pull request #1 from microsoft/master

Update fork

26 files changed, 41 insertions, 32 deletions

diff --git a/TrEE/README.md b/TrEE/README.md
index 6c67e24b..2828752e 100644
--- a/TrEE/README.md
+++ b/TrEE/README.md
@@ -5,6 +5,7 @@ languages:
 - cpp
 products:
 - windows
+- windows-wdk
 ---
 
 <!---
@@ -18,4 +19,4 @@ products:
 
 # TrEE sample
 
-The Trusted Execution Environment (TrEE) sample.
\ No newline at end of file
+The Trusted Execution Environment (TrEE) sample.
diff --git a/avstream/avscamera/common/MetadataInternal.h b/avstream/avscamera/common/MetadataInternal.h
index 2f789a02..0433fda6 100644
--- a/avstream/avscamera/common/MetadataInternal.h
+++ b/avstream/avscamera/common/MetadataInternal.h
@@ -19,7 +19,7 @@
 
 **************************************************************************/
 #pragma once
-
+#if (NTDDI_VERSION >= NTDDI_WINBLUE)
 
 enum MetadataId_Custom
 {
@@ -373,3 +373,4 @@ struct _KSCAMERA_ATTRIBUTES_HEADER
     ULONG   PinId;          //  The Pin this payload affects.
 } KSCAMERA_ATTRIBUTES_HEADER, *PKSCAMERA_ATTRIBUTES_HEADER;
 #endif
+#endif // (NTDDI_VERSION >= NTDDI_WINBLUE)
diff --git a/avstream/avscamera/mft0/MFT0Impl.cpp b/avstream/avscamera/mft0/MFT0Impl.cpp
index 892160d4..992be0e9 100644
--- a/avstream/avscamera/mft0/MFT0Impl.cpp
+++ b/avstream/avscamera/mft0/MFT0Impl.cpp
@@ -1046,13 +1046,14 @@ STDMETHODIMP CSocMft0::ProcessOutput(
     {
         return MF_E_TRANSFORM_NEED_MORE_INPUT;
     }
-
+#if (NTDDI_VERSION >= NTDDI_WINBLUE)
     hr = ProcessMetadata();
     if (FAILED(hr))
     {
         //Log the failure
         hr = S_OK;
     }
+#endif // (NTDDI_VERSION >= NTDDI_WINBLUE)
     hr = CreateOutputSample(&pOutputSamples[0].pSample);
     if (FAILED(hr))
     {
@@ -1404,6 +1405,7 @@ HRESULT CSocMft0::GetPreviewMediaType(
     return MF_E_NOT_FOUND;
 }
 
+#if (NTDDI_VERSION >= NTDDI_WINBLUE)
 /////////////////////////////////////////////////////////////////////
 //
 // Handle the Metadata with the buffer
@@ -1820,7 +1822,7 @@ HRESULT CSocMft0::ParseMetadata_ImageAggregation(
     }
     return S_OK;
 }
-
+#endif // (NTDDI_VERSION >= NTDDI_WINBLUE)
 struct HistogramData
 {
     HistogramDataHeader     Header;
@@ -1863,6 +1865,7 @@ struct Histogram
     }
 };
 
+#if (NTDDI_VERSION >= NTDDI_WINBLUE)
 #define MF_HISTOGRAM_RGB    (MF_HISTOGRAM_CHANNEL_R | MF_HISTOGRAM_CHANNEL_G  | MF_HISTOGRAM_CHANNEL_B )
 #define MF_HISTOGRAM_YCrCb  (MF_HISTOGRAM_CHANNEL_Y | MF_HISTOGRAM_CHANNEL_Cr | MF_HISTOGRAM_CHANNEL_Cb)
 
@@ -1999,11 +2002,13 @@ HRESULT CSocMft0::ParseMetadata_FaceDetection(
         goto done;
     }
 
+#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
     //  Include characterization data if any of the associated bits were set.
     if (pFaceHeader->Flags & KSCAMERA_EXTENDEDPROP_FACEDETECTION_ADVANCED_MASK)
     {
         hr = pMetaDataAttributes->SetBlob(MF_CAPTURE_METADATA_FACEROICHARACTERIZATIONS, pCharBuf, cbCharSize);
     }
+#endif // (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
 
 done:
     delete[] pRectBuf;
@@ -2011,7 +2016,7 @@ done:
 
     return hr;
 }
-
+#endif // (NTDDI_VERSION >= NTDDI_WINBLUE)
 HRESULT CSocMft0::FillBufferLengthFromMediaType(
     _In_ IMFMediaType *pPreviewType,
     _Inout_ IMFMediaBuffer *pBuffer
diff --git a/avstream/avscamera/mft0/MFT0Impl.h b/avstream/avscamera/mft0/MFT0Impl.h
index a73e8c0d..9427dd7d 100644
--- a/avstream/avscamera/mft0/MFT0Impl.h
+++ b/avstream/avscamera/mft0/MFT0Impl.h
@@ -246,7 +246,7 @@ protected:
     HRESULT GetPreviewMediaType(
         _Outptr_result_maybenull_ IMFMediaType **ppType
     );
-
+#if (NTDDI_VERSION >= NTDDI_WINBLUE)
     HRESULT ProcessMetadata();
 
     HRESULT ParseMetadata_PreviewAggregation(
@@ -268,7 +268,7 @@ protected:
         _In_ PKSCAMERA_METADATA_ITEMHEADER pItem,
         _In_ IMFAttributes *pMetaDataAttributes
     );
-
+#endif // (NTDDI_VERSION >= NTDDI_WINBLUE)
     HRESULT FillBufferLengthFromMediaType(
         _In_ IMFMediaType *pPreviewType,
         _Inout_ IMFMediaBuffer *pBuffer
diff --git a/avstream/avscamera/mft0/stdafx.h b/avstream/avscamera/mft0/stdafx.h
index ef768c0b..037376ec 100644
--- a/avstream/avscamera/mft0/stdafx.h
+++ b/avstream/avscamera/mft0/stdafx.h
@@ -16,9 +16,11 @@
 #endif
 
 #include "targetver.h"
+#if (NTDDI_VERSION <= NTDDI_WIN7)
+#pragma message("MFT0 is in not supported in this target Windows version - Change project settings to target a newer version of Windows")
+#endif
 
 #include <wrl.h>
-
 #include <initguid.h>
 #include <mfapi.h>
 #include <mfidl.h>
diff --git a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/driver.c b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/driver.c
index 2be5d2ed..9f28204f 100644
--- a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/driver.c
+++ b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/driver.c
@@ -120,7 +120,7 @@ DriverEntry(
     EventRegisterOSRUSBFX2();
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/general/WinHEC 2017 Lab/Toaster Driver/toaster/toaster.c b/general/WinHEC 2017 Lab/Toaster Driver/toaster/toaster.c
index 6ed215db..7b117240 100644
--- a/general/WinHEC 2017 Lab/Toaster Driver/toaster/toaster.c
+++ b/general/WinHEC 2017 Lab/Toaster Driver/toaster/toaster.c
@@ -72,7 +72,7 @@ Return Value:
     KdPrint(("Toaster Function Driver Sample - Driver Framework Edition.\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If DriverEntry creates any resources
     // that require clean-up in driver unload,
diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/busenum.c b/general/toaster/toastDrv/kmdf/bus/dynamic/busenum.c
index 8b79bff1..e8f62064 100644
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/busenum.c
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/busenum.c
@@ -58,7 +58,7 @@ Return Value:
     KdPrint(("WDF Toaster Bus Driver Sample Dynamic Version.\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/general/toaster/toastDrv/kmdf/bus/static/busenum.c b/general/toaster/toastDrv/kmdf/bus/static/busenum.c
index 41e79f0f..cc54d346 100644
--- a/general/toaster/toastDrv/kmdf/bus/static/busenum.c
+++ b/general/toaster/toastDrv/kmdf/bus/static/busenum.c
@@ -59,7 +59,7 @@ Return Value:
     KdPrint(("Toaster Static Bus Driver Sample - Driver Framework Edition.\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/general/toaster/toastDrv/kmdf/filter/generic/filter.c b/general/toaster/toastDrv/kmdf/filter/generic/filter.c
index c1dadac2..673f55f7 100644
--- a/general/toaster/toastDrv/kmdf/filter/generic/filter.c
+++ b/general/toaster/toastDrv/kmdf/filter/generic/filter.c
@@ -67,7 +67,7 @@ Return Value:
     KdPrint(("Toaster Generic Filter Driver Sample - Driver Framework Edition.\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/general/toaster/toastDrv/kmdf/func/featured/toaster.c b/general/toaster/toastDrv/kmdf/func/featured/toaster.c
index be826982..772b0416 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/toaster.c
+++ b/general/toaster/toastDrv/kmdf/func/featured/toaster.c
@@ -113,7 +113,7 @@ Return Value:
     KdPrint(("WDF Toaster Function Driver Sample - Featured version\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/general/toaster/toastDrv/kmdf/func/simple/toaster.c b/general/toaster/toastDrv/kmdf/func/simple/toaster.c
index 6ed215db..7b117240 100644
--- a/general/toaster/toastDrv/kmdf/func/simple/toaster.c
+++ b/general/toaster/toastDrv/kmdf/func/simple/toaster.c
@@ -72,7 +72,7 @@ Return Value:
     KdPrint(("Toaster Function Driver Sample - Driver Framework Edition.\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If DriverEntry creates any resources
     // that require clean-up in driver unload,
diff --git a/general/toaster/toastDrv/kmdf/toastmon/toastmon.c b/general/toaster/toastDrv/kmdf/toastmon/toastmon.c
index 44f6f5d2..5967d019 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/toastmon.c
+++ b/general/toaster/toastDrv/kmdf/toastmon/toastmon.c
@@ -77,7 +77,7 @@ Return Value:
     KdPrint(("ToastMon Driver Sample - Driver Framework Edition.\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/general/toaster/umdf2/filter/generic/filter.c b/general/toaster/umdf2/filter/generic/filter.c
index d245c2ba..b2897dc5 100644
--- a/general/toaster/umdf2/filter/generic/filter.c
+++ b/general/toaster/umdf2/filter/generic/filter.c
@@ -67,7 +67,7 @@ Return Value:
     KdPrint(("Toaster Generic Filter Driver Sample - Driver Framework Edition.\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/general/toaster/umdf2/func/featured/toaster.c b/general/toaster/umdf2/func/featured/toaster.c
index c25eebd4..157c1843 100644
--- a/general/toaster/umdf2/func/featured/toaster.c
+++ b/general/toaster/umdf2/func/featured/toaster.c
@@ -75,7 +75,7 @@ Return Value:
     KdPrint(("WDF Toaster Function Driver Sample - Featured version\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/general/toaster/umdf2/func/simple/toaster.c b/general/toaster/umdf2/func/simple/toaster.c
index 6ed215db..7b117240 100644
--- a/general/toaster/umdf2/func/simple/toaster.c
+++ b/general/toaster/umdf2/func/simple/toaster.c
@@ -72,7 +72,7 @@ Return Value:
     KdPrint(("Toaster Function Driver Sample - Driver Framework Edition.\n"));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If DriverEntry creates any resources
     // that require clean-up in driver unload,
diff --git a/input/kbfiltr/sys/kbfiltr.c b/input/kbfiltr/sys/kbfiltr.c
index e0009172..ddc78326 100644
--- a/input/kbfiltr/sys/kbfiltr.c
+++ b/input/kbfiltr/sys/kbfiltr.c
@@ -80,7 +80,7 @@ Return Value:
     DebugPrint(("Built %s %s\n", __DATE__, __TIME__));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/input/moufiltr/moufiltr.c b/input/moufiltr/moufiltr.c
index 3e97a7a1..84716db2 100644
--- a/input/moufiltr/moufiltr.c
+++ b/input/moufiltr/moufiltr.c
@@ -47,7 +47,7 @@ Routine Description:
     DebugPrint(("Mouse Filter Driver Sample - Driver Framework Edition.\n"));
     DebugPrint(("Built %s %s\n", __DATE__, __TIME__));
     
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX
index 5fe96e36..b101c772 100644
--- a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX
+++ b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.InX
@@ -33,7 +33,7 @@
    WFPSamplerCalloutDriver.sys = 1,,
 
 [ClassInstall32.nt$ARCH$]
-   AddReg = WFPCalloutClassReg
+   AddReg = WFPCalloutsClassReg
 
 [DestinationDirs]
    DefaultDestDir                      = 12                                                        ;/// %WinDir%\System32\Drivers
@@ -53,8 +53,8 @@
 [DefaultUninstall.nt$ARCH$.Services]
    DelService = %WFPSamplerCalloutDriverServiceName%,0x200                                         ;/// SPSVCINST_STOPSERVICE
 
-[WFPCalloutClassReg]
-   HKR,,,0,%WFPCalloutClassName%
+[WFPCalloutsClassReg]
+   HKR,,,0,%WFPCalloutsClassName%
    HKR,,Icon,,-5
    HKR,,SilentInstall,,1
    HKR,,DeviceCharacteristics,0x10001,0x100                                                        ;/// FLG_ADDREG_BINVALUETYPE | FLG_ADDREG_TYPE_MULTI_SZ, FILE_DEVICE_SECURE_OPEN
@@ -85,7 +85,7 @@
 
 [Strings]
    ProviderString                            = "TODO-Set-Provider"
-   WFPCalloutClassName                       = "WFP Callout"
+   WFPCalloutsClassName                      = "WFP Callout Drivers"
    WFPSamplerCalloutDriverDeviceDescription  = "WFP Sampler Callout Device"
    WFPSamplerCalloutDriverDescription        = "WFP Sampler Callout Driver"
    WFPSamplerCalloutDriverServiceName        = "WFPSamplerCallouts"
diff --git a/pofx/UMDF2/Driver/SingleComp/driver.c b/pofx/UMDF2/Driver/SingleComp/driver.c
index 597c742d..569a1e6a 100644
--- a/pofx/UMDF2/Driver/SingleComp/driver.c
+++ b/pofx/UMDF2/Driver/SingleComp/driver.c
@@ -70,7 +70,7 @@ Return Value:
     Trace(TRACE_LEVEL_INFORMATION, "%!FUNC! Entry of driver");
     
     //
-    // Initiialize driver config to control the attributes that are global to
+    // Initialize driver config to control the attributes that are global to
     // the driver. Note that framework by default provides a driver unload 
     // routine. If DriverEntry creates any resources that require clean-up in
     // driver unload, you can manually override the default by supplying a 
diff --git a/pofx/WDF/Driver/SingleComp/driver.c b/pofx/WDF/Driver/SingleComp/driver.c
index cd7b6dd1..ad3b7d43 100644
--- a/pofx/WDF/Driver/SingleComp/driver.c
+++ b/pofx/WDF/Driver/SingleComp/driver.c
@@ -79,7 +79,7 @@ Return Value:
     WPP_INIT_TRACING(DriverObject, RegistryPath);
 
     //
-    // Initiialize driver config to control the attributes that are global to
+    // Initialize driver config to control the attributes that are global to
     // the driver. Note that framework by default provides a driver unload 
     // routine. If DriverEntry creates any resources that require clean-up in
     // driver unload, you can manually override the default by supplying a 
diff --git a/usb/kmdf_enumswitches/sys/driver.c b/usb/kmdf_enumswitches/sys/driver.c
index 275803e6..e9e99054 100644
--- a/usb/kmdf_enumswitches/sys/driver.c
+++ b/usb/kmdf_enumswitches/sys/driver.c
@@ -107,7 +107,7 @@ Return Value:
                        "OSRUSBFX2 Driver Sample - Driver Framework Edition.\n");
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/usb/kmdf_fx2/driver/driver.c b/usb/kmdf_fx2/driver/driver.c
index 2c73cab2..25be851e 100644
--- a/usb/kmdf_fx2/driver/driver.c
+++ b/usb/kmdf_fx2/driver/driver.c
@@ -136,7 +136,7 @@ Return Value:
     EventRegisterOSRUSBFX2();
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/usb/umdf2_fx2/driver/driver.c b/usb/umdf2_fx2/driver/driver.c
index fb00f9de..7ec5f5df 100644
--- a/usb/umdf2_fx2/driver/driver.c
+++ b/usb/umdf2_fx2/driver/driver.c
@@ -116,7 +116,7 @@ Return Value:
     EventRegisterOSRUSBFX2();
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/usb/umdf_filter_kmdf/kmdf_driver/driver.c b/usb/umdf_filter_kmdf/kmdf_driver/driver.c
index 2c73cab2..25be851e 100644
--- a/usb/umdf_filter_kmdf/kmdf_driver/driver.c
+++ b/usb/umdf_filter_kmdf/kmdf_driver/driver.c
@@ -136,7 +136,7 @@ Return Value:
     EventRegisterOSRUSBFX2();
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,
diff --git a/usb/usbsamp/sys/driver.c b/usb/usbsamp/sys/driver.c
index 26d61477..68b717e4 100644
--- a/usb/usbsamp/sys/driver.c
+++ b/usb/usbsamp/sys/driver.c
@@ -72,7 +72,7 @@ Return Value:
     UsbSamp_DbgPrint(3, ("Built %s %s\n", __DATE__, __TIME__));
 
     //
-    // Initiialize driver config to control the attributes that
+    // Initialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
     // provides a driver unload routine. If you create any resources
     // in the DriverEntry and want to be cleaned in driver unload,