Updated for "Windows 10 Anniversary Update" (Version 1607)

author: karlf <[email protected]> 2016-08-11 13:28:13 -0700
committer: karlf <[email protected]> 2016-08-11 13:28:13 -0700
commit: 96eb96dfb613e4c745db6bd1f53a92fe7e2290fc (patch)
tree: ad5f3ede5cbcd6b598677ce41bcf8318471bdd92 /general
parent: 687b274aa38fd05c8c26e3068932121876d7f745 (diff)
224 files changed, 1856 insertions, 6667 deletions
diff --git a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.c b/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.c
deleted file mode 100644
index 3aade318..00000000
--- a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.c
+++ /dev/null
@@ -1,1253 +0,0 @@
-/*++
-
-Copyright (c) 2011 Microsoft Corporation
-
-Module Name:
-
-    HalExtSampleDma.c
-
-Abstract:
-
-    This file implements a HAL Extension Module for the fictitious chDMA
-    controller.
-
-Author:
-
-    Cody Hartwig (chartwig) 9-Jun-2011
-
---*/
-
-//
-// --------------------------------------------------------------------Includes
-//
-
-#include <nthalext.h>
-
-//
-// ---------------------------------------------------------------- Definitions
-//
-
-//
-// Disable warnings of features used by the standard headers
-//
-// Disable warning C4214: nonstandard extension used : bit field types other than int
-// Disable warning C4201: nonstandard extension used : nameless struct/union
-// Disable warning C4115: named type definition in parentheses
-// Disable warning C4127: conditional expression is constant
-// Disable warning C4200: zero-sized array in struct/union
-//
-
-#pragma warning(disable:4214 4201 4115 4127 4200)
-
-//
-// Define register set size.
-//
-
-#define CH_DMA_REGISTER_SIZE            (0x210)
-
-//
-// Define maximums.
-//
-
-#define CH_DMA_MAX_REQUEST_LINES        (32)
-#define CH_DMA_MAX_CHANNELS             (32)
-
-#define CONFIGURE_ADD_REQ_CONFIG        (0x80000000)
-
-//
-// Define register offsets.
-//
-
-#define CH_DMA_CONTROL                  (0x00)
-#define CH_DMA_STATUS                   (0x04)
-#define CH_DMA_INTERRUPT_MASK           (0x08)
-
-#define CH_DMA_CHAN_CONTROL             (0x00)
-#define CH_DMA_CHAN_MEM_PTR             (0x04)
-#define CH_DMA_CHAN_DEV_PTR             (0x08)
-#define CH_DMA_CHAN_STATUS              (0x1c)
-
-//
-// Define device-side bus widths.
-//
-
-#define CH_DMA_WIDTH_8_BIT              (0)
-#define CH_DMA_WIDTH_16_BIT             (1)
-#define CH_DMA_WIDTH_32_BIT             (2)
-
-//
-// Define transfer burst sizes.
-//
-
-#define CH_DMA_BURST_1_WORD             (0)
-#define CH_DMA_BURST_2_WORD             (1)
-#define CH_DMA_BURST_4_WORD             (2)
-#define CH_DMA_BURST_8_WORD             (3)
-
-//
-// Define transfer directions.
-//
-
-#define CH_DMA_DEVICE_WRITE             (0)
-#define CH_DMA_DEVICE_READ              (1)
-
-//
-// ------------------------------------------------------ Data Type Definitions
-//
-
-#pragma pack(push, 1)
-
-//
-// Register Definitions.
-//
-
-typedef struct _CH_DMA_CONTROL_REGISTER {
-    union {
-        struct {
-            ULONG ControllerEnable:1;
-            ULONG Reserved:31;
-        };
-        ULONG AsUlong;
-    };
-} CH_DMA_CONTROL_REGISTER, *PCH_DMA_CONTROL_REGISTER;
-
-typedef struct _CH_DMA_CHAN_CONTROL_REGISTER {
-    union {
-        struct {
-            ULONG ChannelEnable:1;
-            ULONG InterruptEnable:1;
-            ULONG DeviceWidth:2;
-            ULONG BurstSize:2;
-            ULONG FlowControl:1;
-            ULONG Loop:1;
-            ULONG RequestLine:5;
-            ULONG ReadFromDevice:1;
-            ULONG Reserved:2;
-            ULONG Length:16;
-        };
-        ULONG AsUlong;
-    };
-} CH_DMA_CHAN_CONTROL_REGISTER, *PCH_DMA_CHAN_CONTROL_REGISTER;
-
-typedef struct _CH_DMA_CHAN_STATUS_REGISTER {
-    union {
-        struct {
-            ULONG Busy:1;
-            ULONG Reserved:15;
-            ULONG BytesTransferred:16;
-        };
-        ULONG AsUlong;
-    };
-} CH_DMA_CHAN_STATUS_REGISTER, *PCH_DMA_CHAN_STATUS_REGISTER;
-
-//
-// CSRT resource descriptor types for chDMA.
-//
-
-typedef struct _CH_DMA_ADD_REQ_LINE_CONFIG {
-    ULONG RequestLine;
-    CH_DMA_CHAN_CONTROL_REGISTER Ctrl;
-} CH_DMA_ADD_REQ_LINE_CONFIG, *PCH_DMA_ADD_REQ_LINE_CONFIG;
-
-typedef struct _RD_DMA_CONTROLLER {
-    CSRT_RESOURCE_DESCRIPTOR_HEADER Header;
-    ULONGLONG BasePhysicalAddress;
-    ULONG ChannelCount;
-    ULONG MinimumRequestLine;
-    ULONG MaximumRequestLine;
-    ULONG InterruptGsi;
-    BOOLEAN CacheCoherent;
-    ULONG ReqLineConfigCount;
-    CH_DMA_ADD_REQ_LINE_CONFIG ReqLineConfigs[ANYSIZE_ARRAY];
-} RD_DMA_CONTROLLER, *PRD_DMA_CONTROLLER;
-
-//
-// Resource description matching chDMA controller described in chdmaReadme.txt:
-//
-// CH_DMA_CHAN_CONTROL_REGISTER UartControl;
-// UartControl.AsUlong = 0;
-// UartControl.DeviceWidth = CH_DMA_WIDTH_8_BIT;
-// UartControl.BurstSize = CH_DMA_BURST_1_WORD;
-// UartControl.FlowControl = 1;
-//
-// CH_DMA_ADD_REQ_LINE_CONFIG UartConfig = {
-//      0x15,
-//      UartControl
-// };
-//
-// RD_DMA_CONTROLLER DmaDesc = {
-//      Header,
-//      0x70001000,
-//      32,
-//      0,
-//      31,
-//      0x27,
-//      FALSE,
-//      1,
-//      { UartConfig }
-// };
-//
-
-typedef struct _RD_DMA_CHANNEL {
-    CSRT_RESOURCE_DESCRIPTOR_HEADER Header;
-    ULONG ChannelNumber;
-} RD_DMA_CHANNEL, *PRD_DMA_CHANNEL;
-
-//
-// Resource description matching chDMA channel described in chdmaReadme.txt:
-//
-// RD_DMA_CHANNEL DmaDesc = {
-//      Header,
-//      0
-// };
-//
-
-#pragma pack(pop)
-
-//
-// Extension Request line to configuration mapping.
-//
-
-typedef struct _CH_REQ_LINE_CONFIG {
-    BOOLEAN Valid;
-    CH_DMA_CHAN_CONTROL_REGISTER Ctrl;
-} CH_REQ_LINE_CONFIG, *PCH_REQ_LINE_CONFIG;
-
-typedef struct _CH_REQ_LINE_CONFIG_TABLE {
-    CH_REQ_LINE_CONFIG Entries[CH_DMA_MAX_REQUEST_LINES];
-} CH_DMA_REQ_LINE_CONFIG_TABLE, *PCH_DMA_REQ_LINE_CONFIG_TABLE;
-
-//
-// Define extension internal data for the controller and channel.
-//
-
-typedef struct _CH_DMA_CHANNEL {
-    BOOLEAN Active;
-    BOOLEAN AutoInit;
-} CH_DMA_CHANNEL, *PCH_DMA_CHANNEL;
-
-typedef struct _CH_DMA_CONTROLLER {
-
-    //
-    // Virtual and physical base addresses of the controller.
-    //
-
-    PULONG ControllerBaseVa;
-    PHYSICAL_ADDRESS ControllerBasePa;
-
-    ULONG ChannelCount;
-    ULONG MinimumRequestLine;
-    ULONG MaximumRequestLine;
-
-    //
-    // Individual channel extension status.
-    //
-
-    CH_DMA_CHANNEL Channels[CH_DMA_MAX_CHANNELS];
-
-    //
-    // Request line to configuration mapping.
-    //
-
-    CH_DMA_REQ_LINE_CONFIG_TABLE ReqConfig;
-} CH_DMA_CONTROLLER, *PCH_DMA_CONTROLLER;
-
-//
-// ----------------------------------------------------------------- Prototypes
-//
-
-VOID
-ChInitializeController (
-    __in PVOID ControllerContext
-    );
-
-BOOLEAN
-ChValidateRequestLineBinding (
-    __in PVOID ControllerContext,
-    __in PDMA_REQUEST_LINE_BINDING_DESCRIPTION BindingDescription
-    );
-
-ULONG
-ChQueryMaxFragments (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber,
-    __in ULONG MaxFragmentsRequested
-    );
-
-VOID
-ChProgramChannel (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber,
-    __in ULONG RequestLine,
-    __in PDMA_SCATTER_GATHER_LIST MemoryAddresses,
-    __in PHYSICAL_ADDRESS DeviceAddress,
-    __in BOOLEAN WriteToDevice,
-    __in BOOLEAN LoopTransfer
-    );
-
-BOOLEAN
-ChCancelTransfer (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber
-    );
-
-NTSTATUS
-ChConfigureChannel (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber,
-    __in ULONG FunctionNumber,
-    __in PVOID Context
-    );
-
-VOID
-ChFlushChannel (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber
-    );
-
-_Success_(return != FALSE)
-BOOLEAN
-ChHandleInterrupt (
-    __in PVOID ControllerContext,
-    __out PULONG ChannelNumber,
-    __out PDMA_INTERRUPT_TYPE InterruptType
-    );
-
-ULONG
-ChReadDmaCounter (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber
-    );
-
-//
-// -------------------------------------------------------------------- Globals
-//
-
-DMA_FUNCTION_TABLE ChFunctionTable =
-{
-    ChInitializeController,
-    ChValidateRequestLineBinding,
-    ChQueryMaxFragments,
-    ChProgramChannel,
-    ChConfigureChannel,
-    ChFlushChannel,
-    ChHandleInterrupt,
-    ChReadDmaCounter,
-    NULL, /* ReportCommonBuffer */
-    ChCancelTransfer
-};
-
-//
-// ------------------------------------------------------------------- Routines
-//
-
-VOID
-WriteRegister (
-    __in PCH_DMA_CONTROLLER Controller,
-    __in ULONG RegisterOffset,
-    __in ULONG Value
-    )
-
-{
-
-    PULONG Address;
-
-    Address = Controller->ControllerBaseVa;
-
-    //
-    // Add register offset.  Register offset is in bytes.  Pointer addition is
-    // in ULONGs.
-    //
-
-    Address += (RegisterOffset / 4);
-
-    WRITE_REGISTER_ULONG(Address, Value);
-}
-
-ULONG
-ReadRegister (
-    __in PCH_DMA_CONTROLLER Controller,
-    __in ULONG RegisterOffset
-    )
-
-{
-
-    PULONG Address;
-
-    Address = Controller->ControllerBaseVa;
-
-    //
-    // Add register offset.  Register offset is in bytes.  Pointer addition is
-    // in ULONGs.
-    //
-
-    Address += (RegisterOffset / 4);
-
-    return READ_REGISTER_ULONG(Address);
-}
-
-VOID
-WriteChannelRegister (
-    __in PCH_DMA_CONTROLLER Controller,
-    __in ULONG ChannelNumber,
-    __in ULONG RegisterOffset,
-    __in ULONG Value
-    )
-
-{
-    PULONG Address;
-
-    Address = Controller->ControllerBaseVa;
-
-    //
-    // Add channel base offset.
-    // Register offset is in bytes.  Pointer addition is in ULONGs.
-    //
-
-    Address += (0x10 / 4);
-
-    //
-    // Add channel number offset.
-    //
-
-    Address += ((0x10 * ChannelNumber) / 4);
-
-    //
-    // Add channel register offset.
-    //
-
-    Address += (RegisterOffset / 4);
-
-    WRITE_REGISTER_ULONG(Address, Value);
-}
-
-ULONG
-ReadChannelRegister (
-    __in PCH_DMA_CONTROLLER Controller,
-    __in ULONG ChannelNumber,
-    __in ULONG RegisterOffset
-    )
-
-{
-
-    PULONG Address;
-
-    Address = Controller->ControllerBaseVa;
-
-    //
-    // Add channel base offset.
-    // Register offset is in bytes.  Pointer addition is in ULONGs.
-    //
-
-    Address += (0x10 / 4);
-
-    //
-    // Add channel number offset.
-    //
-
-    Address += ((0x10 * ChannelNumber) / 4);
-
-    //
-    // Add channel register offset.
-    //
-
-    Address += (RegisterOffset / 4);
-
-    return READ_REGISTER_ULONG(Address);
-}
-
-VOID
-ChInitializeController (
-    __in PVOID ControllerContext
-    )
-
-/*++
-
-Routine Description:
-
-    This routine provides an opportunity for DMA controllers to initialize.
-
-Arguments:
-
-    ControllerContext - Supplies a pointer to the controller's internel data.
-
-Return Value:
-
-    None.
-
---*/
-
-{
-
-    CH_DMA_CONTROL_REGISTER CtrlRegister;
-    PCH_DMA_CONTROLLER Controller;
-    ULONG Index;
-    ULONG InterruptMask;
-
-    Controller = (PCH_DMA_CONTROLLER)ControllerContext;
-
-    //
-    // Map the controller base iff this is the first call to init (and it is
-    // therefore not already mapped.)
-    //
-
-    if (Controller->ControllerBaseVa == NULL) {
-        Controller->ControllerBaseVa =
-            (PULONG) HalMapIoSpace(Controller->ControllerBasePa,
-                                   PAGE_SIZE,
-                                   MmNonCached);
-
-        NT_ASSERT(Controller->ControllerBaseVa != NULL);
-    }
-
-    if (Controller->ControllerBaseVa == NULL) {
-        return;
-    }
-
-    //
-    // Initialize each channel.
-    //
-
-    for (Index = 0; Index < Controller->ChannelCount; Index += 1) {
-        WriteChannelRegister(Controller, Index, CH_DMA_CHAN_CONTROL, 0);
-        Controller->Channels[Index].Active = FALSE;
-        Controller->Channels[Index].AutoInit = FALSE;
-    }
-
-    //
-    // Enable the DMA controller.
-    //
-
-    CtrlRegister.AsUlong = 0;
-    CtrlRegister.ControllerEnable = 1;
-    WriteRegister(Controller, CH_DMA_CONTROL, CtrlRegister.AsUlong);
-
-    //
-    // Enable all interrupts.
-    //
-
-    InterruptMask = (1UL << Controller->ChannelCount) - 1;
-    WriteRegister(Controller, CH_DMA_INTERRUPT_MASK, InterruptMask);
-
-    return;
-}
-
-BOOLEAN
-ChValidateRequestLineBinding (
-    __in PVOID ControllerContext,
-    __in PDMA_REQUEST_LINE_BINDING_DESCRIPTION BindingDescription
-    )
-
-/*++
-
-Routine Description:
-
-    This routine queries a DMA controller extension to test the validity of a
-    request line binding.
-
-Arguments:
-
-    ControllerContext - Supplies a pointer to the controller's internal data.
-
-    DeviceDescription - Supplies a pointer to the request information.
-
-Return Value:
-
-    TRUE if the request line binding is valid and supported by the controller.
-
-    FALSE if the binding is invalid.
-
-Environment:
-
-    PASSIVE_LEVEL.
-
---*/
-
-{
-
-    PCH_DMA_CONTROLLER Controller;
-
-    Controller = (PCH_DMA_CONTROLLER)ControllerContext;
-    if (BindingDescription->ChannelNumber > Controller->ChannelCount) {
-        return FALSE;
-    }
-
-    if ((BindingDescription->RequestLine > Controller->MaximumRequestLine) ||
-        (BindingDescription->RequestLine < Controller->MinimumRequestLine)) {
-
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-ULONG
-ChQueryMaxFragments (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber,
-    __in ULONG MaxFragmentsRequested
-    )
-
-/*++
-
-Routine Description:
-
-    This routine queries the DMA extension to determine the number of
-    scatter gather fragments that the next transfer can support.
-
-Arguments:
-
-    ControllerContext - Supplies a pointer to the controller's internal data.
-
-    ChannelNumber - Supplies the number of the channel to program.
-
-    MaxFragmentsRequested - Supplies a hint to the maximum fragments useful to
-        this transfer.
-
-Return Value:
-
-    Number of fragments the next transfer on this channel can support.
-
---*/
-
-{
-
-    UNREFERENCED_PARAMETER(ControllerContext);
-    UNREFERENCED_PARAMETER(ChannelNumber);
-    UNREFERENCED_PARAMETER(MaxFragmentsRequested);
-
-    return 1;
-}
-
-VOID
-ChProgramChannel (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber,
-    __in ULONG RequestLine,
-    __in PDMA_SCATTER_GATHER_LIST MemoryAddresses,
-    __in PHYSICAL_ADDRESS DeviceAddress,
-    __in BOOLEAN WriteToDevice,
-    __in BOOLEAN LoopTransfer
-    )
-
-/*++
-
-Routine Description:
-
-    This routine programs a DMA controller channel for a specific transfer.
-
-Arguments:
-
-    ControllerContext - Supplies a pointer to the controller's internal data.
-
-    ChannelNumber - Supplies the number of the channel to program.
-
-    RequestLine - Supplies the request line number to program.  This request
-        line number is system-unique (as provided to the HAL during
-        registration) and must be translated by the extension.
-
-    MemoryAddress - Supplies the address to be programmed into the memory
-        side of the channel configuration.
-
-    DeviceAddress - Supplies the address to be programmed into the device
-        side of the channel configuration.
-
-    WriteToDevice - Supplies the direction of the transfer.
-
-    LoopTransfer - Supplies whether AutoInitialize has been set in the
-        adapter making this request.
-
-Return Value:
-
-    None.
-
---*/
-
-{
-
-    CH_DMA_CHAN_CONTROL_REGISTER Ctrl;
-    PCH_DMA_CONTROLLER Controller;
-    ULONG DevPtr;
-    ULONG MemPtr;
-
-    Controller = (PCH_DMA_CONTROLLER)ControllerContext;
-    Controller->Channels[ChannelNumber].Active = TRUE;
-
-    //
-    // If this request line exists in the request line config table, use
-    // those values.  Otherwise, use the reset values.
-    //
-
-    Ctrl.AsUlong = 0;
-    if (Controller->ReqConfig.Entries[RequestLine].Valid != 0) {
-        Ctrl.AsUlong = Controller->ReqConfig.Entries[RequestLine].Ctrl.AsUlong;
-    }
-
-    Ctrl.ChannelEnable = 1;
-    Ctrl.InterruptEnable = 1;
-    Ctrl.Loop = (LoopTransfer == FALSE) ? 0 : 1;
-    Ctrl.ReadFromDevice = (WriteToDevice == FALSE) ? 1 : 0;
-
-    //
-    // Request lines numbers reported by BIOS may be offset to make them
-    // globally unique.  Request lines on the controller are based at 0.
-    //
-
-    Ctrl.RequestLine = RequestLine - Controller->MinimumRequestLine;
-    Ctrl.Length = MemoryAddresses->Elements[0].Length;
-
-    DevPtr = DeviceAddress.LowPart;
-    MemPtr = MemoryAddresses->Elements[0].Address.LowPart;
-
-    WriteChannelRegister(Controller,
-                         ChannelNumber,
-                         CH_DMA_CHAN_MEM_PTR,
-                         MemPtr);
-
-    WriteChannelRegister(Controller,
-                         ChannelNumber,
-                         CH_DMA_CHAN_DEV_PTR,
-                         DevPtr);
-
-    //
-    // Channel control is written last as it will enable the channel.
-    //
-
-    WriteChannelRegister(Controller,
-                         ChannelNumber,
-                         CH_DMA_CHAN_CONTROL,
-                         Ctrl.AsUlong);
-}
-
-BOOLEAN
-ChCancelTransfer (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber
-    )
-
-/*++
-
-Routine Description:
-
-    This routine must disable the selected channel.  The channel must not be
-    capable of interrupting for this transfer after being cleared in this way.
-
-Arguments:
-
-    ControllerContext - Supplies a pointer to the controller's internal data.
-
-    ChannelNumber - Supplies the channel number.
-
-Return Value:
-
-    FALSE if the channel is already idle or if the channel is already asserting
-    an interrupt.  TRUE is the channel is active and no interrupt is asserted.
-
---*/
-
-{
-
-    PCH_DMA_CONTROLLER Controller;
-    ULONG StatusRegister;
-
-    Controller = (PCH_DMA_CONTROLLER)ControllerContext;
-
-    //
-    // If the channel is not active (because the interrupt already fired or
-    // because the channel was never programmed, return immediately.
-    //
-
-    if (Controller->Channels[ChannelNumber].Active == FALSE) {
-        return FALSE;
-    }
-
-    //
-    // Disable the channel.
-    //
-
-    WriteChannelRegister(Controller, ChannelNumber, CH_DMA_CHAN_CONTROL, 0);
-
-    //
-    // If an interrupt is already pending on the channel, do nothing.  The
-    // normal interrupt path will complete it.  If an interrupt is not pending
-    // then this was successfully cancelled.  In that case, mark the channel
-    // inactive and return TRUE.
-    //
-
-    StatusRegister = ReadRegister(Controller, CH_DMA_STATUS);
-    if ((StatusRegister & (1UL << ChannelNumber)) != 0) {
-        return FALSE;
-
-    } else {
-        Controller->Channels[ChannelNumber].Active = FALSE;
-        return TRUE;
-    }
-}
-
-NTSTATUS
-AddReqLineConfig (
-    __in PCH_DMA_CONTROLLER Controller,
-    __in PCH_DMA_ADD_REQ_LINE_CONFIG Config
-    )
-
-/*++
-
-Routine Description:
-
-    This routine updates the request line configuration table in the
-    extension's internal data for this controller.
-
-Arguments:
-
-    Controller - Supplies a pointer to the internal data for the controller.
-
-    Config - Supplies a pointer to the configuration to modify.
-
-Return Value:
-
-    STATUS_INVALID_PARAMETER if the request line is invalid.
-    Else, STATUS_SUCCESS.
-
---*/
-
-{
-
-    ULONG RequestLine;
-
-    RequestLine = Config->RequestLine;
-    if ((RequestLine < Controller->MinimumRequestLine) ||
-        (RequestLine > Controller->MaximumRequestLine)) {
-
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    Controller->ReqConfig.Entries[RequestLine].Ctrl.AsUlong =
-        Config->Ctrl.AsUlong;
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS
-ChConfigureChannel (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber,
-    __in ULONG FunctionNumber,
-    __in PVOID Context
-    )
-
-/*++
-
-Routine Description:
-
-    This routine configures the channel for a DMA extension specific operation.
-
-Arguments:
-
-    ControllerContext - Supplies a pointer to the controller's internal data.
-
-    ChannelNumber - Supplies the channel to configure.
-
-    FunctionNumber - Supplies the ID of the operation to perform.
-
-    Context - Supplies parameters for this operation.
-
-Return Value:
-
-    NTSTATUS code.
-
---*/
-
-{
-
-    PCH_DMA_CONTROLLER Controller;
-    NTSTATUS Status;
-
-    UNREFERENCED_PARAMETER(ChannelNumber);
-
-    Controller = (PCH_DMA_CONTROLLER)ControllerContext;
-    switch (FunctionNumber) {
-    case CONFIGURE_ADD_REQ_CONFIG:
-        Status = AddReqLineConfig(Controller,
-                                  (PCH_DMA_ADD_REQ_LINE_CONFIG)Context);
-
-        break;
-    default:
-        Status = STATUS_NOT_IMPLEMENTED;
-    }
-
-    return Status;
-}
-
-VOID
-ChFlushChannel (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber
-    )
-
-/*++
-
-Routine Description:
-
-    This routine flushes a previous transfer from a channel and returns the
-    channel to a state ready for the next ProgramChannel call.
-
-Arguments:
-
-    ControllerContext - Supplies a pointer to the controller's internal data.
-
-    ChannelNumber - Supplies the channel to flush.
-
-Return Value:
-
-    None.
-
---*/
-
-{
-
-    PCH_DMA_CONTROLLER Controller;
-
-    Controller = (PCH_DMA_CONTROLLER)ControllerContext;
-    WriteChannelRegister(Controller, ChannelNumber, CH_DMA_CHAN_CONTROL, 0);
-}
-
-_Success_(return != FALSE)
-BOOLEAN
-ChHandleInterrupt (
-    __in PVOID ControllerContext,
-    __out PULONG ChannelNumber,
-    __out PDMA_INTERRUPT_TYPE InterruptType
-    )
-
-/*++
-
-Routine Description:
-
-    This routine probes a controller for interrupts, clears any interrupts
-    found, fills in channel and interrupt type information.  This routine
-    will be called repeatedly until FALSE is returned.
-
-Arguments:
-
-    ControllerContext - Supplies a pointer to the controller's internal data.
-
-    ChannelNumber - Supplies a placeholder for the extension to fill in which
-        channel is interrupting.
-
-    InterruptType - Supplies a placeholder for the extension to fill in the
-        interrupt type.
-
-Return Value:
-
-    TRUE if an interrupt was found on this controller.
-
-    FALSE otherwise.
-
---*/
-
-{
-
-    PCH_DMA_CONTROLLER Controller;
-    ULONG Index;
-    ULONG StatusRegister;
-
-    Controller = (PCH_DMA_CONTROLLER)ControllerContext;
-    StatusRegister = ReadRegister(Controller, CH_DMA_STATUS);
-    for (Index = 0; Index < Controller->ChannelCount; Index += 1) {
-        if ((StatusRegister & (1UL << Index)) != 0) {
-            *ChannelNumber = Index;
-            *InterruptType = InterruptTypeCompletion;
-            WriteRegister(Controller, CH_DMA_STATUS, (1UL << Index));
-
-            //
-            // If the channel is not marked as active, then this interrupt
-            // is spurious.  Probably this is the result of a transfer being
-            // cancelled.
-            //
-
-            if (Controller->Channels[Index].Active == FALSE) {
-                continue;
-            }
-
-            //
-            // If the channel is not in autoinitialize mode, is it inactive now.
-            // If the channel is in autoinitialize, then it will remain active
-            // until it receives a cancel.
-            //
-
-            if (Controller->Channels[Index].AutoInit == FALSE) {
-                Controller->Channels[Index].Active = FALSE;
-            }
-
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-ULONG ChReadDmaCounter (
-    __in PVOID ControllerContext,
-    __in ULONG ChannelNumber
-    )
-
-/*++
-
-Routine Description:
-
-    This routine determines how many bytes remain to be transferred on the
-    given channel.  If the current transfer is set to loop, this routine
-    will return the number of bytes remaining in the current iteration.
-
-Arguments:
-
-    ControllerContext - Supplies a pointer to the controller's internal data.
-
-    ChannelNumber - Supplies the channel number.
-
-Return Value:
-
-    Returns the number of bytes remaining to be transferred on the given
-    channel.
-
---*/
-
-{
-
-    PCH_DMA_CONTROLLER Controller;
-    CH_DMA_CHAN_CONTROL_REGISTER Ctrl;
-    CH_DMA_CHAN_STATUS_REGISTER StatusReg;
-
-    Controller = (PCH_DMA_CONTROLLER)ControllerContext;
-    Ctrl.AsUlong = ReadChannelRegister(Controller,
-                                       ChannelNumber,
-                                       CH_DMA_CHAN_CONTROL);
-
-    StatusReg.AsUlong = ReadChannelRegister(Controller,
-                                            ChannelNumber,
-                                            CH_DMA_CHAN_STATUS);
-
-    return (Ctrl.Length - StatusReg.BytesTransferred);
-}
-
-NTSTATUS
-RegisterDmaController (
-    __in ULONG Handle,
-    __in PCSRT_RESOURCE_GROUP_HEADER ResourceGroup,
-    __in PCSRT_RESOURCE_DESCRIPTOR_HEADER ResourceDescriptor,
-    __out PULONG ControllerId
-    )
-
-/*++
-
-Routine Description:
-
-    This routine takes a DMA resource descriptor with subtype controller.
-    The controller is then registered with the HAL.
-
-Arguments:
-
-    Handle - Supplies handle passed to extension.
-
-    ResourceGroup - Supplies resource group containing this descriptor.
-
-    ResourceDescrpitor - Supplies the resource descriptor.
-
-    ControllerId - Supplies a placeholder for the controller ID returned from
-        the HAL after registration.
-
-Return Value:
-
-    NTSTATUS Value.
-
---*/
-
-{
-
-    PCH_REQ_LINE_CONFIG ConfigEntry;
-    PCH_REQ_LINE_CONFIG ConfigTableDst;
-    PCH_DMA_ADD_REQ_LINE_CONFIG ConfigTableSrc;
-    CH_DMA_CONTROLLER Controller;
-    PRD_DMA_CONTROLLER DmaDesc;
-    DMA_INITIALIZATION_BLOCK DmaInitBlock;
-    ULONG Index;
-    ULONG RequestLine;
-    NTSTATUS Status;
-
-    RtlZeroMemory(&Controller, sizeof(CH_DMA_CONTROLLER));
-
-    DmaDesc = (PRD_DMA_CONTROLLER)ResourceDescriptor;
-    Controller.ControllerBasePa.QuadPart = DmaDesc->BasePhysicalAddress;
-    Controller.ChannelCount = DmaDesc->ChannelCount;
-    Controller.MinimumRequestLine = DmaDesc->MinimumRequestLine;
-    Controller.MaximumRequestLine = DmaDesc->MaximumRequestLine;
-
-    //
-    // Build request line configuration mapping table.
-    //
-
-    ConfigTableDst = &Controller.ReqConfig.Entries[0];
-    ConfigTableSrc = &DmaDesc->ReqLineConfigs[0];
-
-    //
-    // Verify the supplied configuration description will fit within
-    // the build maximum.
-    //
-
-    if (DmaDesc->ReqLineConfigCount >= CH_DMA_MAX_REQUEST_LINES) {
-        Status = STATUS_INVALID_PARAMETER_1;
-        goto Exit;
-    }
-
-    for (Index = 0; Index < DmaDesc->ReqLineConfigCount; Index += 1) {
-
-        RequestLine = ConfigTableSrc[Index].RequestLine;
-
-        //
-        // Keep PreFast happy that we're assigning within memory bounds
-        //
-
-        if (RequestLine >= CH_DMA_MAX_REQUEST_LINES) {
-            Status = STATUS_INVALID_PARAMETER_2;
-            goto Exit;
-        }
-
-        ConfigEntry = &ConfigTableDst[RequestLine];
-        ConfigEntry->Ctrl.AsUlong = ConfigTableSrc[Index].Ctrl.AsUlong;
-        ConfigEntry->Valid = TRUE;
-    }
-
-    INITIALIZE_DMA_HEADER(&DmaInitBlock);
-    DmaInitBlock.ChannelCount = Controller.ChannelCount;
-    DmaInitBlock.MinimumTransferUnit = 1;
-    DmaInitBlock.MinimumRequestLine = Controller.MinimumRequestLine;
-    DmaInitBlock.MaximumRequestLine = Controller.MaximumRequestLine;
-    DmaInitBlock.CacheCoherent = DmaDesc->CacheCoherent;
-    DmaInitBlock.GeneratesInterrupt = TRUE;
-    DmaInitBlock.InternalData = (PVOID)&Controller;
-    DmaInitBlock.InternalDataSize = sizeof(CH_DMA_CONTROLLER);
-    DmaInitBlock.DmaAddressWidth = 32;
-    DmaInitBlock.Gsi = DmaDesc->InterruptGsi;
-    DmaInitBlock.InterruptPolarity = InterruptActiveHigh;
-    DmaInitBlock.InterruptMode = LevelSensitive;
-    DmaInitBlock.Operations = &ChFunctionTable;
-
-    //
-    // Register physical address space with the HAL.
-    //
-
-    HalRegisterPermanentAddressUsage(Controller.ControllerBasePa,
-                                     CH_DMA_REGISTER_SIZE);
-
-    //
-    // Register controller.
-    //
-
-    Status = RegisterResourceDescriptor(Handle,
-                                        ResourceGroup,
-                                        ResourceDescriptor,
-                                        &DmaInitBlock);
-
-    *ControllerId = DmaInitBlock.ControllerId;
-
-Exit:
-    return Status;
-
-}
-
-NTSTATUS
-RegisterDmaChannel (
-    __in ULONG Handle,
-    __in PCSRT_RESOURCE_GROUP_HEADER ResourceGroup,
-    __in PCSRT_RESOURCE_DESCRIPTOR_HEADER ResourceDescriptor,
-    __in ULONG ControllerId
-    )
-
-/*++
-
-Routine Description:
-
-    This routine takes a DMA resource descriptor with subtype channel.
-    The channel is then registered with the HAL.
-
-Arguments:
-
-    Handle - Supplies handle passed to extension.
-
-    ResourceGroup - Supplies resource group containing this descriptor.
-
-    ResourceDescrpitor - Supplies the resource descriptor.
-
-    ControllerId - Supplies the controller ID this channel is registered with.
-
-Return Value:
-
-    NTSTATUS Value.
-
---*/
-
-{
-
-    DMA_CHANNEL_INITIALIZATION_BLOCK DmaChannelInitBlock;
-    PRD_DMA_CHANNEL DmaDesc;
-
-    NT_ASSERT(ControllerId != 0);
-
-    DmaDesc = (PRD_DMA_CHANNEL)ResourceDescriptor;
-    INITIALIZE_DMA_CHANNEL_HEADER(&DmaChannelInitBlock);
-    DmaChannelInitBlock.ControllerId = ControllerId;
-    DmaChannelInitBlock.GeneratesInterrupt = FALSE;
-    DmaChannelInitBlock.ChannelNumber = DmaDesc->ChannelNumber;
-    DmaChannelInitBlock.CommonBufferLength = 0;
-
-    return RegisterResourceDescriptor(Handle,
-                                      ResourceGroup,
-                                      ResourceDescriptor,
-                                      &DmaChannelInitBlock);
-}
-
-NTSTATUS
-AddResourceGroup (
-    __in ULONG Handle,
-    __in PCSRT_RESOURCE_GROUP_HEADER ResourceGroup
-    )
-
-{
-
-    ULONG ControllerId;
-    PCSRT_RESOURCE_DESCRIPTOR_HEADER ResourceDescriptor;
-
-    ResourceDescriptor = NULL;
-    ControllerId = 0;
-    for (;;) {
-        ResourceDescriptor =
-            GetNextResourceDescriptor(Handle,
-                                      ResourceGroup,
-                                      ResourceDescriptor,
-                                      CSRT_RD_TYPE_DMA,
-                                      CSRT_RD_SUBTYPE_ANY,
-                                      CSRT_RD_UID_ANY);
-
-        if (ResourceDescriptor == NULL) {
-            break;
-        }
-
-        if (ResourceDescriptor->Subtype == CSRT_RD_SUBTYPE_DMA_CONTROLLER) {
-            RegisterDmaController(Handle,
-                                  ResourceGroup,
-                                  ResourceDescriptor,
-                                  &ControllerId);
-
-        } else if (ResourceDescriptor->Subtype == CSRT_RD_SUBTYPE_DMA_CHANNEL) {
-            RegisterDmaChannel(Handle,
-                               ResourceGroup,
-                               ResourceDescriptor,
-                               ControllerId);
-        } else {
-
-            NT_ASSERT(FALSE);
-        }
-    }
-
-    return STATUS_SUCCESS;
-}
diff --git a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.def b/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.def
deleted file mode 100644
index 22ecba00..00000000
--- a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.def
+++ /dev/null
@@ -1,2 +0,0 @@
-LIBRARY HalExtSampleDma
-
diff --git a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.rc b/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.rc
deleted file mode 100644
index 534afafb..00000000
--- a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "verrsrc.h"
-#include <ntverp.h>
-
-#define VER_FILETYPE                VFT_DLL
-#define VER_FILESUBTYPE             VFT_UNKNOWN
-#define VER_FILEDESCRIPTION_STR     "HAL Extension Sample - DMA"
-#define VER_INTERNALNAME_STR        "HalExtSampleDma.DLL"
-#define VER_ORIGINALFILENAME_STR    "HalExtSampleDma.DLL"
-
-#include <common.ver>
diff --git a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.vcxproj b/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.vcxproj
deleted file mode 100644
index 4d7b340c..00000000
--- a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.vcxproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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|Arm">
-      <Configuration>Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Arm">
-      <Configuration>Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7568DCFB-C421-478A-A809-21EF6EC243BE}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Arm</Platform>
-    <SampleGuid>{03525FA0-7E40-493E-AAB7-D8D73FACBC51}</SampleGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <OutDir>$(IntDir)</OutDir>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">HalExtensionInit@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">HalExtensionInit</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">HalExtensionInit@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">HalExtensionInit</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <TargetName>HalExtSampleDma</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <TargetName>HalExtSampleDma</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>%(AdditionalOptions) /J</AdditionalOptions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);halextlib.lib;libcntpr.lib;bufferoverflowfastfailk.lib</AdditionalDependencies>
-      <AdditionalOptions>%(AdditionalOptions)                           -merge:PAGECONST=PAGE                    -merge:INITCONST=INIT                    /LARGEADDRESSAWARE</AdditionalOptions>
-      <ModuleDefinitionFile>HalExtSampleDma.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>%(AdditionalOptions) /J</AdditionalOptions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);halextlib.lib;libcntpr.lib;bufferoverflowfastfailk.lib</AdditionalDependencies>
-      <AdditionalOptions>%(AdditionalOptions)                           -merge:PAGECONST=PAGE                    -merge:INITCONST=INIT                    /LARGEADDRESSAWARE</AdditionalOptions>
-      <ModuleDefinitionFile>HalExtSampleDma.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="HalExtSampleDma.c" />
-    <ResourceCompile Include="HalExtSampleDma.rc" />
-  </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/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.vcxproj.Filters b/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.vcxproj.Filters
deleted file mode 100644
index 0e78975f..00000000
--- a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDma.vcxproj.Filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>{C49AD628-A169-4113-A58C-7869B002B124}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{4066A1BF-4F9E-4F43-B6C3-3DEEDE4A553C}</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>{CD82A108-349C-4687-A02C-C816B6A47307}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="HalExtSampleDma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="HalExtSampleDma.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="HalExtSampleDma.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDmaReadme.txt b/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDmaReadme.txt
deleted file mode 100644
index 05e44648..00000000
--- a/general/HalExtensionSample/HalExtSampleDma/HalExtSampleDmaReadme.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-Copyright (c) 2011 Microsoft Corporation
-
-Author: Cody Hartwig (chartwig) 9-Jun-2011
-
-------
-
-This document describes the chDMA controller.  chDMA is a 32-channel,
-32-request line DMA controller for which a sample HAL extension has been
-implemented.  This document also describes a sample peripheral device and the
-configuration required for use with the DMA controller.
-
-General Controller Information
-==============================
-
-Base Physical Address                     0x70001000
-GSI                                       0x27
-Number of Channels                        32
-Number of Request Lines                   32
-Cache Coherent                            No
-Supports ReadDmaCounter                   Yes
-
-
-Register Layout
-===============
-
-CH_DMA_CONTROL (Offset: 0x00, RW, Reset: 0x00000000)
---------------
-
-This register sets controller-wide settings such as controller enable.
-
-Bit              Function
-31               Controller Enable: 1-enable, 0-disable
-30-0             Reserved
-
-CH_DMA_STATUS (Offset: 0x04, RW1C, Reset: 0x00000000)
--------------
-
-This register describes which channels are currently asserting an interrupt.
-Interrupts are cleared by writing 1 to the appropriate bit.
-
-Bit                 Function
-31                  Channel 31 interrupt status
-30                  Channel 30 interrupt status
-..
-0                   Channel 0 interrupt status
-
-CH_DMA_INTERRUPT_MASK (Offset: 0x08, RW, Reset: 0x00000000)
----------------------
-
-A channel interrupt is unmasked by writing 1 to the corresponding bit in this
-register.
-
-Bit                 Function
-31                  Channel 31 interrupt mask
-30                  Channel 30 interrupt mask
-..
-0                   Channel 0 interrupt mask
-
-CH_DMA_CHANNEL_i_CONTROL (Offset: 0x10 + (i * 0x10), RW, Reset:0x00000000)
-------------------------
-
-This register controls per channel operation of the controller.  A transfer
-may begin once the enable bit is set.  When the enable bit is cleared, the
-current burst is finished and the transfer will stop.
-
-Bit               Function
-31                Enable
-30                Interrupt on completion
-29-28             Device Width:
-                      0b00 - 8-bit
-                      0b01 - 16-bit
-                      0b10 - 32-bit
-                      0b11 - Reserved
-27-26             Burst Size:
-                      0b00 - 1 Word
-                      0b01 - 2 Word
-                      0b10 - 4 Word
-                      0b11 - 8 Word
-25                    Flow Control: 1-enable, 0-disable
-24                    Loop: 1-repeat transfer, 0-transfer once
-23-19             Request line trigger
-18                Transfer Direction: 1-device to mem, 0-mem to device
-17-16             Reserved
-15-0              Transfer Length
-
-CH_DMA_CHANNEL_i_MEM_PTR (Offset: 0x14 + (i * 0x10), RW, Reset: 0x00000000)
-------------------------
-
-This register sets the memory-side address of the transfer.
-
-Bit               Function
-31-0              Memory-side address
-
-CH_DMA_CHANNEL_i_DEV_PTR (Offset: 0x18 + (i * 0x10), RW, Reset: 0x00000000)
-------------------------
-
-This register sets the device-side address of the transfer.
-
-Bit               Function
-31-0              Device-side address
-
-CH_DMA_CHANNEL_i_STATUS (Offset: 0x1c + (i * 0x10), RO, Reset: 0x00000000)
------------------------
-
-This register reports transfer status.
-
-Bit               Function
-31                Channel Busy
-30-16             Reserved
-15-0              Bytes Transferred
-
-
-
-Programming Model
-=================
-Normal operation of the DMA controller is achieved by the following steps:
-
-1. Enable the controller by writing 0x80000000 to the CH_DMA_CONTROL register.
-2. Unmask channel 0's interrupt by or'ing 0x1 with the CH_DMA_INTERRUPT_MASK
-   register
-3. Program the memory-side transfer address into the CH_DMA_CHANNEL_0_MEM_PTR
-   register.
-4. Program the device-side transfer address into the CH_DMA_CHANNEL_0_DEV_PTR
-   register.
-5. Program the CH_DMA_CHANNEL_0_CONTROL register.  This enables the channel.
-
-
-Peripheral Information
-======================
-
-For the purposes of this sample, the chDMA controller is connected to a single
-UAART.  This UART requires the following DMA controller configuration to
-work properly:
-
-Parameter              Value
-Bus Width              8 bits
-Burst Size             1 Word
-Request Line           0x15
-Flow Control           Enabled
diff --git a/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.c b/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.c
deleted file mode 100644
index f45b32b6..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.c
+++ /dev/null
@@ -1,763 +0,0 @@
-/*++
-
-Copyright (c) 2011 Microsoft Corporation
-
-Module Name:
-
-    HalExtSampleTimers.c
-
-Abstract:
-
-    This file implements a HAL Extension Module for the fictitious EGTimer.
-
-Author:
-
-    Evan Green (evgreen) 8-Jan-2011
-
---*/
-
-//
-// ------------------------------------------------------------------- Includes
-//
-
-#include <nthalext.h>
-
-//
-// -------------------------------------------------------------- Specification
-//
-
-//
-// The EGTimer is a fast-access low-latency timer designed for high-performance
-// timekeeping operations. It consists of 4 timers with identical register
-// definitions offset from each other. Each timer contains a 32-bit
-// counter and is capable of generating one-shot or periodic interrupts using
-// a "Reload Value" register. The counter counts up and generates an interrupt
-// once it rolls over from its maximum value of 0xFFFFFFFF to 0 if the
-// interrupt enable bit is set. The counter always runs at a frequency of
-// 10MHz. The register layout of the timer appears below:
-//
-// Offset   Register                    Size
-// 0x00     Timer0_Control              4
-// 0x04     Timer0_ReloadValue          4
-// 0x08     Timer0_CurrentCount         4
-// 0x0C     Timer0_InterruptAcknowledge 4
-// 0x10     Timer1_Control              4
-// 0x14     Timer1_ReloadValue          4
-// 0x18     Timer1_CurrentCount         4
-// 0x1C     Timer1_InterruptAcknowledge 4
-// 0x20     Timer2_Control              4
-// 0x24     Timer2_ReloadValue          4
-// 0x28     Timer2_CurrentCount         4
-// 0x2C     Timer2_InterruptAcknowledge 4
-// 0x30     Timer3_Control              4
-// 0x34     Timer3_ReloadValue          4
-// 0x38     Timer3_CurrentCount         4
-// 0x3C     Timer3_InterruptAcknowledge 4
-//
-// Register Descriptions:
-//
-// TimerN_Control - This is a Read/Write register containing a bitfield of
-//     control values that govern the timer's operation. The initial value of
-//     this register at reset is 0. The defined bits are listed below. 0 should
-//     always be written to undefined bits, and will always be read as 0.
-//
-//     Bit    Function
-//     31-3   Reserved. Read as 0, always write 0 to maintain future
-//                compatibility.
-//
-//     2      Periodic. When set to 1, the timer will automatically reload
-//                itself with the value in the ReloadValue register.
-//                When set to 0, the timer's counter will be disabled by
-//                clearing the "Counter Enabled" bit when it overflows
-//                from 0xFFFFFFFF to 0.
-//
-//     1      Interrupt Enable. When set to 1, the timer will generate an
-//                interrupt when the counter overflows from 0xFFFFFFFF to 0.
-//                When set to 0, the timer will not generate an interrupt upon
-//                overflow.
-//
-//     0      Counter Enable. When set to 1, the counter is enabled and
-//                running. When set to 0, the counter is disable and will not
-//                run.
-//
-// TimerN_ReloadValue - This is a Read/Write register containing the value to
-//     reload the counter with when the timer is in Periodic mode and overflows
-//     from 0xFFFFFFFF to 0.  Writing a value to this register also immediately
-//     writes the same value to the current count register. The initial value
-//     of this register at reset is 0.
-//
-// TimerN_CurrentCount - This is a Read/Write register containg the current
-//     value of the counter. This value can be overwritten at any time. It is
-//     also overwritten by a write to the ReloadValue register. The initial
-//     value of this register at reset is 0.
-//
-// TimerN_InterruptAcknowledge - This is a Read/Write register. On reads, it
-//     returns 1 if an interrupt is pending that has yet to be acknowledged.
-//     Writing a value of 0 clears the pending interrupt. This initial value of
-//     this register at reset is 0.
-//
-
-//
-// ---------------------------------------------------------------- Definitions
-//
-
-//
-// Define the total size of the register block, which is 1 page.
-//
-
-#define EGTIMER_BLOCK_SIZE 0x1000
-
-//
-// Define the size of one timer's registers.
-//
-
-#define EGTIMER_SIZE 0x10
-
-//
-// Define the total number of timers.
-//
-
-#define EGTIMER_COUNT 4
-
-//
-// Define the timer's bit width.
-//
-
-#define EGTIMER_BIT_WIDTH 32
-
-//
-// Define the counter's frequency, in Hertz.
-//
-
-#define EGTIMER_FREQUENCY 10000000
-
-//
-// Define bits for the control register.
-//
-
-#define EGTIMER_CONTROL_ENABLE           0x00000001
-#define EGTIMER_CONTROL_INTERRUPT_ENABLE 0x00000002
-#define EGTIMER_CONTROL_PERIODIC         0x00000004
-
-//
-// ------------------------------------------------------ Data Type Definitions
-//
-
-
-//
-// Define the registers and their offsets, in ULONGs.
-//
-
-typedef enum _EGTIMER_REGISTER {
-    EgTimerControl = 0,
-    EgTimerReloadValue = 1,
-    EgTimerCurrentCount = 2,
-    EgTimerInterruptAcknowledge = 3
-} EGTIMER_REGISTER, *PEGTIMER_REGISTER;
-
-//
-// Define the format of the private data structure. The TimerIndex member
-// allows the extension to pass the same functions for all timer an identify
-// which timer is being referred to.
-//
-
-typedef struct _EGTIMER_DATA {
-    ULONG TimerIndex;
-} EGTIMER_DATA, *PEGTIMER_DATA;
-
-//
-// --------------------------------------------------------------------- Macros
-//
-
-//
-// The following macros are used to read from and write to the timer. The first
-// parameter is the offset from the entire timer block where this timer is
-// found (which timer), and the second parameter is the register to read or
-// write. For the write function, the third parameter is the value to write.
-// READ_REGISTER_ULONG and WRITE_REGISTER_ULONG should always be used to
-// ensure that the proper barriers and flushes are in place for doing direct
-// hardware accesses.
-//
-
-#define READ_EGTIMER(_TimerIndex, _Register)           \
-    READ_REGISTER_ULONG((PULONG)((PUCHAR)EgTimerBase + \
-                                 ((_TimerIndex) * EGTIMER_SIZE)) + (_Register))
-
-#define WRITE_EGTIMER(_TimerIndex, _Register, _Value)                   \
-    WRITE_REGISTER_ULONG((PULONG)((PUCHAR)EgTimerBase +                 \
-                                  ((_TimerIndex) * EGTIMER_SIZE)) +     \
-                                  (_Register),                          \
-                                  _Value)
-
-//
-// ----------------------------------------------- Internal Function Prototypes
-//
-
-NTSTATUS
-EgTimerRegister (
-    __in ULONG Handle,
-    __in PCSRT_RESOURCE_GROUP_HEADER ResourceGroup
-    );
-
-_Function_class_(TIMER_INITIALIZE)
-NTSTATUS
-EgTimerInitialize (
-    __in PVOID TimerData
-    );
-
-_Function_class_(TIMER_QUERY_COUNTER)
-ULONGLONG
-EgTimerQueryCounter (
-    __in PVOID TimerData
-    );
-
-_Function_class_(TIMER_ACKNOWLEDGE_INTERRUPT)
-VOID
-EgTimerAcknowledgeInterrupt (
-    __in PVOID TimerData
-    );
-
-_Function_class_(TIMER_ARM_TIMER)
-NTSTATUS
-EgTimerArm (
-    __in PVOID TimerData,
-    __in TIMER_MODE Mode,
-    __in ULONGLONG TickCount
-    );
-
-_Function_class_(TIMER_STOP)
-VOID
-EgTimerStop (
-    __in PVOID TimerData
-    );
-
-//
-// -------------------------------------------------------------------- Globals
-//
-
-//
-// Define the physical address of the timer block. This information can either
-// be hardcoded like it is here or fetched out of the CSRT resource passed to
-// the extension.
-//
-
-ULONGLONG EgTimerPhysicalAddress = 0x0BADF00D;
-
-//
-// Define the GSIVs for each timer's interrupt. This is also a candidate for
-// information to be retrieved out of the CSRT.
-//
-
-ULONG EgTimerGsi[EGTIMER_COUNT] = {
-    32,
-    33,
-    34,
-    35
-};
-
-//
-// Define the mapped virtual address of the timer block.
-//
-
-PVOID EgTimerBase = NULL;
-
-//
-// ------------------------------------------------------------------ Functions
-//
-
-NTSTATUS
-AddResourceGroup (
-    __in ULONG Handle,
-    __in PCSRT_RESOURCE_GROUP_HEADER ResourceGroup
-    )
-
-/*++
-
-Routine Description:
-
-    This routine identifies and registers all of the Resource Descriptors
-    in the specified Resource Group.
-
-Arguments:
-
-    Handle - Supplies the HAL Extension handle which must be passed to other
-        HAL Extension APIs.
-
-    ResourceGroup - Supplies a pointer to the Resource Group which the
-        HAL Extension has been installed on.
-
-Return Value:
-
-    NTSTATUS code.
-
---*/
-
-{
-
-    NTSTATUS Status;
-
-    //
-    // Register the main timer block.
-    //
-
-    Status = EgTimerRegister(Handle, ResourceGroup);
-    if (!NT_SUCCESS(Status)) {
-        goto AddResourceGroupEnd;
-    }
-
-    Status = STATUS_SUCCESS;
-
-AddResourceGroupEnd:
-    return Status;
-}
-
-//
-// --------------------------------------------------------- Internal Functions
-//
-
-NTSTATUS
-EgTimerRegister (
-    __in ULONG Handle,
-    __in PCSRT_RESOURCE_GROUP_HEADER ResourceGroup
-    )
-
-/*++
-
-Routine Description:
-
-    This routine registers the EG Timer hardware.
-
-Arguments:
-
-    Handle - Supplies the HAL Extension handle which must be passed to other
-        HAL Extension APIs.
-
-    ResourceGroup - Supplies a pointer to the Resource Group which the
-        HAL Extension has been installed on.
-
-Return Value:
-
-    NT status code.
-
---*/
-
-{
-
-    EGTIMER_DATA InternalData;
-    TIMER_INITIALIZATION_BLOCK NewTimer;
-    PHYSICAL_ADDRESS PhysicalAddress;
-    CSRT_RESOURCE_DESCRIPTOR_HEADER ResourceDescriptorHeader;
-    NTSTATUS Status;
-    ULONG TimerIndex;
-
-    //
-    // DEV HACK: Makeup a resource type until we get correct CSRT parsing.
-    //
-
-    ResourceDescriptorHeader.Type = CSRT_RD_TYPE_TIMER;
-    ResourceDescriptorHeader.Subtype = CSRT_RD_SUBTYPE_TIMER;
-    ResourceDescriptorHeader.Length = sizeof(CSRT_RESOURCE_DESCRIPTOR_HEADER);
-
-    //
-    // Register the entire timer block's address usage with the HAL. This
-    // address space should be shown to the HAL as reserved even if the timer
-    // is not going to be registered or used so that the system knows that
-    // region of *physical* address space is occupied.
-    //
-
-    PhysicalAddress.QuadPart = EgTimerPhysicalAddress;
-    Status = HalRegisterPermanentAddressUsage(PhysicalAddress,
-                                              EGTIMER_BLOCK_SIZE);
-
-    if (!NT_SUCCESS(Status)) {
-        goto RegisterEnd;
-    }
-
-    //
-    // Register each timer with the HAL.
-    //
-
-    for (TimerIndex = 0; TimerIndex < EGTIMER_COUNT; TimerIndex += 1) {
-
-        //
-        // Initialize the timer structure.
-        //
-
-        RtlZeroMemory(&NewTimer, sizeof(TIMER_INITIALIZATION_BLOCK));
-        RtlZeroMemory(&InternalData, sizeof(EGTIMER_DATA));
-        INITIALIZE_TIMER_HEADER(&NewTimer);
-        NewTimer.CounterBitWidth = EGTIMER_BIT_WIDTH;
-        NewTimer.CounterFrequency = EGTIMER_FREQUENCY;
-
-        //
-        // Set the pointer to the internal data and its size. The pointer can
-        // be the same for each timer (and a local variable) because a *copy*
-        // of this data will be made for each timer registered. This is the
-        // extensions only chance to dynamically allocate memory.
-        //
-
-        NewTimer.InternalData = &InternalData;
-        NewTimer.InternalDataSize = sizeof(EGTIMER_DATA);
-        NewTimer.Interrupt.Mode = LevelSensitive;
-        NewTimer.Interrupt.Polarity = InterruptActiveHigh;
-
-        //
-        // This must be set to indicate that this is a custom third-party timer.
-        // The HAL will fail the registration if this is not set correctly.
-        //
-
-        NewTimer.KnownType = TimerUnknown;
-
-        //
-        // The timer does not support a divisor. The GSI data can be hardcoded
-        // like it is here or pulled out of the resource from the CSRT table.
-        //
-
-        NewTimer.MaxDivisor = 1;
-        NewTimer.Interrupt.Gsi = EgTimerGsi[TimerIndex];
-        NewTimer.FunctionTable.Initialize = EgTimerInitialize;
-        NewTimer.FunctionTable.QueryCounter = EgTimerQueryCounter;
-        NewTimer.FunctionTable.AcknowledgeInterrupt =
-                                                   EgTimerAcknowledgeInterrupt;
-
-        NewTimer.FunctionTable.ArmTimer = EgTimerArm;
-        NewTimer.FunctionTable.Stop = EgTimerStop;
-        NewTimer.Capabilities = TIMER_COUNTER_READABLE |
-                                TIMER_ONE_SHOT_CAPABLE |
-                                TIMER_PERIODIC_CAPABLE |
-                                TIMER_GENERATES_LINE_BASED_INTERRUPTS;
-
-        InternalData.TimerIndex = TimerIndex;
-        ResourceDescriptorHeader.Uid = TimerIndex;
-        Status = RegisterResourceDescriptor(Handle,
-                                            ResourceGroup,
-                                            &ResourceDescriptorHeader,
-                                            &NewTimer);
-
-        if (!NT_SUCCESS(Status)) {
-            goto RegisterEnd;
-        }
-    }
-
-    Status = STATUS_SUCCESS;
-
-RegisterEnd:
-    return Status;
-}
-
-_Function_class_(TIMER_INITIALIZE)
-NTSTATUS
-EgTimerInitialize (
-    __in PVOID TimerData
-    )
-
-/*++
-
-Routine Description:
-
-    This routine is responsible for initializing the timer hardware. This is
-    guaranteed to be the first timer routine called by the HAL. It must prepare
-    the timer for use by beginning the timer's counter ticking if the counter
-    is readable, setting the intial input clock divisor to 1 if applicable,
-    and masking all interrupts. If the timer's stop routine is called, this
-    routine will be called before the timer is queried or armed again. It will
-    not be called between every rearming of the timer.
-
-    This routine will not be called concurrently with any other calls to
-    this HAL Timer extension. For per-processor timers, this routine will be
-    called once on each processor. A failure on any processor blocks the timer's
-    use on all processors.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context. The contents
-        of this pointer were specified when the timer was initially registered,
-        and may be modified inside this routine. The HAL does not interpret any
-        data deferenced from this pointer.
-
-Return Value:
-
-    Returns an NT status code indicating success or failure. If a successful
-    status code is returned then the HAL may subsequently call further routines
-    in this HAL extension to query or arm the timer. If a failure code is
-    returned, this HAL extension will not attempt to use this timer unless the
-    Initialize routine is called again and succeeds.
-
---*/
-
-{
-
-    PHYSICAL_ADDRESS PhysicalAddress;
-    ULONG RegisterValue;
-    NTSTATUS Status;
-    PEGTIMER_DATA Timer;
-
-    Timer = (PEGTIMER_DATA)TimerData;
-
-    //
-    // Map the timer if no one has done that yet.
-    //
-
-    if (EgTimerBase == NULL) {
-        PhysicalAddress.QuadPart = EgTimerPhysicalAddress;
-        EgTimerBase = HalMapIoSpace(PhysicalAddress,
-                                    EGTIMER_BLOCK_SIZE,
-                                    MmNonCached);
-
-        if (EgTimerBase == NULL) {
-            Status = STATUS_INSUFFICIENT_RESOURCES;
-            goto InitializeEnd;
-        }
-    }
-
-    //
-    // Start the counter ticking in free running mode, and mask all interrupts.
-    // The counter doesn't necessarily need to be reset to 0.
-    //
-
-    WRITE_EGTIMER(Timer->TimerIndex, EgTimerReloadValue, 0);
-    RegisterValue = EGTIMER_CONTROL_ENABLE | EGTIMER_CONTROL_PERIODIC;
-    WRITE_EGTIMER(Timer->TimerIndex, EgTimerControl, RegisterValue);
-    Status = STATUS_SUCCESS;
-
-InitializeEnd:
-    return Status;
-}
-
-_Function_class_(TIMER_QUERY_COUNTER)
-ULONGLONG
-EgTimerQueryCounter (
-    __in PVOID TimerData
-    )
-
-/*++
-
-Routine Description:
-
-    This routine queries the timer hardware and retrieves the current counter
-    value.
-
-    Timers are assumed to always count *up*. If the actual timer hardware counts
-    down, then this routine should subtract the current count from the maximum
-    counter value so that values appear to count up. This routine may be called
-    concurrently on multiple processors and must be reentrant. This routine is
-    extremely performance sensitive, as it may be used to back the system
-    performance counter.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context, whose
-        initial content was supplied when the timer was registered.
-
-Return Value:
-
-    Returns the hardware's current count.
-
---*/
-
-{
-
-    PEGTIMER_DATA Timer;
-
-    Timer = (PEGTIMER_DATA)TimerData;
-
-    return READ_EGTIMER(Timer->TimerIndex, EgTimerCurrentCount);
-}
-
-_Function_class_(TIMER_ACKNOWLEDGE_INTERRUPT)
-VOID
-EgTimerAcknowledgeInterrupt (
-    __in PVOID TimerData
-    )
-
-/*++
-
-Routine Description:
-
-    This routine performs any actions necessary to acknowledge and quiesce a
-    timer interrupt. For per-processor timers, this routine may be called
-    concurrently on multiple processors. This routine will be called on every
-    timer interrupt at the hardware priority level of that interrupt, so this
-    routine is extremely performance sensitive. For timers running in
-    pseudo-periodic mode, this routine must rearm the timer for the same
-    interval as it was armed with without introducing delay into the interrupt
-    interval. Only deadline-based timers support pseudo-periodic mode.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context, whose
-        initial content was supplied when the timer was registered.
-
-Return Value:
-
-    None.
-
---*/
-
-{
-
-    PEGTIMER_DATA Timer;
-
-    Timer = (PEGTIMER_DATA)TimerData;
-
-    //
-    // Acknowledge the interrupt by writing to the interrupt acknowledge
-    // register.
-    //
-
-    WRITE_EGTIMER(Timer->TimerIndex, EgTimerInterruptAcknowledge, 0);
-    return;
-}
-
-_Function_class_(TIMER_ARM_TIMER)
-NTSTATUS
-EgTimerArm (
-    __in PVOID TimerData,
-    __in TIMER_MODE Mode,
-    __in ULONGLONG TickCount
-    )
-
-/*++
-
-Routine Description:
-
-    This routine arms a timer to fire an interrupt after the given number of
-    timer ticks. For timers that only interrupt on rollovers, this simply
-    enables the interrupt, the tick count parameter is ignored. If the timer
-    is currently armed for a different mode or tick count, this call is
-    expected to replace that programming. This routine will not get called
-    concurrently with other timer calls, except on per-processor timers, where
-    it may get called concurrently on different processors.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context, whose
-        initial content was supplied when the timer was registered.
-
-    Mode - Supplies the mode to arm the timer in, which will be one of the
-        modes the HAL extension advertised support for when registering the
-        timer. The modes are as follows:
-
-        OneShot - Arms the timer to fire the given number of ticks from now.
-            Only one interrupt is expected to come in. The HAL does not make
-            assumptions on whether or not the expiration of this interrupt
-            causes the counter to stop. The Query Counter routine will not be
-            called while a timer is armed to fire an interrupt.
-
-        Periodic - Arms the timer to fire periodically with an interval of the
-            given number of ticks. The first interrupt should happen
-            approximately the given number of ticks from when the arm timer
-            function was invoked.
-
-        PseudoPeriodic - Arms the timer with the same functional behavior as
-            periodic mode, with the knowledge that the timer will have to rearm
-            itself during the acknowledge interrupt routine. This mode is
-            expected to have slightly worse performance than pure periodic mode,
-            but is expected to generate periodic interrupts at the exact rate
-            specified.
-
-    TickCount - Supplies the number of ticks from now that the timer should
-        assert its interrupt in. For timers that are only capable of
-        interrupting on rollovers from their maximum value to 0, this parameter
-        is ignored.
-
-Return Value:
-
-    Returns and NTSTATUS code indicating success or failure. If the timer
-    returns success, then the interrupt is expected to come in the specified
-    number of ticks from when the function was called, with a tolerance of
-    however long the function took to execute. If the routine fails, then no
-    timer routines will be called again until the timer Initialize routine is
-    called again and succeeds. In most cases, returning a failure code results
-    in a system bugcheck.
-
---*/
-
-{
-
-    ULONG ControlRegister;
-    PEGTIMER_DATA Timer;
-
-    Timer = (PEGTIMER_DATA)TimerData;
-
-    NT_ASSERT(TickCount != 0);
-    NT_ASSERT(TickCount <= 0xFFFFFFFF);
-    NT_ASSERT(Mode != TimerModePseudoPeriodic);
-
-    //
-    // This will never occur.
-    //
-
-    if ((TickCount > 0xFFFFFFFF) || (TickCount == 0)) {
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    ControlRegister = EGTIMER_CONTROL_ENABLE | EGTIMER_CONTROL_INTERRUPT_ENABLE;
-    if (Mode == TimerModePeriodic) {
-        ControlRegister |= EGTIMER_CONTROL_PERIODIC;
-    }
-
-    //
-    // Disable the timer while it's being programmed to avoid spurious
-    // interrupts.
-    //
-
-    WRITE_EGTIMER(Timer->TimerIndex, EgTimerControl, 0);
-
-    //
-    // Write the reload register to set both the current count value and the
-    // reload value if the interrupt is periodic.
-    //
-
-    WRITE_EGTIMER(Timer->TimerIndex,
-                  EgTimerReloadValue,
-                  0 - (ULONG)TickCount);
-
-    //
-    // Enable the timer.
-    //
-
-    WRITE_EGTIMER(Timer->TimerIndex, EgTimerControl, ControlRegister);
-    return STATUS_SUCCESS;
-}
-
-_Function_class_(TIMER_STOP)
-VOID
-EgTimerStop (
-    __in PVOID TimerData
-    )
-
-/*++
-
-Routine Description:
-
-    This routine stops a timer from ticking. After this function returns, the
-    timer should not generate any more interrupts, and reads to its counter
-    might return the same value every time.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context, whose
-        initial content was supplied when the timer was registered.
-
-Return Value:
-
-    None, this function must succeed.
-
---*/
-
-{
-
-    PEGTIMER_DATA Timer;
-
-    Timer = (PEGTIMER_DATA)TimerData;
-
-    //
-    // All that technically needs to be done to stop the timer from firing is
-    // to clear the interrupt enable bit. Stopping the timer entirely works too.
-    //
-
-    WRITE_EGTIMER(Timer->TimerIndex, EgTimerControl, 0);
-    return;
-}
-
diff --git a/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.def b/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.def
deleted file mode 100644
index 786620d2..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.def
+++ /dev/null
@@ -1,2 +0,0 @@
-LIBRARY HalExtSampleTimers
-
diff --git a/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.rc b/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.rc
deleted file mode 100644
index 89069fbd..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "verrsrc.h"
-#include <ntverp.h>
-
-#define VER_FILETYPE                VFT_DLL
-#define VER_FILESUBTYPE             VFT_UNKNOWN
-#define VER_FILEDESCRIPTION_STR     "HAL Extension Sample - Timers"
-#define VER_INTERNALNAME_STR        "HalExtSampleTimers.DLL"
-#define VER_ORIGINALFILENAME_STR    "HalExtSampleTimers.DLL"
-
-#include <common.ver>
diff --git a/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.vcxproj b/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.vcxproj
deleted file mode 100644
index f03fae0d..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.vcxproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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|Arm">
-      <Configuration>Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Arm">
-      <Configuration>Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{708FC03F-4440-4AF4-B68F-5ADE99A0690B}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Arm</Platform>
-    <SampleGuid>{74DA088F-D0F8-4839-9BFF-3C72F7D46E64}</SampleGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <OutDir>$(IntDir)</OutDir>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">HalExtensionInit@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">HalExtensionInit</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">HalExtensionInit@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">HalExtensionInit</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <TargetName>HalExtSampleTimers</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <TargetName>HalExtSampleTimers</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>%(AdditionalOptions) /J</AdditionalOptions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);halextlib.lib;libcntpr.lib;bufferoverflowfastfailk.lib</AdditionalDependencies>
-      <AdditionalOptions>%(AdditionalOptions)                           -merge:PAGECONST=PAGE                    -merge:INITCONST=INIT                    /LARGEADDRESSAWARE</AdditionalOptions>
-      <ModuleDefinitionFile>HalExtSampleTimers.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>%(AdditionalOptions) /J</AdditionalOptions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);halextlib.lib;libcntpr.lib;bufferoverflowfastfailk.lib</AdditionalDependencies>
-      <AdditionalOptions>%(AdditionalOptions)                           -merge:PAGECONST=PAGE                    -merge:INITCONST=INIT                    /LARGEADDRESSAWARE</AdditionalOptions>
-      <ModuleDefinitionFile>HalExtSampleTimers.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="HalExtSampleTimers.c" />
-    <ResourceCompile Include="HalExtSampleTimers.rc" />
-  </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/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.vcxproj.Filters b/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.vcxproj.Filters
deleted file mode 100644
index 3948916a..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers/HalExtSampleTimers.vcxproj.Filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>{5E4E1ADC-DD92-4AFF-B021-09A73A1D08DF}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{E29262B9-C497-404D-A5E0-5E6064005E48}</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>{E3A98D78-1B54-4D53-AFC0-D44C9D37EC38}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="HalExtSampleTimers.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="HalExtSampleTimers.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="HalExtSampleTimers.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.c b/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.c
deleted file mode 100644
index 9a580fea..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.c
+++ /dev/null
@@ -1,825 +0,0 @@
-/*++
-
-Copyright (c) 2011 Microsoft Corporation
-
-Module Name:
-
-    HalExtSampleTimers2.c
-
-Abstract:
-
-    This file implements a HAL Extension Module for the fictitious EG2Timer.
-
-Author:
-
-    Evan Green (evgreen) 8-Jan-2011
-
---*/
-
-//
-// ------------------------------------------------------------------- Includes
-//
-
-#include <nthalext.h>
-
-//
-// -------------------------------------------------------------- Specification
-//
-
-//
-// The EG2Timer is a fast-access low latency deadline-based timer designed
-// for high-performance timekeeping operations. It consists of one counter
-// counter and three match registers against that counter. Each match register
-// consists of a 32-bit value that is compared on each clock cycle to the
-// current count value. If the values match and the match register is enabled
-// for generating an interrupt, an edge triggered interrupt will be fired. The
-// register can also be configured with an "interval" value such that the
-// match register is automatically moved forward by the given interval to
-// generate periodic interrupts. The main counter is 32 bits and runs at 15MHz.
-// The register layout of the timer block appears below.
-//
-// Offset   Register                   Size
-// 0x00     GlobalControl              4
-// 0x04     CounterValue               4
-// 0x08     Timer0_Match               4
-// 0x0C     Timer0_Interval            4
-// 0x10     Timer0_Control             4
-// 0x14     Timer1_Match               4
-// 0x18     Timer1_Interval            4
-// 0x1C     Timer1_Control             4
-// 0x20     Timer2_Match               4
-// 0x24     Timer2_Interval            4
-// 0x28     Timer2_Control             4
-//
-// Register Descriptions:
-//
-// GlobalControl - Controls global state relating to the timer block. On reset,
-//     this register's value is 0. This register is Read/Write.
-//
-//     Bit    Function
-//     31-1   Reserved. Read as 0, always write 0 to maintain future
-//                compatibility.
-//
-//     0      Enabled. When set to 1, the main counter is enabled and will
-//                count. When set to 0, the main counter is disabled and will
-//                not run.
-//
-// CounterValue - A Read/Write register containing the current value of the
-//     counter. Writes to this register must be done with caution as they do
-//     not alter or adjust the contents of the match registers. On reset, the
-//     value of this register is 0.
-//
-// TimerN_Match - A Read/Write register that contains the match value that this
-//     interrupt is primed against. When the global counter equals the match
-//     value, an interrupt will be generated. If the interrupt is set for
-//     periodic mode, the Interval value will be automatically added to the
-//     match value when the interrupt occurs. On reset, the value of this
-//     register is 0.
-//
-// TimerN_Interval - A Read/Write register that contains the periodic interval
-//     to add to the match register if the interrupt is armed for periodic
-//     mode. On reset, the value of this register is 0.
-//
-// TimerN_Control - A Read/Write register containing a bitfield that controls
-//     the behavior of the match register and associated interrupt. On reset,
-//     the value of this register is 0.
-//
-//     Bit    Function
-//     31-2   Reserved. Read as 0, always write 0 to maintain future
-//                compatibility.
-//
-//     1      Periodic. When set to 1, the value in the Interval register will
-//                automatically be added to the value in the Match register and
-//                written back to the Match register when a match occurs. When
-//                set to 0, the Match register will not change when a match
-//                occurs.
-//
-//     0      InterruptEnable. When set to 1, an interrupt will be generated
-//                when a match occurs. When set to 0, no interrupt will be
-//                generated when a match occurs. The periodic bit is still live
-//                however, the Match register will continue to get accumulated
-//                with the Interval register on matches.
-//
-
-//
-// ---------------------------------------------------------------- Definitions
-//
-
-//
-// Define the total size of the register block, which is 1 page.
-//
-
-#define EG2TIMER_BLOCK_SIZE 0x1000
-
-//
-// Define the size of one timer's match register block, in ULONGs.
-//
-
-#define EG2MATCH_SIZE 3
-
-//
-// Define the total number of match registers.
-//
-
-#define EG2MATCH_COUNT 3
-
-//
-// Define the timer's bit width.
-//
-
-#define EG2TIMER_BIT_WIDTH 32
-
-//
-// Define the counter's frequency, in Hertz.
-//
-
-#define EG2TIMER_FREQUENCY 15000000
-
-//
-// Define the global control bits.
-//
-
-#define EG2TIMER_GLOBAL_CONTROL_ENABLE    0x00000001
-
-//
-// Define bits for the control register.
-//
-
-#define EG2TIMER_MATCH_INTERRUPT_ENABLE 0x00000001
-#define EG2TIMER_MATCH_PERIODIC         0x00000002
-
-//
-// Define the special offset used to indicate this timer is the counter
-// itself.
-//
-
-#define EG2TIMER_COUNTER_OFFSET 0xFFFFFFFF
-
-//
-// ------------------------------------------------------ Data Type Definitions
-//
-
-
-//
-// Define the registers and their offsets, in ULONGs.
-//
-
-typedef enum _EG2TIMER_REGISTER {
-    Eg2TimerGlobalControl = 0,
-    Eg2TimerCurrentCount = 1,
-    Eg2TimerMatch = 2,
-    Eg2TimerInterval = 3,
-    Eg2TimerControl = 4
-} EG2TIMER_REGISTER, *PEG2TIMER_REGISTER;
-
-//
-// Define the format of the private data structure. The offset member stores the
-// offset to the match register, in ULONGs. The value 0 is reserved for the
-// global counter.
-//
-
-typedef struct _EG2TIMER_DATA {
-    ULONG Offset;
-    TIMER_MODE Mode;
-    ULONG Period;
-} EG2TIMER_DATA, *PEG2TIMER_DATA;
-
-//
-// --------------------------------------------------------------------- Macros
-//
-
-//
-// The following macros are used to read from and write to the timer. The first
-// parameter is the offset in ULONGs to apply to the requested register. The
-// second parameter is the register to read or write. For write functions, the
-// third parameter is the value to write.
-//
-// READ_REGISTER_ULONG and WRITE_REGISTER_ULONG should always be used to
-// ensure that the proper barriers and flushes are in place for doing direct
-// hardware accesses.
-//
-
-#define READ_EG2TIMER(_TimerOffset, _Register)           \
-    READ_REGISTER_ULONG((PULONG)Eg2TimerBase + (_TimerOffset) + (_Register))
-
-#define WRITE_EG2TIMER(_TimerOffset, _Register, _Value)                       \
-    WRITE_REGISTER_ULONG((PULONG)Eg2TimerBase + (_TimerOffset) + (_Register), \
-                         (_Value))
-
-//
-// ----------------------------------------------- Internal Function Prototypes
-//
-
-NTSTATUS
-Eg2TimerRegister (
-    __in ULONG Handle,
-    __in PCSRT_RESOURCE_GROUP_HEADER ResourceGroup
-    );
-
-_Function_class_(TIMER_INITIALIZE)
-NTSTATUS
-Eg2TimerInitialize (
-    __in PVOID TimerData
-    );
-
-_Function_class_(TIMER_QUERY_COUNTER)
-ULONGLONG
-Eg2TimerQueryCounter (
-    __in PVOID TimerData
-    );
-
-_Function_class_(TIMER_ACKNOWLEDGE_INTERRUPT)
-VOID
-Eg2TimerAcknowledgeInterrupt (
-    __in PVOID TimerData
-    );
-
-_Function_class_(TIMER_ARM_TIMER)
-NTSTATUS
-Eg2TimerArm (
-    __in PVOID TimerData,
-    __in TIMER_MODE Mode,
-    __in ULONGLONG TickCount
-    );
-
-_Function_class_(TIMER_STOP)
-VOID
-Eg2TimerStop (
-    __in PVOID TimerData
-    );
-
-//
-// -------------------------------------------------------------------- Globals
-//
-
-//
-// Define the physical address of the timer block. This information can either
-// be hardcoded like it is here or fetched out of the CSRT resource passed to
-// the extension.
-//
-
-ULONGLONG Eg2TimerPhysicalAddress = 0xBEEF7AC0;
-
-//
-// Define the GSIVs for each timer's interrupt. This is also a candidate for
-// information to be retrieved out of the CSRT.
-//
-
-ULONG Eg2TimerGsi[EG2MATCH_COUNT] = {
-    40,
-    41,
-    42,
-};
-
-//
-// Define the mapped virtual address of the timer block.
-//
-
-PVOID Eg2TimerBase = NULL;
-
-//
-// ------------------------------------------------------------------ Functions
-//
-
-NTSTATUS
-AddResourceGroup (
-    __in ULONG Handle,
-    __in PCSRT_RESOURCE_GROUP_HEADER ResourceGroup
-    )
-
-/*++
-
-Routine Description:
-
-    This routine identifies and registers all of the Resource Descriptors
-    in the specified Resource Group.
-
-Arguments:
-
-    Handle - Supplies the HAL Extension handle which must be passed to other
-        HAL Extension APIs.
-
-    ResourceGroup - Supplies a pointer to the Resource Group which the
-        HAL Extension has been installed on.
-
-Return Value:
-
-    NTSTATUS code.
-
---*/
-
-{
-
-    NTSTATUS Status;
-
-    //
-    // Register the main timer block.
-    //
-
-    Status = Eg2TimerRegister(Handle, ResourceGroup);
-    if (!NT_SUCCESS(Status)) {
-        goto AddResourceGroupEnd;
-    }
-
-    Status = STATUS_SUCCESS;
-
-AddResourceGroupEnd:
-    return Status;
-}
-
-//
-// --------------------------------------------------------- Internal Functions
-//
-
-NTSTATUS
-Eg2TimerRegister (
-    __in ULONG Handle,
-    __in PCSRT_RESOURCE_GROUP_HEADER ResourceGroup
-    )
-
-/*++
-
-Routine Description:
-
-    This routine registers the EG2 Timer hardware.
-
-Arguments:
-
-    Handle - Supplies the HAL Extension handle which must be passed to other
-        HAL Extension APIs.
-
-    ResourceGroup - Supplies a pointer to the Resource Group which the
-        HAL Extension has been installed on.
-
-Return Value:
-
-    NT status code.
-
---*/
-
-{
-
-    EG2TIMER_DATA InternalData;
-    TIMER_INITIALIZATION_BLOCK NewTimer;
-    PHYSICAL_ADDRESS PhysicalAddress;
-    CSRT_RESOURCE_DESCRIPTOR_HEADER ResourceDescriptorHeader;
-    NTSTATUS Status;
-    ULONG TimerIndex;
-
-    //
-    // DEV HACK: Makeup a resource type until we get correct CSRT parsing.
-    //
-
-    ResourceDescriptorHeader.Type = CSRT_RD_TYPE_TIMER;
-    ResourceDescriptorHeader.Subtype = CSRT_RD_SUBTYPE_TIMER;
-    ResourceDescriptorHeader.Length = sizeof(CSRT_RESOURCE_DESCRIPTOR_HEADER);
-
-    //
-    // Register the entire timer block's address usage with the HAL. This
-    // address space should be shown to the HAL as reserved even if the timer
-    // is not going to be registered or used so that the system knows that
-    // region of *physical* address space is occupied.
-    //
-
-    PhysicalAddress.QuadPart = Eg2TimerPhysicalAddress;
-    Status = HalRegisterPermanentAddressUsage(PhysicalAddress,
-                                              EG2TIMER_BLOCK_SIZE);
-
-    if (!NT_SUCCESS(Status)) {
-        goto RegisterEnd;
-    }
-
-    //
-    // Register the main counter as a non-interrupt generating timer, as it can
-    // be used completely independently of the match registers as long as it
-    // is never written to.
-    //
-
-    RtlZeroMemory(&NewTimer, sizeof(TIMER_INITIALIZATION_BLOCK));
-    RtlZeroMemory(&InternalData, sizeof(EG2TIMER_DATA));
-    INITIALIZE_TIMER_HEADER(&NewTimer);
-    NewTimer.CounterBitWidth = EG2TIMER_BIT_WIDTH;
-    NewTimer.CounterFrequency = EG2TIMER_FREQUENCY;
-
-    //
-    // Set the pointer to the internal data and its size. The pointer can
-    // be the same for each timer (and a local variable) because a *copy*
-    // of this data will be made for each timer registered. This is the
-    // extensions only chance to dynamically allocate memory.
-    //
-
-    NewTimer.InternalData = &InternalData;
-    NewTimer.InternalDataSize = sizeof(EG2TIMER_DATA);
-    NewTimer.Interrupt.Mode = Latched;
-    NewTimer.Interrupt.Polarity = InterruptActiveHigh;
-
-    //
-    // This must be set to indicate that this is a custom third-party timer.
-    // The HAL will fail the registration if this is not set correctly.
-    //
-
-    NewTimer.KnownType = TimerUnknown;
-
-    //
-    // The timer does not support a divisor. The GSI data can be hardcoded
-    // like it is here or pulled out of the resource from the CSRT table.
-    // Filling in extra functions doesn't hurt as the HAL will never call
-    // anything but Initialize and QueryCounter on timers that don't
-    // generate interrupts.
-    //
-
-    NewTimer.MaxDivisor = 1;
-    NewTimer.FunctionTable.Initialize = Eg2TimerInitialize;
-    NewTimer.FunctionTable.QueryCounter = Eg2TimerQueryCounter;
-    NewTimer.FunctionTable.AcknowledgeInterrupt = Eg2TimerAcknowledgeInterrupt;
-    NewTimer.FunctionTable.ArmTimer = Eg2TimerArm;
-    NewTimer.FunctionTable.Stop = Eg2TimerStop;
-    NewTimer.Capabilities = TIMER_COUNTER_READABLE;
-    InternalData.Offset = EG2TIMER_COUNTER_OFFSET;
-    ResourceDescriptorHeader.Uid = EG2TIMER_COUNTER_OFFSET;
-    Status = RegisterResourceDescriptor(Handle,
-                                        ResourceGroup,
-                                        &ResourceDescriptorHeader,
-                                        &NewTimer);
-
-    if (!NT_SUCCESS(Status)) {
-        goto RegisterEnd;
-    }
-
-
-    //
-    // Register each match register as a separate non-readable timer with the
-    // HAL. Since this timer is deadline-based, it can do pseudo-periodic
-    // mode and lossless rate transitions.
-    //
-
-    NewTimer.Capabilities = TIMER_ONE_SHOT_CAPABLE |
-                            TIMER_PERIODIC_CAPABLE |
-                            TIMER_PSEUDO_PERIODIC_CAPABLE |
-                            TIMER_GENERATES_LINE_BASED_INTERRUPTS;
-
-    for (TimerIndex = 0; TimerIndex < EG2MATCH_COUNT; TimerIndex += 1) {
-        NewTimer.Interrupt.Gsi = Eg2TimerGsi[TimerIndex];
-        InternalData.Offset = EG2MATCH_SIZE * TimerIndex;
-        ResourceDescriptorHeader.Uid = EG2MATCH_SIZE * TimerIndex;
-        Status = RegisterResourceDescriptor(Handle,
-                                            ResourceGroup,
-                                            &ResourceDescriptorHeader,
-                                            &NewTimer);
-
-        if (!NT_SUCCESS(Status)) {
-            goto RegisterEnd;
-        }
-    }
-
-    Status = STATUS_SUCCESS;
-
-RegisterEnd:
-    return Status;
-}
-
-_Function_class_(TIMER_INITIALIZE)
-NTSTATUS
-Eg2TimerInitialize (
-    __in PVOID TimerData
-    )
-
-/*++
-
-Routine Description:
-
-    This routine is responsible for initializing the timer hardware. This is
-    guaranteed to be the first timer routine called by the HAL. It must prepare
-    the timer for use by beginning the timer's counter ticking if the counter
-    is readable, setting the intial input clock divisor to 1 if applicable,
-    and masking all interrupts. If the timer's stop routine is called, this
-    routine will be called before the timer is queried or armed again. It will
-    not be called between every rearming of the timer.
-
-    This routine will not be called concurrently with any other calls to
-    this HAL Timer extension. For per-processor timers, this routine will be
-    called once on each processor. A failure on any processor blocks the timer's
-    use on all processors.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context. The contents
-        of this pointer were specified when the timer was initially registered,
-        and may be modified inside this routine. The HAL does not interpret any
-        data deferenced from this pointer.
-
-Return Value:
-
-    Returns an NT status code indicating success or failure. If a successful
-    status code is returned then the HAL may subsequently call further routines
-    in this HAL extension to query or arm the timer. If a failure code is
-    returned, this HAL extension will not attempt to use this timer unless the
-    Initialize routine is called again and succeeds.
-
---*/
-
-{
-
-    PHYSICAL_ADDRESS PhysicalAddress;
-    NTSTATUS Status;
-    PEG2TIMER_DATA Timer;
-
-    Timer = (PEG2TIMER_DATA)TimerData;
-
-    //
-    // Map the timer if no one has done that yet.
-    //
-
-    if (Eg2TimerBase == NULL) {
-        PhysicalAddress.QuadPart = Eg2TimerPhysicalAddress;
-        Eg2TimerBase = HalMapIoSpace(PhysicalAddress,
-                                     EG2TIMER_BLOCK_SIZE,
-                                     MmNonCached);
-
-        if (Eg2TimerBase == NULL) {
-            Status = STATUS_INSUFFICIENT_RESOURCES;
-            goto InitializeEnd;
-        }
-    }
-
-    //
-    // Start the counter ticking in free running mode, and mask all interrupts.
-    // The counter must *not* be reset here, otherwise an Initialize call on the
-    // counter would affect the match register timers, which as far as the HAL
-    // is concerned are completely independent from one another.
-    //
-
-    WRITE_EG2TIMER(0, Eg2TimerGlobalControl, EG2TIMER_GLOBAL_CONTROL_ENABLE);
-    if (Timer->Offset != EG2TIMER_COUNTER_OFFSET) {
-        WRITE_EG2TIMER(Timer->Offset, Eg2TimerControl, 0);
-    }
-
-    Status = STATUS_SUCCESS;
-
-InitializeEnd:
-    return Status;
-}
-
-_Function_class_(TIMER_QUERY_COUNTER)
-ULONGLONG
-Eg2TimerQueryCounter (
-    __in PVOID TimerData
-    )
-
-/*++
-
-Routine Description:
-
-    This routine queries the timer hardware and retrieves the current counter
-    value.
-
-    Timers are assumed to always count *up*. If the actual timer hardware counts
-    down, then this routine should subtract the current count from the maximum
-    counter value so that values appear to count up. This routine may be called
-    concurrently on multiple processors and must be reentrant. This routine is
-    extremely performance sensitive, as it may be used to back the system
-    performance counter.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context, whose
-        initial content was supplied when the timer was registered.
-
-Return Value:
-
-    Returns the hardware's current count.
-
---*/
-
-{
-
-    PEG2TIMER_DATA Timer;
-
-    Timer = (PEG2TIMER_DATA)TimerData;
-
-    NT_ASSERT(Timer->Offset == EG2TIMER_COUNTER_OFFSET);
-
-    return READ_EG2TIMER(Timer->Offset, Eg2TimerCurrentCount);
-}
-
-_Function_class_(TIMER_ACKNOWLEDGE_INTERRUPT)
-VOID
-Eg2TimerAcknowledgeInterrupt (
-    __in PVOID TimerData
-    )
-
-/*++
-
-Routine Description:
-
-    This routine performs any actions necessary to acknowledge and quiesce a
-    timer interrupt. For per-processor timers, this routine may be called
-    concurrently on multiple processors. This routine will be called on every
-    timer interrupt at the hardware priority level of that interrupt, so this
-    routine is extremely performance sensitive. For timers running in
-    pseudo-periodic mode, this routine must rearm the timer for the same
-    interval as it was armed with without introducing delay into the interrupt
-    interval. Only deadline-based timers support pseudo-periodic mode.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context, whose
-        initial content was supplied when the timer was registered.
-
-Return Value:
-
-    None.
-
---*/
-
-{
-
-    ULONG MatchValue;
-    PEG2TIMER_DATA Timer;
-
-    //
-    // No action is necessary here as far as acknowledging the interrupt.
-    // If the current mode is pseudo-periodic, the next interrupt must be
-    // armed now.
-    //
-
-    Timer = (PEG2TIMER_DATA)TimerData;
-
-    NT_ASSERT(Timer->Offset != EG2TIMER_COUNTER_OFFSET);
-    NT_ASSERT(Timer->Mode != TimerModeInvalid);
-
-    if (Timer->Mode == TimerModePseudoPeriodic) {
-
-        NT_ASSERT(Timer->Period != 0);
-
-        //
-        // Read the deadline that just passed, add the period, and then write
-        // the new deadline.
-        //
-
-        MatchValue = READ_EG2TIMER(Timer->Offset, Eg2TimerMatch);
-        MatchValue += Timer->Period;
-        WRITE_EG2TIMER(Timer->Offset, Eg2TimerMatch, MatchValue);
-    }
-
-    return;
-}
-
-_Function_class_(TIMER_ARM_TIMER)
-NTSTATUS
-Eg2TimerArm (
-    __in PVOID TimerData,
-    __in TIMER_MODE Mode,
-    __in ULONGLONG TickCount
-    )
-
-/*++
-
-Routine Description:
-
-    This routine arms a timer to fire an interrupt after the given number of
-    timer ticks. For timers that only interrupt on rollovers, this simply
-    enables the interrupt, the tick count parameter is ignored. If the timer
-    is currently armed for a different mode or tick count, this call is
-    expected to replace that programming. This routine will not get called
-    concurrently with other timer calls, except on per-processor timers, where
-    it may get called concurrently on different processors.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context, whose
-        initial content was supplied when the timer was registered.
-
-    Mode - Supplies the mode to arm the timer in, which will be one of the
-        modes the HAL extension advertised support for when registering the
-        timer. The modes are as follows:
-
-        OneShot - Arms the timer to fire the given number of ticks from now.
-            Only one interrupt is expected to come in. The HAL does not make
-            assumptions on whether or not the expiration of this interrupt
-            causes the counter to stop. The Query Counter routine will not be
-            called while a timer is armed to fire an interrupt.
-
-        Periodic - Arms the timer to fire periodically with an interval of the
-            given number of ticks. The first interrupt should happen
-            approximately the given number of ticks from when the arm timer
-            function was invoked.
-
-        PseudoPeriodic - Arms the timer with the same functional behavior as
-            periodic mode, with the knowledge that the timer will have to rearm
-            itself during the acknowledge interrupt routine. This mode is
-            expected to have slightly worse performance than pure periodic mode,
-            but is expected to generate periodic interrupts at the exact rate
-            specified.
-
-    TickCount - Supplies the number of ticks from now that the timer should
-        assert its interrupt in. For timers that are only capable of
-        interrupting on rollovers from their maximum value to 0, this parameter
-        is ignored.
-
-Return Value:
-
-    Returns and NTSTATUS code indicating success or failure. If the timer
-    returns success, then the interrupt is expected to come in the specified
-    number of ticks from when the function was called, with a tolerance of
-    however long the function took to execute. If the routine fails, then no
-    timer routines will be called again until the timer Initialize routine is
-    called again and succeeds. In most cases, returning a failure code results
-    in a system bugcheck.
-
---*/
-
-{
-
-    ULONG ControlRegister;
-    ULONG MatchValue;
-    PEG2TIMER_DATA Timer;
-
-    Timer = (PEG2TIMER_DATA)TimerData;
-
-    NT_ASSERT(TickCount != 0);
-    NT_ASSERT(TickCount <= 0xFFFFFFFF);
-    NT_ASSERT(Timer->Offset != EG2TIMER_COUNTER_OFFSET);
-
-    //
-    // This will never occur.
-    //
-
-    if ((TickCount > 0xFFFFFFFF) || (TickCount == 0)) {
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    //
-    // Disable the timer while it's being programmed to avoid spurious
-    // interrupts.
-    //
-
-    WRITE_EG2TIMER(Timer->Offset, Eg2TimerControl, 0);
-    ControlRegister = EG2TIMER_MATCH_INTERRUPT_ENABLE;
-
-    //
-    // For periodic mode, set the periodic interval register.
-    //
-
-    if (Mode == TimerModePeriodic) {
-        ControlRegister |= EG2TIMER_MATCH_PERIODIC;
-        WRITE_EG2TIMER(Timer->Offset, Eg2TimerInterval, (ULONG)TickCount);
-    }
-
-    Timer->Mode = Mode;
-    Timer->Period = (ULONG)TickCount;
-
-    //
-    // Calculate and write in the first match value.
-    //
-
-    MatchValue = READ_EG2TIMER(Timer->Offset, Eg2TimerCurrentCount);
-    MatchValue += (ULONG)TickCount;
-    WRITE_EG2TIMER(Timer->Offset, Eg2TimerMatch, MatchValue);
-
-    //
-    // Enable the interrupt.
-    //
-
-    WRITE_EG2TIMER(Timer->Offset, Eg2TimerControl, ControlRegister);
-    return STATUS_SUCCESS;
-}
-
-_Function_class_(TIMER_STOP)
-VOID
-Eg2TimerStop (
-    __in PVOID TimerData
-    )
-
-/*++
-
-Routine Description:
-
-    This routine stops a timer from ticking. After this function returns, the
-    timer should not generate any more interrupts, and reads to its counter
-    might return the same value every time.
-
-Arguments:
-
-    TimerData - Supplies a pointer to the timer's private context, whose
-        initial content was supplied when the timer was registered.
-
-Return Value:
-
-    None, this function must succeed.
-
---*/
-
-{
-
-    PEG2TIMER_DATA Timer;
-
-    Timer = (PEG2TIMER_DATA)TimerData;
-
-    //
-    // Clear the interrupt enable bit.
-    //
-
-    WRITE_EG2TIMER(Timer->Offset, Eg2TimerControl, 0);
-    return;
-}
diff --git a/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.def b/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.def
deleted file mode 100644
index 685129d2..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.def
+++ /dev/null
@@ -1,2 +0,0 @@
-LIBRARY HalExtSampleTimers2
-
diff --git a/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.rc b/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.rc
deleted file mode 100644
index c82378e0..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "verrsrc.h"
-#include <ntverp.h>
-
-#define VER_FILETYPE                VFT_DLL
-#define VER_FILESUBTYPE             VFT_UNKNOWN
-#define VER_FILEDESCRIPTION_STR     "HAL Extension Sample - Timers 2"
-#define VER_INTERNALNAME_STR        "HalExtSampleTimers2.DLL"
-#define VER_ORIGINALFILENAME_STR    "HalExtSampleTimers2.DLL"
-
-#include <common.ver>
diff --git a/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.vcxproj b/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.vcxproj
deleted file mode 100644
index dc581c00..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.vcxproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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|Arm">
-      <Configuration>Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Arm">
-      <Configuration>Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A99E0448-5F6C-42B3-99AA-C43464989418}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Arm</Platform>
-    <SampleGuid>{E9FE899A-F0DB-43B5-8DFD-65D5D790DD76}</SampleGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <OutDir>$(IntDir)</OutDir>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">HalExtensionInit@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">HalExtensionInit</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">HalExtensionInit@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">HalExtensionInit</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <TargetName>HalExtSampleTimers2</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <TargetName>HalExtSampleTimers2</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Arm'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>%(AdditionalOptions) /J</AdditionalOptions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);halextlib.lib;libcntpr.lib;bufferoverflowfastfailk.lib</AdditionalDependencies>
-      <AdditionalOptions>%(AdditionalOptions)                           -merge:PAGECONST=PAGE                    -merge:INITCONST=INIT                    /LARGEADDRESSAWARE</AdditionalOptions>
-      <ModuleDefinitionFile>HalExtSampleTimers2.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Arm'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>%(AdditionalOptions) /J</AdditionalOptions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);halextlib.lib;libcntpr.lib;bufferoverflowfastfailk.lib</AdditionalDependencies>
-      <AdditionalOptions>%(AdditionalOptions)                           -merge:PAGECONST=PAGE                    -merge:INITCONST=INIT                    /LARGEADDRESSAWARE</AdditionalOptions>
-      <ModuleDefinitionFile>HalExtSampleTimers2.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="HalExtSampleTimers2.c" />
-    <ResourceCompile Include="HalExtSampleTimers2.rc" />
-  </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/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.vcxproj.Filters b/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.vcxproj.Filters
deleted file mode 100644
index d752a638..00000000
--- a/general/HalExtensionSample/HalExtSampleTimers2/HalExtSampleTimers2.vcxproj.Filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>{CE019AA9-89F5-4A8E-87D1-ED585767F789}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{EF3411D2-5BFE-41A9-906C-0E6611142568}</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>{07F31510-2D3D-4110-85A6-F39922948329}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="HalExtSampleTimers2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="HalExtSampleTimers2.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="HalExtSampleTimers2.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/general/HalExtensionSample/HalExtensionSample.sln b/general/HalExtensionSample/HalExtensionSample.sln
deleted file mode 100644
index b284bd36..00000000
--- a/general/HalExtensionSample/HalExtensionSample.sln
+++ /dev/null
@@ -1,45 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0
-MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HalExtSampleDma", "HalExtSampleDma", "{C258909E-9676-4DCA-AB5E-4134876CC0F1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HalExtSampleTimers", "HalExtSampleTimers", "{2F891F34-1182-4F77-8923-AF73DF4844C2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HalExtSampleTimers2", "HalExtSampleTimers2", "{20ADC56F-63BE-4671-81B1-D2AC009F7E3C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HalExtSampleDma", "HalExtSampleDma\HalExtSampleDma.vcxproj", "{7568DCFB-C421-478A-A809-21EF6EC243BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HalExtSampleTimers", "HalExtSampleTimers\HalExtSampleTimers.vcxproj", "{708FC03F-4440-4AF4-B68F-5ADE99A0690B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HalExtSampleTimers2", "HalExtSampleTimers2\HalExtSampleTimers2.vcxproj", "{A99E0448-5F6C-42B3-99AA-C43464989418}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Arm = Debug|Arm
-		Release|Arm = Release|Arm
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7568DCFB-C421-478A-A809-21EF6EC243BE}.Debug|Arm.ActiveCfg = Debug|Arm
-		{7568DCFB-C421-478A-A809-21EF6EC243BE}.Debug|Arm.Build.0 = Debug|Arm
-		{7568DCFB-C421-478A-A809-21EF6EC243BE}.Release|Arm.ActiveCfg = Release|Arm
-		{7568DCFB-C421-478A-A809-21EF6EC243BE}.Release|Arm.Build.0 = Release|Arm
-		{708FC03F-4440-4AF4-B68F-5ADE99A0690B}.Debug|Arm.ActiveCfg = Debug|Arm
-		{708FC03F-4440-4AF4-B68F-5ADE99A0690B}.Debug|Arm.Build.0 = Debug|Arm
-		{708FC03F-4440-4AF4-B68F-5ADE99A0690B}.Release|Arm.ActiveCfg = Release|Arm
-		{708FC03F-4440-4AF4-B68F-5ADE99A0690B}.Release|Arm.Build.0 = Release|Arm
-		{A99E0448-5F6C-42B3-99AA-C43464989418}.Debug|Arm.ActiveCfg = Debug|Arm
-		{A99E0448-5F6C-42B3-99AA-C43464989418}.Debug|Arm.Build.0 = Debug|Arm
-		{A99E0448-5F6C-42B3-99AA-C43464989418}.Release|Arm.ActiveCfg = Release|Arm
-		{A99E0448-5F6C-42B3-99AA-C43464989418}.Release|Arm.Build.0 = Release|Arm
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7568DCFB-C421-478A-A809-21EF6EC243BE} = {C258909E-9676-4DCA-AB5E-4134876CC0F1}
-		{708FC03F-4440-4AF4-B68F-5ADE99A0690B} = {2F891F34-1182-4F77-8923-AF73DF4844C2}
-		{A99E0448-5F6C-42B3-99AA-C43464989418} = {20ADC56F-63BE-4671-81B1-D2AC009F7E3C}
-	EndGlobalSection
-EndGlobal
diff --git a/general/PLX9x5x/PLX9x5x.sln b/general/PLX9x5x/PLX9x5x.sln
index 175675b2..13f43e29 100644
--- a/general/PLX9x5x/PLX9x5x.sln
+++ b/general/PLX9x5x/PLX9x5x.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{96B4D999-7E79-4250-A5D9-E18315D8404E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{4E7369AA-C53A-42BC-A8E4-91753D3EA0FF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{839113C4-BEC1-4845-AE0C-A753C2EC3C2D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{F95BD93F-A91C-4F07-8635-C4CD0C704E0F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pci9x5x", "sys\Pci9x5x.vcxproj", "{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pci9x5x", "sys\Pci9x5x.vcxproj", "{501DB362-22B7-4447-9F0B-690EE0F83CF3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plx", "test\plx.vcxproj", "{4D1B1905-50F1-4C12-9754-E8AF3E69B87D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plx", "test\plx.vcxproj", "{EFB89CBA-931F-426E-A7C0-50374FA9EA58}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}.Debug|Win32.Build.0 = Debug|Win32
-		{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}.Release|Win32.ActiveCfg = Release|Win32
-		{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}.Release|Win32.Build.0 = Release|Win32
-		{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}.Debug|x64.ActiveCfg = Debug|x64
-		{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}.Debug|x64.Build.0 = Debug|x64
-		{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}.Release|x64.ActiveCfg = Release|x64
-		{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}.Release|x64.Build.0 = Release|x64
-		{4D1B1905-50F1-4C12-9754-E8AF3E69B87D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4D1B1905-50F1-4C12-9754-E8AF3E69B87D}.Debug|Win32.Build.0 = Debug|Win32
-		{4D1B1905-50F1-4C12-9754-E8AF3E69B87D}.Release|Win32.ActiveCfg = Release|Win32
-		{4D1B1905-50F1-4C12-9754-E8AF3E69B87D}.Release|Win32.Build.0 = Release|Win32
-		{4D1B1905-50F1-4C12-9754-E8AF3E69B87D}.Debug|x64.ActiveCfg = Debug|x64
-		{4D1B1905-50F1-4C12-9754-E8AF3E69B87D}.Debug|x64.Build.0 = Debug|x64
-		{4D1B1905-50F1-4C12-9754-E8AF3E69B87D}.Release|x64.ActiveCfg = Release|x64
-		{4D1B1905-50F1-4C12-9754-E8AF3E69B87D}.Release|x64.Build.0 = Release|x64
+		{501DB362-22B7-4447-9F0B-690EE0F83CF3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{501DB362-22B7-4447-9F0B-690EE0F83CF3}.Debug|Win32.Build.0 = Debug|Win32
+		{501DB362-22B7-4447-9F0B-690EE0F83CF3}.Release|Win32.ActiveCfg = Release|Win32
+		{501DB362-22B7-4447-9F0B-690EE0F83CF3}.Release|Win32.Build.0 = Release|Win32
+		{501DB362-22B7-4447-9F0B-690EE0F83CF3}.Debug|x64.ActiveCfg = Debug|x64
+		{501DB362-22B7-4447-9F0B-690EE0F83CF3}.Debug|x64.Build.0 = Debug|x64
+		{501DB362-22B7-4447-9F0B-690EE0F83CF3}.Release|x64.ActiveCfg = Release|x64
+		{501DB362-22B7-4447-9F0B-690EE0F83CF3}.Release|x64.Build.0 = Release|x64
+		{EFB89CBA-931F-426E-A7C0-50374FA9EA58}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EFB89CBA-931F-426E-A7C0-50374FA9EA58}.Debug|Win32.Build.0 = Debug|Win32
+		{EFB89CBA-931F-426E-A7C0-50374FA9EA58}.Release|Win32.ActiveCfg = Release|Win32
+		{EFB89CBA-931F-426E-A7C0-50374FA9EA58}.Release|Win32.Build.0 = Release|Win32
+		{EFB89CBA-931F-426E-A7C0-50374FA9EA58}.Debug|x64.ActiveCfg = Debug|x64
+		{EFB89CBA-931F-426E-A7C0-50374FA9EA58}.Debug|x64.Build.0 = Debug|x64
+		{EFB89CBA-931F-426E-A7C0-50374FA9EA58}.Release|x64.ActiveCfg = Release|x64
+		{EFB89CBA-931F-426E-A7C0-50374FA9EA58}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF} = {96B4D999-7E79-4250-A5D9-E18315D8404E}
-		{4D1B1905-50F1-4C12-9754-E8AF3E69B87D} = {839113C4-BEC1-4845-AE0C-A753C2EC3C2D}
+		{501DB362-22B7-4447-9F0B-690EE0F83CF3} = {4E7369AA-C53A-42BC-A8E4-91753D3EA0FF}
+		{EFB89CBA-931F-426E-A7C0-50374FA9EA58} = {F95BD93F-A91C-4F07-8635-C4CD0C704E0F}
 	EndGlobalSection
 EndGlobal
diff --git a/general/PLX9x5x/sys/Init.c b/general/PLX9x5x/sys/Init.c
index fbedaa0c..df48afc6 100644
--- a/general/PLX9x5x/sys/Init.c
+++ b/general/PLX9x5x/sys/Init.c
@@ -107,12 +107,25 @@ Return Value:
     TraceEvents(TRACE_LEVEL_INFORMATION, DBG_PNP,
                 "MaximumTransferLength %d", DevExt->MaximumTransferLength);
 
+#ifndef SIMULATE_MEMORY_FRAGMENTATION
     //
     // Calculate the number of DMA_TRANSFER_ELEMENTS + 1 needed to
     // support the MaximumTransferLength.
     //
     dteCount = BYTES_TO_PAGES((ULONG) ROUND_TO_PAGES(
         DevExt->MaximumTransferLength) + PAGE_SIZE);
+#else
+    //
+    // Each DTE describes a Scatter/Gather list element. When
+    // SIMULATE_MEMORY_FRAGMENTATION is defined, we bounce I/O
+    // request buffers to MDL chains to simulate memory
+    // fragmentation. This means we might deal with larger
+    // S/G lists than we would were the I/O buffer virtually
+    // contiguous, so we need more space to write the DTEs.
+    //
+    dteCount = BYTES_TO_PAGES(((ULONG)
+        ROUND_TO_PAGES(MDL_BUFFER_SIZE) + PAGE_SIZE) * MDL_CHAIN_LENGTH) + 1;
+#endif
 
     TraceEvents(TRACE_LEVEL_INFORMATION, DBG_PNP, "Number of DTEs %d", dteCount);
 
@@ -249,6 +262,40 @@ Return Value:
 
 
     //
+    // Create a new IO Queue for IOCTLs in sequential mode.
+    //
+    WDF_IO_QUEUE_CONFIG_INIT( &queueConfig,
+                              WdfIoQueueDispatchSequential);
+
+    queueConfig.EvtIoDeviceControl = PLxEvtIoDeviceControl;
+
+    status = WdfIoQueueCreate(DevExt->Device,
+                              &queueConfig,
+                              WDF_NO_OBJECT_ATTRIBUTES,
+                              &DevExt->ControlQueue);
+    if(!NT_SUCCESS(status)) {
+        TraceEvents(TRACE_LEVEL_ERROR, DBG_PNP,
+                    "WdfIoQueueCreate failed: %!STATUS!",
+                    status);
+        return status;
+    }
+
+    //
+    // Set the Control Queue forwarding for IOCTL requests.
+    //
+    status = WdfDeviceConfigureRequestDispatching(DevExt->Device,
+                                                  DevExt->ControlQueue,
+                                                  WdfRequestTypeDeviceControl);
+
+    if(!NT_SUCCESS(status)) {
+        TraceEvents(TRACE_LEVEL_ERROR, DBG_PNP,
+                    "WdfDeviceConfigureRequestDispatching failed: %!STATUS!",
+                    status);
+        return status;
+    }
+
+
+    //
     // Create a WDFINTERRUPT object.
     //
     status = PLxInterruptCreate(DevExt);
@@ -267,6 +314,44 @@ Return Value:
 }
 
 
+VOID
+PlxCleanupDeviceExtension(
+    _In_ PDEVICE_EXTENSION DevExt
+    )
+/*++
+
+Routine Description:
+
+    Frees allocated memory that was saved in the
+    WDFDEVICE's context, before the device object
+    is deleted.
+
+Arguments:
+
+    DevExt - Pointer to our DEVICE_EXTENSION
+
+Return Value:
+
+     None
+
+--*/
+{
+#ifdef SIMULATE_MEMORY_FRAGMENTATION
+    if (DevExt->WriteMdlChain) {
+        DestroyMdlChain(DevExt->WriteMdlChain);
+        DevExt->WriteMdlChain = NULL;
+    }
+
+    if (DevExt->ReadMdlChain) {
+        DestroyMdlChain(DevExt->ReadMdlChain);
+        DevExt->ReadMdlChain = NULL;
+    }
+#else
+    UNREFERENCED_PARAMETER(DevExt);
+#endif
+}
+
+
 NTSTATUS
 PLxPrepareHardware(
     IN PDEVICE_EXTENSION DevExt,
@@ -486,6 +571,12 @@ Return Value:
         TraceEvents(TRACE_LEVEL_INFORMATION, DBG_PNP,
                     " - The DMA Profile is WdfDmaProfileScatterGather64Duplex");
 
+        //
+        // Opt-in to DMA version 3, which is required by
+        // WdfDmaTransactionSetSingleTransferRequirement
+        //
+        dmaConfig.WdmDmaVersionOverride = 3;
+
         status = WdfDmaEnablerCreate( DevExt->Device,
                                       &dmaConfig,
                                       WDF_NO_OBJECT_ATTRIBUTES,
@@ -497,6 +588,16 @@ Return Value:
                         "WdfDmaEnablerCreate failed: %!STATUS!", status);
             return status;
         }
+
+        //
+        // The PLX device does not have a hard limit on the number of DTEs
+        // it can process for each DMA operation. However, the DTEs are written
+        // to common buffers whose size is the effective upper bound to the
+        // length of the Scatter/Gather lists we can work with.
+        //
+        WdfDmaEnablerSetMaximumScatterGatherElements(
+            DevExt->DmaEnabler,
+            min(DevExt->WriteTransferElements, DevExt->ReadTransferElements));
     }
 
     //
@@ -610,6 +711,27 @@ Return Value:
         return status;
     }
 
+#ifdef SIMULATE_MEMORY_FRAGMENTATION
+    //
+    // Allocate MDL chains that will be used to simulate memory fragmentation.
+    //
+    status = BuildMdlChain(&DevExt->WriteMdlChain);
+    if (!NT_SUCCESS(status)) {
+        TraceEvents(TRACE_LEVEL_ERROR, DBG_WRITE,
+                    "BuildMdlChain(Write) failed: %!STATUS!",
+                    status);
+        return status;
+    }
+
+    status = BuildMdlChain(&DevExt->ReadMdlChain);
+    if (!NT_SUCCESS(status)) {
+        TraceEvents(TRACE_LEVEL_ERROR, DBG_WRITE,
+                    "BuildMdlChain(Read) failed: %!STATUS!",
+                    status);
+        return status;
+    }
+#endif
+
     return status;
 }
 
diff --git a/general/PLX9x5x/sys/Pci9656.c b/general/PLX9x5x/sys/Pci9656.c
index 176b9ca7..7fc33349 100644
--- a/general/PLX9x5x/sys/Pci9656.c
+++ b/general/PLX9x5x/sys/Pci9656.c
@@ -38,6 +38,7 @@ Environment:
 #ifdef ALLOC_PRAGMA
 #pragma alloc_text (INIT, DriverEntry)
 #pragma alloc_text (PAGE, PLxEvtDeviceAdd)
+#pragma alloc_text (PAGE, PlxEvtDeviceCleanup)
 #pragma alloc_text (PAGE, PLxEvtDevicePrepareHardware)
 #pragma alloc_text (PAGE, PLxEvtDeviceReleaseHardware)
 #pragma alloc_text (PAGE, PLxEvtDeviceD0Exit)
@@ -201,6 +202,12 @@ Return Value:
     attributes.SynchronizationScope = WdfSynchronizationScopeDevice;
 
     //
+    // This callback is invoked when the device is removed or the driver
+    // is unloaded.
+    //
+    attributes.EvtCleanupCallback = PlxEvtDeviceCleanup;
+
+    //
     // Create the device
     //
     status = WdfDeviceCreate( &DeviceInit, &attributes, &device );
@@ -288,6 +295,36 @@ Return Value:
     return status;
 }
 
+_Use_decl_annotations_
+VOID
+PlxEvtDeviceCleanup(
+    _In_ WDFOBJECT Device
+    )
+/*++
+
+Routine Description:
+
+    Invoked before the device object is deleted.
+
+Arguments:
+
+    Device - A handle to the WDFDEVICE
+
+Return Value:
+
+     None
+
+--*/
+{
+    PDEVICE_EXTENSION devExt;
+
+    PAGED_CODE();
+
+    devExt = PLxGetDeviceContext((WDFDEVICE)Device);
+
+    PlxCleanupDeviceExtension(devExt);
+}
+
 NTSTATUS
 PLxEvtDevicePrepareHardware (
     WDFDEVICE       Device,
@@ -382,12 +419,11 @@ Return Value:
     devExt = PLxGetDeviceContext(Device);
 
     if (devExt->RegsBase) {
-
         MmUnmapIoSpace(devExt->RegsBase, devExt->RegsLength);
         devExt->RegsBase = NULL;
     }
 
-    if(devExt->SRAMBase){
+    if (devExt->SRAMBase) {
         MmUnmapIoSpace(devExt->SRAMBase, devExt->SRAMLength);
         devExt->SRAMBase = NULL;
     }
diff --git a/general/PLX9x5x/sys/Pci9x5x.vcxproj b/general/PLX9x5x/sys/Pci9x5x.vcxproj
index 8ecc182b..6c79841e 100644
--- a/general/PLX9x5x/sys/Pci9x5x.vcxproj
+++ b/general/PLX9x5x/sys/Pci9x5x.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{1DE5F13E-88E1-4AE6-A063-C35A5472D3FF}</ProjectGuid>
+    <ProjectGuid>{501DB362-22B7-4447-9F0B-690EE0F83CF3}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>9</KMDF_VERSION_MINOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{1D35F3A3-A9F3-4F69-BFDD-0D12D5AED768}</SampleGuid>
+    <SampleGuid>{01A592F9-DDED-4EDB-B96A-3B9061461BE3}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -127,11 +127,6 @@
       <PreCompiledHeader>Use</PreCompiledHeader>
       <PreCompiledHeaderOutputFile>$(IntDir)\precomp.pch</PreCompiledHeaderOutputFile>
     </ClCompile>
-    <Inf Include=".\pci9x5x.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\pci9x5x.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="Pci9656.rc">
       <WppEnabled>true</WppEnabled>
       <WppKernelMode>true</WppKernelMode>
diff --git a/general/PLX9x5x/sys/Pci9x5x.vcxproj.Filters b/general/PLX9x5x/sys/Pci9x5x.vcxproj.Filters
index 571879e3..9641c3bd 100644
--- a/general/PLX9x5x/sys/Pci9x5x.vcxproj.Filters
+++ b/general/PLX9x5x/sys/Pci9x5x.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>{B669D948-3401-4ED3-A372-17F5ACB06C88}</UniqueIdentifier>
+      <UniqueIdentifier>{D8D64C18-868F-4EF5-90D1-BC576379183C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{6BF69C07-3C57-4B3E-B476-2FE25863C4E7}</UniqueIdentifier>
+      <UniqueIdentifier>{80D325BC-90F3-46E6-B694-24F192421197}</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>{C8335578-FDE2-4937-A4B4-983F51CC74A2}</UniqueIdentifier>
+      <UniqueIdentifier>{F76CE674-3662-4D6E-AB77-260FE0381AC9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{CE1E380F-0E2C-4AB0-A135-46775B8C4371}</UniqueIdentifier>
+      <UniqueIdentifier>{8BAFE965-5A65-4AB5-9799-251428E27882}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,11 +39,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\pci9x5x.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="Pci9656.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/PLX9x5x/sys/Private.h b/general/PLX9x5x/sys/Private.h
index 8eae7a45..439551bb 100644
--- a/general/PLX9x5x/sys/Private.h
+++ b/general/PLX9x5x/sys/Private.h
@@ -68,9 +68,17 @@ typedef struct _DEVICE_EXTENSION {
     WDFDMAENABLER           DmaEnabler;
     ULONG                   MaximumTransferLength;
 
+    // IOCTL handling
+    WDFQUEUE                ControlQueue;
+    BOOLEAN                 RequireSingleTransfer;
+
+#ifdef SIMULATE_MEMORY_FRAGMENTATION
+    PMDL                    WriteMdlChain;
+    PMDL                    ReadMdlChain;
+#endif
+
     // Write
     WDFQUEUE                WriteQueue;
-
     WDFDMATRANSACTION       WriteDmaTransaction;
 
     ULONG                   WriteTransferElements;
@@ -87,7 +95,6 @@ typedef struct _DEVICE_EXTENSION {
     PHYSICAL_ADDRESS        ReadCommonBufferBaseLA;   // Logical Address
 
     WDFDMATRANSACTION       ReadDmaTransaction;
-
     WDFQUEUE                ReadQueue;
 
     ULONG                   HwErrCount;
@@ -120,6 +127,7 @@ WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(TRANSACTION_CONTEXT, PLxGetTransactionContext
 DRIVER_INITIALIZE DriverEntry;
 
 EVT_WDF_DRIVER_DEVICE_ADD PLxEvtDeviceAdd;
+EVT_WDF_OBJECT_CONTEXT_CLEANUP PlxEvtDeviceCleanup;
 
 EVT_WDF_OBJECT_CONTEXT_CLEANUP PlxEvtDriverContextCleanup;
 
@@ -130,6 +138,7 @@ EVT_WDF_DEVICE_RELEASE_HARDWARE PLxEvtDeviceReleaseHardware;
 
 EVT_WDF_IO_QUEUE_IO_READ PLxEvtIoRead;
 EVT_WDF_IO_QUEUE_IO_WRITE PLxEvtIoWrite;
+EVT_WDF_IO_QUEUE_IO_DEVICE_CONTROL PLxEvtIoDeviceControl;
 
 EVT_WDF_INTERRUPT_ISR PLxEvtInterruptIsr;
 EVT_WDF_INTERRUPT_DPC PLxEvtInterruptDpc;
@@ -146,6 +155,11 @@ PLxInitializeDeviceExtension(
     IN PDEVICE_EXTENSION DevExt
     );
 
+VOID
+PlxCleanupDeviceExtension(
+    _In_ PDEVICE_EXTENSION DevExt
+    );
+
 NTSTATUS
 PLxPrepareHardware(
     IN PDEVICE_EXTENSION DevExt,
@@ -205,6 +219,45 @@ PLxInitializeDMA(
     IN PDEVICE_EXTENSION DevExt
     );
 
+#ifdef SIMULATE_MEMORY_FRAGMENTATION
+//
+// Passed to ExAllocatePoolWithTag to track memory allocations
+//
+#define POOL_TAG 'x5x9'
+
+//
+// Constants for the MDL chains we use to simulate memory fragmentation.
+//
+#define MDL_CHAIN_LENGTH 8
+#define MDL_BUFFER_SIZE  ((PCI9656_MAXIMUM_TRANSFER_LENGTH) / MDL_CHAIN_LENGTH)
+
+C_ASSERT(MDL_CHAIN_LENGTH * MDL_BUFFER_SIZE == PCI9656_MAXIMUM_TRANSFER_LENGTH);
+
+NTSTATUS
+BuildMdlChain(
+    _Out_ PMDL* MdlChain
+    );
+
+VOID
+DestroyMdlChain(
+    _In_ PMDL MdlChain
+    );
+
+VOID
+CopyBufferToMdlChain(
+    _In_reads_bytes_(Length) PVOID Buffer,
+    _In_ size_t Length,
+    _In_ PMDL MdlChain
+    );
+
+VOID
+CopyMdlChainToBuffer(
+    _In_ PMDL MdlChain,
+    _Out_writes_bytes_(Length) PVOID Buffer,
+    _In_ size_t Length
+    );
+#endif // SIMULATE_MEMORY_FRAGMENTATION
+
 #pragma warning(disable:4127) // avoid conditional expression is constant error with W4
 
 #endif  // _PCI9656_H_
diff --git a/general/PLX9x5x/sys/Public.h b/general/PLX9x5x/sys/Public.h
index 16c425ae..401e5cb3 100644
--- a/general/PLX9x5x/sys/Public.h
+++ b/general/PLX9x5x/sys/Public.h
@@ -32,4 +32,10 @@ Environment:
 DEFINE_GUID (GUID_PLX_INTERFACE, 
    0x29d2a384, 0x2e47, 0x49b5, 0xae, 0xbf, 0x69, 0x62, 0xc2, 0x2b, 0xd7, 0xc2);
 
+//
+// This IOCTL toggles the driver's DMA Single Transfer Requirement
+// on and off each time it is called.
+//
+#define IOCTL_PLX9X5X_TOGGLE_SINGLE_TRANSFER \
+    CTL_CODE(FILE_DEVICE_UNKNOWN, 0x0, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
diff --git a/general/PLX9x5x/sys/Read.c b/general/PLX9x5x/sys/Read.c
index 319cf094..4bfdfacc 100644
--- a/general/PLX9x5x/sys/Read.c
+++ b/general/PLX9x5x/sys/Read.c
@@ -76,7 +76,17 @@ Return Value:
             status = STATUS_INVALID_BUFFER_SIZE;
             break;
         }
-        
+
+        //
+        // Set the transaction's Single Transfer Requirement if
+        // the user application asked for it. This needs to be
+        // set before initializing the transaction.
+        //
+        WdfDmaTransactionSetSingleTransferRequirement(
+            devExt->ReadDmaTransaction,
+            devExt->RequireSingleTransfer);
+
+#ifndef SIMULATE_MEMORY_FRAGMENTATION
         //
         // Initialize this new DmaTransaction.
         //
@@ -92,6 +102,42 @@ Return Value:
                         "failed: %!STATUS!", status);
             break;
         }
+#else
+        PMDL mdl;
+        PVOID virtualAddress;
+        PTRANSACTION_CONTEXT context;
+
+        //
+        // For illustrative purposes, initialize the DMA transaction with a
+        // heavily fragmented MDL chain instead of the request's output buffer.
+        // If RequireSingleTransfer was set, then KMDF will attempt to fulfill
+        // the DMA transaction in a single transfer. Otherwise, the transaction
+        // may require several operations in which case PLxEvtProgramReadDma
+        // will be invoked multiple times.
+        //
+        mdl = devExt->ReadMdlChain;
+        virtualAddress = MmGetMdlVirtualAddress(mdl);
+
+        status = WdfDmaTransactionInitialize(devExt->ReadDmaTransaction,
+                                             PLxEvtProgramReadDma,
+                                             WdfDmaDirectionReadFromDevice,
+                                             mdl,
+                                             virtualAddress,
+                                             Length);
+        if(!NT_SUCCESS(status)) {
+            TraceEvents(TRACE_LEVEL_ERROR, DBG_WRITE,
+                        "WdfDmaTransactionInitialize failed: %!STATUS!", status);
+            break;
+        }
+
+        //
+        // Get this DMA transaction's context and save the Request handle
+        // to it, since the Request isn't otherwise associated with the
+        // transaction object.
+        //
+        context = PLxGetTransactionContext(devExt->ReadDmaTransaction);
+        context->Request = Request;
+#endif // SIMULATE_MEMORY_FRAGMENTATION
 
 #if 0 // FYI
         //
@@ -425,10 +471,41 @@ Return Value:
     WDFREQUEST         request;
     size_t             bytesTransferred;
 
+#ifndef SIMULATE_MEMORY_FRAGMENTATION
     //
     // Get the associated request from the transaction.
     //
     request = WdfDmaTransactionGetRequest(DmaTransaction);
+#else
+    PVOID buffer;
+    size_t length;
+    WDFDEVICE device;
+    PDEVICE_EXTENSION devExt;
+
+    device = WdfDmaTransactionGetDevice(DmaTransaction);
+    devExt = PLxGetDeviceContext(device);
+
+    //
+    // This means that the DMA transaction was not initialized
+    // with WdfDmaTransactionInitializeUsingRequest, so the
+    // request was not implicitly associated with it. Instead,
+    // we saved it in the object's context space.
+    //
+    request = PLxGetTransactionContext(DmaTransaction)->Request;
+
+    //
+    // Copy the MDL chain's contents back to the original request buffer.
+    //
+    Status = WdfRequestRetrieveOutputBuffer(request, 0, &buffer, &length);
+    if (!NT_SUCCESS(Status)) {
+        TraceEvents(TRACE_LEVEL_ERROR, DBG_READ,
+                    "WdfRequestRetrieveOutputBuffer failed: %!STATUS!",
+                    Status);
+    }
+    else {
+        CopyMdlChainToBuffer(devExt->ReadMdlChain, buffer, length);
+    }
+#endif // SIMULATE_MEMORY_FRAGMENTATION
 
     ASSERT(request);
 
diff --git a/general/PLX9x5x/sys/Write.c b/general/PLX9x5x/sys/Write.c
index 3e4d8b53..cef1d71d 100644
--- a/general/PLX9x5x/sys/Write.c
+++ b/general/PLX9x5x/sys/Write.c
@@ -79,6 +79,15 @@ Return Value:
     }
 
     //
+    // Set the transaction's Single Transfer Requirement if
+    // the user application asked for it. This needs to be
+    // set before initializing the transaction.
+    //
+    WdfDmaTransactionSetSingleTransferRequirement(
+        devExt->WriteDmaTransaction,
+        devExt->RequireSingleTransfer);
+
+    //
     // Following code illustrates two different ways of initializing a DMA
     // transaction object. If ASSOC_WRITE_REQUEST_WITH_DMA_TRANSACTION is
     // defined in the sources file, the first section will be used.
@@ -124,8 +133,9 @@ Return Value:
         PTRANSACTION_CONTEXT  transContext;
         PMDL                  mdl;
         PVOID                 virtualAddress;
-        ULONG                 length;
+        size_t                length;
 
+#ifndef SIMULATE_MEMORY_FRAGMENTATION
         //
         // Initialize this new DmaTransaction with direct parameters.
         //
@@ -138,6 +148,27 @@ Return Value:
 
         virtualAddress = MmGetMdlVirtualAddress(mdl);
         length = MmGetMdlByteCount(mdl);
+#else
+        PVOID buffer;
+
+        //
+        // For illustrative purposes, copy the Request's memory to a
+        // heavily fragmented MDL chain. If RequireSingleTransfer was set,
+        // then KMDF will attempt to fulfill the DMA transaction in a single
+        // transfer. Otherwise, the transaction may require several operations
+        // in which case PLxEvtProgramWriteDma will be invoked multiple times.
+        //
+        status = WdfRequestRetrieveInputBuffer(Request, 0, &buffer, &length);
+        if (!NT_SUCCESS(status)) {
+            TraceEvents(TRACE_LEVEL_ERROR, DBG_WRITE,
+                        "WdfRequestRetrieveInputBuffer failed: %!STATUS!", status);
+            goto CleanUp;
+        }
+
+        mdl = devExt->WriteMdlChain;
+        virtualAddress = MmGetMdlVirtualAddress(mdl);
+        CopyBufferToMdlChain(buffer, length, mdl);
+#endif // SIMULATE_MEMORY_FRAGMENTATION
 
         _Analysis_assume_(length > 0);
         status = WdfDmaTransactionInitialize( devExt->WriteDmaTransaction,
@@ -160,7 +191,7 @@ Return Value:
         transContext = PLxGetTransactionContext( devExt->WriteDmaTransaction );
         transContext->Request = Request;
     }
-#endif
+#endif // ASSOC_WRITE_REQUEST_WITH_DMA_TRANSACTION
 
 #if 0 //FYI
         //
diff --git a/general/PLX9x5x/sys/pci9x5x.inx b/general/PLX9x5x/sys/pci9x5x.inx
index 8fc7def6..85e5df54 100644
--- a/general/PLX9x5x/sys/pci9x5x.inx
+++ b/general/PLX9x5x/sys/pci9x5x.inx
diff --git a/general/PLX9x5x/sys/trace.h b/general/PLX9x5x/sys/trace.h
index a9726b3a..59710ec1 100644
--- a/general/PLX9x5x/sys/trace.h
+++ b/general/PLX9x5x/sys/trace.h
@@ -55,6 +55,8 @@ Environment:
         WPP_DEFINE_BIT(DBG_LOCKS)            /* bit 10 = 0x00000400 */ \
         WPP_DEFINE_BIT(DBG_QUEUEING)         /* bit 11 = 0x00000800 */ \
         WPP_DEFINE_BIT(DBG_HW_ACCESS)        /* bit 12 = 0x00001000 */ \
+        WPP_DEFINE_BIT(DBG_IOCTL)            /* bit 13 = 0x00002000 */ \
+        WPP_DEFINE_BIT(DBG_MDLCHAIN)         /* bit 14 = 0x00004000 */ \
         /* You can have up to 32 defines. If you want more than that,\
             you have to provide another trace control GUID */\
         )
diff --git a/general/PLX9x5x/test/plx.cpp b/general/PLX9x5x/test/plx.cpp
index c5bae510..fb6681ea 100644
--- a/general/PLX9x5x/test/plx.cpp
+++ b/general/PLX9x5x/test/plx.cpp
@@ -332,47 +332,54 @@ void
 PLX::Menu()
 {
     int menu = -1;
+    const char* menuItems[MENU_MAX];
+    BOOL status, toggle;
 
-    while(menu != 0 && pDeviceInterfaceDetail) {
-        printf("\n"
-               " 1- Read from device\n"
-               " 2- Write from device\n"
-               " 3- Read/Write from device\n"
-               " 4- Read/Write Thread Test\n"
-               " 5- Select new device\n"
-               " 6- Change Buffer Size\n"
-               " 7- Compare Read/Write Buffers\n"
-               " 8- Display Read/Write Buffers\n"
-               " 9- Change Thread Lifetime\n"
-               "10- Command Line Options\n"
-               " 0- Quit\n");
+    menuItems[MENU_TEST] = "Quit";
+    menuItems[READ_TEST] = "Read from device";
+    menuItems[WRITE_TEST] = "Write to device";
+    menuItems[READ_WRITE_TEST] = "Read/Write from device";
+    menuItems[THREAD_TEST] = "Read/Write Thread Test";
+    menuItems[DEVICE_PATH] = "Select new device";
+    menuItems[SET_SIZE] = "Change Buffer Size";
+    menuItems[COMPARE_BUFFERS] = "Compare Read/Write Buffers";
+    menuItems[DISPLAY_BUFFERS] = "Display Read/Write Buffers";
+    menuItems[THREAD_TIME] = "Change Thread Lifetime";
+    menuItems[SINGLE_TRANSFER_TOGGLE] = "Toggle single transfer requirement";
+    menuItems[COMMAND_LINE] = "Command Line Options";
 
-        if (scanf_s("%d", &menu) == 0) {
+    while(menu != MENU_TEST && pDeviceInterfaceDetail) {
+        for (int i = MENU_TEST + 1; i < MENU_MAX; i++) {
+            printf("\n%2x - %s", i, menuItems[i]);
+        }
+        printf("\n%2x - %s\n", MENU_TEST, menuItems[MENU_TEST]);
+
+        if (scanf_s("%x", &menu) == 0) {
             break;
         }
 
         switch(menu) {
-            case READ_TEST:                             // 1
+            case READ_TEST:
                 ReadTest();
                 break;
 
-            case WRITE_TEST:                            // 2
+            case WRITE_TEST:
                 WriteTest();
                 break;
 
-            case READ_WRITE_TEST:                       // 3
+            case READ_WRITE_TEST:
                 ReadWriteTest();
                 break;
 
-            case THREAD_TEST:                           // 4
+            case THREAD_TEST:
                 ThreadedReadWriteTest();
                 break;
 
-            case DEVICE_PATH:                           // 5
+            case DEVICE_PATH:
                 GetDevicePath();
                 break;
 
-            case SET_SIZE:                              // 6
+            case SET_SIZE:
                 ULONG size;
                 printf("\nEnter new buffer size: ");
                 if (scanf_s("%u", &size) != 0) {
@@ -380,22 +387,34 @@ PLX::Menu()
                 }
                 break;
 
-            case COMPARE_BUFFERS:                       // 7
+            case COMPARE_BUFFERS:
                 CompareReadWriteBuffers();
                 break;
 
-            case DISPLAY_BUFFERS:                       // 8
+            case DISPLAY_BUFFERS:
                 DisplayReadWriteBuffers();
                 break;
 
-            case THREAD_TIME:                           // 9
+            case THREAD_TIME:
                 printf("\nEnter new Thread Lifetime (ms): ");
                 if (scanf_s("%u", &ThreadTimer) == 0) {
                     break;
                 }
                 break;
 
-            case COMMAND_LINE:                          // 10
+            case SINGLE_TRANSFER_TOGGLE:
+                status = SendSingleTransferIoctl(&toggle);
+                if (status) {
+                    printf("Single transfer requirement is %s\n",
+                        toggle ? "on" : "off");
+                }
+                else {
+                    printf("Could not toggle the single transfer "
+                           "requirement\n");
+                }
+                break;
+
+            case COMMAND_LINE:
                 printf("Command Line Options\n"
                        " Set Read Buffer Size:           '/rb=xx'\n"
                        " Set Write Buffer Size:          '/wb=xx'\n"
@@ -549,6 +568,13 @@ PLX::ThreadedReadWriteTest()
                 printf("WaitForMultipleObjects[%d] error %u\n", i, error);
             }
         }
+
+        if (!error) {
+            //
+            // Reset the TimeUp flag
+            //
+            g_TimeUp = 0;
+        }
     }
 
     if (Contexts) {
@@ -779,6 +805,44 @@ PLX::SetBufferSizes(ULONG size)
 }
 
 BOOL
+PLX::SendSingleTransferIoctl(BOOL* Toggle)
+{
+    BOOL status = TRUE;
+    UCHAR outBuffer = 0;
+    DWORD bytesReceived = 0;
+
+    if (hDevice == INVALID_HANDLE_VALUE) {
+        status = GetDeviceHandle();
+        if (status == FALSE) {
+            goto Done;
+        }
+    }
+
+    status = DeviceIoControl(hDevice,
+                             IOCTL_PLX9X5X_TOGGLE_SINGLE_TRANSFER,
+                             NULL,
+                             0,
+                             &outBuffer,
+                             sizeof(outBuffer),
+                             &bytesReceived,
+                             NULL);
+    if (status == FALSE || bytesReceived != sizeof(outBuffer)) {
+        printf("DeviceIoControl failed 0x%x\n", GetLastError());
+        goto Done;
+    }
+
+    *Toggle = outBuffer;
+
+Done:
+    if (hDevice != INVALID_HANDLE_VALUE) {
+        CloseHandle(hDevice);
+        hDevice = INVALID_HANDLE_VALUE;
+    }
+
+    return status;
+}
+
+BOOL
 PLX::GetDevicePath()
 {
     SP_DEVICE_INTERFACE_DATA DeviceInterfaceData;
@@ -1102,3 +1166,4 @@ PLX::SetThreadLifeTime(ULONG time)
     ThreadTimer = time;
 }
 
+
diff --git a/general/PLX9x5x/test/plx.hpp b/general/PLX9x5x/test/plx.hpp
index fe87fea1..10147df7 100644
--- a/general/PLX9x5x/test/plx.hpp
+++ b/general/PLX9x5x/test/plx.hpp
@@ -20,6 +20,7 @@ Environment:
 #pragma once
 
 #include <windows.h>
+#include <winioctl.h>
 #include <setupapi.h>
 
 #include <stdio.h>
@@ -52,19 +53,21 @@ typedef struct _THREAD_CONTEXT
 
 } THREAD_CONTEXT, *PTHREAD_CONTEXT;
 
-typedef enum {
+enum {
 
-    MENU_TEST       = 0,
-    READ_TEST       = 1,
-    WRITE_TEST      = 2,
-    READ_WRITE_TEST = 3,
-    THREAD_TEST     = 4,
-    DEVICE_PATH     = 5,
-    SET_SIZE        = 6,
-    COMPARE_BUFFERS = 7,
-    DISPLAY_BUFFERS = 8,
-    THREAD_TIME     = 9,
-    COMMAND_LINE    = 10,
+    MENU_TEST,
+    READ_TEST,
+    WRITE_TEST,
+    READ_WRITE_TEST,
+    THREAD_TEST,
+    DEVICE_PATH,
+    SET_SIZE,
+    COMPARE_BUFFERS,
+    DISPLAY_BUFFERS,
+    THREAD_TIME,
+    SINGLE_TRANSFER_TOGGLE,
+    COMMAND_LINE,
+    MENU_MAX
 
 } COMMAND;
 
@@ -105,6 +108,9 @@ public:
     BOOL
     SetBufferSizes(ULONG size);
 
+    BOOL
+    SendSingleTransferIoctl(BOOL* Toggle);
+
     void
     DisplayReadWriteBuffers();
 
diff --git a/general/PLX9x5x/test/plx.vcxproj b/general/PLX9x5x/test/plx.vcxproj
index f5aee498..3c4519ff 100644
--- a/general/PLX9x5x/test/plx.vcxproj
+++ b/general/PLX9x5x/test/plx.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D12B451F-9593-4418-8E9D-3876568F0735}</ProjectGuid>
+    <ProjectGuid>{EFB89CBA-931F-426E-A7C0-50374FA9EA58}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{14470144-508A-4DC0-A4FB-05B235920C7D}</SampleGuid>
+    <SampleGuid>{C12C9771-61BE-4B27-83FF-C088E9B0307F}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/PLX9x5x/test/plx.vcxproj.Filters b/general/PLX9x5x/test/plx.vcxproj.Filters
index 836927a3..808b6416 100644
--- a/general/PLX9x5x/test/plx.vcxproj.Filters
+++ b/general/PLX9x5x/test/plx.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>{000E7888-9A7D-4186-A5B1-CD11AABC5214}</UniqueIdentifier>
+      <UniqueIdentifier>{297D236E-3E7C-4989-B3A0-0E9B4687ED03}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{C8A54ADD-C416-4801-951A-201A6C356E22}</UniqueIdentifier>
+      <UniqueIdentifier>{59B25362-CF9F-414A-ADBE-67FC03BEF70D}</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>{A98EC5F5-DB3F-4CFD-8487-F6901096E6D6}</UniqueIdentifier>
+      <UniqueIdentifier>{8C28172C-2543-4814-83C6-80CC3DDD1EE4}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/SystemDma/wdm/SystemDma.sln b/general/SystemDma/wdm/SystemDma.sln
index 6a27f1f4..86e9aa7c 100644
--- a/general/SystemDma/wdm/SystemDma.sln
+++ b/general/SystemDma/wdm/SystemDma.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{40D8A4EB-CEC0-4AC2-BFB4-38ED5242C772}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{2E9AC603-03FE-496D-BC7F-EDAFEE45EAA0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{9444CA2A-D65A-4EE0-A962-274E2F3CF233}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{D904E7F1-482F-4CBD-B7B2-24B01A41D90D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SystemDmaApp", "exe\SystemDmaApp.vcxproj", "{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SystemDmaApp", "exe\SystemDmaApp.vcxproj", "{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDma", "sys\SDma.vcxproj", "{3985BC4B-064D-4593-A898-9C73AE59F11C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDma", "sys\SDma.vcxproj", "{1523D522-CC98-45CD-82A8-8A3CF2B974DC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}.Debug|Win32.Build.0 = Debug|Win32
-		{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}.Release|Win32.ActiveCfg = Release|Win32
-		{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}.Release|Win32.Build.0 = Release|Win32
-		{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}.Debug|x64.ActiveCfg = Debug|x64
-		{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}.Debug|x64.Build.0 = Debug|x64
-		{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}.Release|x64.ActiveCfg = Release|x64
-		{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}.Release|x64.Build.0 = Release|x64
-		{3985BC4B-064D-4593-A898-9C73AE59F11C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3985BC4B-064D-4593-A898-9C73AE59F11C}.Debug|Win32.Build.0 = Debug|Win32
-		{3985BC4B-064D-4593-A898-9C73AE59F11C}.Release|Win32.ActiveCfg = Release|Win32
-		{3985BC4B-064D-4593-A898-9C73AE59F11C}.Release|Win32.Build.0 = Release|Win32
-		{3985BC4B-064D-4593-A898-9C73AE59F11C}.Debug|x64.ActiveCfg = Debug|x64
-		{3985BC4B-064D-4593-A898-9C73AE59F11C}.Debug|x64.Build.0 = Debug|x64
-		{3985BC4B-064D-4593-A898-9C73AE59F11C}.Release|x64.ActiveCfg = Release|x64
-		{3985BC4B-064D-4593-A898-9C73AE59F11C}.Release|x64.Build.0 = Release|x64
+		{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}.Debug|Win32.Build.0 = Debug|Win32
+		{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}.Release|Win32.ActiveCfg = Release|Win32
+		{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}.Release|Win32.Build.0 = Release|Win32
+		{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}.Debug|x64.ActiveCfg = Debug|x64
+		{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}.Debug|x64.Build.0 = Debug|x64
+		{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}.Release|x64.ActiveCfg = Release|x64
+		{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}.Release|x64.Build.0 = Release|x64
+		{1523D522-CC98-45CD-82A8-8A3CF2B974DC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1523D522-CC98-45CD-82A8-8A3CF2B974DC}.Debug|Win32.Build.0 = Debug|Win32
+		{1523D522-CC98-45CD-82A8-8A3CF2B974DC}.Release|Win32.ActiveCfg = Release|Win32
+		{1523D522-CC98-45CD-82A8-8A3CF2B974DC}.Release|Win32.Build.0 = Release|Win32
+		{1523D522-CC98-45CD-82A8-8A3CF2B974DC}.Debug|x64.ActiveCfg = Debug|x64
+		{1523D522-CC98-45CD-82A8-8A3CF2B974DC}.Debug|x64.Build.0 = Debug|x64
+		{1523D522-CC98-45CD-82A8-8A3CF2B974DC}.Release|x64.ActiveCfg = Release|x64
+		{1523D522-CC98-45CD-82A8-8A3CF2B974DC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE} = {40D8A4EB-CEC0-4AC2-BFB4-38ED5242C772}
-		{3985BC4B-064D-4593-A898-9C73AE59F11C} = {9444CA2A-D65A-4EE0-A962-274E2F3CF233}
+		{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01} = {2E9AC603-03FE-496D-BC7F-EDAFEE45EAA0}
+		{1523D522-CC98-45CD-82A8-8A3CF2B974DC} = {D904E7F1-482F-4CBD-B7B2-24B01A41D90D}
 	EndGlobalSection
 EndGlobal
diff --git a/general/SystemDma/wdm/exe/SystemDmaApp.vcxproj b/general/SystemDma/wdm/exe/SystemDmaApp.vcxproj
index a7609715..f78cbee9 100644
--- a/general/SystemDma/wdm/exe/SystemDmaApp.vcxproj
+++ b/general/SystemDma/wdm/exe/SystemDmaApp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{442B1B6F-AFAA-45A4-BF7E-2085841BBCAE}</ProjectGuid>
+    <ProjectGuid>{6E5E2ADE-D50C-41DA-ACFB-FBA8151AED01}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{8454C72A-8659-4B42-923C-9318CEBE1D9E}</SampleGuid>
+    <SampleGuid>{F7A529D1-62F5-4954-9C68-B1FB1771CC60}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/SystemDma/wdm/exe/SystemDmaApp.vcxproj.Filters b/general/SystemDma/wdm/exe/SystemDmaApp.vcxproj.Filters
index 581ec22d..9d5f68d1 100644
--- a/general/SystemDma/wdm/exe/SystemDmaApp.vcxproj.Filters
+++ b/general/SystemDma/wdm/exe/SystemDmaApp.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>{9165AF3C-7BC3-4657-8EF7-4F494D41F49D}</UniqueIdentifier>
+      <UniqueIdentifier>{BF41CD4F-52A1-4419-81E8-9786CB2AFB1E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{50BBBADC-20CA-47BE-BC07-9242E4E4BD93}</UniqueIdentifier>
+      <UniqueIdentifier>{228A5D2B-64CA-4417-B284-F3BCC803887D}</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>{E382FB1B-6C4B-4558-8C22-8A69FDDE6B6F}</UniqueIdentifier>
+      <UniqueIdentifier>{A773B3A2-C1BE-45DE-BE84-B32D4C1CDD32}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/SystemDma/wdm/sys/SDma.vcxproj b/general/SystemDma/wdm/sys/SDma.vcxproj
index 838042d3..584a802f 100644
--- a/general/SystemDma/wdm/sys/SDma.vcxproj
+++ b/general/SystemDma/wdm/sys/SDma.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{3985BC4B-064D-4593-A898-9C73AE59F11C}</ProjectGuid>
+    <ProjectGuid>{1523D522-CC98-45CD-82A8-8A3CF2B974DC}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{7EE6B6B0-9980-4C86-AA78-EF29D53BEF17}</SampleGuid>
+    <SampleGuid>{0425FE5A-63A2-4D00-858D-67293A21C5E2}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/SystemDma/wdm/sys/SDma.vcxproj.Filters b/general/SystemDma/wdm/sys/SDma.vcxproj.Filters
index 116400e1..eaba14c6 100644
--- a/general/SystemDma/wdm/sys/SDma.vcxproj.Filters
+++ b/general/SystemDma/wdm/sys/SDma.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>{59F0B344-1374-4E15-A8B7-9C8E3213A541}</UniqueIdentifier>
+      <UniqueIdentifier>{A9E50ADD-EF44-4A28-9342-D5A8DA29D639}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{5483EB90-1466-4DB6-9E7F-3DB593CD79FB}</UniqueIdentifier>
+      <UniqueIdentifier>{5F595723-D776-488D-BF02-26BE0D36ABD1}</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>{315FEF3C-524B-47DA-99BF-6C5B211CE531}</UniqueIdentifier>
+      <UniqueIdentifier>{0352C950-CFFE-4C45-B627-D707B4448D2A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{4997B2F3-3A07-4B16-AB97-AC5CF9527734}</UniqueIdentifier>
+      <UniqueIdentifier>{E9574296-37C9-4979-B5CF-CFC1CF1434F7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/cancel/cancel.sln b/general/cancel/cancel.sln
index f0c190ec..d3fec9cb 100644
--- a/general/cancel/cancel.sln
+++ b/general/cancel/cancel.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{DEC3F1B6-5DEC-468C-B8BB-C1DC2C421850}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{797B3D69-5519-4280-9906-4574BC389996}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{23E633E4-C580-4996-9178-02E7FA6E4DC5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{B7C44059-E502-4CFD-9195-34B5BBB1546B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Startio", "Startio", "{7621E5ED-5028-4A69-9728-A44E6FF16C4B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Startio", "Startio", "{B35BD397-0062-48D6-9E0B-623A9E842B26}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cancel", "sys\cancel.vcxproj", "{7624E1DC-F66B-40BD-961E-D847560EBD80}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cancel", "sys\cancel.vcxproj", "{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "canclapp", "exe\canclapp.vcxproj", "{531B7E42-B149-471F-B8FC-8983CCCB2DBF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "canclapp", "exe\canclapp.vcxproj", "{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cancel", "startio\cancel.vcxproj", "{CE95297F-417A-4A1E-B842-AD545D354500}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cancel", "startio\cancel.vcxproj", "{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,37 +23,37 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7624E1DC-F66B-40BD-961E-D847560EBD80}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7624E1DC-F66B-40BD-961E-D847560EBD80}.Debug|Win32.Build.0 = Debug|Win32
-		{7624E1DC-F66B-40BD-961E-D847560EBD80}.Release|Win32.ActiveCfg = Release|Win32
-		{7624E1DC-F66B-40BD-961E-D847560EBD80}.Release|Win32.Build.0 = Release|Win32
-		{7624E1DC-F66B-40BD-961E-D847560EBD80}.Debug|x64.ActiveCfg = Debug|x64
-		{7624E1DC-F66B-40BD-961E-D847560EBD80}.Debug|x64.Build.0 = Debug|x64
-		{7624E1DC-F66B-40BD-961E-D847560EBD80}.Release|x64.ActiveCfg = Release|x64
-		{7624E1DC-F66B-40BD-961E-D847560EBD80}.Release|x64.Build.0 = Release|x64
-		{531B7E42-B149-471F-B8FC-8983CCCB2DBF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{531B7E42-B149-471F-B8FC-8983CCCB2DBF}.Debug|Win32.Build.0 = Debug|Win32
-		{531B7E42-B149-471F-B8FC-8983CCCB2DBF}.Release|Win32.ActiveCfg = Release|Win32
-		{531B7E42-B149-471F-B8FC-8983CCCB2DBF}.Release|Win32.Build.0 = Release|Win32
-		{531B7E42-B149-471F-B8FC-8983CCCB2DBF}.Debug|x64.ActiveCfg = Debug|x64
-		{531B7E42-B149-471F-B8FC-8983CCCB2DBF}.Debug|x64.Build.0 = Debug|x64
-		{531B7E42-B149-471F-B8FC-8983CCCB2DBF}.Release|x64.ActiveCfg = Release|x64
-		{531B7E42-B149-471F-B8FC-8983CCCB2DBF}.Release|x64.Build.0 = Release|x64
-		{CE95297F-417A-4A1E-B842-AD545D354500}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CE95297F-417A-4A1E-B842-AD545D354500}.Debug|Win32.Build.0 = Debug|Win32
-		{CE95297F-417A-4A1E-B842-AD545D354500}.Release|Win32.ActiveCfg = Release|Win32
-		{CE95297F-417A-4A1E-B842-AD545D354500}.Release|Win32.Build.0 = Release|Win32
-		{CE95297F-417A-4A1E-B842-AD545D354500}.Debug|x64.ActiveCfg = Debug|x64
-		{CE95297F-417A-4A1E-B842-AD545D354500}.Debug|x64.Build.0 = Debug|x64
-		{CE95297F-417A-4A1E-B842-AD545D354500}.Release|x64.ActiveCfg = Release|x64
-		{CE95297F-417A-4A1E-B842-AD545D354500}.Release|x64.Build.0 = Release|x64
+		{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}.Debug|Win32.Build.0 = Debug|Win32
+		{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}.Release|Win32.ActiveCfg = Release|Win32
+		{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}.Release|Win32.Build.0 = Release|Win32
+		{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}.Debug|x64.ActiveCfg = Debug|x64
+		{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}.Debug|x64.Build.0 = Debug|x64
+		{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}.Release|x64.ActiveCfg = Release|x64
+		{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}.Release|x64.Build.0 = Release|x64
+		{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}.Debug|Win32.Build.0 = Debug|Win32
+		{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}.Release|Win32.ActiveCfg = Release|Win32
+		{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}.Release|Win32.Build.0 = Release|Win32
+		{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}.Debug|x64.ActiveCfg = Debug|x64
+		{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}.Debug|x64.Build.0 = Debug|x64
+		{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}.Release|x64.ActiveCfg = Release|x64
+		{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}.Release|x64.Build.0 = Release|x64
+		{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}.Debug|Win32.Build.0 = Debug|Win32
+		{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}.Release|Win32.ActiveCfg = Release|Win32
+		{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}.Release|Win32.Build.0 = Release|Win32
+		{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}.Debug|x64.ActiveCfg = Debug|x64
+		{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}.Debug|x64.Build.0 = Debug|x64
+		{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}.Release|x64.ActiveCfg = Release|x64
+		{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{7624E1DC-F66B-40BD-961E-D847560EBD80} = {DEC3F1B6-5DEC-468C-B8BB-C1DC2C421850}
-		{531B7E42-B149-471F-B8FC-8983CCCB2DBF} = {23E633E4-C580-4996-9178-02E7FA6E4DC5}
-		{CE95297F-417A-4A1E-B842-AD545D354500} = {7621E5ED-5028-4A69-9728-A44E6FF16C4B}
+		{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC} = {797B3D69-5519-4280-9906-4574BC389996}
+		{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7} = {B7C44059-E502-4CFD-9195-34B5BBB1546B}
+		{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E} = {B35BD397-0062-48D6-9E0B-623A9E842B26}
 	EndGlobalSection
 EndGlobal
diff --git a/general/cancel/exe/canclapp.vcxproj b/general/cancel/exe/canclapp.vcxproj
index 9d773ba4..4cddd29c 100644
--- a/general/cancel/exe/canclapp.vcxproj
+++ b/general/cancel/exe/canclapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{531B7E42-B149-471F-B8FC-8983CCCB2DBF}</ProjectGuid>
+    <ProjectGuid>{5525BABA-1BF1-47B1-93E2-F7A0F62C06C7}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{2D283D6D-F460-4609-A38C-0C9A1C261663}</SampleGuid>
+    <SampleGuid>{BE0D41F9-A019-4A1E-9D1B-80F9AD5727D4}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/cancel/exe/canclapp.vcxproj.Filters b/general/cancel/exe/canclapp.vcxproj.Filters
index 9fe9f999..5e0e15ce 100644
--- a/general/cancel/exe/canclapp.vcxproj.Filters
+++ b/general/cancel/exe/canclapp.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>{0FEAE906-189A-421D-A495-02BE6BD56D5B}</UniqueIdentifier>
+      <UniqueIdentifier>{C0ECFA81-B1DC-4727-9ACC-E84E98BDFBAA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{63CE3A5E-8192-4CE8-A08A-5BB7DFA40D49}</UniqueIdentifier>
+      <UniqueIdentifier>{B73D426B-2133-4034-BB36-E89154F6AFB1}</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>{7625AB82-3F98-4B7F-89BF-D72AD913D45B}</UniqueIdentifier>
+      <UniqueIdentifier>{84C42702-5407-49E2-B0CA-CE2BBD8BDE56}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/cancel/startio/cancel.vcxproj b/general/cancel/startio/cancel.vcxproj
index 5afc6e51..6b0ea2b6 100644
--- a/general/cancel/startio/cancel.vcxproj
+++ b/general/cancel/startio/cancel.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{CE95297F-417A-4A1E-B842-AD545D354500}</ProjectGuid>
+    <ProjectGuid>{325B0DEE-27D9-402C-AD6B-42B1B3AEAE8E}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{E44B3998-5BDD-49A8-8715-0C8F72742A35}</SampleGuid>
+    <SampleGuid>{EAF53F5E-D491-4711-9A8D-0A86044F7C9F}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/cancel/startio/cancel.vcxproj.Filters b/general/cancel/startio/cancel.vcxproj.Filters
index 6ac2e051..3b28a824 100644
--- a/general/cancel/startio/cancel.vcxproj.Filters
+++ b/general/cancel/startio/cancel.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>{E494A40A-3958-4EDF-B7C6-32C06EFEB65B}</UniqueIdentifier>
+      <UniqueIdentifier>{F07AC8CB-146B-45D0-BD8B-D8A43DA7D898}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{BC27F0CD-8873-4D29-B724-3C033F0BC89C}</UniqueIdentifier>
+      <UniqueIdentifier>{658194E1-5F16-4E66-A1B3-3DA87431BA56}</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>{FBA31D4F-3A5E-43F1-92EC-1FD1D62F9C4C}</UniqueIdentifier>
+      <UniqueIdentifier>{E163F32A-9E4B-43E6-BCA9-BD4732214F4A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{A13A12DF-D40B-4522-895F-36227156A823}</UniqueIdentifier>
+      <UniqueIdentifier>{0949490D-EEE1-4002-91DF-D7DD1675E8C7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/cancel/sys/cancel.c b/general/cancel/sys/cancel.c
index 58bf72e9..50580baf 100644
--- a/general/cancel/sys/cancel.c
+++ b/general/cancel/sys/cancel.c
@@ -282,7 +282,7 @@ Return Value:
             // layering itself over a this driver. A driver is
             // required to supply a dispatch routine for IRP_MJ_CREATE.
             //
-            fileContext = ExAllocatePoolWithQuotaTag(NonPagedPool, 
+            fileContext = ExAllocatePoolWithQuotaTag(NonPagedPoolNx, 
                                               sizeof(FILE_CONTEXT),
                                               TAG);
 
diff --git a/general/cancel/sys/cancel.vcxproj b/general/cancel/sys/cancel.vcxproj
index 81e495ef..618fffad 100644
--- a/general/cancel/sys/cancel.vcxproj
+++ b/general/cancel/sys/cancel.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{7624E1DC-F66B-40BD-961E-D847560EBD80}</ProjectGuid>
+    <ProjectGuid>{A1A90123-A9E1-4F81-BCC5-7D0AFCB29BAC}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{94C84B2A-BA1D-4247-891F-E8E06A3674DB}</SampleGuid>
+    <SampleGuid>{FFFC90E6-0186-42DC-829F-03986A62EE87}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/cancel/sys/cancel.vcxproj.Filters b/general/cancel/sys/cancel.vcxproj.Filters
index db33c650..b06bd1bb 100644
--- a/general/cancel/sys/cancel.vcxproj.Filters
+++ b/general/cancel/sys/cancel.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>{76ACAF4D-8EE9-4FDC-9D42-16B803FD21C2}</UniqueIdentifier>
+      <UniqueIdentifier>{6E0AA80C-B5BE-4311-980E-7095385230CF}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{35AC8B42-7A9B-4609-8960-B23407C28987}</UniqueIdentifier>
+      <UniqueIdentifier>{453738B6-120F-442D-9A94-DF67C7137F85}</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>{2353E056-A752-4437-ACB6-C9F190C6920F}</UniqueIdentifier>
+      <UniqueIdentifier>{1AB894BC-0BFE-4431-A4DF-EBF2F0A99786}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{20F1A0AF-5FD4-422C-B62D-35E37135815F}</UniqueIdentifier>
+      <UniqueIdentifier>{E63355BC-8866-4E7F-BD8C-E5E01FD941E3}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/echo/kmdf/driver/AutoSync/echo.inx b/general/echo/kmdf/driver/AutoSync/echo.inx
index 24d4370d..d22c8806 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.inx
+++ b/general/echo/kmdf/driver/AutoSync/echo.inx
diff --git a/general/echo/kmdf/driver/AutoSync/echo.vcxproj b/general/echo/kmdf/driver/AutoSync/echo.vcxproj
index 0c1b0ac0..b41d49c9 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.vcxproj
+++ b/general/echo/kmdf/driver/AutoSync/echo.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{C4DF013B-7414-4D27-B108-DC70B6A8DD80}</ProjectGuid>
+    <ProjectGuid>{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{3A2C1022-6A0D-49CE-8375-AD5ED987BCF5}</SampleGuid>
+    <SampleGuid>{315B8CBA-8105-439D-8F1A-F4291E25B6C6}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -75,13 +75,7 @@
   <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">
-    <Inf Include=".\echo.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\echo.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>echo</TargetName>
   </PropertyGroup>
diff --git a/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters b/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
index 0d3f7346..b74c71cb 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
+++ b/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{CAC61770-4C68-4C08-8954-C2EE9F4615B7}</UniqueIdentifier>
+      <UniqueIdentifier>{5F185289-EC4E-4722-AEA2-0B4F3C5C1B4B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{D8218D2B-4511-4292-A88E-8FADB0F1397E}</UniqueIdentifier>
+      <UniqueIdentifier>{20A0E0CC-6A73-4E97-8B00-7F3446A87F11}</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>{E024B75C-350B-4462-936B-54AFDBE3B003}</UniqueIdentifier>
+      <UniqueIdentifier>{F09DC5A0-148C-4EFB-A50D-C1C7F465CB09}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{AEECFCB2-863B-4F2E-8286-C6819113B132}</UniqueIdentifier>
+      <UniqueIdentifier>{0EA02671-13DA-40C0-850F-1A44D332A58D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\echo.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="device.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/echo/kmdf/driver/AutoSync/queue.c b/general/echo/kmdf/driver/AutoSync/queue.c
index 4906e067..b821add2 100644
--- a/general/echo/kmdf/driver/AutoSync/queue.c
+++ b/general/echo/kmdf/driver/AutoSync/queue.c
@@ -423,7 +423,7 @@ Return Value:
         queueContext->Length = 0L;
     }
 
-    queueContext->Buffer = ExAllocatePoolWithTag(NonPagedPool, Length, 'sam1');
+    queueContext->Buffer = ExAllocatePoolWithTag(NonPagedPoolNx, Length, 'sam1');
     if( queueContext->Buffer == NULL ) {
         KdPrint(("EchoEvtIoWrite: Could not allocate %Iu byte buffer\n", Length));
         WdfRequestComplete(Request, STATUS_INSUFFICIENT_RESOURCES);
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.inx b/general/echo/kmdf/driver/DriverSync/echo_2.inx
index 3cb9b163..235d12c0 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.inx
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.inx
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
index ad731fd9..95957fec 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B405FDF0-4BAD-4E15-86D6-48501103E91F}</ProjectGuid>
+    <ProjectGuid>{8E09C05F-B634-49BE-96C9-64682605DFB0}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{5D9EA73C-DEA4-4E2D-A61B-27BD444A4EE7}</SampleGuid>
+    <SampleGuid>{5F1267F8-39A5-49E0-A0D3-6D7C430F11B7}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -75,13 +75,7 @@
   <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">
-    <Inf Include=".\echo_2.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\echo_2.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>echo_2</TargetName>
   </PropertyGroup>
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
index 274afb0b..a8292fef 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{97EF35D4-90F8-4D46-979C-74DCEB007F84}</UniqueIdentifier>
+      <UniqueIdentifier>{EC10D63B-B51A-4A42-AC2C-54C5E9525944}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7E927353-FF78-45C4-837F-EDD782088E83}</UniqueIdentifier>
+      <UniqueIdentifier>{9EF2AD11-E87C-435A-AA3B-D706A34C0258}</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>{B669A8E3-E681-47BD-BF49-1FD5410AAD61}</UniqueIdentifier>
+      <UniqueIdentifier>{C14B0E60-6730-4C38-B2CC-C95C65C48EE0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{918A2EDA-630F-4822-AF89-DFEBD8BDA328}</UniqueIdentifier>
+      <UniqueIdentifier>{2E1C95C5-8516-4563-8F8C-A4EB61299F69}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\echo_2.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="device.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/echo/kmdf/driver/DriverSync/queue.c b/general/echo/kmdf/driver/DriverSync/queue.c
index 6017294e..78c199d2 100644
--- a/general/echo/kmdf/driver/DriverSync/queue.c
+++ b/general/echo/kmdf/driver/DriverSync/queue.c
@@ -638,7 +638,7 @@ Return Value:
         queueContext->Length = 0L;
     }
 
-    queueContext->Buffer = ExAllocatePoolWithTag(NonPagedPool, Length, 'sam1');
+    queueContext->Buffer = ExAllocatePoolWithTag(NonPagedPoolNx, Length, 'sam1');
     if( queueContext->Buffer == NULL ) {
         KdPrint(("EchoEvtIoWrite: Could not allocate %Iu byte buffer\n",Length));
         WdfRequestComplete(Request, STATUS_INSUFFICIENT_RESOURCES);
diff --git a/general/echo/kmdf/exe/echoapp.cpp b/general/echo/kmdf/exe/echoapp.cpp
index 2383db2c..348b4976 100644
--- a/general/echo/kmdf/exe/echoapp.cpp
+++ b/general/echo/kmdf/exe/echoapp.cpp
@@ -446,7 +446,7 @@ AsyncIo(
 
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
-                    printf(" %dth Read failed %d \n",i, GetLastError());
+                    printf(" %dth Read failed %d \n", (ULONG) i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
@@ -460,7 +460,7 @@ AsyncIo(
                       &pOvList[i]) == 0) {
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
-                    printf(" %dth Write failed %d \n",i, GetLastError());
+                    printf(" %dth Write failed %d \n", (ULONG) i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
@@ -487,7 +487,7 @@ AsyncIo(
         if (ioType == READER_TYPE) {
 
             i = completedOv - pOvList;
-            printf("Number of bytes read by request number %d is %d\n", i, numberOfBytesTransferred);
+            printf("Number of bytes read by request number %Id is %d\n", i, numberOfBytesTransferred);
 
             //
             // If we're done with the I/Os, then exit
@@ -513,7 +513,7 @@ AsyncIo(
                       completedOv) == 0) {
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
-                    printf("%dth Read failed %d \n", i, GetLastError());
+                    printf("%Idth Read failed %d \n", i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
@@ -522,7 +522,7 @@ AsyncIo(
 
             i = completedOv - pOvList;
 
-            printf("Number of bytes written by request number %d is %d\n", i, numberOfBytesTransferred);
+            printf("Number of bytes written by request number %Id is %d\n", i, numberOfBytesTransferred);
 
             //
             // If we're done with the I/Os, then exit
@@ -549,7 +549,7 @@ AsyncIo(
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
 
-                    printf("%dth write failed %d \n", i, GetLastError());
+                    printf("%Idth write failed %d \n", i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
diff --git a/general/echo/kmdf/exe/echoapp.vcxproj b/general/echo/kmdf/exe/echoapp.vcxproj
index 611109de..d0c2d740 100644
--- a/general/echo/kmdf/exe/echoapp.vcxproj
+++ b/general/echo/kmdf/exe/echoapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{6064ECE2-B8F6-4272-85EC-C80BD65DE700}</ProjectGuid>
+    <ProjectGuid>{4500713F-105B-4F35-9FC9-85D30E7C3F2D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{622CAFC6-E185-4727-952B-9B24EE9F7F80}</SampleGuid>
+    <SampleGuid>{B366A3FE-0009-4DB9-8482-AD1EDA2557F3}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/echo/kmdf/exe/echoapp.vcxproj.Filters b/general/echo/kmdf/exe/echoapp.vcxproj.Filters
index 16c9210f..0292f388 100644
--- a/general/echo/kmdf/exe/echoapp.vcxproj.Filters
+++ b/general/echo/kmdf/exe/echoapp.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>{F7DC8A79-8789-4F30-AAF9-84E75E74662B}</UniqueIdentifier>
+      <UniqueIdentifier>{9B789EE5-1E52-465E-B2F4-E76788525B58}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{978DA09C-AAC5-4A3C-BDD6-C06EE55BF876}</UniqueIdentifier>
+      <UniqueIdentifier>{CAB74E51-A64C-4198-A264-1B5025B52C8A}</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>{069F7D15-D8CC-4677-BD02-7013C88EF23B}</UniqueIdentifier>
+      <UniqueIdentifier>{FD7CD877-7D31-4A6F-9B7B-37A253E72D84}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/echo/kmdf/kmdfecho.sln b/general/echo/kmdf/kmdfecho.sln
index 87d4ca91..fc7a8245 100644
--- a/general/echo/kmdf/kmdfecho.sln
+++ b/general/echo/kmdf/kmdfecho.sln
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{2CB6609B-4511-4F2F-89DD-0F70D2D4978C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{4C3245DE-386F-4315-AE20-B7F8938239A7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{DA4A75C3-4783-40D0-87FF-48BE5D4C347A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{F6CBEC4C-BA8E-46F5-9A69-B164E393E074}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{63B83859-9E79-4DA8-8A37-A657790D1DE9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{4A3350D6-C44E-40F3-9274-DCC201D5613E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DriverSync", "DriverSync", "{284392FE-8376-4F89-9793-46999E72B1CD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DriverSync", "DriverSync", "{329569F4-D659-4E23-9B29-791CA85BF28F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{C4DF013B-7414-4D27-B108-DC70B6A8DD80}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo_2", "driver\DriverSync\echo_2.vcxproj", "{F95F639B-5A29-4D6A-A0BF-60558789C717}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo_2", "driver\DriverSync\echo_2.vcxproj", "{8E09C05F-B634-49BE-96C9-64682605DFB0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,39 +25,39 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|Win32.Build.0 = Debug|Win32
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|Win32.ActiveCfg = Release|Win32
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|Win32.Build.0 = Release|Win32
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|x64.ActiveCfg = Debug|x64
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|x64.Build.0 = Debug|x64
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|x64.ActiveCfg = Release|x64
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|x64.Build.0 = Release|x64
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|Win32.Build.0 = Debug|Win32
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|Win32.ActiveCfg = Release|Win32
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|Win32.Build.0 = Release|Win32
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|x64.ActiveCfg = Debug|x64
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|x64.Build.0 = Debug|x64
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|x64.ActiveCfg = Release|x64
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|x64.Build.0 = Release|x64
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|Win32.Build.0 = Debug|Win32
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|Win32.ActiveCfg = Release|Win32
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|Win32.Build.0 = Release|Win32
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|x64.ActiveCfg = Debug|x64
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|x64.Build.0 = Debug|x64
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|x64.ActiveCfg = Release|x64
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|x64.Build.0 = Release|x64
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|Win32.Build.0 = Debug|Win32
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|Win32.ActiveCfg = Release|Win32
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|Win32.Build.0 = Release|Win32
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|x64.ActiveCfg = Debug|x64
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|x64.Build.0 = Debug|x64
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|x64.ActiveCfg = Release|x64
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|x64.Build.0 = Release|x64
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|Win32.ActiveCfg = Debug|Win32
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|Win32.Build.0 = Debug|Win32
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|Win32.ActiveCfg = Release|Win32
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|Win32.Build.0 = Release|Win32
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|x64.ActiveCfg = Debug|x64
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|x64.Build.0 = Debug|x64
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|x64.ActiveCfg = Release|x64
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|x64.Build.0 = Release|x64
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|Win32.Build.0 = Debug|Win32
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|Win32.ActiveCfg = Release|Win32
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|Win32.Build.0 = Release|Win32
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|x64.ActiveCfg = Debug|x64
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|x64.Build.0 = Debug|x64
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|x64.ActiveCfg = Release|x64
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB} = {2CB6609B-4511-4F2F-89DD-0F70D2D4978C}
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80} = {DA4A75C3-4783-40D0-87FF-48BE5D4C347A}
-		{F95F639B-5A29-4D6A-A0BF-60558789C717} = {284392FE-8376-4F89-9793-46999E72B1CD}
-		{DA4A75C3-4783-40D0-87FF-48BE5D4C347A} = {63B83859-9E79-4DA8-8A37-A657790D1DE9}
-		{284392FE-8376-4F89-9793-46999E72B1CD} = {63B83859-9E79-4DA8-8A37-A657790D1DE9}
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69} = {4C3245DE-386F-4315-AE20-B7F8938239A7}
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66} = {F6CBEC4C-BA8E-46F5-9A69-B164E393E074}
+		{8E09C05F-B634-49BE-96C9-64682605DFB0} = {329569F4-D659-4E23-9B29-791CA85BF28F}
+		{F6CBEC4C-BA8E-46F5-9A69-B164E393E074} = {4A3350D6-C44E-40F3-9274-DCC201D5613E}
+		{329569F4-D659-4E23-9B29-791CA85BF28F} = {4A3350D6-C44E-40F3-9274-DCC201D5613E}
 	EndGlobalSection
 EndGlobal
diff --git a/general/echo/umdf/WUDFEchoDriver.inx b/general/echo/umdf/WUDFEchoDriver.inx
index 03f727ee..ad6e9bf4 100644
--- a/general/echo/umdf/WUDFEchoDriver.inx
+++ b/general/echo/umdf/WUDFEchoDriver.inx
diff --git a/general/echo/umdf/WUDFEchoDriver.vcxproj b/general/echo/umdf/WUDFEchoDriver.vcxproj
index 8e5f4558..c9a5a638 100644
--- a/general/echo/umdf/WUDFEchoDriver.vcxproj
+++ b/general/echo/umdf/WUDFEchoDriver.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{ED527E05-B9E4-4B58-AEF4-A52994AE2829}</ProjectGuid>
+    <ProjectGuid>{13CC3E04-E27E-4E44-90DE-CFBED92D7130}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{95603758-8BCA-495F-A2B2-13FCC5FF53FD}</SampleGuid>
+    <SampleGuid>{9838DCDC-C817-4EA5-B7E8-B3F97F2B138A}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -81,11 +81,6 @@
       <WppDllMacro>true</WppDllMacro>
       <WppScanConfigurationData>internal.h</WppScanConfigurationData>
     </ClCompile>
-    <Inf Include="WudfEchoDriver.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\WudfEchoDriver.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="Echo.rc">
       <WppEnabled>true</WppEnabled>
       <WppDllMacro>true</WppDllMacro>
diff --git a/general/echo/umdf/WUDFEchoDriver.vcxproj.Filters b/general/echo/umdf/WUDFEchoDriver.vcxproj.Filters
index 86c4a54a..8a23705a 100644
--- a/general/echo/umdf/WUDFEchoDriver.vcxproj.Filters
+++ b/general/echo/umdf/WUDFEchoDriver.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>{437C2853-EB63-4965-9736-A8FDBF0928A7}</UniqueIdentifier>
+      <UniqueIdentifier>{CF73CF52-2BA2-434D-8E38-8F730D54F150}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{8B078219-E9D2-4EA5-9056-172A3917798B}</UniqueIdentifier>
+      <UniqueIdentifier>{6D44B960-AD87-4EA1-80E4-D63DF6914D51}</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>{936B986E-FAD4-44C8-8D5B-2AA3FA81ADAE}</UniqueIdentifier>
+      <UniqueIdentifier>{9542D238-C8CE-44BC-9307-50CEDCCA5F25}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{66578744-D55B-452B-88ED-8F86F6BACB82}</UniqueIdentifier>
+      <UniqueIdentifier>{D77C3549-2C94-49EB-909E-54EB79474A98}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,11 +39,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="WudfEchoDriver.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="Echo.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/echo/umdf/echo.sln b/general/echo/umdf/echo.sln
index 376bf830..cc459eea 100644
--- a/general/echo/umdf/echo.sln
+++ b/general/echo/umdf/echo.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFEchoDriver", "WUDFEchoDriver.vcxproj", "{ED527E05-B9E4-4B58-AEF4-A52994AE2829}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFEchoDriver", "WUDFEchoDriver.vcxproj", "{13CC3E04-E27E-4E44-90DE-CFBED92D7130}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Debug|Win32.Build.0 = Debug|Win32
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Release|Win32.ActiveCfg = Release|Win32
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Release|Win32.Build.0 = Release|Win32
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Debug|x64.ActiveCfg = Debug|x64
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Debug|x64.Build.0 = Debug|x64
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Release|x64.ActiveCfg = Release|x64
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Release|x64.Build.0 = Release|x64
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Debug|Win32.Build.0 = Debug|Win32
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Release|Win32.ActiveCfg = Release|Win32
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Release|Win32.Build.0 = Release|Win32
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Debug|x64.ActiveCfg = Debug|x64
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Debug|x64.Build.0 = Debug|x64
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Release|x64.ActiveCfg = Release|x64
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/general/echo/umdf2/driver/AutoSync/echo.vcxproj b/general/echo/umdf2/driver/AutoSync/echo.vcxproj
index 93fc544b..e3a2e18d 100644
--- a/general/echo/umdf2/driver/AutoSync/echo.vcxproj
+++ b/general/echo/umdf2/driver/AutoSync/echo.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{407818D1-E32A-406A-9023-D0413C0733E4}</ProjectGuid>
+    <ProjectGuid>{82306592-0B90-44A7-AC88-F75A9E98E645}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{A6CA93A2-E3F5-40E0-A4AE-4930BB05BF0F}</SampleGuid>
+    <SampleGuid>{B74758D6-F9D4-46A4-9647-8B5AC4A9C689}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -75,13 +75,7 @@
   <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">
-    <Inf Include=".\EchoUm.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\EchoUm.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>echo</TargetName>
   </PropertyGroup>
diff --git a/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters b/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters
index 55d8a04f..e7ee9b9d 100644
--- a/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters
+++ b/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{58D2BB85-1D40-4837-A558-C21C3266B208}</UniqueIdentifier>
+      <UniqueIdentifier>{B7A478F1-3462-402C-B3F4-2DB5F7484941}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{6036C97F-A229-4B81-B07B-34A70C91F167}</UniqueIdentifier>
+      <UniqueIdentifier>{AE34D3A5-726B-49B1-B974-C4D38F3B8CE0}</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>{8D6CC9F5-9AC8-45DD-8987-861FD69E167C}</UniqueIdentifier>
+      <UniqueIdentifier>{D9E33B3E-851D-4243-A6DA-F559C1FFF3FB}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{6FC299B3-583D-4209-A259-CF65F4D02C10}</UniqueIdentifier>
+      <UniqueIdentifier>{CAF21CF9-F7FF-4D7E-8FAD-E38B097DEF0B}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\EchoUm.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="device.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/echo/umdf2/driver/AutoSync/echoum.inx b/general/echo/umdf2/driver/AutoSync/echoum.inx
index 87db7cad..4e3cd6b3 100644
--- a/general/echo/umdf2/driver/AutoSync/echoum.inx
+++ b/general/echo/umdf2/driver/AutoSync/echoum.inx
diff --git a/general/echo/umdf2/exe/echoapp.cpp b/general/echo/umdf2/exe/echoapp.cpp
index 2383db2c..348b4976 100644
--- a/general/echo/umdf2/exe/echoapp.cpp
+++ b/general/echo/umdf2/exe/echoapp.cpp
@@ -446,7 +446,7 @@ AsyncIo(
 
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
-                    printf(" %dth Read failed %d \n",i, GetLastError());
+                    printf(" %dth Read failed %d \n", (ULONG) i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
@@ -460,7 +460,7 @@ AsyncIo(
                       &pOvList[i]) == 0) {
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
-                    printf(" %dth Write failed %d \n",i, GetLastError());
+                    printf(" %dth Write failed %d \n", (ULONG) i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
@@ -487,7 +487,7 @@ AsyncIo(
         if (ioType == READER_TYPE) {
 
             i = completedOv - pOvList;
-            printf("Number of bytes read by request number %d is %d\n", i, numberOfBytesTransferred);
+            printf("Number of bytes read by request number %Id is %d\n", i, numberOfBytesTransferred);
 
             //
             // If we're done with the I/Os, then exit
@@ -513,7 +513,7 @@ AsyncIo(
                       completedOv) == 0) {
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
-                    printf("%dth Read failed %d \n", i, GetLastError());
+                    printf("%Idth Read failed %d \n", i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
@@ -522,7 +522,7 @@ AsyncIo(
 
             i = completedOv - pOvList;
 
-            printf("Number of bytes written by request number %d is %d\n", i, numberOfBytesTransferred);
+            printf("Number of bytes written by request number %Id is %d\n", i, numberOfBytesTransferred);
 
             //
             // If we're done with the I/Os, then exit
@@ -549,7 +549,7 @@ AsyncIo(
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
 
-                    printf("%dth write failed %d \n", i, GetLastError());
+                    printf("%Idth write failed %d \n", i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
diff --git a/general/echo/umdf2/exe/echoapp.vcxproj b/general/echo/umdf2/exe/echoapp.vcxproj
index 120c89bf..d0c2d740 100644
--- a/general/echo/umdf2/exe/echoapp.vcxproj
+++ b/general/echo/umdf2/exe/echoapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{4527D01F-6A3D-4E3C-95BE-866DA38F0A0A}</ProjectGuid>
+    <ProjectGuid>{4500713F-105B-4F35-9FC9-85D30E7C3F2D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{56E9CA0F-2FCF-4CC0-83D7-8179527F8288}</SampleGuid>
+    <SampleGuid>{B366A3FE-0009-4DB9-8482-AD1EDA2557F3}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/echo/umdf2/exe/echoapp.vcxproj.Filters b/general/echo/umdf2/exe/echoapp.vcxproj.Filters
index e502be53..0292f388 100644
--- a/general/echo/umdf2/exe/echoapp.vcxproj.Filters
+++ b/general/echo/umdf2/exe/echoapp.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>{8314F6CA-5E08-4F38-A79C-490CF0B1921E}</UniqueIdentifier>
+      <UniqueIdentifier>{9B789EE5-1E52-465E-B2F4-E76788525B58}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{B852C8A0-1F3F-4216-BE3B-027A9FCEA14C}</UniqueIdentifier>
+      <UniqueIdentifier>{CAB74E51-A64C-4198-A264-1B5025B52C8A}</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>{32AE256A-842E-4EC3-B190-09460CD4FA0A}</UniqueIdentifier>
+      <UniqueIdentifier>{FD7CD877-7D31-4A6F-9B7B-37A253E72D84}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/echo/umdf2/umdf2echo.sln b/general/echo/umdf2/umdf2echo.sln
index 71f8fa75..d1d8aea6 100644
--- a/general/echo/umdf2/umdf2echo.sln
+++ b/general/echo/umdf2/umdf2echo.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}") = "Exe", "Exe", "{E49BA847-A88E-4272-BC2D-D7ECB6937401}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{E19EE60B-03D8-4337-B1B0-87AC0B4C9279}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{5AC4DDBC-AC4B-41E3-AE1A-21DC1570A05E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{C6D1441B-C2EA-4548-8AE2-3DE76078F3DE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{48DED557-0B57-44D5-A364-F76A9BD5D83B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{5E4B11F2-937A-460F-8072-940A8EC7E648}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{FFCCCB8B-74AB-4C85-9200-B33171AAF119}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{4500713F-105B-4F35-9FC9-85D30E7C3F2D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{407818D1-E32A-406A-9023-D0413C0733E4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{82306592-0B90-44A7-AC88-F75A9E98E645}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,29 +21,29 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Debug|Win32.Build.0 = Debug|Win32
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Release|Win32.ActiveCfg = Release|Win32
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Release|Win32.Build.0 = Release|Win32
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Debug|x64.ActiveCfg = Debug|x64
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Debug|x64.Build.0 = Debug|x64
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Release|x64.ActiveCfg = Release|x64
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Release|x64.Build.0 = Release|x64
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Debug|Win32.Build.0 = Debug|Win32
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Release|Win32.ActiveCfg = Release|Win32
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Release|Win32.Build.0 = Release|Win32
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Debug|x64.ActiveCfg = Debug|x64
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Debug|x64.Build.0 = Debug|x64
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Release|x64.ActiveCfg = Release|x64
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Release|x64.Build.0 = Release|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|Win32.Build.0 = Debug|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|Win32.ActiveCfg = Release|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|Win32.Build.0 = Release|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|x64.ActiveCfg = Debug|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|x64.Build.0 = Debug|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|x64.ActiveCfg = Release|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|x64.Build.0 = Release|x64
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Debug|Win32.Build.0 = Debug|Win32
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Release|Win32.ActiveCfg = Release|Win32
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Release|Win32.Build.0 = Release|Win32
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Debug|x64.ActiveCfg = Debug|x64
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Debug|x64.Build.0 = Debug|x64
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Release|x64.ActiveCfg = Release|x64
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119} = {E49BA847-A88E-4272-BC2D-D7ECB6937401}
-		{407818D1-E32A-406A-9023-D0413C0733E4} = {5AC4DDBC-AC4B-41E3-AE1A-21DC1570A05E}
-		{5AC4DDBC-AC4B-41E3-AE1A-21DC1570A05E} = {48DED557-0B57-44D5-A364-F76A9BD5D83B}
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D} = {E19EE60B-03D8-4337-B1B0-87AC0B4C9279}
+		{82306592-0B90-44A7-AC88-F75A9E98E645} = {C6D1441B-C2EA-4548-8AE2-3DE76078F3DE}
+		{C6D1441B-C2EA-4548-8AE2-3DE76078F3DE} = {5E4B11F2-937A-460F-8072-940A8EC7E648}
 	EndGlobalSection
 EndGlobal
diff --git a/general/echo/umdfSocketEcho/Driver/SocketEcho.inx b/general/echo/umdfSocketEcho/Driver/SocketEcho.inx
index c7150d7c..b80dee9a 100644
--- a/general/echo/umdfSocketEcho/Driver/SocketEcho.inx
+++ b/general/echo/umdfSocketEcho/Driver/SocketEcho.inx
diff --git a/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj b/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj
index cfe950b0..750422be 100644
--- a/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj
+++ b/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}</ProjectGuid>
+    <ProjectGuid>{353E2F22-BD87-47F3-A211-90DE8D583D26}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{57A14DB7-700E-4B8F-BB83-0476F61B04AB}</SampleGuid>
+    <SampleGuid>{CE6B3D79-4604-4FAC-8A53-20B7000101FD}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -82,11 +82,6 @@
       <WppDllMacro>true</WppDllMacro>
       <WppScanConfigurationData>internal.h</WppScanConfigurationData>
     </ClCompile>
-    <Inf Include="SocketEcho.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\SocketEcho.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="SocketEcho.rc">
       <WppEnabled>true</WppEnabled>
       <WppDllMacro>true</WppDllMacro>
diff --git a/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj.Filters b/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj.Filters
index 7406bc8a..1c5cadc5 100644
--- a/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj.Filters
+++ b/general/echo/umdfSocketEcho/Driver/SocketEcho.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>{4634173A-AFBA-4CB0-A38B-3039057FE4C2}</UniqueIdentifier>
+      <UniqueIdentifier>{76642063-E1CB-43C5-8493-5F651D92F60C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{5C46A0BC-B376-47CD-99FF-19195273DC2E}</UniqueIdentifier>
+      <UniqueIdentifier>{4AB44AAB-2BDE-4DA4-A128-40382366A9F5}</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>{368D33EB-7143-4726-935B-5B0A0F2C042A}</UniqueIdentifier>
+      <UniqueIdentifier>{005AFEBA-780E-49DC-BCB8-4163463DE6D5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{3B3E9AC4-246E-4375-BAAE-6F6938AB5BC9}</UniqueIdentifier>
+      <UniqueIdentifier>{FDF16DEE-FA54-49E3-BC76-FCFD47F8BF37}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,11 +39,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="SocketEcho.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="SocketEcho.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj b/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj
index e83fa9f9..e648bc34 100644
--- a/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj
+++ b/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B832D7D3-C7DE-4E44-8812-FDB1991E503D}</ProjectGuid>
+    <ProjectGuid>{70A0F94B-0D04-4AB4-A653-733AC0210EBC}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{B28D7831-D20D-4451-9D56-95D026F4AF7F}</SampleGuid>
+    <SampleGuid>{0C41C62B-B1D0-4A46-B431-6DA1A153FDC0}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj.Filters b/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj.Filters
index 71857f2a..daed19de 100644
--- a/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj.Filters
+++ b/general/echo/umdfSocketEcho/Exe/socketechoserver.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>{6E35CF09-8803-4962-92AA-CEDE880104E3}</UniqueIdentifier>
+      <UniqueIdentifier>{6F82EFE8-0818-4BAE-A52F-C72D9E63CAD6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{CC742E22-4156-475F-8A37-A96412F8D67C}</UniqueIdentifier>
+      <UniqueIdentifier>{448C5D48-4FD2-4DA5-964C-3EF201A3ED31}</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>{6334BFC0-C39E-48DC-95E5-A3B1997E3C9A}</UniqueIdentifier>
+      <UniqueIdentifier>{439980EC-B0F0-45A7-AF18-E832E564F57D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/echo/umdfSocketEcho/umdfsocketecho.sln b/general/echo/umdfSocketEcho/umdfsocketecho.sln
index 96eb22b6..775550f5 100644
--- a/general/echo/umdfSocketEcho/umdfsocketecho.sln
+++ b/general/echo/umdfSocketEcho/umdfsocketecho.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{A07EE392-4980-445C-B7D5-62A433133943}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{5926AA26-ED89-4B86-ADD3-6415A17996DF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{8B570B91-8F7B-4FC0-B8D7-C169B3B9F3A0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{17E8DD65-7DC7-4D59-96A0-52A20C036403}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SocketEcho", "Driver\SocketEcho.vcxproj", "{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SocketEcho", "Driver\SocketEcho.vcxproj", "{353E2F22-BD87-47F3-A211-90DE8D583D26}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socketechoserver", "Exe\socketechoserver.vcxproj", "{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socketechoserver", "Exe\socketechoserver.vcxproj", "{70A0F94B-0D04-4AB4-A653-733AC0210EBC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Debug|Win32.Build.0 = Debug|Win32
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Release|Win32.ActiveCfg = Release|Win32
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Release|Win32.Build.0 = Release|Win32
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Debug|x64.ActiveCfg = Debug|x64
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Debug|x64.Build.0 = Debug|x64
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Release|x64.ActiveCfg = Release|x64
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Release|x64.Build.0 = Release|x64
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Debug|Win32.Build.0 = Debug|Win32
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Release|Win32.ActiveCfg = Release|Win32
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Release|Win32.Build.0 = Release|Win32
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Debug|x64.ActiveCfg = Debug|x64
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Debug|x64.Build.0 = Debug|x64
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Release|x64.ActiveCfg = Release|x64
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Release|x64.Build.0 = Release|x64
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Debug|Win32.ActiveCfg = Debug|Win32
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Debug|Win32.Build.0 = Debug|Win32
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Release|Win32.ActiveCfg = Release|Win32
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Release|Win32.Build.0 = Release|Win32
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Debug|x64.ActiveCfg = Debug|x64
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Debug|x64.Build.0 = Debug|x64
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Release|x64.ActiveCfg = Release|x64
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Release|x64.Build.0 = Release|x64
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Debug|Win32.Build.0 = Debug|Win32
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Release|Win32.ActiveCfg = Release|Win32
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Release|Win32.Build.0 = Release|Win32
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Debug|x64.ActiveCfg = Debug|x64
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Debug|x64.Build.0 = Debug|x64
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Release|x64.ActiveCfg = Release|x64
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B} = {A07EE392-4980-445C-B7D5-62A433133943}
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3} = {8B570B91-8F7B-4FC0-B8D7-C169B3B9F3A0}
+		{353E2F22-BD87-47F3-A211-90DE8D583D26} = {5926AA26-ED89-4B86-ADD3-6415A17996DF}
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC} = {17E8DD65-7DC7-4D59-96A0-52A20C036403}
 	EndGlobalSection
 EndGlobal
diff --git a/general/event/eventsample.sln b/general/event/eventsample.sln
index fd6ce73a..3bb164b2 100644
--- a/general/event/eventsample.sln
+++ b/general/event/eventsample.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{A9909D6D-8A29-406C-A968-49D288571564}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{2FC03CC0-1C79-456A-9014-274D87327B9A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wdm", "Wdm", "{6D384D47-52EE-4445-9F2F-A5947E8D36BE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wdm", "Wdm", "{D1C7DC44-3DC6-475C-A445-CBDF807DC810}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "exe\event.vcxproj", "{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "exe\event.vcxproj", "{43F430EA-B1A7-4A80-B390-121C1C5A99C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "wdm\event.vcxproj", "{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "wdm\event.vcxproj", "{21F8EA86-F950-4D2D-B256-721B3151157A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Debug|Win32.Build.0 = Debug|Win32
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Release|Win32.ActiveCfg = Release|Win32
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Release|Win32.Build.0 = Release|Win32
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Debug|x64.ActiveCfg = Debug|x64
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Debug|x64.Build.0 = Debug|x64
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Release|x64.ActiveCfg = Release|x64
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Release|x64.Build.0 = Release|x64
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Debug|Win32.Build.0 = Debug|Win32
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Release|Win32.ActiveCfg = Release|Win32
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Release|Win32.Build.0 = Release|Win32
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Debug|x64.ActiveCfg = Debug|x64
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Debug|x64.Build.0 = Debug|x64
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Release|x64.ActiveCfg = Release|x64
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Release|x64.Build.0 = Release|x64
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Debug|Win32.Build.0 = Debug|Win32
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Release|Win32.ActiveCfg = Release|Win32
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Release|Win32.Build.0 = Release|Win32
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Debug|x64.ActiveCfg = Debug|x64
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Debug|x64.Build.0 = Debug|x64
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Release|x64.ActiveCfg = Release|x64
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Release|x64.Build.0 = Release|x64
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Debug|Win32.Build.0 = Debug|Win32
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Release|Win32.ActiveCfg = Release|Win32
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Release|Win32.Build.0 = Release|Win32
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Debug|x64.ActiveCfg = Debug|x64
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Debug|x64.Build.0 = Debug|x64
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Release|x64.ActiveCfg = Release|x64
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA} = {A9909D6D-8A29-406C-A968-49D288571564}
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB} = {6D384D47-52EE-4445-9F2F-A5947E8D36BE}
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4} = {2FC03CC0-1C79-456A-9014-274D87327B9A}
+		{21F8EA86-F950-4D2D-B256-721B3151157A} = {D1C7DC44-3DC6-475C-A445-CBDF807DC810}
 	EndGlobalSection
 EndGlobal
diff --git a/general/event/exe/event.vcxproj b/general/event/exe/event.vcxproj
index c766e610..59df0e8b 100644
--- a/general/event/exe/event.vcxproj
+++ b/general/event/exe/event.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}</ProjectGuid>
+    <ProjectGuid>{43F430EA-B1A7-4A80-B390-121C1C5A99C4}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{F9033692-F4E7-4095-BC2B-D5BADC007D30}</SampleGuid>
+    <SampleGuid>{BF9BBA5B-7BCF-4527-B357-39679BBF1DBA}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/event/exe/event.vcxproj.Filters b/general/event/exe/event.vcxproj.Filters
index 086ec75c..24066c0a 100644
--- a/general/event/exe/event.vcxproj.Filters
+++ b/general/event/exe/event.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>{4A49E5E2-7CFB-4C09-A2FC-0DFC1BDF6F29}</UniqueIdentifier>
+      <UniqueIdentifier>{55A3C741-9CBD-4AA7-98D2-AB032642C676}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{9B2A6E91-192B-4E3B-8FEB-CB07E83DC175}</UniqueIdentifier>
+      <UniqueIdentifier>{1F31A1C8-AAB4-41AA-9353-F91A6A185B2F}</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>{89F7E440-8EFA-40ED-869F-A9B66BAFD9CE}</UniqueIdentifier>
+      <UniqueIdentifier>{88F38F8A-D5F3-4C24-A9E8-9B6A574D60C6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/event/wdm/event.c b/general/event/wdm/event.c
index 64bae443..8900d722 100644
--- a/general/event/wdm/event.c
+++ b/general/event/wdm/event.c
@@ -107,7 +107,13 @@ Return Value:
 
     UNREFERENCED_PARAMETER(RegistryPath);
 
-    DebugPrint(("==>DriverEntry\n"));
+	DebugPrint(("==>DriverEntry\n")); DbgBreakPoint();
+
+    //
+    // Opt-in to using non-executable pool memory on Windows 8 and later.
+    // https://msdn.microsoft.com/en-us/library/windows/hardware/hh920402(v=vs.85).aspx
+    //
+    ExInitializeDriverRuntime(DrvRtPoolNxOptIn);
 
     //
     // Create the device object
diff --git a/general/event/wdm/event.vcxproj b/general/event/wdm/event.vcxproj
index e04e27f4..507a3b57 100644
--- a/general/event/wdm/event.vcxproj
+++ b/general/event/wdm/event.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}</ProjectGuid>
+    <ProjectGuid>{21F8EA86-F950-4D2D-B256-721B3151157A}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{4CDA076B-602B-41D2-B44E-C5A30A5FAEC9}</SampleGuid>
+    <SampleGuid>{CB8CC3B6-AB82-4CC0-A34E-F410EECB74B1}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -89,24 +89,28 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
@@ -117,24 +121,28 @@
   </ItemGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
diff --git a/general/event/wdm/event.vcxproj.Filters b/general/event/wdm/event.vcxproj.Filters
index 51e6e7a2..0b3ee89a 100644
--- a/general/event/wdm/event.vcxproj.Filters
+++ b/general/event/wdm/event.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>{FBA431BE-C574-4FA3-A9A7-AC53BC5FA3D8}</UniqueIdentifier>
+      <UniqueIdentifier>{E8EC7AB7-4A52-40EF-AE2C-2407B7383221}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{59F6A01C-DE89-40FA-974F-C7A4F9FE7382}</UniqueIdentifier>
+      <UniqueIdentifier>{1F009C6F-D429-4D66-99E1-3728B7F559FE}</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>{3030B68B-29A8-42DA-97F3-9E142944B42D}</UniqueIdentifier>
+      <UniqueIdentifier>{7428ED65-F559-4708-A24F-FE39C1B3C86B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{FE8A95D1-C7A7-4574-95F7-8A2D87F51FC9}</UniqueIdentifier>
+      <UniqueIdentifier>{C55E0ADA-91DE-4876-88FD-3FF9ED492D70}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/filehistory/exe/fhsetup.vcxproj b/general/filehistory/exe/fhsetup.vcxproj
index 6fcf831a..fdb347e1 100644
--- a/general/filehistory/exe/fhsetup.vcxproj
+++ b/general/filehistory/exe/fhsetup.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{E161CE2A-151F-4F83-B672-B7820C773F04}</ProjectGuid>
+    <ProjectGuid>{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{2A54C912-9D2E-44BC-B3FE-6C2960D95CE3}</SampleGuid>
+    <SampleGuid>{8E38B679-4605-44E5-9C1B-44B05A5A5DF5}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/filehistory/exe/fhsetup.vcxproj.Filters b/general/filehistory/exe/fhsetup.vcxproj.Filters
index 63bf971f..5cb08132 100644
--- a/general/filehistory/exe/fhsetup.vcxproj.Filters
+++ b/general/filehistory/exe/fhsetup.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>{F9F98705-F949-4652-8769-DD49818FBAA9}</UniqueIdentifier>
+      <UniqueIdentifier>{A057879C-B0E4-4D55-A840-76CB421200B5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{5CBA5790-2B5E-4F9D-BB5B-E0E080B92068}</UniqueIdentifier>
+      <UniqueIdentifier>{351B6DDB-CB13-4598-9469-D8DA8C566237}</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>{7D32D1EF-09B7-44BA-B460-66874FB0FFEB}</UniqueIdentifier>
+      <UniqueIdentifier>{11B25EA5-2E86-459D-8B67-F8184BA99C72}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/filehistory/filehistory.sln b/general/filehistory/filehistory.sln
index 81a5235b..200c158c 100644
--- a/general/filehistory/filehistory.sln
+++ b/general/filehistory/filehistory.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fhsetup", "exe\fhsetup.vcxproj", "{E161CE2A-151F-4F83-B672-B7820C773F04}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fhsetup", "exe\fhsetup.vcxproj", "{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E161CE2A-151F-4F83-B672-B7820C773F04}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E161CE2A-151F-4F83-B672-B7820C773F04}.Debug|Win32.Build.0 = Debug|Win32
-		{E161CE2A-151F-4F83-B672-B7820C773F04}.Release|Win32.ActiveCfg = Release|Win32
-		{E161CE2A-151F-4F83-B672-B7820C773F04}.Release|Win32.Build.0 = Release|Win32
-		{E161CE2A-151F-4F83-B672-B7820C773F04}.Debug|x64.ActiveCfg = Debug|x64
-		{E161CE2A-151F-4F83-B672-B7820C773F04}.Debug|x64.Build.0 = Debug|x64
-		{E161CE2A-151F-4F83-B672-B7820C773F04}.Release|x64.ActiveCfg = Release|x64
-		{E161CE2A-151F-4F83-B672-B7820C773F04}.Release|x64.Build.0 = Release|x64
+		{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}.Debug|Win32.Build.0 = Debug|Win32
+		{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}.Release|Win32.ActiveCfg = Release|Win32
+		{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}.Release|Win32.Build.0 = Release|Win32
+		{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}.Debug|x64.ActiveCfg = Debug|x64
+		{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}.Debug|x64.Build.0 = Debug|x64
+		{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}.Release|x64.ActiveCfg = Release|x64
+		{DD221269-A9F3-43ED-A12B-B9C7CF812D1D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/general/installwdf/InstallWdf.vcxproj b/general/installwdf/InstallWdf.vcxproj
index 786a2115..09611ba1 100644
--- a/general/installwdf/InstallWdf.vcxproj
+++ b/general/installwdf/InstallWdf.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}</ProjectGuid>
+    <ProjectGuid>{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{5A7DAFFE-E936-414D-A9C8-B476C90C5EC5}</SampleGuid>
+    <SampleGuid>{B0538915-496F-4D46-8E49-FAB50AA4AF07}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/installwdf/InstallWdf.vcxproj.Filters b/general/installwdf/InstallWdf.vcxproj.Filters
index 15cb6967..c7a13da5 100644
--- a/general/installwdf/InstallWdf.vcxproj.Filters
+++ b/general/installwdf/InstallWdf.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>{5A4ACA1D-68FE-421F-8ED9-5D51A0E65913}</UniqueIdentifier>
+      <UniqueIdentifier>{1B36F2E0-F9DB-46BA-AB8E-7221E3D7B878}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{1126A1D0-DA51-4E84-B49B-3B52FDAF5EDB}</UniqueIdentifier>
+      <UniqueIdentifier>{3B1065A2-8683-4477-879B-CA856FFB6D19}</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>{CB19DA30-E0FB-413E-B16A-09AC70493E34}</UniqueIdentifier>
+      <UniqueIdentifier>{0FB8D982-C6A0-48B5-95D9-5986C97339F1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/installwdf/installwdf.sln b/general/installwdf/installwdf.sln
index 31aad125..3b8e71ec 100644
--- a/general/installwdf/installwdf.sln
+++ b/general/installwdf/installwdf.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InstallWdf", "InstallWdf.vcxproj", "{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InstallWdf", "InstallWdf.vcxproj", "{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}.Debug|Win32.Build.0 = Debug|Win32
-		{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}.Release|Win32.ActiveCfg = Release|Win32
-		{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}.Release|Win32.Build.0 = Release|Win32
-		{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}.Debug|x64.ActiveCfg = Debug|x64
-		{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}.Debug|x64.Build.0 = Debug|x64
-		{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}.Release|x64.ActiveCfg = Release|x64
-		{3ACC106E-6FE9-4D7E-895A-1633E1CABC27}.Release|x64.Build.0 = Release|x64
+		{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}.Debug|Win32.Build.0 = Debug|Win32
+		{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}.Release|Win32.ActiveCfg = Release|Win32
+		{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}.Release|Win32.Build.0 = Release|Win32
+		{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}.Debug|x64.ActiveCfg = Debug|x64
+		{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}.Debug|x64.Build.0 = Debug|x64
+		{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}.Release|x64.ActiveCfg = Release|x64
+		{D72AC09E-BA68-4A50-A8C7-AFBD98FA9B76}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj b/general/ioctl/kmdf/exe/nonpnpapp.vcxproj
index 2c94c413..beefe967 100644
--- a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj
+++ b/general/ioctl/kmdf/exe/nonpnpapp.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{0EF21B20-E757-4FD0-8A1C-4ABF6FD7E466}</ProjectGuid>
+    <ProjectGuid>{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>11</KMDF_VERSION_MINOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{FF8A5123-63A1-4527-A466-ED494318076D}</SampleGuid>
+    <SampleGuid>{F5414C9C-6CDE-4673-879E-27AD5A30C4C5}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj.Filters b/general/ioctl/kmdf/exe/nonpnpapp.vcxproj.Filters
index 221896d4..264eb8eb 100644
--- a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj.Filters
+++ b/general/ioctl/kmdf/exe/nonpnpapp.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>{438A7A19-8784-4ADC-BB59-D3D149EA5459}</UniqueIdentifier>
+      <UniqueIdentifier>{1ABA2FD0-ACFA-4BE3-9294-AD78BDFAFB28}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A4461789-7186-462B-9A53-73365178FC6A}</UniqueIdentifier>
+      <UniqueIdentifier>{B2BBAC2E-0840-44AD-B46B-A87DFD88D9FE}</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>{323846A7-7FFC-4D78-8D57-B470FE54DE4B}</UniqueIdentifier>
+      <UniqueIdentifier>{6F984D8E-34B3-4615-BFC7-A472099FD919}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/ioctl/kmdf/exe/testapp.c b/general/ioctl/kmdf/exe/testapp.c
index a6cd07c1..a645203e 100644
--- a/general/ioctl/kmdf/exe/testapp.c
+++ b/general/ioctl/kmdf/exe/testapp.c
@@ -374,9 +374,9 @@ DoIoctls(
     // Printing Input & Output buffer pointers and size
     //
 
-    printf("InputBuffer Pointer = %p, BufLength = %d\n", InputBuffer,
+    printf("InputBuffer Pointer = %p, BufLength = %Id\n", InputBuffer,
                         sizeof(InputBuffer));
-    printf("OutputBuffer Pointer = %p BufLength = %d\n", OutputBuffer,
+    printf("OutputBuffer Pointer = %p BufLength = %Id\n", OutputBuffer,
                                 sizeof(OutputBuffer));
     //
     // Performing METHOD_BUFFERED
diff --git a/general/ioctl/kmdf/ioctl.sln b/general/ioctl/kmdf/ioctl.sln
index aab61213..33b0a089 100644
--- a/general/ioctl/kmdf/ioctl.sln
+++ b/general/ioctl/kmdf/ioctl.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{B028EBDA-6423-4F60-AA5E-FA6D82D7724A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{95163A67-FF5E-4FE5-B291-2CB67B2FD431}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{4DA95BFC-3253-4E4A-92C3-7C8BAE993A05}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{290EBA75-A70E-4C4A-BF59-38FF2BCA1779}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nonpnpapp", "exe\nonpnpapp.vcxproj", "{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nonpnpapp", "exe\nonpnpapp.vcxproj", "{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nonpnp", "sys\nonpnp.vcxproj", "{B622D542-4942-46A1-B976-F530446DD6A5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nonpnp", "sys\nonpnp.vcxproj", "{50EE7E00-D19A-4741-9440-33BECFCF6BED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Debug|Win32.Build.0 = Debug|Win32
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Release|Win32.ActiveCfg = Release|Win32
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Release|Win32.Build.0 = Release|Win32
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Debug|x64.ActiveCfg = Debug|x64
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Debug|x64.Build.0 = Debug|x64
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Release|x64.ActiveCfg = Release|x64
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Release|x64.Build.0 = Release|x64
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Debug|Win32.Build.0 = Debug|Win32
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Release|Win32.ActiveCfg = Release|Win32
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Release|Win32.Build.0 = Release|Win32
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Debug|x64.ActiveCfg = Debug|x64
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Debug|x64.Build.0 = Debug|x64
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Release|x64.ActiveCfg = Release|x64
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Release|x64.Build.0 = Release|x64
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Debug|Win32.ActiveCfg = Debug|Win32
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Debug|Win32.Build.0 = Debug|Win32
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Release|Win32.ActiveCfg = Release|Win32
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Release|Win32.Build.0 = Release|Win32
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Debug|x64.ActiveCfg = Debug|x64
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Debug|x64.Build.0 = Debug|x64
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Release|x64.ActiveCfg = Release|x64
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Release|x64.Build.0 = Release|x64
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Debug|Win32.ActiveCfg = Debug|Win32
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Debug|Win32.Build.0 = Debug|Win32
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Release|Win32.ActiveCfg = Release|Win32
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Release|Win32.Build.0 = Release|Win32
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Debug|x64.ActiveCfg = Debug|x64
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Debug|x64.Build.0 = Debug|x64
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Release|x64.ActiveCfg = Release|x64
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB} = {B028EBDA-6423-4F60-AA5E-FA6D82D7724A}
-		{B622D542-4942-46A1-B976-F530446DD6A5} = {4DA95BFC-3253-4E4A-92C3-7C8BAE993A05}
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20} = {95163A67-FF5E-4FE5-B291-2CB67B2FD431}
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED} = {290EBA75-A70E-4C4A-BF59-38FF2BCA1779}
 	EndGlobalSection
 EndGlobal
diff --git a/general/ioctl/kmdf/sys/nonpnp.vcxproj b/general/ioctl/kmdf/sys/nonpnp.vcxproj
index 615ccb8e..65332fb6 100644
--- a/general/ioctl/kmdf/sys/nonpnp.vcxproj
+++ b/general/ioctl/kmdf/sys/nonpnp.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B622D542-4942-46A1-B976-F530446DD6A5}</ProjectGuid>
+    <ProjectGuid>{50EE7E00-D19A-4741-9440-33BECFCF6BED}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{AC100EE8-8981-47E5-ABCA-B8DCCFFA5682}</SampleGuid>
+    <SampleGuid>{45D75B6C-2DA7-499F-A790-DDA070CCE572}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/ioctl/kmdf/sys/nonpnp.vcxproj.Filters b/general/ioctl/kmdf/sys/nonpnp.vcxproj.Filters
index eb46c5bb..ec1df6f7 100644
--- a/general/ioctl/kmdf/sys/nonpnp.vcxproj.Filters
+++ b/general/ioctl/kmdf/sys/nonpnp.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>{D4EF066B-A145-401A-8669-BAAC70BA8F50}</UniqueIdentifier>
+      <UniqueIdentifier>{DE155745-AD64-4A1C-A33A-3CD533BDE541}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{C68D949D-F770-4FF0-883D-729F5284E601}</UniqueIdentifier>
+      <UniqueIdentifier>{8657A752-2DEF-4ECB-A41D-A6A980248883}</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>{724D8E55-13DB-47B2-AB8D-3A86DF521511}</UniqueIdentifier>
+      <UniqueIdentifier>{00DE07D9-312A-4A66-92DE-CC38F3D84EAB}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{A4CB0903-2F69-4A15-8F3D-AF05EFE1323F}</UniqueIdentifier>
+      <UniqueIdentifier>{CCDEE8CB-FD51-470D-96D2-D68CA8D094CF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/ioctl/wdm/exe/install.c b/general/ioctl/wdm/exe/install.c
index 4b77f0aa..c94693f5 100644
--- a/general/ioctl/wdm/exe/install.c
+++ b/general/ioctl/wdm/exe/install.c
@@ -27,7 +27,7 @@ Environment:
 #include <stdlib.h>
 #include <string.h>
 #include <strsafe.h>
-#include "sioctl.h"
+#include <sys\sioctl.h>
 
 BOOLEAN
 InstallDriver(
diff --git a/general/ioctl/wdm/exe/ioctlapp.vcxproj b/general/ioctl/wdm/exe/ioctlapp.vcxproj
index 9157b73e..aee6cda3 100644
--- a/general/ioctl/wdm/exe/ioctlapp.vcxproj
+++ b/general/ioctl/wdm/exe/ioctlapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}</ProjectGuid>
+    <ProjectGuid>{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{CD28B759-C8BC-4F51-AB5E-AFF59331509B}</SampleGuid>
+    <SampleGuid>{14E9681A-41C8-43B1-885D-6CD8CB06AAD8}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -91,13 +91,13 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <BaseAddress>0x04000000</BaseAddress>
@@ -107,13 +107,13 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <BaseAddress>0x04000000</BaseAddress>
@@ -123,13 +123,13 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <BaseAddress>0x04000000</BaseAddress>
@@ -139,13 +139,13 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <BaseAddress>0x04000000</BaseAddress>
diff --git a/general/ioctl/wdm/exe/ioctlapp.vcxproj.Filters b/general/ioctl/wdm/exe/ioctlapp.vcxproj.Filters
index 4129898e..373592eb 100644
--- a/general/ioctl/wdm/exe/ioctlapp.vcxproj.Filters
+++ b/general/ioctl/wdm/exe/ioctlapp.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>{73262017-91DD-45A8-8A68-9CCCAB2CA1C0}</UniqueIdentifier>
+      <UniqueIdentifier>{49310AE5-27D6-4E5F-8E16-7787FBBFC870}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{744376AF-8B58-45ED-828B-AA01CE10E194}</UniqueIdentifier>
+      <UniqueIdentifier>{10285CDD-3CE2-48BD-9108-C546303EC345}</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>{CB96AC92-B6DE-4B43-A7B4-EEB29C73C2BB}</UniqueIdentifier>
+      <UniqueIdentifier>{4DC87590-E3DB-45A9-8BF6-F0552982B4A7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/ioctl/wdm/exe/testapp.c b/general/ioctl/wdm/exe/testapp.c
index 5a62faa0..7a4e6abd 100644
--- a/general/ioctl/wdm/exe/testapp.c
+++ b/general/ioctl/wdm/exe/testapp.c
@@ -19,7 +19,7 @@ Environment:
 #include <stdlib.h>
 #include <string.h>
 #include <strsafe.h>
-#include "..\sys\sioctl.h"
+#include <sys\sioctl.h>
 
 
 BOOLEAN
@@ -122,9 +122,9 @@ main(
     // Printing Input & Output buffer pointers and size
     //
 
-    printf("InputBuffer Pointer = %p, BufLength = %d\n", InputBuffer,
+    printf("InputBuffer Pointer = %p, BufLength = %Iu\n", InputBuffer,
                         sizeof(InputBuffer));
-    printf("OutputBuffer Pointer = %p BufLength = %d\n", OutputBuffer,
+    printf("OutputBuffer Pointer = %p BufLength = %Iu\n", OutputBuffer,
                                 sizeof(OutputBuffer));
     //
     // Performing METHOD_BUFFERED
diff --git a/general/ioctl/wdm/ioctl.sln b/general/ioctl/wdm/ioctl.sln
index d1d7b7fe..e50c578c 100644
--- a/general/ioctl/wdm/ioctl.sln
+++ b/general/ioctl/wdm/ioctl.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{05ABA65F-2F21-4F5E-A1D5-DD008F644663}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{C4575BAC-8843-4B59-88F5-8D142A59F463}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{D5D0F833-0D75-4099-9A7F-B016159FC352}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{52CD4CBC-6018-4367-BE2B-EA5A2864E7BE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ioctlapp", "exe\ioctlapp.vcxproj", "{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ioctlapp", "exe\ioctlapp.vcxproj", "{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sioctl", "sys\sioctl.vcxproj", "{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sioctl", "sys\sioctl.vcxproj", "{29BD96E0-B6C5-42A0-B683-FD9740810699}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Debug|Win32.Build.0 = Debug|Win32
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Release|Win32.ActiveCfg = Release|Win32
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Release|Win32.Build.0 = Release|Win32
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Debug|x64.ActiveCfg = Debug|x64
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Debug|x64.Build.0 = Debug|x64
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Release|x64.ActiveCfg = Release|x64
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Release|x64.Build.0 = Release|x64
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Debug|Win32.Build.0 = Debug|Win32
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Release|Win32.ActiveCfg = Release|Win32
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Release|Win32.Build.0 = Release|Win32
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Debug|x64.ActiveCfg = Debug|x64
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Debug|x64.Build.0 = Debug|x64
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Release|x64.ActiveCfg = Release|x64
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Release|x64.Build.0 = Release|x64
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Debug|Win32.Build.0 = Debug|Win32
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Release|Win32.ActiveCfg = Release|Win32
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Release|Win32.Build.0 = Release|Win32
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Debug|x64.ActiveCfg = Debug|x64
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Debug|x64.Build.0 = Debug|x64
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Release|x64.ActiveCfg = Release|x64
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Release|x64.Build.0 = Release|x64
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Debug|Win32.ActiveCfg = Debug|Win32
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Debug|Win32.Build.0 = Debug|Win32
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Release|Win32.ActiveCfg = Release|Win32
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Release|Win32.Build.0 = Release|Win32
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Debug|x64.ActiveCfg = Debug|x64
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Debug|x64.Build.0 = Debug|x64
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Release|x64.ActiveCfg = Release|x64
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725} = {05ABA65F-2F21-4F5E-A1D5-DD008F644663}
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0} = {D5D0F833-0D75-4099-9A7F-B016159FC352}
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9} = {C4575BAC-8843-4B59-88F5-8D142A59F463}
+		{29BD96E0-B6C5-42A0-B683-FD9740810699} = {52CD4CBC-6018-4367-BE2B-EA5A2864E7BE}
 	EndGlobalSection
 EndGlobal
diff --git a/general/ioctl/wdm/sys/sioctl.c b/general/ioctl/wdm/sys/sioctl.c
index 7eae2971..4f0a8539 100644
--- a/general/ioctl/wdm/sys/sioctl.c
+++ b/general/ioctl/wdm/sys/sioctl.c
@@ -473,7 +473,7 @@ Return Value:
         // system overhead for large size buffers.
         //
 
-        buffer = MmGetSystemAddressForMdlSafe(mdl, NormalPagePriority );
+        buffer = MmGetSystemAddressForMdlSafe( mdl, NormalPagePriority | MdlMappingNoExecute );
 
         if (!buffer) {
                 ntStatus = STATUS_INSUFFICIENT_RESOURCES;
@@ -527,7 +527,7 @@ Return Value:
         }
 
 
-        buffer = MmGetSystemAddressForMdlSafe(mdl, NormalPagePriority );
+        buffer = MmGetSystemAddressForMdlSafe( mdl, NormalPagePriority | MdlMappingNoExecute );
 
         if (!buffer) {
             MmUnlockPages(mdl);
@@ -588,7 +588,7 @@ Return Value:
         // from the application to the driver.
         //
 
-        buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority);
+        buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority | MdlMappingNoExecute);
 
         if (!buffer) {
             ntStatus = STATUS_INSUFFICIENT_RESOURCES;
@@ -641,7 +641,7 @@ Return Value:
         // from the driver to the application.
         //
 
-        buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority);
+        buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority | MdlMappingNoExecute);
 
         if (!buffer) {
             ntStatus = STATUS_INSUFFICIENT_RESOURCES;
diff --git a/general/ioctl/wdm/sys/sioctl.vcxproj b/general/ioctl/wdm/sys/sioctl.vcxproj
index 8b12549a..a5ac0ef3 100644
--- a/general/ioctl/wdm/sys/sioctl.vcxproj
+++ b/general/ioctl/wdm/sys/sioctl.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}</ProjectGuid>
+    <ProjectGuid>{29BD96E0-B6C5-42A0-B683-FD9740810699}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{57EBFE5D-4194-4628-B3DB-243FA7D03AC9}</SampleGuid>
+    <SampleGuid>{A08AE94A-35FF-4A31-B152-5E3A43CE78A0}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/ioctl/wdm/sys/sioctl.vcxproj.Filters b/general/ioctl/wdm/sys/sioctl.vcxproj.Filters
index 4f493adc..2a2486b1 100644
--- a/general/ioctl/wdm/sys/sioctl.vcxproj.Filters
+++ b/general/ioctl/wdm/sys/sioctl.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>{E9EE9FFB-2EBC-4879-8005-029F0C26829C}</UniqueIdentifier>
+      <UniqueIdentifier>{70613DC7-CE18-48E4-A282-83BAD5F14DB8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7C81EF4D-3554-45D3-A116-B443830349FD}</UniqueIdentifier>
+      <UniqueIdentifier>{61600929-B133-4CE1-A15E-E4E6B15BAFDD}</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>{4B6FECB8-7A2A-4AFD-95F2-94D7C452E97E}</UniqueIdentifier>
+      <UniqueIdentifier>{E7360814-7364-44AA-933C-DD4BFBF95E8D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{D4A26FDD-3685-4E62-BFD4-51FD89171C68}</UniqueIdentifier>
+      <UniqueIdentifier>{CF3AF6D6-43D2-4102-8996-8EF19621C095}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/obcallback/control/ObCallbackTestCtrl.vcxproj b/general/obcallback/control/ObCallbackTestCtrl.vcxproj
index c7910b47..0f407b4f 100644
--- a/general/obcallback/control/ObCallbackTestCtrl.vcxproj
+++ b/general/obcallback/control/ObCallbackTestCtrl.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{6E438FB8-A5A5-4A81-8858-2AE023797676}</ProjectGuid>
+    <ProjectGuid>{F723CC91-3218-4252-89C1-F7998292C456}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9B16F24F-0454-42EA-8B35-8BE1B2FE9C7D}</SampleGuid>
+    <SampleGuid>{003682A9-FE10-4932-91BD-DA6390471330}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/obcallback/control/ObCallbackTestCtrl.vcxproj.Filters b/general/obcallback/control/ObCallbackTestCtrl.vcxproj.Filters
index 53c03cc3..d93cc3b5 100644
--- a/general/obcallback/control/ObCallbackTestCtrl.vcxproj.Filters
+++ b/general/obcallback/control/ObCallbackTestCtrl.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>{B3C6FD4B-F6ED-46BB-8F78-6AF5432A5DD4}</UniqueIdentifier>
+      <UniqueIdentifier>{F6868CE0-3371-412D-B276-349D279F8BBB}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{C356DDA6-5AAE-4201-8065-C13B466DE260}</UniqueIdentifier>
+      <UniqueIdentifier>{C11E7AF9-320C-411B-857C-9B9DFE48566E}</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>{FD9ED782-F61C-46D5-9D36-20E514618602}</UniqueIdentifier>
+      <UniqueIdentifier>{B279966D-714D-4016-BA0B-CC7671CE0CD4}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/obcallback/driver/ObCallbackTest.vcxproj b/general/obcallback/driver/ObCallbackTest.vcxproj
index c5defcfc..8f0bced2 100644
--- a/general/obcallback/driver/ObCallbackTest.vcxproj
+++ b/general/obcallback/driver/ObCallbackTest.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{43C24BD9-11B3-4793-A7F8-029602B80C96}</ProjectGuid>
+    <ProjectGuid>{850E3104-6DE2-4FA3-8E53-4CA21A230429}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{03286AEF-DE78-4332-84DB-7F31CF6228D9}</SampleGuid>
+    <SampleGuid>{9E9E0074-EA13-48A7-AFEE-B64F91E6C4CD}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/obcallback/driver/ObCallbackTest.vcxproj.Filters b/general/obcallback/driver/ObCallbackTest.vcxproj.Filters
index 2a09974a..be41767d 100644
--- a/general/obcallback/driver/ObCallbackTest.vcxproj.Filters
+++ b/general/obcallback/driver/ObCallbackTest.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>{ECF6E7A0-2E50-45CA-AF8D-DBAA9A4F1C28}</UniqueIdentifier>
+      <UniqueIdentifier>{DAB28F4F-6F9C-48C0-8CE6-02E9B7860CA6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{D91FD909-AA67-488E-9E0D-54463C5160B0}</UniqueIdentifier>
+      <UniqueIdentifier>{6C27AD75-7E9F-40DF-8824-719B2B4B1292}</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>{625071DD-8755-4C84-8237-46892091663F}</UniqueIdentifier>
+      <UniqueIdentifier>{C0CE7837-BBE6-43DA-974E-4EF8DD28F5A8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{ABAB7A03-1F6A-4667-ABE6-351CA30F3988}</UniqueIdentifier>
+      <UniqueIdentifier>{F30A6168-49CE-4F09-911A-A3DD7A99E84E}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/obcallback/obcallback.sln b/general/obcallback/obcallback.sln
index dbbcebe2..74498a08 100644
--- a/general/obcallback/obcallback.sln
+++ b/general/obcallback/obcallback.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Control", "Control", "{D04BB44A-89ED-4933-BD10-F593D3879737}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Control", "Control", "{A66A4EE4-C0A3-4557-A39B-9EBDF9EEE095}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{E0BAFFAC-0DAA-40BB-B49D-9B3AFA3B21F4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{60D4EAED-6467-440B-8BF6-E8537A962604}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ObCallbackTestCtrl", "control\ObCallbackTestCtrl.vcxproj", "{6E438FB8-A5A5-4A81-8858-2AE023797676}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ObCallbackTestCtrl", "control\ObCallbackTestCtrl.vcxproj", "{F723CC91-3218-4252-89C1-F7998292C456}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ObCallbackTest", "driver\ObCallbackTest.vcxproj", "{43C24BD9-11B3-4793-A7F8-029602B80C96}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ObCallbackTest", "driver\ObCallbackTest.vcxproj", "{850E3104-6DE2-4FA3-8E53-4CA21A230429}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6E438FB8-A5A5-4A81-8858-2AE023797676}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6E438FB8-A5A5-4A81-8858-2AE023797676}.Debug|Win32.Build.0 = Debug|Win32
-		{6E438FB8-A5A5-4A81-8858-2AE023797676}.Release|Win32.ActiveCfg = Release|Win32
-		{6E438FB8-A5A5-4A81-8858-2AE023797676}.Release|Win32.Build.0 = Release|Win32
-		{6E438FB8-A5A5-4A81-8858-2AE023797676}.Debug|x64.ActiveCfg = Debug|x64
-		{6E438FB8-A5A5-4A81-8858-2AE023797676}.Debug|x64.Build.0 = Debug|x64
-		{6E438FB8-A5A5-4A81-8858-2AE023797676}.Release|x64.ActiveCfg = Release|x64
-		{6E438FB8-A5A5-4A81-8858-2AE023797676}.Release|x64.Build.0 = Release|x64
-		{43C24BD9-11B3-4793-A7F8-029602B80C96}.Debug|Win32.ActiveCfg = Debug|Win32
-		{43C24BD9-11B3-4793-A7F8-029602B80C96}.Debug|Win32.Build.0 = Debug|Win32
-		{43C24BD9-11B3-4793-A7F8-029602B80C96}.Release|Win32.ActiveCfg = Release|Win32
-		{43C24BD9-11B3-4793-A7F8-029602B80C96}.Release|Win32.Build.0 = Release|Win32
-		{43C24BD9-11B3-4793-A7F8-029602B80C96}.Debug|x64.ActiveCfg = Debug|x64
-		{43C24BD9-11B3-4793-A7F8-029602B80C96}.Debug|x64.Build.0 = Debug|x64
-		{43C24BD9-11B3-4793-A7F8-029602B80C96}.Release|x64.ActiveCfg = Release|x64
-		{43C24BD9-11B3-4793-A7F8-029602B80C96}.Release|x64.Build.0 = Release|x64
+		{F723CC91-3218-4252-89C1-F7998292C456}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F723CC91-3218-4252-89C1-F7998292C456}.Debug|Win32.Build.0 = Debug|Win32
+		{F723CC91-3218-4252-89C1-F7998292C456}.Release|Win32.ActiveCfg = Release|Win32
+		{F723CC91-3218-4252-89C1-F7998292C456}.Release|Win32.Build.0 = Release|Win32
+		{F723CC91-3218-4252-89C1-F7998292C456}.Debug|x64.ActiveCfg = Debug|x64
+		{F723CC91-3218-4252-89C1-F7998292C456}.Debug|x64.Build.0 = Debug|x64
+		{F723CC91-3218-4252-89C1-F7998292C456}.Release|x64.ActiveCfg = Release|x64
+		{F723CC91-3218-4252-89C1-F7998292C456}.Release|x64.Build.0 = Release|x64
+		{850E3104-6DE2-4FA3-8E53-4CA21A230429}.Debug|Win32.ActiveCfg = Debug|Win32
+		{850E3104-6DE2-4FA3-8E53-4CA21A230429}.Debug|Win32.Build.0 = Debug|Win32
+		{850E3104-6DE2-4FA3-8E53-4CA21A230429}.Release|Win32.ActiveCfg = Release|Win32
+		{850E3104-6DE2-4FA3-8E53-4CA21A230429}.Release|Win32.Build.0 = Release|Win32
+		{850E3104-6DE2-4FA3-8E53-4CA21A230429}.Debug|x64.ActiveCfg = Debug|x64
+		{850E3104-6DE2-4FA3-8E53-4CA21A230429}.Debug|x64.Build.0 = Debug|x64
+		{850E3104-6DE2-4FA3-8E53-4CA21A230429}.Release|x64.ActiveCfg = Release|x64
+		{850E3104-6DE2-4FA3-8E53-4CA21A230429}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{6E438FB8-A5A5-4A81-8858-2AE023797676} = {D04BB44A-89ED-4933-BD10-F593D3879737}
-		{43C24BD9-11B3-4793-A7F8-029602B80C96} = {E0BAFFAC-0DAA-40BB-B49D-9B3AFA3B21F4}
+		{F723CC91-3218-4252-89C1-F7998292C456} = {A66A4EE4-C0A3-4557-A39B-9EBDF9EEE095}
+		{850E3104-6DE2-4FA3-8E53-4CA21A230429} = {60D4EAED-6467-440B-8BF6-E8537A962604}
 	EndGlobalSection
 EndGlobal
diff --git a/general/pcidrv/kmdf/HW/PCIDRV.vcxproj b/general/pcidrv/kmdf/HW/PCIDRV.vcxproj
index f37c79b1..fdf14d4d 100644
--- a/general/pcidrv/kmdf/HW/PCIDRV.vcxproj
+++ b/general/pcidrv/kmdf/HW/PCIDRV.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{147B5094-8C9D-4C84-B266-297D1E03D038}</ProjectGuid>
+    <ProjectGuid>{3DC6A380-6A31-4460-B934-83E1BAC700EE}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{31AFCCDA-DE2F-4533-AFB7-F8D0C668C5AE}</SampleGuid>
+    <SampleGuid>{CE26AF24-DCC9-47E5-A4EF-F27522A31C90}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -186,11 +186,6 @@
       <PreCompiledHeader>Use</PreCompiledHeader>
       <PreCompiledHeaderOutputFile>$(IntDir)\precomp.pch</PreCompiledHeaderOutputFile>
     </ClCompile>
-    <Inf Include="..\genpci.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\genpci.inf</CopyOutput>
-    </Inf>
     <MofComp Include="..\pcidrv.mof">
       <CreateBinaryMofFile>".\$(IntDir)\pcidrv.bmf"</CreateBinaryMofFile>
     </MofComp>
@@ -284,54 +279,54 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/pcidrv/kmdf/HW/PCIDRV.vcxproj.Filters b/general/pcidrv/kmdf/HW/PCIDRV.vcxproj.Filters
index ceed7571..5b231159 100644
--- a/general/pcidrv/kmdf/HW/PCIDRV.vcxproj.Filters
+++ b/general/pcidrv/kmdf/HW/PCIDRV.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>{0952D163-791F-4123-BCD0-F58AFDBD257F}</UniqueIdentifier>
+      <UniqueIdentifier>{DB96CB22-6A66-43CC-85A1-595B666359FA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{AF230497-BE0C-4FA2-95A2-9BD4EFC3EB49}</UniqueIdentifier>
+      <UniqueIdentifier>{A2E37450-3BB8-4654-83E7-A2D4C6389188}</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>{38573357-97D6-4F88-9261-F38ABE26C075}</UniqueIdentifier>
+      <UniqueIdentifier>{BED5B461-9900-4B64-AA62-7EB31CBAD465}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{8DB6212C-6D77-4437-87CE-60D7E13C7314}</UniqueIdentifier>
+      <UniqueIdentifier>{45FBFCD5-F036-411A-84A3-0EAF7388567B}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -57,9 +57,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="..\genpci.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="..\pcidrv.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/general/pcidrv/kmdf/PCIDRV.C b/general/pcidrv/kmdf/PCIDRV.C
index 41a71b3c..e3f65678 100644
--- a/general/pcidrv/kmdf/PCIDRV.C
+++ b/general/pcidrv/kmdf/PCIDRV.C
@@ -111,6 +111,11 @@ Return Value:
     PDRIVER_CONTEXT        driverContext;
 
     //
+    // Allow NonPagedPool to be mapped to NonPagedPoolNx on WIN8 and newer OS's 
+    //
+    ExInitializeDriverRuntime(DrvRtPoolNxOptIn);
+
+    //
     // Initialize WPP Tracing
     //
     WPP_INIT_TRACING( DriverObject, RegistryPath );
diff --git a/general/pcidrv/kmdf/genpci.inx b/general/pcidrv/kmdf/genpci.inx
index 9711236b..b278dcd8 100644
--- a/general/pcidrv/kmdf/genpci.inx
+++ b/general/pcidrv/kmdf/genpci.inx
diff --git a/general/pcidrv/pcidrv.sln b/general/pcidrv/pcidrv.sln
index d7720b8e..5f93e524 100644
--- a/general/pcidrv/pcidrv.sln
+++ b/general/pcidrv/pcidrv.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}") = "Test", "Test", "{C5095E94-8EC9-45BE-9EDF-B080381F0ABE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{81C106DF-8695-4395-B58E-31F0EF3496FC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HW", "HW", "{4926BA95-0E65-44E7-9A0D-0FB3190E4141}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HW", "HW", "{203C7FF1-146A-41D9-A2B4-AB21B38DF232}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{18525246-BE0C-4DA9-91ED-74DD067860C8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{78452B5A-06CB-41D0-AB5F-42E59F5A3209}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myping", "test\myping.vcxproj", "{B04477EF-85F2-47B6-A669-39E90D52DFB9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myping", "test\myping.vcxproj", "{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PCIDRV", "kmdf\HW\PCIDRV.vcxproj", "{147B5094-8C9D-4C84-B266-297D1E03D038}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PCIDRV", "kmdf\HW\PCIDRV.vcxproj", "{3DC6A380-6A31-4460-B934-83E1BAC700EE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,29 +21,29 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Debug|Win32.Build.0 = Debug|Win32
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Release|Win32.ActiveCfg = Release|Win32
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Release|Win32.Build.0 = Release|Win32
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Debug|x64.ActiveCfg = Debug|x64
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Debug|x64.Build.0 = Debug|x64
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Release|x64.ActiveCfg = Release|x64
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Release|x64.Build.0 = Release|x64
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Debug|Win32.ActiveCfg = Debug|Win32
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Debug|Win32.Build.0 = Debug|Win32
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Release|Win32.ActiveCfg = Release|Win32
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Release|Win32.Build.0 = Release|Win32
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Debug|x64.ActiveCfg = Debug|x64
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Debug|x64.Build.0 = Debug|x64
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Release|x64.ActiveCfg = Release|x64
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Release|x64.Build.0 = Release|x64
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Debug|Win32.Build.0 = Debug|Win32
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Release|Win32.ActiveCfg = Release|Win32
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Release|Win32.Build.0 = Release|Win32
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Debug|x64.ActiveCfg = Debug|x64
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Debug|x64.Build.0 = Debug|x64
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Release|x64.ActiveCfg = Release|x64
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Release|x64.Build.0 = Release|x64
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Debug|Win32.Build.0 = Debug|Win32
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Release|Win32.ActiveCfg = Release|Win32
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Release|Win32.Build.0 = Release|Win32
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Debug|x64.ActiveCfg = Debug|x64
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Debug|x64.Build.0 = Debug|x64
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Release|x64.ActiveCfg = Release|x64
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9} = {C5095E94-8EC9-45BE-9EDF-B080381F0ABE}
-		{147B5094-8C9D-4C84-B266-297D1E03D038} = {4926BA95-0E65-44E7-9A0D-0FB3190E4141}
-		{4926BA95-0E65-44E7-9A0D-0FB3190E4141} = {18525246-BE0C-4DA9-91ED-74DD067860C8}
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B} = {81C106DF-8695-4395-B58E-31F0EF3496FC}
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE} = {203C7FF1-146A-41D9-A2B4-AB21B38DF232}
+		{203C7FF1-146A-41D9-A2B4-AB21B38DF232} = {78452B5A-06CB-41D0-AB5F-42E59F5A3209}
 	EndGlobalSection
 EndGlobal
diff --git a/general/pcidrv/test/myping.vcxproj b/general/pcidrv/test/myping.vcxproj
index 921944fc..c5d03091 100644
--- a/general/pcidrv/test/myping.vcxproj
+++ b/general/pcidrv/test/myping.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B04477EF-85F2-47B6-A669-39E90D52DFB9}</ProjectGuid>
+    <ProjectGuid>{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{7BAACFF2-0887-4947-85E0-1A609F5CAA8A}</SampleGuid>
+    <SampleGuid>{A5C4D92B-0C39-42B8-9B1E-DA4A2583C1CC}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/pcidrv/test/myping.vcxproj.Filters b/general/pcidrv/test/myping.vcxproj.Filters
index c3c1c20d..0af44f95 100644
--- a/general/pcidrv/test/myping.vcxproj.Filters
+++ b/general/pcidrv/test/myping.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>{E227B2E2-02E5-416E-87EA-041459F6A688}</UniqueIdentifier>
+      <UniqueIdentifier>{CB89C3D8-5D89-4E0E-921B-0A352CFF9B62}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{3723BC8D-C247-4CC3-9752-9E4A013C403A}</UniqueIdentifier>
+      <UniqueIdentifier>{39480465-BA23-4466-9C53-BC0F48547978}</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>{82B8C96C-7352-4531-A71B-137B4FD15E6C}</UniqueIdentifier>
+      <UniqueIdentifier>{A1734800-97BC-489E-934F-051BC44DE1F1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/perfcounters/kcs/kcs.sln b/general/perfcounters/kcs/kcs.sln
index 884b1df4..c6191b37 100644
--- a/general/perfcounters/kcs/kcs.sln
+++ b/general/perfcounters/kcs/kcs.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kcs", "kcs.vcxproj", "{F3ED0AEC-F87B-4F79-B156-B56586B944E4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kcs", "kcs.vcxproj", "{A0CFCF38-1874-446B-92D5-584D180B12F8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F3ED0AEC-F87B-4F79-B156-B56586B944E4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F3ED0AEC-F87B-4F79-B156-B56586B944E4}.Debug|Win32.Build.0 = Debug|Win32
-		{F3ED0AEC-F87B-4F79-B156-B56586B944E4}.Release|Win32.ActiveCfg = Release|Win32
-		{F3ED0AEC-F87B-4F79-B156-B56586B944E4}.Release|Win32.Build.0 = Release|Win32
-		{F3ED0AEC-F87B-4F79-B156-B56586B944E4}.Debug|x64.ActiveCfg = Debug|x64
-		{F3ED0AEC-F87B-4F79-B156-B56586B944E4}.Debug|x64.Build.0 = Debug|x64
-		{F3ED0AEC-F87B-4F79-B156-B56586B944E4}.Release|x64.ActiveCfg = Release|x64
-		{F3ED0AEC-F87B-4F79-B156-B56586B944E4}.Release|x64.Build.0 = Release|x64
+		{A0CFCF38-1874-446B-92D5-584D180B12F8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A0CFCF38-1874-446B-92D5-584D180B12F8}.Debug|Win32.Build.0 = Debug|Win32
+		{A0CFCF38-1874-446B-92D5-584D180B12F8}.Release|Win32.ActiveCfg = Release|Win32
+		{A0CFCF38-1874-446B-92D5-584D180B12F8}.Release|Win32.Build.0 = Release|Win32
+		{A0CFCF38-1874-446B-92D5-584D180B12F8}.Debug|x64.ActiveCfg = Debug|x64
+		{A0CFCF38-1874-446B-92D5-584D180B12F8}.Debug|x64.Build.0 = Debug|x64
+		{A0CFCF38-1874-446B-92D5-584D180B12F8}.Release|x64.ActiveCfg = Release|x64
+		{A0CFCF38-1874-446B-92D5-584D180B12F8}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/general/perfcounters/kcs/kcs.vcxproj b/general/perfcounters/kcs/kcs.vcxproj
index 8752a69c..5f30eb23 100644
--- a/general/perfcounters/kcs/kcs.vcxproj
+++ b/general/perfcounters/kcs/kcs.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{F3ED0AEC-F87B-4F79-B156-B56586B944E4}</ProjectGuid>
+    <ProjectGuid>{A0CFCF38-1874-446B-92D5-584D180B12F8}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{645520EA-5297-4972-B738-B46537C50294}</SampleGuid>
+    <SampleGuid>{8C7CD3A0-C931-4AAB-943F-0AB402029733}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/perfcounters/kcs/kcs.vcxproj.Filters b/general/perfcounters/kcs/kcs.vcxproj.Filters
index 95035aea..0a2b4eef 100644
--- a/general/perfcounters/kcs/kcs.vcxproj.Filters
+++ b/general/perfcounters/kcs/kcs.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>{72EAD35D-F168-46BE-8F02-E79EA9A404BF}</UniqueIdentifier>
+      <UniqueIdentifier>{C74EBBFF-6648-4561-BCEF-C06B12BDF03B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{C66195DA-5B37-4759-8370-E727989B500E}</UniqueIdentifier>
+      <UniqueIdentifier>{4E634576-137D-4CFD-BF35-E2C758F368C2}</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>{1422332E-6F0D-4F3F-9F12-C8F1DD344B02}</UniqueIdentifier>
+      <UniqueIdentifier>{607A58D5-1577-4C28-86A6-4ECEE0DC54B0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{F6F0837E-DC90-49DE-8AD8-F746B0CD1AEB}</UniqueIdentifier>
+      <UniqueIdentifier>{73CDF637-094B-4D07-B7C7-4B30522D019A}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/registry/regfltr/exe/regctrl.vcxproj b/general/registry/regfltr/exe/regctrl.vcxproj
index 4a4bff13..35c4e051 100644
--- a/general/registry/regfltr/exe/regctrl.vcxproj
+++ b/general/registry/regfltr/exe/regctrl.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{80F2FF9A-F64D-4BC8-B469-C498268F0893}</ProjectGuid>
+    <ProjectGuid>{EF1294A9-96EE-458A-B2F2-3B8A4433193E}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{0D1260D8-BC17-4D6D-827F-EAE520A16BA1}</SampleGuid>
+    <SampleGuid>{DF5A770A-5577-4837-8A09-06BB9DC34573}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/registry/regfltr/exe/regctrl.vcxproj.Filters b/general/registry/regfltr/exe/regctrl.vcxproj.Filters
index 231ab1d9..91968211 100644
--- a/general/registry/regfltr/exe/regctrl.vcxproj.Filters
+++ b/general/registry/regfltr/exe/regctrl.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>{6DAFAEA8-8FF3-494E-A725-A2DC7670CC24}</UniqueIdentifier>
+      <UniqueIdentifier>{615E4203-7A7D-4A5B-89E0-03264A4AEC2F}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7E18F6C2-880E-479F-BAF0-92350FF8521F}</UniqueIdentifier>
+      <UniqueIdentifier>{33A895D5-D507-411A-B3D7-E8FFAF920B6C}</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>{D47D5E7A-8D65-4127-A011-6E2CCBE4F537}</UniqueIdentifier>
+      <UniqueIdentifier>{216FC0DE-892D-42B2-B308-B612B30EBEE5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/registry/regfltr/regfltr.sln b/general/registry/regfltr/regfltr.sln
index 152bf0a3..590e18ea 100644
--- a/general/registry/regfltr/regfltr.sln
+++ b/general/registry/regfltr/regfltr.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{54DDD01C-98B2-4DF0-ABD4-FFFA5E8AF6E6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{76D1A9E4-9C22-48E0-83ED-A93058BEDCA3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{4DC3A66B-04A0-4561-8E12-9E7C15E84931}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{80102EBE-97FA-4FF5-9C23-5CB690CC3C0D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regctrl", "exe\regctrl.vcxproj", "{80F2FF9A-F64D-4BC8-B469-C498268F0893}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regctrl", "exe\regctrl.vcxproj", "{EF1294A9-96EE-458A-B2F2-3B8A4433193E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regfltr", "sys\regfltr.vcxproj", "{5DD375CD-55ED-4473-ACF1-603E816B1B7F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regfltr", "sys\regfltr.vcxproj", "{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{80F2FF9A-F64D-4BC8-B469-C498268F0893}.Debug|Win32.ActiveCfg = Debug|Win32
-		{80F2FF9A-F64D-4BC8-B469-C498268F0893}.Debug|Win32.Build.0 = Debug|Win32
-		{80F2FF9A-F64D-4BC8-B469-C498268F0893}.Release|Win32.ActiveCfg = Release|Win32
-		{80F2FF9A-F64D-4BC8-B469-C498268F0893}.Release|Win32.Build.0 = Release|Win32
-		{80F2FF9A-F64D-4BC8-B469-C498268F0893}.Debug|x64.ActiveCfg = Debug|x64
-		{80F2FF9A-F64D-4BC8-B469-C498268F0893}.Debug|x64.Build.0 = Debug|x64
-		{80F2FF9A-F64D-4BC8-B469-C498268F0893}.Release|x64.ActiveCfg = Release|x64
-		{80F2FF9A-F64D-4BC8-B469-C498268F0893}.Release|x64.Build.0 = Release|x64
-		{5DD375CD-55ED-4473-ACF1-603E816B1B7F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5DD375CD-55ED-4473-ACF1-603E816B1B7F}.Debug|Win32.Build.0 = Debug|Win32
-		{5DD375CD-55ED-4473-ACF1-603E816B1B7F}.Release|Win32.ActiveCfg = Release|Win32
-		{5DD375CD-55ED-4473-ACF1-603E816B1B7F}.Release|Win32.Build.0 = Release|Win32
-		{5DD375CD-55ED-4473-ACF1-603E816B1B7F}.Debug|x64.ActiveCfg = Debug|x64
-		{5DD375CD-55ED-4473-ACF1-603E816B1B7F}.Debug|x64.Build.0 = Debug|x64
-		{5DD375CD-55ED-4473-ACF1-603E816B1B7F}.Release|x64.ActiveCfg = Release|x64
-		{5DD375CD-55ED-4473-ACF1-603E816B1B7F}.Release|x64.Build.0 = Release|x64
+		{EF1294A9-96EE-458A-B2F2-3B8A4433193E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EF1294A9-96EE-458A-B2F2-3B8A4433193E}.Debug|Win32.Build.0 = Debug|Win32
+		{EF1294A9-96EE-458A-B2F2-3B8A4433193E}.Release|Win32.ActiveCfg = Release|Win32
+		{EF1294A9-96EE-458A-B2F2-3B8A4433193E}.Release|Win32.Build.0 = Release|Win32
+		{EF1294A9-96EE-458A-B2F2-3B8A4433193E}.Debug|x64.ActiveCfg = Debug|x64
+		{EF1294A9-96EE-458A-B2F2-3B8A4433193E}.Debug|x64.Build.0 = Debug|x64
+		{EF1294A9-96EE-458A-B2F2-3B8A4433193E}.Release|x64.ActiveCfg = Release|x64
+		{EF1294A9-96EE-458A-B2F2-3B8A4433193E}.Release|x64.Build.0 = Release|x64
+		{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}.Debug|Win32.Build.0 = Debug|Win32
+		{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}.Release|Win32.ActiveCfg = Release|Win32
+		{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}.Release|Win32.Build.0 = Release|Win32
+		{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}.Debug|x64.ActiveCfg = Debug|x64
+		{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}.Debug|x64.Build.0 = Debug|x64
+		{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}.Release|x64.ActiveCfg = Release|x64
+		{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{80F2FF9A-F64D-4BC8-B469-C498268F0893} = {54DDD01C-98B2-4DF0-ABD4-FFFA5E8AF6E6}
-		{5DD375CD-55ED-4473-ACF1-603E816B1B7F} = {4DC3A66B-04A0-4561-8E12-9E7C15E84931}
+		{EF1294A9-96EE-458A-B2F2-3B8A4433193E} = {76D1A9E4-9C22-48E0-83ED-A93058BEDCA3}
+		{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6} = {80102EBE-97FA-4FF5-9C23-5CB690CC3C0D}
 	EndGlobalSection
 EndGlobal
diff --git a/general/registry/regfltr/sys/regfltr.vcxproj b/general/registry/regfltr/sys/regfltr.vcxproj
index a41d6718..957be3ba 100644
--- a/general/registry/regfltr/sys/regfltr.vcxproj
+++ b/general/registry/regfltr/sys/regfltr.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DD375CD-55ED-4473-ACF1-603E816B1B7F}</ProjectGuid>
+    <ProjectGuid>{DCD09C78-DEC6-483A-9F5E-2C17D467C4D6}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{7D592DE5-96F0-40B9-8248-2CF66A8598FE}</SampleGuid>
+    <SampleGuid>{1622F012-ABA6-4B2C-89FD-8D947B097D29}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/registry/regfltr/sys/regfltr.vcxproj.Filters b/general/registry/regfltr/sys/regfltr.vcxproj.Filters
index 102cb3f2..e03c3574 100644
--- a/general/registry/regfltr/sys/regfltr.vcxproj.Filters
+++ b/general/registry/regfltr/sys/regfltr.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>{F62D61F7-DCE8-4A41-9279-8004A63F38C1}</UniqueIdentifier>
+      <UniqueIdentifier>{DFE96339-C50C-4420-8972-CCDB6E4C881D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{752F76C0-8A4C-47F7-86DC-3765B9DB318C}</UniqueIdentifier>
+      <UniqueIdentifier>{34CF200F-C4B3-433D-B8C0-AEB5225582B8}</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>{CD06AB4D-22C8-4DC9-8B81-34F857E144FC}</UniqueIdentifier>
+      <UniqueIdentifier>{3DD7829A-EF0E-4779-9377-EFB977E68C6A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{289E8C44-65C6-44CF-B6B3-6D551292E0C6}</UniqueIdentifier>
+      <UniqueIdentifier>{8B68FEE9-94C8-4E1F-8E81-7387DA5E522D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/Package/package.VcxProj b/general/toaster/toastDrv/Package/package.VcxProj
index df14540a..43181207 100644
--- a/general/toaster/toastDrv/Package/package.VcxProj
+++ b/general/toaster/toastDrv/Package/package.VcxProj
@@ -19,35 +19,32 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\classinstaller\tostrcls.vcxproj">
-      <Project>{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\kmdf\bus\dynamic\dynambus.vcxproj">
-      <Project>{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}</Project>
+      <Project>{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\bus\static\StatBus.vcxproj">
-      <Project>{965C0E80-0715-4376-A138-48D08EFDDC09}</Project>
+      <Project>{6C6E0C23-5B37-4BBB-8909-435078D49364}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\filter\generic\filter.vcxproj">
-      <Project>{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}</Project>
+      <Project>{B39F6628-73BA-4AC3-863A-EA20892F1EFD}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\filter\sideband\filter.vcxproj">
-      <Project>{5094C704-35B0-4A25-AD30-570C49BCAE82}</Project>
+      <Project>{1A40DA6D-B948-43A7-864C-962517EE0A1D}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\func\featured\wdffeatured.vcxproj">
-      <Project>{CA0E203E-4C96-466F-BF19-24F42DFC0C89}</Project>
+      <Project>{C0049CDD-7551-4681-9E30-EFE32868F651}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\func\simple\wdfsimple.vcxproj">
-      <Project>{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}</Project>
+      <Project>{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}</Project>
     </ProjectReference>
     <ProjectReference Include="..\kmdf\toastmon\wdftoastmon.vcxproj">
-      <Project>{A5E50982-981B-40B9-BEE6-1E15581FE947}</Project>
+      <Project>{D15FD911-F2DA-4644-8142-6D22756AD287}</Project>
     </ProjectReference>
     <ProjectReference Include="..\umdf\func\WUDFToaster.vcxproj">
-      <Project>{B439C142-C570-44A6-B13C-43F70AE05A69}</Project>
+      <Project>{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}</Project>
     </ProjectReference>
     <ProjectReference Include="..\umdf\Toastmon\WUDFToastMon.vcxproj">
-      <Project>{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}</Project>
+      <Project>{F575419D-099B-4DA0-B80C-88D766DD7542}</Project>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="PropertySheets">
@@ -59,8 +56,8 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D72A34B9-86A5-4801-B7E3-256CF1F382AD}</ProjectGuid>
-    <SampleGuid>{DC08D3F2-EDC5-409B-800B-8F8AC3703227}</SampleGuid>
+    <ProjectGuid>{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}</ProjectGuid>
+    <SampleGuid>{198A87DB-8A25-471F-971B-7F131503ADBA}</SampleGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/general/toaster/toastDrv/Package/package.VcxProj.Filters b/general/toaster/toastDrv/Package/package.VcxProj.Filters
index 6ac14cf2..f2732c36 100644
--- a/general/toaster/toastDrv/Package/package.VcxProj.Filters
+++ b/general/toaster/toastDrv/Package/package.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>{326C9B70-6DC4-4EA3-92EB-476DC4DBD40B}</UniqueIdentifier>
+      <UniqueIdentifier>{E3FF1186-A45E-4F9A-A4CE-A201588AABBB}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{24CE830C-B385-46E4-83A3-B26A795BF457}</UniqueIdentifier>
+      <UniqueIdentifier>{3D734124-81A9-453D-9D3B-8CCB518874BA}</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>{695BFD83-FE23-4414-BBAC-E44BB2BBAE00}</UniqueIdentifier>
+      <UniqueIdentifier>{CF3D354B-7827-4425-AFE0-BB3C638CAA1D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{8A6D9B6E-0F3C-448E-948B-DCA1A5066C25}</UniqueIdentifier>
+      <UniqueIdentifier>{FFF9B3CB-B591-4F59-BDE7-F9F033C56A73}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/general/toaster/toastDrv/classinstaller/classInst.c b/general/toaster/toastDrv/classinstaller/classInst.c
deleted file mode 100644
index 9aa3294a..00000000
--- a/general/toaster/toastDrv/classinstaller/classInst.c
+++ /dev/null
@@ -1,513 +0,0 @@
-//+---------------------------------------------------------------------------
-//
-//  Copyright (c) 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:       ClassINST.C
-//
-//  Contents:   class-installer for toaster.
-//
-//  Notes:      This is a sample class installer. Class installer is not required 
-//              for every class of device. I have included here to provide 
-//              an icon for the toaster class and to demonstrate how one
-//              can provide a customer property sheet in the device manager
-//              in response to DIF_ADDPROPERTYPAGE_ADVANCED. 
-//              The property sheet has a check box. If you enable the box
-//              and press OK, it will restart the device. This is required
-//              if the user changes the device properties, and it needs to
-//              be restarted to apply the new attributes.
-//              For a complete description of ClassInstallers, please see the 
-//              Microsoft Windows 2000 DDK Documentation.
-//
-//  
-//  Revision: Added property page - Nov 14, 2000
-//  
-//
-//----------------------------------------------------------------------------
-
-//
-// Annotation to indicate to prefast that this is nondriver user-mode code.
-//
-#include <DriverSpecs.h>
-__user_code  
-
-#include <windows.h>
-#include <strsafe.h>
-#include <setupapi.h>
-#include <stdio.h>
-#include "resource.h"
-#include <dontuse.h>
-//+---------------------------------------------------------------------------
-//
-// WARNING! 
-//
-// Installer must not generate any popup to the user.
-//    It should provide appropriate defaults.
-//
-//  OutputDebugString should be fine...
-//
-#if DBG
-#define DbgOut(Text) OutputDebugString(TEXT("ClassInstaller: " Text "\n"))
-#else
-#define DbgOut(Text) 
-#endif 
-
-typedef struct _TOASTER_PROP_PARAMS
-{
-
-   HDEVINFO                     DeviceInfoSet;
-   PSP_DEVINFO_DATA             DeviceInfoData;
-   BOOL                         Restart;
-   
-} TOASTER_PROP_PARAMS, *PTOASTER_PROP_PARAMS;
-
-
-INT_PTR
-PropPageDlgProc(_In_ HWND   hDlg,
-               _In_ UINT   uMessage,
-               _In_ WPARAM wParam,
-               _In_ LPARAM lParam);
-
-UINT
-CALLBACK
-PropPageDlgCallback(HWND hwnd,
-                    UINT uMsg,
-                    LPPROPSHEETPAGE ppsp);
-DWORD
-PropPageProvider(
-    _In_  HDEVINFO            DeviceInfoSet,
-    _In_  PSP_DEVINFO_DATA    DeviceInfoData OPTIONAL
-);
-
-BOOL
-OnNotify(
-    HWND    ParentHwnd,
-    LPNMHDR NmHdr,
-    PTOASTER_PROP_PARAMS Params
-    );
-    
-HMODULE ModuleInstance;
-
-BOOL WINAPI 
-DllMain(
-    HINSTANCE DllInstance,
-    DWORD Reason,
-    PVOID Reserved
-    )
-{
-
-    UNREFERENCED_PARAMETER( Reserved );
-
-    switch(Reason) {
-
-        case DLL_PROCESS_ATTACH: {
-
-            ModuleInstance = DllInstance;
-            DisableThreadLibraryCalls(DllInstance);
-            InitCommonControls();
-            break;
-        }
-
-        case DLL_PROCESS_DETACH: {
-            ModuleInstance = NULL;
-            break;
-        }
-
-        default: {
-            break;
-        }
-    }
-
-    return TRUE;
-}
-
-DWORD CALLBACK
-ToasterClassInstaller(
-    _In_  DI_FUNCTION         InstallFunction,
-    _In_  HDEVINFO            DeviceInfoSet,
-    _In_  PSP_DEVINFO_DATA    DeviceInfoData OPTIONAL
-    )
-/*++
-
-Routine Description: 
-
-    Responds to Class-installer messages
-    .  
-Arguments:
-
-     InstallFunction   [in] 
-     DeviceInfoSet     [in]
-     DeviceInfoData    [in]
-
-Return Value:
-
-Returns:    NO_ERROR, ERROR_DI_POSTPROCESSING_REQUIRED, or an error code.
-
---*/
-{
-    switch (InstallFunction)
-    {
-        case DIF_INSTALLDEVICE: 
-            //
-            // Sent twice: once before installing the device and once
-            // after installing device, if you have returned 
-            // ERROR_DI_POSTPROCESSING_REQUIRED during the first pass.
-            //
-            DbgOut("DIF_INSTALLDEVICE");
-            break;
-            
-        case DIF_ADDPROPERTYPAGE_ADVANCED:
-            //
-            // Sent when you check the properties of the device in the
-            // device manager.
-            //
-            DbgOut("DIF_ADDPROPERTYPAGE_ADVANCED");
-            return PropPageProvider(DeviceInfoSet, DeviceInfoData);           
-            
-        case DIF_POWERMESSAGEWAKE:
-            //
-            // Sent when you check the power management tab 
-            //
-            DbgOut("DIF_POWERMESSAGEWAKE");
-            break;
-
-        case DIF_PROPERTYCHANGE:
-            //
-            // Sent when you change the property of the device using
-            // SetupDiSetDeviceInstallParams. (Enable/Disable/Restart)
-            //
-            DbgOut("DIF_PROPERTYCHANGE");
-            break;
-        case DIF_REMOVE: 
-             //
-             // Sent when you uninstall the device.
-             //
-             DbgOut("DIF_REMOVE");
-             break;
-             
-        case DIF_NEWDEVICEWIZARD_FINISHINSTALL:
-            //
-            // Sent near the end of installation to allow 
-            // an installer to supply wizard page(s) to the user.
-            // These wizard pages are different from the device manager
-            // property sheet.There are popped only once during install.
-            //
-            DbgOut("DIF_NEWDEVICEWIZARD_FINISHINSTALL");
-            break;
-            
-        case DIF_SELECTDEVICE:
-            DbgOut("DIF_SELECTDEVICE");
-            break;
-        case DIF_DESTROYPRIVATEDATA:
-            //
-            // Sent when Setup destroys a device information set 
-            // or an SP_DEVINFO_DATA element, or when Setup discards 
-            // its list of co-installers and class installer for a device
-            //
-            DbgOut("DIF_DESTROYPRIVATEDATA");
-            break;
-        case DIF_INSTALLDEVICEFILES:
-            DbgOut("DIF_INSTALLDEVICEFILES");
-            break;
-        case DIF_ALLOW_INSTALL:
-            //
-            // Sent to confirm whether the installer wants to allow
-            // the installation of device.
-            //
-            DbgOut("DIF_ALLOW_INSTALL");
-            break;
-        case DIF_SELECTBESTCOMPATDRV:
-            DbgOut("DIF_SELECTBESTCOMPATDRV");
-            break;
-
-        case DIF_INSTALLINTERFACES:
-            DbgOut("DIF_INSTALLINTERFACES");
-            break;
-        case DIF_REGISTER_COINSTALLERS:
-            DbgOut("DIF_REGISTER_COINSTALLERS");
-            break;
-        default:
-            DbgOut("DIF_???");
-            break;
-    }   
-    return ERROR_DI_DO_DEFAULT;    
-}
-
-DWORD
-PropPageProvider(
-    _In_  HDEVINFO            DeviceInfoSet,
-    _In_  PSP_DEVINFO_DATA    DeviceInfoData OPTIONAL
-)
-
-/*++
-
-Routine Description: 
-
-    Entry-point for adding additional device manager property
-    sheet pages.  
-Arguments:
-
-Return Value:
-
-Returns:    NO_ERROR, ERROR_DI_DO_DEFAULT, or an error code.
-
---*/
-{
-    HPROPSHEETPAGE  pageHandle;
-    PROPSHEETPAGE   page;
-    PTOASTER_PROP_PARAMS      params = NULL;
-    SP_ADDPROPERTYPAGE_DATA AddPropertyPageData = {0};
-
-    //
-    // DeviceInfoSet is NULL if setup is requesting property pages for
-    // the device setup class. We don't want to do anything in this 
-    // case.
-    //
-    if (DeviceInfoData==NULL) {
-        return ERROR_DI_DO_DEFAULT;
-    }
-
-    AddPropertyPageData.ClassInstallHeader.cbSize = 
-         sizeof(SP_CLASSINSTALL_HEADER);
-
-    //
-    // Get the current class install parameters for the device
-    //
-
-    if (SetupDiGetClassInstallParams(DeviceInfoSet, DeviceInfoData,
-         (PSP_CLASSINSTALL_HEADER)&AddPropertyPageData,
-         sizeof(SP_ADDPROPERTYPAGE_DATA), NULL )) 
-    {
-
-        //
-        // Ensure that the maximum number of dynamic pages for the 
-        // device has not yet been met
-        //
-        if(AddPropertyPageData.NumDynamicPages >= MAX_INSTALLWIZARD_DYNAPAGES){
-            return NO_ERROR;
-        }
-        params = HeapAlloc(GetProcessHeap(), 0, sizeof(TOASTER_PROP_PARAMS));
-        if (params)
-        {
-            //
-            // Save DeviceInfoSet and DeviceInfoData
-            //
-            params->DeviceInfoSet     = DeviceInfoSet;
-            params->DeviceInfoData    = DeviceInfoData;
-            params->Restart           = FALSE;
-            
-            //
-            // Create custom property sheet page
-            //
-            memset(&page, 0, sizeof(PROPSHEETPAGE));
-
-            page.dwSize = sizeof(PROPSHEETPAGE);
-            page.dwFlags = PSP_USECALLBACK;
-            page.hInstance = ModuleInstance;
-            page.pszTemplate = MAKEINTRESOURCE(DLG_TOASTER_PORTSETTINGS);
-            page.pfnDlgProc = (DLGPROC) PropPageDlgProc;
-            page.pfnCallback = PropPageDlgCallback;
-
-            page.lParam = (LPARAM) params;
-
-            pageHandle = CreatePropertySheetPage(&page);
-            if(!pageHandle)
-            {
-                HeapFree(GetProcessHeap(), 0, params);
-                return NO_ERROR;
-            }
-
-            //
-            // Add the new page to the list of dynamic property 
-            // sheets
-            //
-            AddPropertyPageData.DynamicPages[
-                AddPropertyPageData.NumDynamicPages++]=pageHandle;
-
-            SetupDiSetClassInstallParams(DeviceInfoSet,
-                        DeviceInfoData,
-                        (PSP_CLASSINSTALL_HEADER)&AddPropertyPageData,
-                        sizeof(SP_ADDPROPERTYPAGE_DATA));
-        }
-    }
-    return NO_ERROR;
-} 
-
-INT_PTR
-PropPageDlgProc(_In_ HWND   hDlg,
-                   _In_ UINT   uMessage,
-                   _In_ WPARAM wParam,
-                   _In_ LPARAM lParam)
-/*++
-
-Routine Description: PropPageDlgProc
-
-    The windows control function for the custom property page window
-
-Arguments:
-
-    hDlg, uMessage, wParam, lParam: standard windows DlgProc parameters
-
-Return Value:
-
-    BOOL: FALSE if function fails, TRUE if function passes
-
---*/
-{
-    PTOASTER_PROP_PARAMS params;
-
-    UNREFERENCED_PARAMETER( wParam );
-
-    params = (PTOASTER_PROP_PARAMS) GetWindowLongPtr(hDlg, DWLP_USER);
-
-    switch(uMessage) {
-    case WM_COMMAND:
-        break;
-
-    case WM_CONTEXTMENU:
-        break;
-
-    case WM_HELP:
-        break;
-
-    case WM_INITDIALOG:
-
-        //
-        // on WM_INITDIALOG call, lParam points to the property
-        // sheet page.
-        //
-        // The lParam field in the property sheet page struct is set by the
-        // caller. This was set when we created the property sheet.
-        // Save this in the user window long so that we can access it on later 
-        // on later messages.
-        //
-
-        params = (PTOASTER_PROP_PARAMS) ((LPPROPSHEETPAGE)lParam)->lParam;
-        SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR) params);
-        break;
-
-
-    case WM_NOTIFY:
-        OnNotify(hDlg, (NMHDR *)lParam, params);
-        break;
-
-    default: 
-        return FALSE;
-    }
-
-    return TRUE;
-} 
-
-
-UINT
-CALLBACK
-PropPageDlgCallback(HWND hwnd,
-                   UINT uMsg,
-                   LPPROPSHEETPAGE ppsp)
-{
-    PTOASTER_PROP_PARAMS params;
-
-    UNREFERENCED_PARAMETER( hwnd );
-
-    switch (uMsg) {
-
-    case PSPCB_CREATE:
-        //
-        // Called when the property sheet is first displayed
-        //
-        return TRUE;    // return TRUE to continue with creation of page
-
-    case PSPCB_RELEASE:
-        //
-        // Called when property page is destroyed, even if the page 
-        // was never displayed. This is the correct way to release data.
-        //
-        params = (PTOASTER_PROP_PARAMS) ppsp->lParam;
-        LocalFree(params);
-        return 0;       // return value ignored
-    default:
-        break;
-    }
-
-    return TRUE;
-}
-
-
-BOOL
-OnNotify(
-    HWND    ParentHwnd,
-    LPNMHDR NmHdr,
-    PTOASTER_PROP_PARAMS Params
-    )
-{
-    SP_DEVINSTALL_PARAMS spDevInstall = {0};
-    TCHAR                friendlyName[LINE_LEN] ={0};
-    size_t  charCount;
-    BOOL    fSuccess;
-
-    switch (NmHdr->code) {
-    case PSN_APPLY:
-        //
-        // Sent when the user clicks on Apply OR OK !!
-        //
-
-        GetDlgItemText(ParentHwnd, IDC_FRIENDLYNAME, friendlyName,
-                                        LINE_LEN-1 );
-        friendlyName[LINE_LEN-1] = UNICODE_NULL;
-        if(friendlyName[0]) {
-
-            if (FAILED(StringCchLength(friendlyName,
-                         STRSAFE_MAX_CCH,
-                         &charCount))) {
-                DbgOut("StringCchLength failed!");                   
-                break;
-            }
-            fSuccess = SetupDiSetDeviceRegistryProperty(Params->DeviceInfoSet, 
-                         Params->DeviceInfoData,
-                         SPDRP_FRIENDLYNAME,
-                         (BYTE *)friendlyName,
-                         (DWORD)((charCount + 1) * sizeof(TCHAR))
-                         );
-            if(!fSuccess) {
-                DbgOut("SetupDiSetDeviceRegistryProperty failed!");                   
-                break;
-            }
-
-            //
-            // Inform setup about property change so that it can
-            // restart the device.
-            //
-
-            spDevInstall.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
-     
-            if (Params && SetupDiGetDeviceInstallParams(Params->DeviceInfoSet,
-                                              Params->DeviceInfoData,
-                                              &spDevInstall)) {
-                //
-                // If your device requires a reboot to restart, you can
-                // specify that by setting DI_NEEDREBOOT as shown below
-                //
-                // if(NeedReboot) {
-                //    spDevInstall.Flags |= DI_PROPERTIES_CHANGE | DI_NEEDREBOOT;
-                // }
-                //
-                spDevInstall.FlagsEx |= DI_FLAGSEX_PROPCHANGE_PENDING;
-                
-                SetupDiSetDeviceInstallParams(Params->DeviceInfoSet,
-                                              Params->DeviceInfoData,
-                                              &spDevInstall);
-            }
-        
-        }
-        return TRUE;
-
-    default:
-        return FALSE;
-    }
-    return FALSE;   
-} 
-
diff --git a/general/toaster/toastDrv/classinstaller/classinst.rc b/general/toaster/toastDrv/classinstaller/classinst.rc
deleted file mode 100644
index 7320e436..00000000
--- a/general/toaster/toastDrv/classinstaller/classinst.rc
+++ /dev/null
@@ -1,65 +0,0 @@
-/*++
-
-Copyright (c) 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.
-
-Module Name:
-
-    classinst.rc
-
-Abstract:
-
-    Resource Script for Toaster Class Installer Sample
-
-Environment:
-
-    user mode only
-
-Revision History:
-
---*/
-
-
-#include "resource.h"
-#include <windows.h>
-#include <ntverp.h>
-
-#define VER_FILETYPE    VFT_APP
-#define VER_FILESUBTYPE VFT2_UNKNOWN
-#define VER_FILEDESCRIPTION_STR     "Class-Installer DLL for Toaster Sample"
-#define VER_INTERNALNAME_STR        "TostrCls.dll"
-#define VER_ORIGINALFILENAME_STR    "TostrCls.dll"
-
-#include <common.ver>
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-DLG_TOASTER_PORTSETTINGS DIALOGEX 0, 0, 257, 215
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "Custom Property Page"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "You can change the friendly name of the device with the following edit box. If you give a name and click OK, it will cause the device to restart.",
-                    IDC_STATIC,43,24,171,27,WS_BORDER,WS_EX_STATICEDGE
-    EDITTEXT        IDC_FRIENDLYNAME,97,78,118,14,ES_AUTOHSCROLL
-    LTEXT           "FriendlyName",204,46,81,46,10
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-IDI_CLASS_ICON  ICON    DISCARDABLE     "TOASTER.ICO"
-
-
diff --git a/general/toaster/toastDrv/classinstaller/resource.h b/general/toaster/toastDrv/classinstaller/resource.h
deleted file mode 100644
index e8331ee0..00000000
--- a/general/toaster/toastDrv/classinstaller/resource.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*++
-
-Copyright (c) 1999-2000  Microsoft Corporation
-
-Module Name:
-
-    Resource.h
-
-Abstract:
-
-    Resource def.
-
-Environment:
-
-    user mode only
-
-Notes:
-
-  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.
-
-  Copyright (c) 1999-2000 Microsoft Corporation.  All Rights Reserved.
-
-
-Revision History:
-
---*/
-
-#define IDI_CLASS_ICON                       100
-
-#define DLG_TOASTER_PORTSETTINGS             200
-
-#define IDC_STATIC                           202
-
-#define IDC_FRIENDLYNAME                     203
-
diff --git a/general/toaster/toastDrv/classinstaller/toaster.ico b/general/toaster/toastDrv/classinstaller/toaster.ico
deleted file mode 100644
index 77ad2081..00000000
--- a/general/toaster/toastDrv/classinstaller/toaster.ico
+++ /dev/null
diff --git a/general/toaster/toastDrv/classinstaller/tostrcls.def b/general/toaster/toastDrv/classinstaller/tostrcls.def
deleted file mode 100644
index 877e3aff..00000000
--- a/general/toaster/toastDrv/classinstaller/tostrcls.def
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY  TOSTRCLS
-
-EXPORTS   
-   ToasterClassInstaller
-   
diff --git a/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj b/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj
deleted file mode 100644
index a3a6891d..00000000
--- a/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj
+++ /dev/null
@@ -1,237 +0,0 @@
-<?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>{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <SupportsPackaging>false</SupportsPackaging>
-    <RequiresPackageProject>true</RequiresPackageProject>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{EB79C9FC-7142-4AC9-BF03-D873407A31DE}</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>DynamicLibrary</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>DynamicLibrary</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>DynamicLibrary</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>DynamicLibrary</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>tostrcls</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>tostrcls</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>tostrcls</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>tostrcls</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib;comctl32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-      <ModuleDefinitionFile>tostrcls.def</ModuleDefinitionFile>
-    </Link>
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib;comctl32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-      <ModuleDefinitionFile>tostrcls.def</ModuleDefinitionFile>
-    </Link>
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib;comctl32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-      <ModuleDefinitionFile>tostrcls.def</ModuleDefinitionFile>
-    </Link>
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib;comctl32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-      <ModuleDefinitionFile>tostrcls.def</ModuleDefinitionFile>
-    </Link>
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="classinst.c" />
-    <ResourceCompile Include="classinst.rc" />
-  </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/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj.Filters b/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj.Filters
deleted file mode 100644
index 841ba6f6..00000000
--- a/general/toaster/toastDrv/classinstaller/tostrcls.vcxproj.Filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>{DFE60A11-D228-4BF1-B20A-708606E63695}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{692DFF5B-CE0A-4047-8EC8-27394EDFB2B6}</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>{20E0445D-854A-4108-AAF5-8DF38235343B}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="classinst.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="tostrcls.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="classinst.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/general/toaster/toastDrv/coinstaller/coinst.c b/general/toaster/toastDrv/coinstaller/coinst.c
deleted file mode 100644
index a78223c5..00000000
--- a/general/toaster/toastDrv/coinstaller/coinst.c
+++ /dev/null
@@ -1,343 +0,0 @@
-// 45678901234567890123456789012345678901234567890123456789012345678901234567890
-//+---------------------------------------------------------------------------
-//
-//  Microsoft Windows
-//  Copyright (C) Microsoft Corporation, 1999.
-//
-//  File:       COINST.C
-//
-//  Contents:   co-installer hook.
-//
-//  Notes:      For a complete description of CoInstallers, please see the
-//                 Microsoft Windows 2000 DDK Documentation
-//
-//
-// Revision History:
-//              Added FriendlyName interface
-//
-//              Modified to create a friendlyname in the first callback to
-//              to install device rather than in post-processing.
-//                  - July 28, 2000
-//
-//----------------------------------------------------------------------------
-
-//
-// Annotation to indicate to prefast that this is nondriver user-mode code.
-//
-#include <DriverSpecs.h>
-__user_code  
-
-#include <windows.h>
-#include <setupapi.h>
-#include <stdio.h>
-#include <strsafe.h>
-
-//+---------------------------------------------------------------------------
-//
-// WARNING!
-//
-// A Coinstaller must not generate any popup to the user.
-//     it should provide appropriate defaults.
-//
-//  OutputDebugString should be fine...
-//
-#if DBG
-#define DbgOut(Text) OutputDebugString(TEXT("CoInstaller: " Text "\n"))
-#else
-#define DbgOut(Text)
-#endif
-
-//+---------------------------------------------------------------------------
-//
-//  Function:   MyOpenInfFile
-//
-//  Purpose:    Will open the handle to the INF file being installed
-//
-//  Arguments:
-//      DeviceInfoSet     [in]
-//      DeviceInfoData    [in]
-//      ErrorLine         [out] // Optional, See SetupOpenInfFile
-//
-//  Returns:    HINF Handle of INF file
-//
-HINF MyOpenInfFile (
-                    _In_      HDEVINFO          DeviceInfoSet,
-                    _In_      PSP_DEVINFO_DATA  DeviceInfoData,
-                    _Out_opt_ PUINT             ErrorLine
-                    )
-{
-    SP_DRVINFO_DATA DriverInfoData;
-    SP_DRVINFO_DETAIL_DATA DriverInfoDetailData;
-    DWORD Status;
-    HINF FileHandle;
-
-    if (NULL != ErrorLine)
-    {
-        *ErrorLine = 0;
-    }
-
-    DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA);
-    if (!SetupDiGetSelectedDriver( DeviceInfoSet,
-        DeviceInfoData,
-        &DriverInfoData))
-    {
-        DbgOut("Fail: SetupDiGetSelectedDriver");
-        return INVALID_HANDLE_VALUE;
-    }
-
-    DriverInfoDetailData.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA);
-    if (!SetupDiGetDriverInfoDetail(DeviceInfoSet,
-        DeviceInfoData,
-        &DriverInfoData,
-        &DriverInfoDetailData,
-        sizeof(SP_DRVINFO_DETAIL_DATA),
-        NULL))
-    {
-        if ((Status = GetLastError()) == ERROR_INSUFFICIENT_BUFFER)
-        {
-            // We don't need the extended information.  Ignore.
-        }
-        else
-        {
-            DbgOut("Fail: SetupDiGetDriverInfoDetail");
-            return INVALID_HANDLE_VALUE;
-        }
-    }
-
-    if (INVALID_HANDLE_VALUE == (FileHandle = SetupOpenInfFile(
-        DriverInfoDetailData.InfFileName,
-        NULL,
-        INF_STYLE_WIN4,
-        ErrorLine)))
-    {
-        DbgOut("Fail: SetupOpenInfFile");
-    }
-    return FileHandle;
-}
-
-//+---------------------------------------------------------------------------
-//
-//  Function:   ToasterCoInstaller
-//
-//  Purpose:    Responds to co-installer messages
-//
-//  Arguments:
-//      InstallFunction   [in]
-//      DeviceInfoSet     [in]
-//      DeviceInfoData    [in]
-//      Context           [inout]
-//
-//  Returns:    NO_ERROR, ERROR_DI_POSTPROCESSING_REQUIRED, or an error code.
-//
-DWORD CALLBACK
-ToasterCoInstaller (
-               _In_     DI_FUNCTION               InstallFunction,
-               _In_     HDEVINFO                  DeviceInfoSet,
-               _In_     PSP_DEVINFO_DATA          DeviceInfoData,  OPTIONAL
-               _Inout_ PCOINSTALLER_CONTEXT_DATA Context
-               )
-{
-    switch (InstallFunction)
-    {
-    case DIF_INSTALLDEVICE:
-        if(!Context->PostProcessing)
-        {
-            TCHAR       FriendlyName[MAX_PATH];
-            BOOL        fSuccess=FALSE;
-            DWORD       dwRegType, UINumber;
-            size_t      len;
-
-            DbgOut("DIF_INSTALLDEVICE");
-
-            //
-            // We wil create here a friendly name for this device
-            // based on it's serial number.
-            // The bus driver returns the serial No. in the UINumber.
-            // field of the device capabiliities structure.
-            // So let us get that first .
-            //
-            fSuccess =
-            SetupDiGetDeviceRegistryProperty(DeviceInfoSet,
-                                             DeviceInfoData,
-                                             SPDRP_UI_NUMBER,
-                                             &dwRegType,
-                                             (BYTE*) &UINumber,
-                                             sizeof(UINumber),
-                                             NULL);
-            if (fSuccess)
-            {
-                //
-                // Cook a FriendlyName and add it to the registry
-                //
-                if (SUCCEEDED(StringCbPrintf(FriendlyName,
-                               sizeof(FriendlyName),
-                               TEXT("ToasterDevice%02u"),
-                               UINumber))) {
-
-                    if (SUCCEEDED(StringCbLength(FriendlyName,
-                                    sizeof(FriendlyName),
-                                    &len))) {
-                        fSuccess = SetupDiSetDeviceRegistryProperty(DeviceInfoSet,
-                                     DeviceInfoData,
-                                     SPDRP_FRIENDLYNAME,
-                                     (BYTE *)FriendlyName,
-                                     (DWORD)len
-                                     );
-                        if(!fSuccess) {
-                            DbgOut("SetupDiSetDeviceRegistryProperty failed!");
-                        }
-                    }
-                    
-                }
-
-            }
-
-            // You can use PrivateData to pass Data needed for PostProcessing
-            // Context->PrivateData = Something;
-
-            return ERROR_DI_POSTPROCESSING_REQUIRED; //Set for PostProcessing
-        }
-        else // post processing
-        {
-            INFCONTEXT  InfContext;
-            HINF        InfFile;
-
-            //
-            // Sample code to show how you can process a custom section
-            // in your INF file.
-            //
-            DbgOut("DIF_INSTALLDEVICE PostProcessing");
-
-            if (INVALID_HANDLE_VALUE == (InfFile =
-                MyOpenInfFile(DeviceInfoSet,DeviceInfoData,NULL)))
-            {
-                return GetLastError();
-            }
-
-            if (SetupFindFirstLine(InfFile, // InfHandle
-                TEXT("MySection"),
-                TEXT("MySpecialFlag"),
-                &InfContext))
-            {
-                DbgOut("DIF_INSTALLDEVICE MySpecicalFlag, Do something here!");
-
-            }
-
-        }
-        break;
-
-    case DIF_REMOVE:
-        DbgOut("DIF_REMOVE");
-        break;
-
-    case DIF_SELECTDEVICE:
-        DbgOut("DIF_SELECTDEVICE");
-        break;
-    case DIF_ASSIGNRESOURCES:
-        DbgOut("DIF_ASSIGNRESOURCES");
-        break;
-    case DIF_PROPERTIES:
-        DbgOut("DIF_PROPERTIES");
-        break;
-    case DIF_FIRSTTIMESETUP:
-        DbgOut("DIF_FIRSTTIMESETUP");
-        break;
-    case DIF_FOUNDDEVICE:
-        DbgOut("DIF_FOUNDDEVICE");
-        break;
-    case DIF_SELECTCLASSDRIVERS:
-        DbgOut("DIF_SELECTCLASSDRIVERS");
-        break;
-    case DIF_VALIDATECLASSDRIVERS:
-        DbgOut("DIF_VALIDATECLASSDRIVERS");
-        break;
-    case DIF_INSTALLCLASSDRIVERS:
-        DbgOut("DIF_INSTALLCLASSDRIVERS");
-        break;
-    case DIF_CALCDISKSPACE:
-        DbgOut("DIF_CALCDISKSPACE");
-        break;
-    case DIF_DESTROYPRIVATEDATA:
-        DbgOut("DIF_DESTROYPRIVATEDATA");
-        break;
-    case DIF_VALIDATEDRIVER:
-        DbgOut("DIF_VALIDATEDRIVER");
-        break;
-    case DIF_MOVEDEVICE:
-        DbgOut("DIF_MOVEDEVICE");
-        break;
-    case DIF_DETECT:
-        DbgOut("DIF_DETECT");
-        break;
-    case DIF_INSTALLWIZARD:
-        DbgOut("DIF_INSTALLWIZARD");
-        break;
-    case DIF_DESTROYWIZARDDATA:
-        DbgOut("DIF_DESTROYWIZARDDATA");
-        break;
-    case DIF_PROPERTYCHANGE:
-        DbgOut("DIF_PROPERTYCHANGE");
-        break;
-    case DIF_ENABLECLASS:
-        DbgOut("DIF_ENABLECLASS");
-        break;
-    case DIF_DETECTVERIFY:
-        DbgOut("DIF_DETECTVERIFY");
-        break;
-    case DIF_INSTALLDEVICEFILES:
-        DbgOut("DIF_INSTALLDEVICEFILES");
-        break;
-    case DIF_ALLOW_INSTALL:
-        DbgOut("DIF_ALLOW_INSTALL");
-        break;
-    case DIF_SELECTBESTCOMPATDRV:
-        DbgOut("DIF_SELECTBESTCOMPATDRV");
-        break;
-    case DIF_REGISTERDEVICE:
-        DbgOut("DIF_REGISTERDEVICE");
-        break;
-    case DIF_NEWDEVICEWIZARD_PRESELECT:
-        DbgOut("DIF_NEWDEVICEWIZARD_PRESELECT");
-        break;
-    case DIF_NEWDEVICEWIZARD_SELECT:
-        DbgOut("DIF_NEWDEVICEWIZARD_SELECT");
-        break;
-    case DIF_NEWDEVICEWIZARD_PREANALYZE:
-        DbgOut("DIF_NEWDEVICEWIZARD_PREANALYZE");
-        break;
-    case DIF_NEWDEVICEWIZARD_POSTANALYZE:
-        DbgOut("DIF_NEWDEVICEWIZARD_POSTANALYZE");
-        break;
-    case DIF_NEWDEVICEWIZARD_FINISHINSTALL:
-        DbgOut("DIF_NEWDEVICEWIZARD_FINISHINSTALL");
-        break;
-    case DIF_INSTALLINTERFACES:
-        DbgOut("DIF_INSTALLINTERFACES");
-        break;
-    case DIF_DETECTCANCEL:
-        DbgOut("DIF_DETECTCANCEL");
-        break;
-    case DIF_REGISTER_COINSTALLERS:
-        DbgOut("DIF_REGISTER_COINSTALLERS");
-        break;
-    case DIF_ADDPROPERTYPAGE_ADVANCED:
-        DbgOut("DIF_ADDPROPERTYPAGE_ADVANCED");
-        break;
-    case DIF_ADDPROPERTYPAGE_BASIC:
-        DbgOut("DIF_ADDPROPERTYPAGE_BASIC");
-        break;
-    case DIF_TROUBLESHOOTER:
-        DbgOut("DIF_TROUBLESHOOTER");
-        break;
-    case DIF_POWERMESSAGEWAKE:
-        DbgOut("DIF_POWERMESSAGEWAKE");
-        break;
-    default:
-        DbgOut("?????");
-        break;
-    }
-
-    return NO_ERROR;
-}
-
-
diff --git a/general/toaster/toastDrv/coinstaller/tostrco1.def b/general/toaster/toastDrv/coinstaller/tostrco1.def
deleted file mode 100644
index 8927a887..00000000
--- a/general/toaster/toastDrv/coinstaller/tostrco1.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY  TOSTRCO1
-
-EXPORTS   
-   ToasterCoInstaller 
-
-   
diff --git a/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj b/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj
deleted file mode 100644
index efbef488..00000000
--- a/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj
+++ /dev/null
@@ -1,210 +0,0 @@
-<?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>{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{2C2FDE7E-AF76-431C-B346-457A23F65F6D}</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>DynamicLibrary</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>DynamicLibrary</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>DynamicLibrary</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>DynamicLibrary</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>tostrco1</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>tostrco1</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>tostrco1</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>tostrco1</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;kernel32.lib;advapi32.lib;user32.lib</AdditionalDependencies>
-      <BaseAddress>0x2000000</BaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Link>
-      <ModuleDefinitionFile>tostrco1.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Link>
-      <ModuleDefinitionFile>tostrco1.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Link>
-      <ModuleDefinitionFile>tostrco1.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Link>
-      <ModuleDefinitionFile>tostrco1.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="coinst.c" />
-  </ItemGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <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/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj.Filters b/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj.Filters
deleted file mode 100644
index a9cd7e88..00000000
--- a/general/toaster/toastDrv/coinstaller/tostrco1.vcxproj.Filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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>{DA0ECA8C-145B-4D3A-8C0F-7DADEEABEE7C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{19EA12EE-E368-463D-B066-44D1E82DD776}</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>{E5E47602-89BD-4D0E-93C1-4EA3331105AA}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="coinst.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="tostrco1.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/general/toaster/toastDrv/exe/enum/Enum.vcxproj b/general/toaster/toastDrv/exe/enum/Enum.vcxproj
index 175e7897..7059deb7 100644
--- a/general/toaster/toastDrv/exe/enum/Enum.vcxproj
+++ b/general/toaster/toastDrv/exe/enum/Enum.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}</ProjectGuid>
+    <ProjectGuid>{91E7C695-3307-4596-90E1-065AFB4D2643}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9C22B158-73CF-4D66-B85C-4E4AE9DB0AC4}</SampleGuid>
+    <SampleGuid>{AC84F877-CAB8-44D9-9199-028B400504FA}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -89,17 +89,17 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -108,17 +108,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -127,17 +127,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -146,17 +146,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
diff --git a/general/toaster/toastDrv/exe/enum/Enum.vcxproj.Filters b/general/toaster/toastDrv/exe/enum/Enum.vcxproj.Filters
index dbbc99c6..fff7bcd3 100644
--- a/general/toaster/toastDrv/exe/enum/Enum.vcxproj.Filters
+++ b/general/toaster/toastDrv/exe/enum/Enum.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>{4DF85533-7B9E-4C98-8769-7C6420BCE72E}</UniqueIdentifier>
+      <UniqueIdentifier>{0478CA74-6E89-40CC-BA37-7A2FBC70982B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{871CA74F-21C6-45DD-888C-CA8EA3F48965}</UniqueIdentifier>
+      <UniqueIdentifier>{418A5D3D-5225-4430-AD6C-DBCDB8B00D57}</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>{5B1A9C9F-B7FB-4466-9E15-80E147D55C1A}</UniqueIdentifier>
+      <UniqueIdentifier>{F170FC27-1BFE-4060-A548-BD9A219A502C}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/exe/notify/notify.vcxproj b/general/toaster/toastDrv/exe/notify/notify.vcxproj
index ded7bd0b..99a5f790 100644
--- a/general/toaster/toastDrv/exe/notify/notify.vcxproj
+++ b/general/toaster/toastDrv/exe/notify/notify.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}</ProjectGuid>
+    <ProjectGuid>{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{C26150C1-ABE5-4264-BD23-6449114CA46C}</SampleGuid>
+    <SampleGuid>{B9D000EC-83CC-4167-802E-8438A8FF51E4}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -89,15 +89,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -105,15 +105,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -121,15 +121,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -137,15 +137,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/exe/notify/notify.vcxproj.Filters b/general/toaster/toastDrv/exe/notify/notify.vcxproj.Filters
index 1ba140e2..6590341f 100644
--- a/general/toaster/toastDrv/exe/notify/notify.vcxproj.Filters
+++ b/general/toaster/toastDrv/exe/notify/notify.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>{D1EC8595-68A9-4660-8CDA-5C17574C450B}</UniqueIdentifier>
+      <UniqueIdentifier>{DBCA469B-548D-4437-BF5A-97DCEBE3D840}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{75CBFBEA-4EA9-4872-8030-99429611E8A1}</UniqueIdentifier>
+      <UniqueIdentifier>{DE8C6977-FC68-4C69-8630-4694C3622D6C}</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>{1F8FFCF9-E0C1-4EBE-8C4E-76C812637E15}</UniqueIdentifier>
+      <UniqueIdentifier>{BF9BD5C8-F576-4DB4-BB8E-2AED59380E60}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/exe/toast/toast.vcxproj b/general/toaster/toastDrv/exe/toast/toast.vcxproj
index d06a207d..af82acfe 100644
--- a/general/toaster/toastDrv/exe/toast/toast.vcxproj
+++ b/general/toaster/toastDrv/exe/toast/toast.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}</ProjectGuid>
+    <ProjectGuid>{8FA35EEE-04BE-438A-AD20-A8E849C9A107}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9B71A258-9AC3-4501-B5D5-03FD83F9F40A}</SampleGuid>
+    <SampleGuid>{E86474CB-C1C2-4A18-8715-FC4AC163A6D2}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -89,15 +89,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -105,15 +105,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -121,15 +121,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
@@ -137,15 +137,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/exe/toast/toast.vcxproj.Filters b/general/toaster/toastDrv/exe/toast/toast.vcxproj.Filters
index a8533f0b..961ea2ff 100644
--- a/general/toaster/toastDrv/exe/toast/toast.vcxproj.Filters
+++ b/general/toaster/toastDrv/exe/toast/toast.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>{8C1E3DAE-53E3-457C-98F3-FB405BC9A120}</UniqueIdentifier>
+      <UniqueIdentifier>{C5935659-AF96-4A26-9828-7135F79A7107}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{C2C50665-6AB2-4502-B4A2-29496B9935F0}</UniqueIdentifier>
+      <UniqueIdentifier>{4542E5F6-7451-43E0-8EFF-A7AC183A23B2}</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>{D0127FBE-76C6-4B7C-91D7-DC444B6B223D}</UniqueIdentifier>
+      <UniqueIdentifier>{29D0DA0A-77D3-48A1-87F5-15578B07F740}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj b/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj
index a1ab7caf..1de90b0b 100644
--- a/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj
+++ b/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{9FF1CCE5-AD65-444C-97C1-179619AA2479}</ProjectGuid>
+    <ProjectGuid>{869C08D1-A32F-49C7-9831-2ADB52F241B6}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{519C06B4-3DEE-4917-9D48-4EA2905EF515}</SampleGuid>
+    <SampleGuid>{FCD66B78-4C9B-4619-8C39-EFB1AE426386}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj.Filters b/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj.Filters
index d9b9e30b..512407d1 100644
--- a/general/toaster/toastDrv/exe/wmi/WmiToast.vcxproj.Filters
+++ b/general/toaster/toastDrv/exe/wmi/WmiToast.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>{779E4F7E-89F5-41F9-92C2-C9E8B7060B92}</UniqueIdentifier>
+      <UniqueIdentifier>{7244DA1C-4F60-44A8-940A-AD55012199D1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{BFEAC96B-E61B-4729-B62C-A7F52A16E99C}</UniqueIdentifier>
+      <UniqueIdentifier>{8B1421F5-129C-46B6-905E-C0516D654622}</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>{D5FE79F8-F00F-4D49-B219-CB749AD7DD7A}</UniqueIdentifier>
+      <UniqueIdentifier>{C72A10B1-2A49-4A34-8061-ED8EABF77E9A}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/kmdf/inc/driver.h b/general/toaster/toastDrv/inc/driver.h
index 8e7ade01..8e7ade01 100644
--- a/general/toaster/toastDrv/kmdf/inc/driver.h
+++ b/general/toaster/toastDrv/inc/driver.h
diff --git a/general/toaster/toastDrv/kmdf/inc/public.h b/general/toaster/toastDrv/inc/public.h
index 0628f95f..0628f95f 100644
--- a/general/toaster/toastDrv/kmdf/inc/public.h
+++ b/general/toaster/toastDrv/inc/public.h
diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/buspdo.c b/general/toaster/toastDrv/kmdf/bus/dynamic/buspdo.c
index 5c908770..d7d2cf54 100644
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/buspdo.c
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/buspdo.c
@@ -83,7 +83,7 @@ Return Value:
     }
 
     dst->HardwareIds = (PWCHAR) ExAllocatePoolWithTag(
-        NonPagedPool,
+        NonPagedPoolNx,
         safeMultResult,
         BUS_TAG);
 
diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx
index e45f4329..9f7634b1 100644
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx
diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj
index 042c93ef..659d356e 100644
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}</ProjectGuid>
+    <ProjectGuid>{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{168C515B-E0DC-4CCE-AB5D-4B3FE501CC58}</SampleGuid>
+    <SampleGuid>{DD9AA820-3B18-435A-88BD-1574156D5E12}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -108,15 +108,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -124,15 +124,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -140,15 +140,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -156,15 +156,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj.Filters b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj.Filters
index 46ffc89f..081dc9b3 100644
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.vcxproj.Filters
@@ -3,25 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{F47FA196-0B9F-4630-A6DC-87B41000BC35}</UniqueIdentifier>
+      <UniqueIdentifier>{AC53A94A-C5A4-40B4-8A66-32832F92CC2F}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{62AF8524-CB5B-468E-9398-455D5E9DC688}</UniqueIdentifier>
+      <UniqueIdentifier>{55B97607-1E61-45FF-91CB-B2B5A201C882}</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>{812EE7F2-C44C-4C50-AC55-CE56B09EF7AC}</UniqueIdentifier>
+      <UniqueIdentifier>{D0EAD36D-F4E0-4E66-9393-160608E23A85}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{00095F3E-A751-4C8E-9052-D3E64DF88F1E}</UniqueIdentifier>
+      <UniqueIdentifier>{847FA4FE-DFFD-4B58-860A-38A570C5CFD6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\dynambus.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="busenum.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj b/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj
index b78e8a0c..9b7b3374 100644
--- a/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj
+++ b/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{965C0E80-0715-4376-A138-48D08EFDDC09}</ProjectGuid>
+    <ProjectGuid>{6C6E0C23-5B37-4BBB-8909-435078D49364}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{23FA1088-5777-47FF-8254-EFD0B687928E}</SampleGuid>
+    <SampleGuid>{112DC6FF-C92C-45C5-B5E1-85C2129D81D3}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -108,15 +108,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -124,15 +124,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -140,15 +140,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
@@ -156,15 +156,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj.Filters b/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj.Filters
index f4363bf0..9668a27e 100644
--- a/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/bus/static/StatBus.vcxproj.Filters
@@ -3,25 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{86D36061-8E62-43AE-9677-EF29528CAAE9}</UniqueIdentifier>
+      <UniqueIdentifier>{C4C78574-F3CF-412F-BF41-26EEFB651EC3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{67A8D587-DF81-4D99-B5F5-A02788E04594}</UniqueIdentifier>
+      <UniqueIdentifier>{7B3EF77E-8DE8-4D96-A0CF-4356B08F046D}</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>{5EB6269C-B636-406C-A13C-A22C2CF8D4DA}</UniqueIdentifier>
+      <UniqueIdentifier>{101CDAA2-6E2D-47AD-AB91-F9FF064131AF}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{26ED96D4-93DD-490C-84FF-7B474E8AE395}</UniqueIdentifier>
+      <UniqueIdentifier>{4B642090-F96B-49A0-B433-97692B1A5EF5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\statbus.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="busenum.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
index 9e8cb03a..0725d2bb 100644
--- a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
+++ b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
diff --git a/general/toaster/toastDrv/kmdf/filter/filter.inx b/general/toaster/toastDrv/kmdf/filter/filter.inx
index db58c43d..d579ff7e 100644
--- a/general/toaster/toastDrv/kmdf/filter/filter.inx
+++ b/general/toaster/toastDrv/kmdf/filter/filter.inx
diff --git a/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj b/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj
index e59da4b8..e2bbd3c4 100644
--- a/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj
+++ b/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}</ProjectGuid>
+    <ProjectGuid>{B39F6628-73BA-4AC3-863A-EA20892F1EFD}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{319B1451-754B-4F6E-9EBC-FDF268C22624}</SampleGuid>
+    <SampleGuid>{92082E8D-0D74-485B-9578-34DB3ED3F74D}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -100,7 +100,7 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -108,17 +108,17 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -126,17 +126,17 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -144,17 +144,17 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -162,10 +162,10 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj.Filters b/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj.Filters
index d5f0682e..7c92ccef 100644
--- a/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/filter/generic/filter.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{57623C7D-A559-470E-82F1-5855F3D3E968}</UniqueIdentifier>
+      <UniqueIdentifier>{E3242171-0D71-4EAC-94E0-E3B9FC647C16}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{1425FE66-5130-4EBE-BC59-706EFFACDBAC}</UniqueIdentifier>
+      <UniqueIdentifier>{D593E254-6A82-4D73-A34E-CD7D019FB577}</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>{557E8DA6-D010-47FD-A26B-A6BC0D90716E}</UniqueIdentifier>
+      <UniqueIdentifier>{5240632B-924D-4233-AE9C-CE317927559C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{BD774D78-091B-4F17-86D1-EDA291D0D2F4}</UniqueIdentifier>
+      <UniqueIdentifier>{B6CEB15F-684F-4D1C-A9C3-400B108BC28E}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="..\filter.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="filter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj b/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj
index bf299111..1d3bc662 100644
--- a/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj
+++ b/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{5094C704-35B0-4A25-AD30-570C49BCAE82}</ProjectGuid>
+    <ProjectGuid>{1A40DA6D-B948-43A7-864C-962517EE0A1D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{45B5BA9D-00B6-4AC4-BAC8-C9458CEE7190}</SampleGuid>
+    <SampleGuid>{433785F9-277E-45B7-97C7-7BD4D705B18D}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -101,17 +101,17 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
@@ -122,17 +122,17 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
@@ -143,17 +143,17 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
@@ -164,17 +164,17 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);IOCTL_INTERFACE=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj.Filters b/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj.Filters
index f78f59e4..24a2d237 100644
--- a/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/filter/sideband/filter.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{CDD79DAB-0B3B-443A-9490-7EC7FA5C9B21}</UniqueIdentifier>
+      <UniqueIdentifier>{1252FA89-6F4A-4F02-B1C1-2ADE5DF160E5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{DC29ED4D-9D57-4982-AD99-B5099AA50460}</UniqueIdentifier>
+      <UniqueIdentifier>{563927D3-D3A9-467F-9FEB-9BBAFA7874AA}</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>{EA8061CA-59F3-441F-8AD7-74F675F1B50F}</UniqueIdentifier>
+      <UniqueIdentifier>{2C21B45C-F0E7-4E75-8D5A-8ED0EB3E1009}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{3EAB2CF5-86A8-4A52-839A-15A3878E8426}</UniqueIdentifier>
+      <UniqueIdentifier>{C33F22A9-B917-461D-802A-BACBF53ACFDF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="..\filter.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="filter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
index 6a256f2c..32916e7e 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
+++ b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj
index 468b7716..6120ade6 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj
+++ b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{CA0E203E-4C96-466F-BF19-24F42DFC0C89}</ProjectGuid>
+    <ProjectGuid>{C0049CDD-7551-4681-9E30-EFE32868F651}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{2EBCE232-7DA0-4C77-9EEA-8DE675F4ADC7}</SampleGuid>
+    <SampleGuid>{64BB8707-3DD7-40D5-A874-E33251334995}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -113,17 +113,17 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -132,17 +132,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -151,17 +151,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -170,17 +170,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);TOASTER_FUNC_FEATURED</PreprocessorDefinitions>
     </Midl>
     <Link>
diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj.Filters b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj.Filters
index c37a360d..9fd3e21f 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.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>{5AEF704A-4799-414D-BC85-F523B601FF9D}</UniqueIdentifier>
+      <UniqueIdentifier>{77F46A21-812D-47F4-8CDA-8667B9516A0D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{8688F2E4-3E07-4E21-947E-9A0917D3799F}</UniqueIdentifier>
+      <UniqueIdentifier>{DB601389-B92E-40DF-919C-4DB72E7E890A}</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>{D979FABA-F85A-4E60-8402-9E1603B7F223}</UniqueIdentifier>
+      <UniqueIdentifier>{9043E19F-FA3C-4876-B616-FE80F6FFFA40}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{91E1B29C-05DE-4125-9FB5-C19173D157DD}</UniqueIdentifier>
+      <UniqueIdentifier>{AA6801CD-B2C4-47AD-8ADE-357A97AE98EB}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -30,9 +30,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdffeatured.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="toaster.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/general/toaster/toastDrv/kmdf/func/featured/wmi.c b/general/toaster/toastDrv/kmdf/func/featured/wmi.c
index 2dc8775f..e7c76a23 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/wmi.c
+++ b/general/toaster/toastDrv/kmdf/func/featured/wmi.c
@@ -62,7 +62,7 @@ ToasterHelperFunction3(
     );
 
 
-#define ToasterDeviceInformation_SIZE FIELD_OFFSET(ToasterDeviceInformation, VariableData)
+#define ToasterDeviceInformation_SIZE UFIELD_OFFSET(ToasterDeviceInformation, VariableData)
 
 WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(ToasterDeviceInformation, ToasterWmiGetData)
 WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(ToasterControl, ToasterWmiGetControlData)
@@ -356,7 +356,7 @@ EvtWmiInstanceStdDeviceDataSetInstance(
 {
     PAGED_CODE();
 
-    if (InBufferSize < (ULONG)ToasterDeviceInformation_SIZE) {
+    if (InBufferSize < ToasterDeviceInformation_SIZE) {
         return STATUS_BUFFER_TOO_SMALL;
     }
 
@@ -444,9 +444,9 @@ ToasterFireArrivalEvent(
     size = wnodeSize + wnodeInstanceNameSize + wnodeDataBlockSize;
 
     //
-    // Allocate memory for the WNODE from NonPagedPool
+    // Allocate memory for the WNODE from NonPagedPoolNx
     //
-    wnode = ExAllocatePoolWithTag(NonPagedPool, size, TOASTER_POOL_TAG);
+    wnode = ExAllocatePoolWithTag(NonPagedPoolNx, size, TOASTER_POOL_TAG);
 
     if (NULL != wnode) {
         RtlZeroMemory(wnode, size);
@@ -580,14 +580,14 @@ Return Value:
     //
     status = WdfDeviceAllocAndQueryProperty(Device,
                                             DevicePropertyFriendlyName,
-                                            NonPagedPool,
+                                            NonPagedPoolNx,
                                             WDF_NO_OBJECT_ATTRIBUTES,
                                             DeviceName);
 
     if (!NT_SUCCESS(status) && status != STATUS_INSUFFICIENT_RESOURCES) {
         status = WdfDeviceAllocAndQueryProperty(Device,
                                                 DevicePropertyDeviceDescription,
-                                                NonPagedPool,
+                                                NonPagedPoolNx,
                                                 WDF_NO_OBJECT_ATTRIBUTES,
                                                 DeviceName);
 
diff --git a/general/toaster/toastDrv/kmdf/func/shared/toaster.h b/general/toaster/toastDrv/kmdf/func/shared/toaster.h
index 4dde5c42..fc847d2d 100644
--- a/general/toaster/toastDrv/kmdf/func/shared/toaster.h
+++ b/general/toaster/toastDrv/kmdf/func/shared/toaster.h
@@ -28,8 +28,8 @@ Environment:
 
 #include "wmilib.h"
 #include <initguid.h>
-#include "..\inc\driver.h"
-#include "..\inc\public.h"
+#include "driver.h"
+#include "public.h"
 
 // For Featured driver only
 #ifdef TOASTER_FUNC_FEATURED
diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
index 9d07ff93..ad55da36 100644
--- a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
+++ b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj
index 92186701..4656138e 100644
--- a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj
+++ b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}</ProjectGuid>
+    <ProjectGuid>{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{B609B6B5-97C5-4918-AD38-A4E7EE1B43BD}</SampleGuid>
+    <SampleGuid>{91DBD0B6-6FC1-4A3E-8110-FD832091F89B}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -98,54 +98,54 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\inc;..\shared</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj.Filters b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj.Filters
index cadde112..0631732e 100644
--- a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{63D238C3-D6F1-4A4D-8E9A-CD96C3EF19BA}</UniqueIdentifier>
+      <UniqueIdentifier>{AA78EAA0-EB89-4DFF-B704-8117A1B43E0E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{D146F406-1C35-4F03-8623-AD0E44BDE5C0}</UniqueIdentifier>
+      <UniqueIdentifier>{2B9D7536-B3AC-490E-8995-C8E764CE42FF}</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>{17782FC8-CA51-4C10-8D28-E9EA73162C1A}</UniqueIdentifier>
+      <UniqueIdentifier>{A72C4B5C-5EEA-4605-ADEA-C5258878B301}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{8DF8F970-514A-42CA-BEB9-7B0BBD19E87E}</UniqueIdentifier>
+      <UniqueIdentifier>{F1462C26-D17A-4F77-A706-BDD04B29EAE8}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdfsimple.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="toaster.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/toastDrv/kmdf/toastmon/toastmon.c b/general/toaster/toastDrv/kmdf/toastmon/toastmon.c
index e06c523b..82b2e5d3 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/toastmon.c
+++ b/general/toaster/toastDrv/kmdf/toastmon/toastmon.c
@@ -851,7 +851,7 @@ Return Value:
     attributes.ParentObject = request;
     status = WdfMemoryCreate(
                         &attributes,
-                        NonPagedPool,
+                        NonPagedPoolNx,
                         DRIVER_TAG,
                         READ_BUF_SIZE,
                         &memory,
@@ -931,7 +931,7 @@ Return Value:
     attributes.ParentObject = request;
     status = WdfMemoryCreate(
                         &attributes,
-                        NonPagedPool,
+                        NonPagedPoolNx,
                         DRIVER_TAG,
                         WRITE_BUF_SIZE,
                         &memory,
diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
index 214e2273..cfee1b11 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
+++ b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj
index b6981f74..a31e31c7 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj
+++ b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A5E50982-981B-40B9-BEE6-1E15581FE947}</ProjectGuid>
+    <ProjectGuid>{D15FD911-F2DA-4644-8142-6D22756AD287}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9CAC55A2-7E42-4350-840F-0EE864DEC954}</SampleGuid>
+    <SampleGuid>{0C425406-1D19-4B02-8130-808A2679E773}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -101,15 +101,15 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,15 +117,15 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -133,15 +133,15 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -149,15 +149,15 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj.Filters b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj.Filters
index 2f2921ed..1dc2e071 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj.Filters
+++ b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{734E963A-2784-4259-A850-7B527681AB96}</UniqueIdentifier>
+      <UniqueIdentifier>{5F3B1BF3-8AA1-4260-A45B-EC21831E877B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{1C35D44B-4EF9-4C91-A466-1C08A009F227}</UniqueIdentifier>
+      <UniqueIdentifier>{43739221-90B9-4A1F-9CAD-F06ADD55B435}</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>{8588E893-BBAD-441F-A814-9664F0BBEF97}</UniqueIdentifier>
+      <UniqueIdentifier>{5D93FF77-9BB3-41AF-9463-36BEC1612A7B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{9C5C6D96-ABDC-4238-9471-4DD2FF83DC29}</UniqueIdentifier>
+      <UniqueIdentifier>{54979279-ACEC-4A61-9D03-A14A147693FF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdftoastmon.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="toastmon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/toastDrv/kmdf/toastmon/wmi.c b/general/toaster/toastDrv/kmdf/toastmon/wmi.c
index eb2ef2a3..b3cdcb88 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/wmi.c
+++ b/general/toaster/toastDrv/kmdf/toastmon/wmi.c
@@ -188,14 +188,14 @@ Return Value:
     //
     status = WdfIoTargetAllocAndQueryTargetProperty(Target,
                                                     DevicePropertyFriendlyName,
-                                                    NonPagedPool,
+                                                    NonPagedPoolNx,
                                                     WDF_NO_OBJECT_ATTRIBUTES,
                                                     TargetName);
 
     if (!NT_SUCCESS(status) && status != STATUS_INSUFFICIENT_RESOURCES) {
         status = WdfIoTargetAllocAndQueryTargetProperty(Target,
                                                         DevicePropertyDeviceDescription,
-                                                        NonPagedPool,
+                                                        NonPagedPoolNx,
                                                         WDF_NO_OBJECT_ATTRIBUTES,
                                                         TargetName);
 
diff --git a/general/toaster/toastDrv/toaster.sln b/general/toaster/toastDrv/toaster.sln
index cffb0f49..0d1c2e6c 100644
--- a/general/toaster/toastDrv/toaster.sln
+++ b/general/toaster/toastDrv/toaster.sln
@@ -3,81 +3,73 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{ADC63E58-1F2E-4A3A-A760-779FD9EAD00E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{F8CFBC14-78B5-4B7D-B9B5-648E3389C70C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Classinstaller", "Classinstaller", "{2C550FE4-29CD-40A8-836D-313696A3442B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wmi", "Wmi", "{C1205C19-4601-4DF6-A222-91CC30C12284}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Coinstaller", "Coinstaller", "{470F597C-0DBC-44AC-B69B-594ACB7B1ED0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{B1177A9B-61C5-4747-B40A-9F36D83CE9A0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wmi", "Wmi", "{F39421E1-95F5-4DEE-A78F-B522BE05FEB0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notify", "Notify", "{26B8AB05-2BE2-4266-AB19-BA912C0ACFA1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{29C3C959-4CBC-4D9D-B660-2135BF00CC55}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toast", "Toast", "{D2F3C374-F164-4E08-A5FE-F902972C57F9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notify", "Notify", "{9C9637D5-A764-49F0-AF7D-C7F123CEB343}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Enum", "Enum", "{742BA5B5-A2DA-463A-A85E-9A12DE605FA6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toast", "Toast", "{0293B300-378A-4D97-B93C-0690C8BC8019}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastmon", "Toastmon", "{581503D0-FE38-435F-B12A-FAAA2AE22359}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Enum", "Enum", "{F1085E78-8F4D-4044-B58E-BDA9E7E35A0F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{57D2095B-0A01-4F4C-A5D8-50F40DC155D0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastmon", "Toastmon", "{0BFA46E4-075E-475A-B73E-6FAB41B71B68}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{ECBD2F30-C9DF-4B13-83C2-45BDFD988518}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{929B678F-2875-4DEE-AA34-2C255D4B84EA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{7466998A-6403-4EBB-9328-656ECFD3F594}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{AC2EC9A6-11CC-4F9C-BBA6-2E78FFFF5C84}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Featured", "Featured", "{4B422EE1-0A80-4048-81BF-0005A2D67381}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{1EFF08AC-2EAE-4E76-BAA7-0361BDA16DB2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sideband", "Sideband", "{BACE2A27-C593-43C6-B058-1D0A6A5D63B5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Featured", "Featured", "{A6681C1E-BA3B-4DD1-A641-DA27776A0319}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{5C1F160D-DF15-4215-AAC1-59BDF70D2C38}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sideband", "Sideband", "{B2431307-5557-4D2E-AB33-F38E7D8680A4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generic", "Generic", "{9577224D-E994-4E6E-BE11-FF456B8A4D46}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{A457C9CB-C02C-4835-8B4F-D3C03956C246}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Static", "Static", "{A69FDC71-8327-494A-9840-CF684E74965C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generic", "Generic", "{F956DAF1-330C-458A-B659-A30D5CE74374}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bus", "Bus", "{320825A6-82C4-42DE-91A3-EE5994B74EC3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Static", "Static", "{0A0AA60F-8EAD-4BC1-AB00-315A13174032}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dynamic", "Dynamic", "{4A994F2B-05BD-4CED-9157-45B29777740D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bus", "Bus", "{C1623324-F98A-40DF-B5BD-A1D4465653C5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastmon", "Toastmon", "{16ECEF20-C217-4477-8C88-E8A231CC23B8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dynamic", "Dynamic", "{E2B2526B-3B31-4309-A22A-1236F16CB840}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umdf", "Umdf", "{82276D55-C8B4-4C84-98FE-83F10C898FA0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastmon", "Toastmon", "{85556EF1-3D39-442F-BB0A-B3B5D6DE7352}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{9BEE50D5-9D78-4CA3-A535-75904B21C448}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umdf", "Umdf", "{B9DF6659-83A8-42FF-80CD-A03012E07CCE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{BF917E30-8925-4467-A1BF-CBD9E0AC7D12}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WmiToast", "exe\wmi\WmiToast.vcxproj", "{869C08D1-A32F-49C7-9831-2ADB52F241B6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{D72A34B9-86A5-4801-B7E3-256CF1F382AD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notify", "exe\notify\notify.vcxproj", "{816AC9A5-B371-4041-880C-A6B630DBCCE9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrcls", "classinstaller\tostrcls.vcxproj", "{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toast", "exe\toast\toast.vcxproj", "{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrco1", "coinstaller\tostrco1.vcxproj", "{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enum", "exe\enum\Enum.vcxproj", "{B26E87C6-12CE-4E03-A002-A2BF12B34986}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WmiToast", "exe\wmi\WmiToast.vcxproj", "{9FF1CCE5-AD65-444C-97C1-179619AA2479}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdftoastmon", "kmdf\toastmon\wdftoastmon.vcxproj", "{D15FD911-F2DA-4644-8142-6D22756AD287}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notify", "exe\notify\notify.vcxproj", "{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdfsimple", "kmdf\func\simple\wdfsimple.vcxproj", "{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toast", "exe\toast\toast.vcxproj", "{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdffeatured", "kmdf\func\featured\wdffeatured.vcxproj", "{C0049CDD-7551-4681-9E30-EFE32868F651}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enum", "exe\enum\Enum.vcxproj", "{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter", "kmdf\filter\sideband\filter.vcxproj", "{1A40DA6D-B948-43A7-864C-962517EE0A1D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdftoastmon", "kmdf\toastmon\wdftoastmon.vcxproj", "{A5E50982-981B-40B9-BEE6-1E15581FE947}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter", "kmdf\filter\generic\filter.vcxproj", "{B39F6628-73BA-4AC3-863A-EA20892F1EFD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdfsimple", "kmdf\func\simple\wdfsimple.vcxproj", "{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatBus", "kmdf\bus\static\StatBus.vcxproj", "{6C6E0C23-5B37-4BBB-8909-435078D49364}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdffeatured", "kmdf\func\featured\wdffeatured.vcxproj", "{CA0E203E-4C96-466F-BF19-24F42DFC0C89}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynambus", "kmdf\bus\dynamic\dynambus.vcxproj", "{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter", "kmdf\filter\sideband\filter.vcxproj", "{5094C704-35B0-4A25-AD30-570C49BCAE82}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFToastMon", "umdf\Toastmon\WUDFToastMon.vcxproj", "{F575419D-099B-4DA0-B80C-88D766DD7542}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter", "kmdf\filter\generic\filter.vcxproj", "{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatBus", "kmdf\bus\static\StatBus.vcxproj", "{965C0E80-0715-4376-A138-48D08EFDDC09}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynambus", "kmdf\bus\dynamic\dynambus.vcxproj", "{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFToastMon", "umdf\Toastmon\WUDFToastMon.vcxproj", "{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFToaster", "umdf\func\WUDFToaster.vcxproj", "{B439C142-C570-44A6-B13C-43F70AE05A69}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFToaster", "umdf\func\WUDFToaster.vcxproj", "{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -87,170 +79,152 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Debug|Win32.Build.0 = Debug|Win32
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Release|Win32.ActiveCfg = Release|Win32
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Release|Win32.Build.0 = Release|Win32
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Debug|x64.ActiveCfg = Debug|x64
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Debug|x64.Build.0 = Debug|x64
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Release|x64.ActiveCfg = Release|x64
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD}.Release|x64.Build.0 = Release|x64
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Debug|Win32.Build.0 = Debug|Win32
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Release|Win32.ActiveCfg = Release|Win32
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Release|Win32.Build.0 = Release|Win32
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Debug|x64.ActiveCfg = Debug|x64
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Debug|x64.Build.0 = Debug|x64
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Release|x64.ActiveCfg = Release|x64
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC}.Release|x64.Build.0 = Release|x64
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Debug|Win32.Build.0 = Debug|Win32
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Release|Win32.ActiveCfg = Release|Win32
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Release|Win32.Build.0 = Release|Win32
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Debug|x64.ActiveCfg = Debug|x64
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Debug|x64.Build.0 = Debug|x64
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Release|x64.ActiveCfg = Release|x64
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF}.Release|x64.Build.0 = Release|x64
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Debug|Win32.Build.0 = Debug|Win32
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Release|Win32.ActiveCfg = Release|Win32
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Release|Win32.Build.0 = Release|Win32
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Debug|x64.ActiveCfg = Debug|x64
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Debug|x64.Build.0 = Debug|x64
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Release|x64.ActiveCfg = Release|x64
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479}.Release|x64.Build.0 = Release|x64
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Debug|Win32.Build.0 = Debug|Win32
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Release|Win32.ActiveCfg = Release|Win32
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Release|Win32.Build.0 = Release|Win32
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Debug|x64.ActiveCfg = Debug|x64
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Debug|x64.Build.0 = Debug|x64
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Release|x64.ActiveCfg = Release|x64
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD}.Release|x64.Build.0 = Release|x64
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Debug|Win32.Build.0 = Debug|Win32
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Release|Win32.ActiveCfg = Release|Win32
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Release|Win32.Build.0 = Release|Win32
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Debug|x64.ActiveCfg = Debug|x64
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Debug|x64.Build.0 = Debug|x64
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Release|x64.ActiveCfg = Release|x64
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E}.Release|x64.Build.0 = Release|x64
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Debug|Win32.Build.0 = Debug|Win32
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Release|Win32.ActiveCfg = Release|Win32
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Release|Win32.Build.0 = Release|Win32
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Debug|x64.ActiveCfg = Debug|x64
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Debug|x64.Build.0 = Debug|x64
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Release|x64.ActiveCfg = Release|x64
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37}.Release|x64.Build.0 = Release|x64
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Debug|Win32.Build.0 = Debug|Win32
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Release|Win32.ActiveCfg = Release|Win32
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Release|Win32.Build.0 = Release|Win32
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Debug|x64.ActiveCfg = Debug|x64
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Debug|x64.Build.0 = Debug|x64
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Release|x64.ActiveCfg = Release|x64
-		{A5E50982-981B-40B9-BEE6-1E15581FE947}.Release|x64.Build.0 = Release|x64
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Debug|Win32.Build.0 = Debug|Win32
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Release|Win32.ActiveCfg = Release|Win32
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Release|Win32.Build.0 = Release|Win32
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Debug|x64.ActiveCfg = Debug|x64
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Debug|x64.Build.0 = Debug|x64
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Release|x64.ActiveCfg = Release|x64
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759}.Release|x64.Build.0 = Release|x64
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Debug|Win32.Build.0 = Debug|Win32
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Release|Win32.ActiveCfg = Release|Win32
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Release|Win32.Build.0 = Release|Win32
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Debug|x64.ActiveCfg = Debug|x64
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Debug|x64.Build.0 = Debug|x64
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Release|x64.ActiveCfg = Release|x64
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89}.Release|x64.Build.0 = Release|x64
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Debug|Win32.Build.0 = Debug|Win32
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Release|Win32.ActiveCfg = Release|Win32
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Release|Win32.Build.0 = Release|Win32
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Debug|x64.ActiveCfg = Debug|x64
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Debug|x64.Build.0 = Debug|x64
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Release|x64.ActiveCfg = Release|x64
-		{5094C704-35B0-4A25-AD30-570C49BCAE82}.Release|x64.Build.0 = Release|x64
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Debug|Win32.Build.0 = Debug|Win32
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Release|Win32.ActiveCfg = Release|Win32
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Release|Win32.Build.0 = Release|Win32
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Debug|x64.ActiveCfg = Debug|x64
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Debug|x64.Build.0 = Debug|x64
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Release|x64.ActiveCfg = Release|x64
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207}.Release|x64.Build.0 = Release|x64
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Debug|Win32.ActiveCfg = Debug|Win32
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Debug|Win32.Build.0 = Debug|Win32
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Release|Win32.ActiveCfg = Release|Win32
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Release|Win32.Build.0 = Release|Win32
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Debug|x64.ActiveCfg = Debug|x64
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Debug|x64.Build.0 = Debug|x64
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Release|x64.ActiveCfg = Release|x64
-		{965C0E80-0715-4376-A138-48D08EFDDC09}.Release|x64.Build.0 = Release|x64
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Debug|Win32.Build.0 = Debug|Win32
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Release|Win32.ActiveCfg = Release|Win32
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Release|Win32.Build.0 = Release|Win32
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Debug|x64.ActiveCfg = Debug|x64
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Debug|x64.Build.0 = Debug|x64
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Release|x64.ActiveCfg = Release|x64
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8}.Release|x64.Build.0 = Release|x64
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Debug|Win32.Build.0 = Debug|Win32
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Release|Win32.ActiveCfg = Release|Win32
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Release|Win32.Build.0 = Release|Win32
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Debug|x64.ActiveCfg = Debug|x64
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Debug|x64.Build.0 = Debug|x64
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Release|x64.ActiveCfg = Release|x64
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}.Release|x64.Build.0 = Release|x64
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Debug|Win32.Build.0 = Debug|Win32
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Release|Win32.ActiveCfg = Release|Win32
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Release|Win32.Build.0 = Release|Win32
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Debug|x64.ActiveCfg = Debug|x64
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Debug|x64.Build.0 = Debug|x64
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Release|x64.ActiveCfg = Release|x64
-		{B439C142-C570-44A6-B13C-43F70AE05A69}.Release|x64.Build.0 = Release|x64
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Debug|Win32.Build.0 = Debug|Win32
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Release|Win32.ActiveCfg = Release|Win32
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Release|Win32.Build.0 = Release|Win32
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Debug|x64.ActiveCfg = Debug|x64
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Debug|x64.Build.0 = Debug|x64
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Release|x64.ActiveCfg = Release|x64
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F}.Release|x64.Build.0 = Release|x64
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Debug|Win32.Build.0 = Debug|Win32
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Release|Win32.ActiveCfg = Release|Win32
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Release|Win32.Build.0 = Release|Win32
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Debug|x64.ActiveCfg = Debug|x64
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Debug|x64.Build.0 = Debug|x64
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Release|x64.ActiveCfg = Release|x64
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6}.Release|x64.Build.0 = Release|x64
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Debug|Win32.Build.0 = Debug|Win32
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Release|Win32.ActiveCfg = Release|Win32
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Release|Win32.Build.0 = Release|Win32
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Debug|x64.ActiveCfg = Debug|x64
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Debug|x64.Build.0 = Debug|x64
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Release|x64.ActiveCfg = Release|x64
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9}.Release|x64.Build.0 = Release|x64
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Debug|Win32.Build.0 = Debug|Win32
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Release|Win32.ActiveCfg = Release|Win32
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Release|Win32.Build.0 = Release|Win32
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Debug|x64.ActiveCfg = Debug|x64
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Debug|x64.Build.0 = Debug|x64
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Release|x64.ActiveCfg = Release|x64
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6}.Release|x64.Build.0 = Release|x64
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Debug|Win32.Build.0 = Debug|Win32
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Release|Win32.ActiveCfg = Release|Win32
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Release|Win32.Build.0 = Release|Win32
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Debug|x64.ActiveCfg = Debug|x64
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Debug|x64.Build.0 = Debug|x64
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Release|x64.ActiveCfg = Release|x64
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986}.Release|x64.Build.0 = Release|x64
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Debug|Win32.Build.0 = Debug|Win32
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Release|Win32.ActiveCfg = Release|Win32
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Release|Win32.Build.0 = Release|Win32
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Debug|x64.ActiveCfg = Debug|x64
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Debug|x64.Build.0 = Debug|x64
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Release|x64.ActiveCfg = Release|x64
+		{D15FD911-F2DA-4644-8142-6D22756AD287}.Release|x64.Build.0 = Release|x64
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Debug|Win32.Build.0 = Debug|Win32
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Release|Win32.ActiveCfg = Release|Win32
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Release|Win32.Build.0 = Release|Win32
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Debug|x64.ActiveCfg = Debug|x64
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Debug|x64.Build.0 = Debug|x64
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Release|x64.ActiveCfg = Release|x64
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795}.Release|x64.Build.0 = Release|x64
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Debug|Win32.Build.0 = Debug|Win32
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Release|Win32.ActiveCfg = Release|Win32
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Release|Win32.Build.0 = Release|Win32
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Debug|x64.ActiveCfg = Debug|x64
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Debug|x64.Build.0 = Debug|x64
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Release|x64.ActiveCfg = Release|x64
+		{C0049CDD-7551-4681-9E30-EFE32868F651}.Release|x64.Build.0 = Release|x64
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Debug|Win32.Build.0 = Debug|Win32
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Release|Win32.ActiveCfg = Release|Win32
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Release|Win32.Build.0 = Release|Win32
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Debug|x64.ActiveCfg = Debug|x64
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Debug|x64.Build.0 = Debug|x64
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Release|x64.ActiveCfg = Release|x64
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D}.Release|x64.Build.0 = Release|x64
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Debug|Win32.Build.0 = Debug|Win32
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Release|Win32.ActiveCfg = Release|Win32
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Release|Win32.Build.0 = Release|Win32
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Debug|x64.ActiveCfg = Debug|x64
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Debug|x64.Build.0 = Debug|x64
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Release|x64.ActiveCfg = Release|x64
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD}.Release|x64.Build.0 = Release|x64
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Debug|Win32.Build.0 = Debug|Win32
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Release|Win32.ActiveCfg = Release|Win32
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Release|Win32.Build.0 = Release|Win32
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Debug|x64.ActiveCfg = Debug|x64
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Debug|x64.Build.0 = Debug|x64
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Release|x64.ActiveCfg = Release|x64
+		{6C6E0C23-5B37-4BBB-8909-435078D49364}.Release|x64.Build.0 = Release|x64
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Debug|Win32.Build.0 = Debug|Win32
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Release|Win32.ActiveCfg = Release|Win32
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Release|Win32.Build.0 = Release|Win32
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Debug|x64.ActiveCfg = Debug|x64
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Debug|x64.Build.0 = Debug|x64
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Release|x64.ActiveCfg = Release|x64
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03}.Release|x64.Build.0 = Release|x64
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Debug|Win32.Build.0 = Debug|Win32
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Release|Win32.ActiveCfg = Release|Win32
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Release|Win32.Build.0 = Release|Win32
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Debug|x64.ActiveCfg = Debug|x64
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Debug|x64.Build.0 = Debug|x64
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Release|x64.ActiveCfg = Release|x64
+		{F575419D-099B-4DA0-B80C-88D766DD7542}.Release|x64.Build.0 = Release|x64
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Debug|Win32.Build.0 = Debug|Win32
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Release|Win32.ActiveCfg = Release|Win32
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Release|Win32.Build.0 = Release|Win32
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Debug|x64.ActiveCfg = Debug|x64
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Debug|x64.Build.0 = Debug|x64
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Release|x64.ActiveCfg = Release|x64
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D72A34B9-86A5-4801-B7E3-256CF1F382AD} = {ADC63E58-1F2E-4A3A-A760-779FD9EAD00E}
-		{EA6EA609-654B-4B46-ABA1-1092BD3FA0AC} = {2C550FE4-29CD-40A8-836D-313696A3442B}
-		{70FAA53D-F08B-4131-A5BD-FCAA3EFC48FF} = {470F597C-0DBC-44AC-B69B-594ACB7B1ED0}
-		{9FF1CCE5-AD65-444C-97C1-179619AA2479} = {F39421E1-95F5-4DEE-A78F-B522BE05FEB0}
-		{AFCA7BE8-3FDB-4257-AAAF-EBE85BC05EDD} = {9C9637D5-A764-49F0-AF7D-C7F123CEB343}
-		{36EF502E-38C8-4BAB-B7FE-C9ED9194292E} = {0293B300-378A-4D97-B93C-0690C8BC8019}
-		{A6E7CA25-D12B-4C39-9A01-BEEE71E04F37} = {F1085E78-8F4D-4044-B58E-BDA9E7E35A0F}
-		{A5E50982-981B-40B9-BEE6-1E15581FE947} = {0BFA46E4-075E-475A-B73E-6FAB41B71B68}
-		{FB919684-BF55-4E3D-95FA-CBCB7B0D8759} = {AC2EC9A6-11CC-4F9C-BBA6-2E78FFFF5C84}
-		{CA0E203E-4C96-466F-BF19-24F42DFC0C89} = {A6681C1E-BA3B-4DD1-A641-DA27776A0319}
-		{5094C704-35B0-4A25-AD30-570C49BCAE82} = {B2431307-5557-4D2E-AB33-F38E7D8680A4}
-		{C79A9F42-BDB4-4B5A-B7B5-1BEBF7752207} = {F956DAF1-330C-458A-B659-A30D5CE74374}
-		{965C0E80-0715-4376-A138-48D08EFDDC09} = {0A0AA60F-8EAD-4BC1-AB00-315A13174032}
-		{EA66789C-5ABF-44C0-9BFD-C7618507E9C8} = {E2B2526B-3B31-4309-A22A-1236F16CB840}
-		{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7} = {85556EF1-3D39-442F-BB0A-B3B5D6DE7352}
-		{B439C142-C570-44A6-B13C-43F70AE05A69} = {BF917E30-8925-4467-A1BF-CBD9E0AC7D12}
-		{F39421E1-95F5-4DEE-A78F-B522BE05FEB0} = {29C3C959-4CBC-4D9D-B660-2135BF00CC55}
-		{9C9637D5-A764-49F0-AF7D-C7F123CEB343} = {29C3C959-4CBC-4D9D-B660-2135BF00CC55}
-		{0293B300-378A-4D97-B93C-0690C8BC8019} = {29C3C959-4CBC-4D9D-B660-2135BF00CC55}
-		{F1085E78-8F4D-4044-B58E-BDA9E7E35A0F} = {29C3C959-4CBC-4D9D-B660-2135BF00CC55}
-		{0BFA46E4-075E-475A-B73E-6FAB41B71B68} = {929B678F-2875-4DEE-AA34-2C255D4B84EA}
-		{AC2EC9A6-11CC-4F9C-BBA6-2E78FFFF5C84} = {1EFF08AC-2EAE-4E76-BAA7-0361BDA16DB2}
-		{1EFF08AC-2EAE-4E76-BAA7-0361BDA16DB2} = {929B678F-2875-4DEE-AA34-2C255D4B84EA}
-		{A6681C1E-BA3B-4DD1-A641-DA27776A0319} = {1EFF08AC-2EAE-4E76-BAA7-0361BDA16DB2}
-		{B2431307-5557-4D2E-AB33-F38E7D8680A4} = {A457C9CB-C02C-4835-8B4F-D3C03956C246}
-		{A457C9CB-C02C-4835-8B4F-D3C03956C246} = {929B678F-2875-4DEE-AA34-2C255D4B84EA}
-		{F956DAF1-330C-458A-B659-A30D5CE74374} = {A457C9CB-C02C-4835-8B4F-D3C03956C246}
-		{0A0AA60F-8EAD-4BC1-AB00-315A13174032} = {C1623324-F98A-40DF-B5BD-A1D4465653C5}
-		{C1623324-F98A-40DF-B5BD-A1D4465653C5} = {929B678F-2875-4DEE-AA34-2C255D4B84EA}
-		{E2B2526B-3B31-4309-A22A-1236F16CB840} = {C1623324-F98A-40DF-B5BD-A1D4465653C5}
-		{85556EF1-3D39-442F-BB0A-B3B5D6DE7352} = {B9DF6659-83A8-42FF-80CD-A03012E07CCE}
-		{BF917E30-8925-4467-A1BF-CBD9E0AC7D12} = {B9DF6659-83A8-42FF-80CD-A03012E07CCE}
+		{30FFB863-CECC-4E27-85F1-8DAC2256FC2F} = {F8CFBC14-78B5-4B7D-B9B5-648E3389C70C}
+		{869C08D1-A32F-49C7-9831-2ADB52F241B6} = {C1205C19-4601-4DF6-A222-91CC30C12284}
+		{816AC9A5-B371-4041-880C-A6B630DBCCE9} = {26B8AB05-2BE2-4266-AB19-BA912C0ACFA1}
+		{B9EE93AA-581C-4DB2-8164-0D1E08029BB6} = {D2F3C374-F164-4E08-A5FE-F902972C57F9}
+		{B26E87C6-12CE-4E03-A002-A2BF12B34986} = {742BA5B5-A2DA-463A-A85E-9A12DE605FA6}
+		{D15FD911-F2DA-4644-8142-6D22756AD287} = {581503D0-FE38-435F-B12A-FAAA2AE22359}
+		{1C73C590-1F01-45BF-9BFA-97F8BCEB2795} = {ECBD2F30-C9DF-4B13-83C2-45BDFD988518}
+		{C0049CDD-7551-4681-9E30-EFE32868F651} = {4B422EE1-0A80-4048-81BF-0005A2D67381}
+		{1A40DA6D-B948-43A7-864C-962517EE0A1D} = {BACE2A27-C593-43C6-B058-1D0A6A5D63B5}
+		{B39F6628-73BA-4AC3-863A-EA20892F1EFD} = {9577224D-E994-4E6E-BE11-FF456B8A4D46}
+		{6C6E0C23-5B37-4BBB-8909-435078D49364} = {A69FDC71-8327-494A-9840-CF684E74965C}
+		{E5E1F492-05BB-45A3-B09F-F643DC1C6B03} = {4A994F2B-05BD-4CED-9157-45B29777740D}
+		{F575419D-099B-4DA0-B80C-88D766DD7542} = {16ECEF20-C217-4477-8C88-E8A231CC23B8}
+		{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F} = {9BEE50D5-9D78-4CA3-A535-75904B21C448}
+		{C1205C19-4601-4DF6-A222-91CC30C12284} = {B1177A9B-61C5-4747-B40A-9F36D83CE9A0}
+		{26B8AB05-2BE2-4266-AB19-BA912C0ACFA1} = {B1177A9B-61C5-4747-B40A-9F36D83CE9A0}
+		{D2F3C374-F164-4E08-A5FE-F902972C57F9} = {B1177A9B-61C5-4747-B40A-9F36D83CE9A0}
+		{742BA5B5-A2DA-463A-A85E-9A12DE605FA6} = {B1177A9B-61C5-4747-B40A-9F36D83CE9A0}
+		{581503D0-FE38-435F-B12A-FAAA2AE22359} = {57D2095B-0A01-4F4C-A5D8-50F40DC155D0}
+		{ECBD2F30-C9DF-4B13-83C2-45BDFD988518} = {7466998A-6403-4EBB-9328-656ECFD3F594}
+		{7466998A-6403-4EBB-9328-656ECFD3F594} = {57D2095B-0A01-4F4C-A5D8-50F40DC155D0}
+		{4B422EE1-0A80-4048-81BF-0005A2D67381} = {7466998A-6403-4EBB-9328-656ECFD3F594}
+		{BACE2A27-C593-43C6-B058-1D0A6A5D63B5} = {5C1F160D-DF15-4215-AAC1-59BDF70D2C38}
+		{5C1F160D-DF15-4215-AAC1-59BDF70D2C38} = {57D2095B-0A01-4F4C-A5D8-50F40DC155D0}
+		{9577224D-E994-4E6E-BE11-FF456B8A4D46} = {5C1F160D-DF15-4215-AAC1-59BDF70D2C38}
+		{A69FDC71-8327-494A-9840-CF684E74965C} = {320825A6-82C4-42DE-91A3-EE5994B74EC3}
+		{320825A6-82C4-42DE-91A3-EE5994B74EC3} = {57D2095B-0A01-4F4C-A5D8-50F40DC155D0}
+		{4A994F2B-05BD-4CED-9157-45B29777740D} = {320825A6-82C4-42DE-91A3-EE5994B74EC3}
+		{16ECEF20-C217-4477-8C88-E8A231CC23B8} = {82276D55-C8B4-4C84-98FE-83F10C898FA0}
+		{9BEE50D5-9D78-4CA3-A535-75904B21C448} = {82276D55-C8B4-4C84-98FE-83F10C898FA0}
 	EndGlobalSection
 EndGlobal
diff --git a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.inx b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.inx
index 24067461..eba3c794 100644
--- a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.inx
+++ b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.inx
diff --git a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj
index 7055b671..8dce7fd4 100644
--- a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj
+++ b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D9D1EDA9-B9AD-4C14-BCDE-DBE39CED25B7}</ProjectGuid>
+    <ProjectGuid>{F575419D-099B-4DA0-B80C-88D766DD7542}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{6713742F-8981-4BDD-8232-744F6ACE78A0}</SampleGuid>
+    <SampleGuid>{439EDE87-12DD-4F6D-8C22-A8AC9DAEF4B2}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj.Filters b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj.Filters
index ba04cdae..890e83d6 100644
--- a/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.vcxproj.Filters
+++ b/general/toaster/toastDrv/umdf/Toastmon/WUDFToastMon.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>{C958237F-A7DD-499B-8D1E-59D0ED81A78A}</UniqueIdentifier>
+      <UniqueIdentifier>{FDA736D6-A855-4CED-9C9E-B6FF707C26E1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{6167785E-EAD2-49EE-9D85-0DCE3CDCA899}</UniqueIdentifier>
+      <UniqueIdentifier>{03AC1F65-1B83-4D8E-9D06-DF35B5085EA7}</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>{A3079E54-E051-4EDD-8669-23098CEF4A4F}</UniqueIdentifier>
+      <UniqueIdentifier>{E8FFB961-9B2B-4A4A-8F75-5F933AF32C60}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{EB7A1810-4971-4585-938E-98F65782861E}</UniqueIdentifier>
+      <UniqueIdentifier>{C6C8B61F-CD41-4ACB-AC13-2E7A02CC94A0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,11 +39,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="WUDFToastMon.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="ToastMon.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/toaster/toastDrv/umdf/func/WUDFToaster.inx b/general/toaster/toastDrv/umdf/func/WUDFToaster.inx
index 7c65bd09..9874becf 100644
--- a/general/toaster/toastDrv/umdf/func/WUDFToaster.inx
+++ b/general/toaster/toastDrv/umdf/func/WUDFToaster.inx
diff --git a/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj b/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj
index 26aa3b69..e45ee69c 100644
--- a/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj
+++ b/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B439C142-C570-44A6-B13C-43F70AE05A69}</ProjectGuid>
+    <ProjectGuid>{3A32C2D4-D40F-4DB8-9F25-ABB21CEB7C7F}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{71A982A9-366B-42AD-AEFD-F60AAD4820F2}</SampleGuid>
+    <SampleGuid>{8FD6D25D-F593-45DB-AF96-6F358E01587B}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -234,15 +234,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\uuid.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\advapi32.lib</AdditionalDependencies>
@@ -251,15 +251,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\uuid.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\advapi32.lib</AdditionalDependencies>
@@ -268,15 +268,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\uuid.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\advapi32.lib</AdditionalDependencies>
@@ -285,15 +285,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\kmdf\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;.\$(IntDir);..\..\inc</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\uuid.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\advapi32.lib</AdditionalDependencies>
diff --git a/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj.Filters b/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj.Filters
index 46ae82b5..b64202cf 100644
--- a/general/toaster/toastDrv/umdf/func/WUDFToaster.vcxproj.Filters
+++ b/general/toaster/toastDrv/umdf/func/WUDFToaster.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>{170A06AF-2C82-4ACA-A945-09EC764D4AD0}</UniqueIdentifier>
+      <UniqueIdentifier>{9ACEB224-90E2-40F2-838C-9F279873D314}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{9D2AA52F-CCFD-4741-8446-4BC64BE329AB}</UniqueIdentifier>
+      <UniqueIdentifier>{150AE92E-5F8C-4B90-B7BE-352ECA0434CD}</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>{298C639B-301D-4144-BD66-7074B07ED001}</UniqueIdentifier>
+      <UniqueIdentifier>{BBE5A5E9-E1F7-47E7-91B7-111A3D0BAE2A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{2BF2C9E3-92D6-43CA-B2A3-98DF1231AABC}</UniqueIdentifier>
+      <UniqueIdentifier>{CCF62242-AF1C-424F-942F-E11D79A0EF79}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -48,11 +48,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="WUDFToaster.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="WUDFToaster.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/toaster/toastpkg/README.md b/general/toaster/toastpkg/README.md
index 7a5b7855..326d40a9 100644
--- a/general/toaster/toastpkg/README.md
+++ b/general/toaster/toastpkg/README.md
@@ -1,21 +1,134 @@
-Toaster Package Sample
-======================
+Toaster Sample Driver
+=====================
+The Toaster collection is an iterative series of samples that demonstrate fundamental aspects of Windows driver development for both Kernel-Mode Driver Framework (KMDF) and User-Mode Driver Framework (UMDF) version 1.
 
-The Toastpkg sample simulates hardware-first and software-first installation of the toaster sample driver.
+All the samples work with a hypothetical toaster bus, over which toaster devices can be connected to a PC.
 
-The Toaster Installation Package comprises driver projects (.vcxproj files) that are contained in the toastpkg.sln solution file (in general/toaster/toastpkg).
+The Toaster sample collection comprises driver projects (.vcxproj files) that are contained in the toaster.sln solution file (in general\\toaster\\toastdrv).
 
-This document discusses the different approaches that end users take when adding new hardware to their computer, and describes an approach that addresses these scenarios in a consistent, robust manner. It also outlines the mechanisms provided to facilitate additional vendor requirements such as the installation of value-added software.
+Related technologies
+--------------------
+[Windows Driver Frameworks](http://msdn.microsoft.com/en-us/library/windows/hardware/ff557565)
 
-**Introduction**
+For detailed descriptions and code walkthroughs of each project, see [Sample Toaster Driver Programming Tour](http://msdn.microsoft.com/en-us/library/windows/hardware/dn569312). To learn how to build and run the samples, read on.
 
-The installation of software to support an instance of a given device (known as "device installation" or "driver installation") is done in a device-centric fashion in Windows operating systems. A device INF that matches up with one of the device's hardware or compatible IDs is used to identify the required driver file(s), registry modifications, etc., that are needed to make the device fully operational. This INF, along with the files copied thereby and a catalog that contains the digital signatures of the INF and these other files, constitute what is known as a "driver package".
 
-Because device installation is done for a specific instance of a device, the "natural" method of adding devices to a computer running a Plug and Play operating system is by plugging in the device first, letting Plug and Play find the device and automatically initiate an installation for that device. The device installation may then proceed using a driver package supplied with the OS, or a "3rd-party" driver package (supplied via CD-ROM, the Internet, or some other distribution mechanism). When the device installation is initiated by the addition of hardware, this is termed a "hardware-first" device installation.
+Run the sample
+--------------
+The computer where you install the driver is called the *target computer* or the *test computer*. Typically this is a separate computer from where you develop and build the driver package. The computer where you develop and build the driver is called the *host computer*.
 
-Users may, however, take an alternate approach to adding hardware to their computer. In this scenario, they first run a setup program (perhaps launched as an autorun application when the vendor-supplied CD-ROM is inserted). This setup program may perform installation activities, and then prompt the user to insert their hardware. Upon the hardware's insertion, the vendor-supplied driver package (which was "pre-installed" by the setup program) is then found by Plug and Play, and the installation proceeds as in the hardware-first scenario. When the device installation is initiated by running a setup program, this is termed a "software-first" device installation. This approach to adding new hardware is just as valid as the hardware-first scenario, and some vendors may even instruct their users (via documentation that ships with the hardware) that this is the preferred method.
+The process of moving the driver package to the target computer and installing the driver is called *deploying the driver*. You can deploy components of the Toaster Sample automatically or manually. Here, we install the wdfsimple driver on the target computer.
 
-Vendors must support the hardware-first scenario (by providing a driver package that may be supplied to the "Found New Hardware" wizard with no "pre-configuration" performed by a setup program or other mechanism). Vendors may optionally support the software-first scenario as well, but the actual installation of the device instance is done by Plug and Play upon the device's arrival, as described above.
+### Specifying which projects to deploy
 
-Vendors may also wish to perform additional activities as part of the device installation. For example, the vendor may want to allow the user to optionally install one or more applications that ship with the device (e.g., a scanner that ships with an image processing application). Such software is termed "value-added software". Value-added software is distinct from the files that comprise the driver package because, unlike the core driver files, the device does not require value-added software to function properly. In the previous example of a scanner, for instance, perhaps the user already has an image processing application that they prefer. The user should be given the option of whether or not they want to install any value-added software. Additional activities (such as allowing the user to select value-added software offerings) may be accomplished by using a vendor-supplied device-specific co-installer.
+Before doing this, you should back up your package.vcxproj file, located in your sample directory, for example C:\\Toaster\\C++\\Package.
+
+1.  In the Properties for the package project, navigate to **Common Properties \> References**.
+2.  Remove all references except WdfSimple. (Use the **Remove Reference** button at the bottom.)
+
+### Automatic deployment (root enumerated)
+
+Before you automatically deploy a driver, you must provision the target computer. For instructions, see [Configuring a Computer for Driver Deployment, Testing, and Debugging](http://msdn.microsoft.com/en-us/library/windows/hardware/).
+
+1.  On the host computer, in Visual Studio, in Solution Explorer, right click the **package** project (within the package folder), and choose **Properties**. Navigate to **Configuration Properties \> Driver Install \> Deployment**.
+2.  Check **Enable deployment**, and check **Remove previous driver versions before deployment**. For **Target Computer Name**, use the drop down to select the name of a target computer that you provisioned previously. Select **Hardware ID Driver Update**, and enter **{b85b7c50-6a01-11d2-b841-00c04fad5171}\\MsToaster** for the hardware ID. (You can find this value in the WdfSimple.inx file.) Click **Apply** and **OK**.
+3.  Because this solution contains many projects, you may find it easier to remove some of them before you build and deploy a driver package. To do so, right click **package** (lower case), and choose **Properties**. Navigate to **Common Properties-\>References** and click **Remove Reference** to remove projects you don't want. (You can add them back later by using **Add New Reference**.) Click **OK**.
+4.  On the **Build** menu, choose **Build Solution** or **Rebuild Solution** (if you removed references).
+5.  If you removed references and deployment does not succeed, try deleting the contents of the c:\\DriverTest\\Drivers folder on the target machine, and then retry deployment.
+
+### Manual deployment (root enumerated)
+
+Before you manually deploy a driver, you must turn on test signing and install a certificate on the target computer. You also need to copy the [DevCon](http://msdn.microsoft.com/en-us/library/windows/hardware/ff544707) tool to the target computer. For instructions, see [Preparing a Computer for Manual Driver Deployment](http://msdn.microsoft.com/en-us/library/windows/hardware/dn265571).
+
+1.  Copy all of the files in your driver package to a folder on the target computer (for example, c:\\WdfSimplePackage).
+2.  On the target computer, open a Command Prompt window as Administrator. Navigate to your driver package folder, and enter the following command:
+
+    **devcon install WdfSimple.inf {b85b7c50-6a01-11d2-b841-00c04fad5171}\\MsToaster**
+
+### View the root enumerated driver in Device Manager
+
+On the target computer, in a Command Prompt window, enter **devmgmt** to open Device Manager. In Device Manager, on the **View** menu, choose **Devices by type**. In the device tree, locate **Microsoft WDF Simple Toaster (No Class Installer)**.
+
+In Device Manager, on the **View** menu, choose **Devices by connection**. Locate **Microsoft WDF Simple Toaster (No Class Installer)** as a child of the root node of the device tree.
+
+Build the sample using MSBuild
+------------------------------
+
+As an alternative to building the Toaster sample in Visual Studio, you can build it in a Visual Studio Command Prompt window. In Visual Studio, on the **Tools** menu, choose **Visual Studio Command Prompt**. In the Visual Studio Command Prompt window, navigate to the folder that has the solution file, Toaster.sln. Use the MSBuild command to build the solution. Here are some examples:
+
+**msbuild /p:configuration="Debug" /p:platform="x64" Toaster.sln**
+
+**msbuild /p:configuration="Release" /p:platform="Win32" Toaster.sln**
+
+For more information about using MSBuild to build a driver package, see [Building a Driver](http://msdn.microsoft.com/en-us/library/windows/hardware/ff554644).
+
+UMDF Toaster File Manifest
+--------------------------
+#### WUDFToaster.idl
+Component Interface file
+
+#### WUDFToaster.cpp
+DLL Support code - provides the DLL's entry point as well as the DllGetClassObject export.
+
+#### WUDFToaster.def
+This file lists the functions that the driver DLL exports.
+
+#### stdafx.h
+This is the main header file for the sample driver.
+
+#### driver.cpp & driver.h
+Definition and implementation of the IDriverEntry callbacks in CDriver class.
+
+#### device.cpp & device.h
+Definition and implementation of various interfaces and their callbacks in CDevice class. Add your PnP and Power interfaces specific for your hardware.
+
+#### queue.cpp & queue.h
+Definition and implementation of the base queue callback class (CQueue). IQueueCallbackDevicekIoControl, IQueueCallbackRead and IQueueCallBackWrite callbacks are implemented to handle I/O control requests.
+
+#### WUDFToaster.rc
+This file defines resource information for the WUDF Toaster sample driver.
+
+#### WUDFToaster.inf
+Sample INF for installing the sample WUDF Toaster driver under the Toaster class of devices.
+
+#### WUDFtoaster.ctl, internal.h
+This file lists the WPP trace control GUID(s) for the sample driver. This file can be used with the tracelog command's -guid flag to enable the collection of these trace events within an established trace session.
+These GUIDs must remain in sync with the trace control guids defined in internal.h.
+
+Toastmon File Manifest
+----------------------
+#### comsup.cpp & comsup.h
+Boilerplate COM Support code - specifically base classes which provide implementations for the standard COM interfaces IUnknown and IClassFactory which are used throughout the sample.
+The implementation of IClassFactory is designed to create instances of the CMyDriver class. If you should change the name of your base driver class, you would also need to modify this file.
+
+#### dllsup.cpp
+Boilerplate DLL Support code - provides the DLL's entry point as well as the single required export (DllGetClassObject).
+These depend on comsup.cpp to perform the necessary class creation.
+
+#### exports.def
+This file lists the functions that the driver DLL exports.
+
+#### makefile
+This file redirects to the real makefile, which is shared by all the driver components of the Windows Driver Kit.
+
+#### internal.h
+This is the main header file for the ToastMon driver
+
+#### driver.cpp & driver.h
+Definition and implementation of the driver callback class for the ToastMon sample.
+
+#### device.cpp & device.h
+Definition and implementation of the device callback class for the ToastMon sample. This is mostly boilerplate, but also registers for RemoteInterface Arrival notifications. When a RemoteInterface arrival callback occurs, it calls CreateRemoteInterface and creates a CMyRemoteTarget callback object to handle I/O on that RemoteInterface.
+
+#### RemoteTarget.cpp & RemoteTarget.h
+Definition and implementation of the remote target callback class for the ToastMon sample.
+
+#### list.h
+Doubly-linked-list code
+
+#### ToastMon.rc
+This file defines resource information for the ToastMon sample driver.
+
+#### UMDFToastMon.inf
+Sample INF for installing the Skeleton driver to control a root enumerated device with a hardware ID of UMDFSamples\\ToastMon
 
diff --git a/general/toaster/toastpkg/toastapp/toastapp.vcxproj b/general/toaster/toastpkg/toastapp/toastapp.vcxproj
index 772c2744..99f5d3ed 100644
--- a/general/toaster/toastpkg/toastapp/toastapp.vcxproj
+++ b/general/toaster/toastpkg/toastapp/toastapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{4BE9B424-9C7C-495D-BECD-A04867DB2802}</ProjectGuid>
+    <ProjectGuid>{DA341425-3029-4DFD-8024-6910371ACEF5}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{00FF9348-781D-4F7C-B665-3C46FF4F4DBE}</SampleGuid>
+    <SampleGuid>{11D55790-49C6-4517-A55C-ECAAB33AC1E9}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters b/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters
index 21f9ddec..3d3a9ae7 100644
--- a/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters
+++ b/general/toaster/toastpkg/toastapp/toastapp.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>{67DF9821-5DF2-4390-8645-AA3893DBEB53}</UniqueIdentifier>
+      <UniqueIdentifier>{EC7E6C8A-C706-422C-AD10-91E347D35360}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7FB050B7-6DF1-4D3D-BE1C-B6D7D27C122B}</UniqueIdentifier>
+      <UniqueIdentifier>{0137E48B-AEC4-4FAF-BC20-ADB802C90BD2}</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>{08ED54F9-B7BC-42BA-B064-47CA51C6FE48}</UniqueIdentifier>
+      <UniqueIdentifier>{C2DFE14E-5F5A-4CE1-8FEF-B6E479EE9088}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastpkg/toastcd/tostx86.cat b/general/toaster/toastpkg/toastcd/tostx86.cat
index b16db9e9..e8b604b5 100644
--- a/general/toaster/toastpkg/toastcd/tostx86.cat
+++ b/general/toaster/toastpkg/toastcd/tostx86.cat
diff --git a/general/toaster/toastpkg/toastcd/tstamd64.cat b/general/toaster/toastpkg/toastcd/tstamd64.cat
index 637df4db..cd1a8eb6 100644
--- a/general/toaster/toastpkg/toastcd/tstamd64.cat
+++ b/general/toaster/toastpkg/toastcd/tstamd64.cat
diff --git a/general/toaster/toastpkg/toastco/tostrco2.vcxproj b/general/toaster/toastpkg/toastco/tostrco2.vcxproj
index afaed3ff..acaa1a74 100644
--- a/general/toaster/toastpkg/toastco/tostrco2.vcxproj
+++ b/general/toaster/toastpkg/toastco/tostrco2.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2603EF56-C013-4A84-897A-76EA07FDBB27}</ProjectGuid>
+    <ProjectGuid>{7C8F71F5-C429-4DFF-957E-00B9E82E2882}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{94575B57-4141-4421-94D8-C4826C2077AF}</SampleGuid>
+    <SampleGuid>{3EE5DFE9-31C3-48A4-BAB4-DF9CD0FFE1BC}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters b/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters
index f176be76..7a8dd21a 100644
--- a/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters
+++ b/general/toaster/toastpkg/toastco/tostrco2.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>{1EC35066-5352-4C66-AB55-7064A1D2710A}</UniqueIdentifier>
+      <UniqueIdentifier>{0E160D93-81ED-43A4-BE15-4BCB9047831E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{461AEF17-4B21-4416-983F-205E529241F9}</UniqueIdentifier>
+      <UniqueIdentifier>{EBF03CB3-5F56-4F34-A0E5-B350D5686B99}</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>{D2257EDC-D839-4646-836B-75D16A94E4F0}</UniqueIdentifier>
+      <UniqueIdentifier>{E8916D68-529D-40C2-8127-D69423218770}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastpkg/toastpkg.sln b/general/toaster/toastpkg/toastpkg.sln
index dd1e999c..870855c3 100644
--- a/general/toaster/toastpkg/toastpkg.sln
+++ b/general/toaster/toastpkg/toastpkg.sln
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastapp", "Toastapp", "{8638CA9F-2C57-4198-A01B-002B6A1226B2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastapp", "Toastapp", "{552BDD2C-737F-4EB1-884C-BDFC2370EC4A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastco", "Toastco", "{9B6AB1AE-E802-4AF9-B72B-D2262CFF65AD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastco", "Toastco", "{F661D16C-5F0B-4FE2-AAEC-97D786C17D54}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastva", "Toastva", "{80ACC4C0-C750-4914-9A4F-D36076590E22}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastva", "Toastva", "{9326D33D-A5B7-443B-91D0-A65AE33394DB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastapp", "toastapp\toastapp.vcxproj", "{4BE9B424-9C7C-495D-BECD-A04867DB2802}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastapp", "toastapp\toastapp.vcxproj", "{DA341425-3029-4DFD-8024-6910371ACEF5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrco2", "toastco\tostrco2.vcxproj", "{2603EF56-C013-4A84-897A-76EA07FDBB27}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrco2", "toastco\tostrco2.vcxproj", "{7C8F71F5-C429-4DFF-957E-00B9E82E2882}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastva", "toastva\toastva.vcxproj", "{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastva", "toastva\toastva.vcxproj", "{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2603EF56-C013-4A84-897A-76EA07FDBB27} = {2603EF56-C013-4A84-897A-76EA07FDBB27}
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882} = {7C8F71F5-C429-4DFF-957E-00B9E82E2882}
 	EndProjectSection
 EndProject
 Global
@@ -26,37 +26,37 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|Win32.Build.0 = Debug|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|Win32.ActiveCfg = Release|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|Win32.Build.0 = Release|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|x64.ActiveCfg = Debug|x64
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|x64.Build.0 = Debug|x64
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|x64.ActiveCfg = Release|x64
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|x64.Build.0 = Release|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|Win32.Build.0 = Debug|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|Win32.ActiveCfg = Release|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|Win32.Build.0 = Release|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|x64.ActiveCfg = Debug|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|x64.Build.0 = Debug|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|x64.ActiveCfg = Release|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|x64.Build.0 = Release|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|Win32.Build.0 = Debug|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|Win32.ActiveCfg = Release|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|Win32.Build.0 = Release|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|x64.ActiveCfg = Debug|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|x64.Build.0 = Debug|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|x64.ActiveCfg = Release|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|x64.Build.0 = Release|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|Win32.Build.0 = Debug|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|Win32.ActiveCfg = Release|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|Win32.Build.0 = Release|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|x64.ActiveCfg = Debug|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|x64.Build.0 = Debug|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|x64.ActiveCfg = Release|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|x64.Build.0 = Release|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|Win32.Build.0 = Debug|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|Win32.ActiveCfg = Release|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|Win32.Build.0 = Release|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|x64.ActiveCfg = Debug|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|x64.Build.0 = Debug|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|x64.ActiveCfg = Release|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|x64.Build.0 = Release|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|Win32.Build.0 = Debug|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|Win32.ActiveCfg = Release|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|Win32.Build.0 = Release|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|x64.ActiveCfg = Debug|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|x64.Build.0 = Debug|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|x64.ActiveCfg = Release|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802} = {8638CA9F-2C57-4198-A01B-002B6A1226B2}
-		{2603EF56-C013-4A84-897A-76EA07FDBB27} = {9B6AB1AE-E802-4AF9-B72B-D2262CFF65AD}
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421} = {80ACC4C0-C750-4914-9A4F-D36076590E22}
+		{DA341425-3029-4DFD-8024-6910371ACEF5} = {552BDD2C-737F-4EB1-884C-BDFC2370EC4A}
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882} = {F661D16C-5F0B-4FE2-AAEC-97D786C17D54}
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5} = {9326D33D-A5B7-443B-91D0-A65AE33394DB}
 	EndGlobalSection
 EndGlobal
diff --git a/general/toaster/toastpkg/toastva/toastva.vcxproj b/general/toaster/toastpkg/toastva/toastva.vcxproj
index 55a4cfb6..92591cdd 100644
--- a/general/toaster/toastpkg/toastva/toastva.vcxproj
+++ b/general/toaster/toastpkg/toastva/toastva.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}</ProjectGuid>
+    <ProjectGuid>{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{43F6E849-808D-47F0-9F7A-4D173795892D}</SampleGuid>
+    <SampleGuid>{02BCF403-1E72-4F88-9267-FBFB771C8A94}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters b/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters
index af5a1160..20306006 100644
--- a/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters
+++ b/general/toaster/toastpkg/toastva/toastva.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>{69A8D8BA-92F5-4CB0-A45E-6F00B9831369}</UniqueIdentifier>
+      <UniqueIdentifier>{4127F338-E099-419C-A8F1-58489A04992A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{37B69B6B-8428-4579-9C66-618C8E6B9003}</UniqueIdentifier>
+      <UniqueIdentifier>{66FC923F-DCC6-4587-98AE-5C092542A0EA}</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>{9F8FFEAF-405F-44A2-BAE8-E44AC9BDF69D}</UniqueIdentifier>
+      <UniqueIdentifier>{EA13A6E0-448B-4674-AFA8-79C6B8269AD5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/Package/package.VcxProj b/general/toaster/umdf2/Package/package.VcxProj
index 0b9bc62d..19a45a22 100644
--- a/general/toaster/umdf2/Package/package.VcxProj
+++ b/general/toaster/umdf2/Package/package.VcxProj
@@ -20,10 +20,10 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\filter\generic\filterum.vcxproj">
-      <Project>{322F1E83-402B-49F0-B206-FD44F046091F}</Project>
+      <Project>{3CC42473-D121-41F4-AE26-1F2F0AC65E82}</Project>
     </ProjectReference>
     <ProjectReference Include="..\func\simple\wdfsimpleum.vcxproj">
-      <Project>{2FB86AE0-CD30-4E4E-93D1-306A8982263C}</Project>
+      <Project>{31C45025-FDA4-4CB5-B55E-81F934382654}</Project>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="PropertySheets">
@@ -35,8 +35,8 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}</ProjectGuid>
-    <SampleGuid>{1DF2195C-0F0C-4679-8995-133027CE291F}</SampleGuid>
+    <ProjectGuid>{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}</ProjectGuid>
+    <SampleGuid>{B552060C-CC51-4961-8C6E-74C455A65757}</SampleGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/general/toaster/umdf2/Package/package.VcxProj.Filters b/general/toaster/umdf2/Package/package.VcxProj.Filters
index 1761b725..6d56f080 100644
--- a/general/toaster/umdf2/Package/package.VcxProj.Filters
+++ b/general/toaster/umdf2/Package/package.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>{D2DAB9A9-5425-40C2-87AA-D9786B3E42F5}</UniqueIdentifier>
+      <UniqueIdentifier>{0B198A0D-D6A7-4D7C-B773-41969DAE5343}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7D7C232A-C3B7-4775-B0F1-9EF3256E4A00}</UniqueIdentifier>
+      <UniqueIdentifier>{DA189D30-1E24-422A-B856-F4FE19A4C936}</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>{BF9AF006-025D-4D97-8CC6-848B3618B69C}</UniqueIdentifier>
+      <UniqueIdentifier>{B99B6F74-A017-4AEA-B846-B757A4258320}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{E1B01869-FAF8-4E60-93B6-1DEA6295B589}</UniqueIdentifier>
+      <UniqueIdentifier>{F4FF09EC-A122-471B-B493-44267FF160BA}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/general/toaster/umdf2/exe/enum/Enum.vcxproj b/general/toaster/umdf2/exe/enum/Enum.vcxproj
index 55524214..7059deb7 100644
--- a/general/toaster/umdf2/exe/enum/Enum.vcxproj
+++ b/general/toaster/umdf2/exe/enum/Enum.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{12CC02AE-DC1B-4B19-966F-9F324828D94D}</ProjectGuid>
+    <ProjectGuid>{91E7C695-3307-4596-90E1-065AFB4D2643}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{EAE54135-6F6A-4694-B2BE-8EF7AD38CFDE}</SampleGuid>
+    <SampleGuid>{AC84F877-CAB8-44D9-9199-028B400504FA}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/umdf2/exe/enum/Enum.vcxproj.Filters b/general/toaster/umdf2/exe/enum/Enum.vcxproj.Filters
index 952d8156..fff7bcd3 100644
--- a/general/toaster/umdf2/exe/enum/Enum.vcxproj.Filters
+++ b/general/toaster/umdf2/exe/enum/Enum.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>{58733B34-2D37-4533-A53B-61D148D97CC2}</UniqueIdentifier>
+      <UniqueIdentifier>{0478CA74-6E89-40CC-BA37-7A2FBC70982B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{4C9923EA-9B5C-4DD4-BF2F-EBAA7B6815C0}</UniqueIdentifier>
+      <UniqueIdentifier>{418A5D3D-5225-4430-AD6C-DBCDB8B00D57}</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>{A563728A-CB57-4506-BEC0-BA328E4BC76C}</UniqueIdentifier>
+      <UniqueIdentifier>{F170FC27-1BFE-4060-A548-BD9A219A502C}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/exe/notify/notify.vcxproj b/general/toaster/umdf2/exe/notify/notify.vcxproj
index ecee4086..99a5f790 100644
--- a/general/toaster/umdf2/exe/notify/notify.vcxproj
+++ b/general/toaster/umdf2/exe/notify/notify.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}</ProjectGuid>
+    <ProjectGuid>{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{0CE9F05C-A3F4-4E23-9057-DB90E8DB24F1}</SampleGuid>
+    <SampleGuid>{B9D000EC-83CC-4167-802E-8438A8FF51E4}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/umdf2/exe/notify/notify.vcxproj.Filters b/general/toaster/umdf2/exe/notify/notify.vcxproj.Filters
index ec0b3c28..6590341f 100644
--- a/general/toaster/umdf2/exe/notify/notify.vcxproj.Filters
+++ b/general/toaster/umdf2/exe/notify/notify.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>{6B905269-3A91-4F64-9E49-E5A9BA33D6F2}</UniqueIdentifier>
+      <UniqueIdentifier>{DBCA469B-548D-4437-BF5A-97DCEBE3D840}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A9BEAF80-2298-41A9-A7CF-3315D06823C1}</UniqueIdentifier>
+      <UniqueIdentifier>{DE8C6977-FC68-4C69-8630-4694C3622D6C}</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>{E8D961C9-3289-486E-87E7-A27F36334C88}</UniqueIdentifier>
+      <UniqueIdentifier>{BF9BD5C8-F576-4DB4-BB8E-2AED59380E60}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/exe/toast/toast.vcxproj b/general/toaster/umdf2/exe/toast/toast.vcxproj
index 8eb09f0b..af82acfe 100644
--- a/general/toaster/umdf2/exe/toast/toast.vcxproj
+++ b/general/toaster/umdf2/exe/toast/toast.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{73C36066-9CDD-4D33-AACB-4A1B54083FC9}</ProjectGuid>
+    <ProjectGuid>{8FA35EEE-04BE-438A-AD20-A8E849C9A107}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{7EA1DD91-8456-47F7-BDE0-4F27F5EA522F}</SampleGuid>
+    <SampleGuid>{E86474CB-C1C2-4A18-8715-FC4AC163A6D2}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/umdf2/exe/toast/toast.vcxproj.Filters b/general/toaster/umdf2/exe/toast/toast.vcxproj.Filters
index 6705206b..961ea2ff 100644
--- a/general/toaster/umdf2/exe/toast/toast.vcxproj.Filters
+++ b/general/toaster/umdf2/exe/toast/toast.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>{CBE9C966-D1FD-4F05-95F6-AF6BD7E02A4D}</UniqueIdentifier>
+      <UniqueIdentifier>{C5935659-AF96-4A26-9828-7135F79A7107}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{75AE28AC-313C-498E-9FD3-86F7E7849E1E}</UniqueIdentifier>
+      <UniqueIdentifier>{4542E5F6-7451-43E0-8EFF-A7AC183A23B2}</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>{9C3CDC3D-85F9-430D-9FCB-A2769D5699F4}</UniqueIdentifier>
+      <UniqueIdentifier>{29D0DA0A-77D3-48A1-87F5-15578B07F740}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/filter/generic/filterum.inx b/general/toaster/umdf2/filter/generic/filterum.inx
index 431550a0..6686b2fb 100644
--- a/general/toaster/umdf2/filter/generic/filterum.inx
+++ b/general/toaster/umdf2/filter/generic/filterum.inx
diff --git a/general/toaster/umdf2/filter/generic/filterum.vcxproj b/general/toaster/umdf2/filter/generic/filterum.vcxproj
index 0f32ed2d..84dd508e 100644
--- a/general/toaster/umdf2/filter/generic/filterum.vcxproj
+++ b/general/toaster/umdf2/filter/generic/filterum.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{322F1E83-402B-49F0-B206-FD44F046091F}</ProjectGuid>
+    <ProjectGuid>{3CC42473-D121-41F4-AE26-1F2F0AC65E82}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{27CAA789-59E6-4CE6-A3C4-1E32A3B836B7}</SampleGuid>
+    <SampleGuid>{1A4A32BA-1596-4F52-BC48-B85A6D8D5D12}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -101,7 +101,6 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -110,11 +109,9 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -122,7 +119,6 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -131,11 +127,9 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,7 +137,6 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -152,11 +145,9 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -164,7 +155,6 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
@@ -173,11 +163,9 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""filterum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/filter/generic/filterum.vcxproj.Filters b/general/toaster/umdf2/filter/generic/filterum.vcxproj.Filters
index fbc2255e..4170887d 100644
--- a/general/toaster/umdf2/filter/generic/filterum.vcxproj.Filters
+++ b/general/toaster/umdf2/filter/generic/filterum.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{D2172684-87C0-4852-875A-0CA8BD491BD7}</UniqueIdentifier>
+      <UniqueIdentifier>{B98D4FD9-00A8-4964-AE34-6AF1F833564B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{4613B345-34B0-4251-93CF-3414D7B1C840}</UniqueIdentifier>
+      <UniqueIdentifier>{30413FCB-C550-4E4B-85F0-F39789145A19}</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>{9BB65910-D35E-42C5-BF39-F62B4D9F973B}</UniqueIdentifier>
+      <UniqueIdentifier>{D54A0D65-9B62-45F4-8B43-F92BC9FF355C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{3FF9C7B5-8269-4401-8BB5-225709D52804}</UniqueIdentifier>
+      <UniqueIdentifier>{71F51C61-8117-4556-90E5-DE06697F59D6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\filterum.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="filter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.inx b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
index b6c650ff..067ca605 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.inx
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj
index e580d540..65b00def 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}</ProjectGuid>
+    <ProjectGuid>{FCF21B34-353D-4F85-9EA0-C29978C12DBF}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{70A815C1-5D9C-419C-8379-F61A04BA3DD1}</SampleGuid>
+    <SampleGuid>{E74D4F4D-7209-4A02-BD2C-3BB528618D2E}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters
index bdfdc4f9..7a394e09 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{4C00BD29-A08C-48FF-9326-65CB99A38B85}</UniqueIdentifier>
+      <UniqueIdentifier>{B8C9DC5B-7C98-4A49-93F3-E3442CBF75A5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{588F07FC-8AC0-4132-B7D8-A2C7C589CBA1}</UniqueIdentifier>
+      <UniqueIdentifier>{14D2CA4B-89D1-4EBA-9189-6488CD5FA53B}</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>{F07FF097-C35A-47EB-A0F6-1B7AF7677990}</UniqueIdentifier>
+      <UniqueIdentifier>{9E64748C-D7C7-4161-9D23-8F53507ECDDA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{AEBC341B-92EB-4BFD-980F-F69DD9AEC99C}</UniqueIdentifier>
+      <UniqueIdentifier>{13A3B2C6-C1C7-4A41-8F08-27011CD7C327}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdffeaturedum.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="power.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/umdf2/func/shared/toaster.h b/general/toaster/umdf2/func/shared/toaster.h
index 006166e7..87ddcd54 100644
--- a/general/toaster/umdf2/func/shared/toaster.h
+++ b/general/toaster/umdf2/func/shared/toaster.h
@@ -28,8 +28,8 @@ Environment:
 #include <wudfwdm.h>
 #include <wdf.h>
 #include <initguid.h>
-#include "..\inc\driver.h"
-#include "..\inc\public.h"
+#include "driver.h"
+#include "public.h"
 
 #define TOASTER_POOL_TAG (ULONG) 'saoT'
 
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.inx b/general/toaster/umdf2/func/simple/wdfsimpleum.inx
index 0cd117e2..18576c76 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.inx
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.inx
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj
index f947f97e..6ed5cc6b 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2FB86AE0-CD30-4E4E-93D1-306A8982263C}</ProjectGuid>
+    <ProjectGuid>{31C45025-FDA4-4CB5-B55E-81F934382654}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{DDC9A998-E2C4-47F7-AB33-D0F4C54E1A07}</SampleGuid>
+    <SampleGuid>{7D92DB42-741A-42C9-87E5-E9EC492CCC0D}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -102,17 +102,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -121,17 +118,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -140,17 +134,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -159,17 +150,14 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\inc;..\shared</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);___TARGETNAME="""wdfsimpleum.DYNLINK"""</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters
index fb8738bb..1fbc9c7b 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{DC7382CC-718D-4177-8EBD-6A3AAA546FA2}</UniqueIdentifier>
+      <UniqueIdentifier>{1A3802F5-383A-403F-B84E-5CC40D20B8B2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{0B35AC27-FBA9-482C-AB2D-A0B9A44DFBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{68D48BB7-AE50-491B-9EBF-C9DADA0FC35F}</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>{648AB4A2-DE81-48B3-9E36-5A767F698567}</UniqueIdentifier>
+      <UniqueIdentifier>{E8112111-3C61-4671-83B0-B97F62F8CAEA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{73524C9E-B6C0-4702-B212-55BDE5F61FFB}</UniqueIdentifier>
+      <UniqueIdentifier>{22FDD2D2-7FE2-4575-9FDB-91166ED98B18}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\wdfsimpleum.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="toaster.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/toaster/umdf2/umdf2toaster.sln b/general/toaster/umdf2/umdf2toaster.sln
index e47cbb9c..0b476358 100644
--- a/general/toaster/umdf2/umdf2toaster.sln
+++ b/general/toaster/umdf2/umdf2toaster.sln
@@ -3,39 +3,39 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{ED63C611-D43D-42E8-A083-AB082C31A0DF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{44837D96-E34C-4A65-9AD1-AA84279876DC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notify", "Notify", "{3055CBF7-B33A-4DED-BFB5-19DE53027CF2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notify", "Notify", "{FA4A8867-88BE-4EAB-B31F-ADBBD9FEF845}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{06CC3519-A442-4DC8-93B5-3320863FB409}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{04EDF890-486C-4B66-8360-CA172D2ED6A8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toast", "Toast", "{48DB3120-7565-4863-8C99-C0DE5FD2DC11}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toast", "Toast", "{E15B3554-BFCE-4C53-A132-DBF669D01584}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Enum", "Enum", "{B0E9361C-6773-4E78-870D-10887BBE6D40}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Enum", "Enum", "{1A6F0878-1D3D-4301-A5B7-5D5E03DC4DD8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{CE2CDD3A-ED87-475C-BE33-4ED4C288884D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{12113395-BEDC-46E3-A87C-62455B650D4C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{38DD140E-6B82-43DA-8269-FF850206DAD6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Func", "Func", "{2798D90E-2976-4C76-8843-0F467D4B98E5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Featured", "Featured", "{8A73614A-6351-42D3-A518-9C6B504D9E55}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Featured", "Featured", "{FF4B4265-D9F5-4071-9683-A6A94350994F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generic", "Generic", "{E7B355DF-2054-45A0-BF14-B78D6E61DDF1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generic", "Generic", "{A3B700C5-0F77-4926-ADBA-520CE882A8F1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{8CADBFA7-5C4A-46FA-9171-10827B7BB3F9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{CA73AC30-5711-4A0E-B0D2-59E79C79ECEA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notify", "exe\notify\notify.vcxproj", "{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notify", "exe\notify\notify.vcxproj", "{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toast", "exe\toast\toast.vcxproj", "{73C36066-9CDD-4D33-AACB-4A1B54083FC9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toast", "exe\toast\toast.vcxproj", "{8FA35EEE-04BE-438A-AD20-A8E849C9A107}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enum", "exe\enum\Enum.vcxproj", "{12CC02AE-DC1B-4B19-966F-9F324828D94D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enum", "exe\enum\Enum.vcxproj", "{91E7C695-3307-4596-90E1-065AFB4D2643}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdfsimpleum", "func\simple\wdfsimpleum.vcxproj", "{2FB86AE0-CD30-4E4E-93D1-306A8982263C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdfsimpleum", "func\simple\wdfsimpleum.vcxproj", "{31C45025-FDA4-4CB5-B55E-81F934382654}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdffeaturedum", "func\featured\wdffeaturedum.vcxproj", "{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdffeaturedum", "func\featured\wdffeaturedum.vcxproj", "{FCF21B34-353D-4F85-9EA0-C29978C12DBF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filterum", "filter\generic\filterum.vcxproj", "{322F1E83-402B-49F0-B206-FD44F046091F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filterum", "filter\generic\filterum.vcxproj", "{3CC42473-D121-41F4-AE26-1F2F0AC65E82}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,79 +45,79 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Debug|Win32.Build.0 = Debug|Win32
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Release|Win32.ActiveCfg = Release|Win32
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Release|Win32.Build.0 = Release|Win32
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Debug|x64.ActiveCfg = Debug|x64
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Debug|x64.Build.0 = Debug|x64
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Release|x64.ActiveCfg = Release|x64
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76}.Release|x64.Build.0 = Release|x64
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Debug|Win32.Build.0 = Debug|Win32
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Release|Win32.ActiveCfg = Release|Win32
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Release|Win32.Build.0 = Release|Win32
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Debug|x64.ActiveCfg = Debug|x64
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Debug|x64.Build.0 = Debug|x64
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Release|x64.ActiveCfg = Release|x64
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248}.Release|x64.Build.0 = Release|x64
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Debug|Win32.Build.0 = Debug|Win32
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Release|Win32.ActiveCfg = Release|Win32
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Release|Win32.Build.0 = Release|Win32
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Debug|x64.ActiveCfg = Debug|x64
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Debug|x64.Build.0 = Debug|x64
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Release|x64.ActiveCfg = Release|x64
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9}.Release|x64.Build.0 = Release|x64
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Debug|Win32.Build.0 = Debug|Win32
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Release|Win32.ActiveCfg = Release|Win32
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Release|Win32.Build.0 = Release|Win32
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Debug|x64.ActiveCfg = Debug|x64
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Debug|x64.Build.0 = Debug|x64
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Release|x64.ActiveCfg = Release|x64
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D}.Release|x64.Build.0 = Release|x64
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Debug|Win32.Build.0 = Debug|Win32
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Release|Win32.ActiveCfg = Release|Win32
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Release|Win32.Build.0 = Release|Win32
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Debug|x64.ActiveCfg = Debug|x64
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Debug|x64.Build.0 = Debug|x64
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Release|x64.ActiveCfg = Release|x64
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C}.Release|x64.Build.0 = Release|x64
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Debug|Win32.Build.0 = Debug|Win32
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Release|Win32.ActiveCfg = Release|Win32
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Release|Win32.Build.0 = Release|Win32
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Debug|x64.ActiveCfg = Debug|x64
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Debug|x64.Build.0 = Debug|x64
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Release|x64.ActiveCfg = Release|x64
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5}.Release|x64.Build.0 = Release|x64
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Debug|Win32.Build.0 = Debug|Win32
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Release|Win32.ActiveCfg = Release|Win32
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Release|Win32.Build.0 = Release|Win32
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Debug|x64.ActiveCfg = Debug|x64
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Debug|x64.Build.0 = Debug|x64
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Release|x64.ActiveCfg = Release|x64
-		{322F1E83-402B-49F0-B206-FD44F046091F}.Release|x64.Build.0 = Release|x64
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Debug|Win32.Build.0 = Debug|Win32
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Release|Win32.ActiveCfg = Release|Win32
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Release|Win32.Build.0 = Release|Win32
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Debug|x64.ActiveCfg = Debug|x64
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Debug|x64.Build.0 = Debug|x64
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Release|x64.ActiveCfg = Release|x64
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD}.Release|x64.Build.0 = Release|x64
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Debug|Win32.Build.0 = Debug|Win32
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Release|Win32.ActiveCfg = Release|Win32
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Release|Win32.Build.0 = Release|Win32
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Debug|x64.ActiveCfg = Debug|x64
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Debug|x64.Build.0 = Debug|x64
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Release|x64.ActiveCfg = Release|x64
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB}.Release|x64.Build.0 = Release|x64
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Debug|Win32.Build.0 = Debug|Win32
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Release|Win32.ActiveCfg = Release|Win32
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Release|Win32.Build.0 = Release|Win32
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Debug|x64.ActiveCfg = Debug|x64
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Debug|x64.Build.0 = Debug|x64
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Release|x64.ActiveCfg = Release|x64
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107}.Release|x64.Build.0 = Release|x64
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Debug|Win32.ActiveCfg = Debug|Win32
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Debug|Win32.Build.0 = Debug|Win32
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Release|Win32.ActiveCfg = Release|Win32
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Release|Win32.Build.0 = Release|Win32
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Debug|x64.ActiveCfg = Debug|x64
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Debug|x64.Build.0 = Debug|x64
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Release|x64.ActiveCfg = Release|x64
+		{91E7C695-3307-4596-90E1-065AFB4D2643}.Release|x64.Build.0 = Release|x64
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Debug|Win32.ActiveCfg = Debug|Win32
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Debug|Win32.Build.0 = Debug|Win32
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Release|Win32.ActiveCfg = Release|Win32
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Release|Win32.Build.0 = Release|Win32
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Debug|x64.ActiveCfg = Debug|x64
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Debug|x64.Build.0 = Debug|x64
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Release|x64.ActiveCfg = Release|x64
+		{31C45025-FDA4-4CB5-B55E-81F934382654}.Release|x64.Build.0 = Release|x64
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Debug|Win32.Build.0 = Debug|Win32
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Release|Win32.ActiveCfg = Release|Win32
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Release|Win32.Build.0 = Release|Win32
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Debug|x64.ActiveCfg = Debug|x64
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Debug|x64.Build.0 = Debug|x64
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Release|x64.ActiveCfg = Release|x64
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF}.Release|x64.Build.0 = Release|x64
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Debug|Win32.Build.0 = Debug|Win32
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Release|Win32.ActiveCfg = Release|Win32
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Release|Win32.Build.0 = Release|Win32
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Debug|x64.ActiveCfg = Debug|x64
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Debug|x64.Build.0 = Debug|x64
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Release|x64.ActiveCfg = Release|x64
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{AF4C3FCE-D27E-4E5E-9914-D8D7D1BD5B76} = {ED63C611-D43D-42E8-A083-AB082C31A0DF}
-		{A26CCD87-3E7D-47C0-A7D2-46FF83F3D248} = {3055CBF7-B33A-4DED-BFB5-19DE53027CF2}
-		{73C36066-9CDD-4D33-AACB-4A1B54083FC9} = {48DB3120-7565-4863-8C99-C0DE5FD2DC11}
-		{12CC02AE-DC1B-4B19-966F-9F324828D94D} = {B0E9361C-6773-4E78-870D-10887BBE6D40}
-		{2FB86AE0-CD30-4E4E-93D1-306A8982263C} = {CE2CDD3A-ED87-475C-BE33-4ED4C288884D}
-		{F0EA96C5-8CF6-4978-9DB0-179579D4C6D5} = {8A73614A-6351-42D3-A518-9C6B504D9E55}
-		{322F1E83-402B-49F0-B206-FD44F046091F} = {E7B355DF-2054-45A0-BF14-B78D6E61DDF1}
-		{3055CBF7-B33A-4DED-BFB5-19DE53027CF2} = {06CC3519-A442-4DC8-93B5-3320863FB409}
-		{48DB3120-7565-4863-8C99-C0DE5FD2DC11} = {06CC3519-A442-4DC8-93B5-3320863FB409}
-		{B0E9361C-6773-4E78-870D-10887BBE6D40} = {06CC3519-A442-4DC8-93B5-3320863FB409}
-		{CE2CDD3A-ED87-475C-BE33-4ED4C288884D} = {38DD140E-6B82-43DA-8269-FF850206DAD6}
-		{8A73614A-6351-42D3-A518-9C6B504D9E55} = {38DD140E-6B82-43DA-8269-FF850206DAD6}
-		{E7B355DF-2054-45A0-BF14-B78D6E61DDF1} = {8CADBFA7-5C4A-46FA-9171-10827B7BB3F9}
+		{71F91DD8-7891-4431-8F10-D33D2AA7F7AD} = {44837D96-E34C-4A65-9AD1-AA84279876DC}
+		{2B7E892B-CDE4-4A4F-9D0B-108CE8B7CABB} = {FA4A8867-88BE-4EAB-B31F-ADBBD9FEF845}
+		{8FA35EEE-04BE-438A-AD20-A8E849C9A107} = {E15B3554-BFCE-4C53-A132-DBF669D01584}
+		{91E7C695-3307-4596-90E1-065AFB4D2643} = {1A6F0878-1D3D-4301-A5B7-5D5E03DC4DD8}
+		{31C45025-FDA4-4CB5-B55E-81F934382654} = {12113395-BEDC-46E3-A87C-62455B650D4C}
+		{FCF21B34-353D-4F85-9EA0-C29978C12DBF} = {FF4B4265-D9F5-4071-9683-A6A94350994F}
+		{3CC42473-D121-41F4-AE26-1F2F0AC65E82} = {A3B700C5-0F77-4926-ADBA-520CE882A8F1}
+		{FA4A8867-88BE-4EAB-B31F-ADBBD9FEF845} = {04EDF890-486C-4B66-8360-CA172D2ED6A8}
+		{E15B3554-BFCE-4C53-A132-DBF669D01584} = {04EDF890-486C-4B66-8360-CA172D2ED6A8}
+		{1A6F0878-1D3D-4301-A5B7-5D5E03DC4DD8} = {04EDF890-486C-4B66-8360-CA172D2ED6A8}
+		{12113395-BEDC-46E3-A87C-62455B650D4C} = {2798D90E-2976-4C76-8843-0F467D4B98E5}
+		{FF4B4265-D9F5-4071-9683-A6A94350994F} = {2798D90E-2976-4C76-8843-0F467D4B98E5}
+		{A3B700C5-0F77-4926-ADBA-520CE882A8F1} = {CA73AC30-5711-4A0E-B0D2-59E79C79ECEA}
 	EndGlobalSection
 EndGlobal
diff --git a/general/tracing/SystemTraceControl/ReadMe.txt b/general/tracing/SystemTraceControl/ReadMe.txt
deleted file mode 100644
index 54609bd7..00000000
--- a/general/tracing/SystemTraceControl/ReadMe.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-EventTracing SystemTraceProvider control sample
-====================================================================================
-This sample demonstrates how to use event tracing control API's to collect events
-from system trace provider. The code provided will start an ETW system trace and
-enable system events with stacks. After collecting the data for 30 seconds trace
-will be stopped. Resulting file (systemtrace.etl) can be processed with
-inbox tracerpt.exe, programmatically (OpenTrace/ProcessTrace/CloseTrace) or using
-WPT (Windows Performance Toolkit) available in the SDK.
-
-Sample Language Implementations
-===============================
-C++
-
-Files
-=================================================
-SystemTraceProvider.sln
-SystemTraceProvider.vcxproj
-SystemTraceProvider.cpp
-sources
-ReadMe.txt
-
-To build the sample using the command prompt:
-=============================================
-     1. Open the Command Prompt window and navigate to the  directory.
-     2. Type msbuild SystemTraceControl.sln.
-
-To build the sample using Visual Studio (preferred method):
-================================================
-     1. Open File Explorer and navigate to the  SystemTraceControl directory.
-     2. Double-click the icon for the .sln (solution) file to open the file in Visual Studio.
-     3. In the Build menu, select Build Solution. The application will be built in the default \Debug or \Release directory.
-
-To run the sample:
-=================
-     1. Navigate to the directory that contains the new executable, using the command prompt or File Explorer.
-     2. Type SystemTraceControl.exe at the command line, or double-click the icon for SystemTraceControl.exe to launch it from File Explorer.
-\ No newline at end of file
diff --git a/general/tracing/SystemTraceControl/SystemTraceControl.cpp b/general/tracing/SystemTraceControl/SystemTraceControl.cpp
index a8c55026..42647061 100644
--- a/general/tracing/SystemTraceControl/SystemTraceControl.cpp
+++ b/general/tracing/SystemTraceControl/SystemTraceControl.cpp
@@ -81,13 +81,13 @@ AllocateTraceProperties (
         (MAXIMUM_SESSION_NAME * sizeof(WCHAR)); 
 
     if (LoggerName != NULL) {
-        StringCchCopy((LPWSTR)((PCHAR)TraceProperties + TraceProperties->LoggerNameOffset), 
+        StringCchCopyW((LPWSTR)((PCHAR)TraceProperties + TraceProperties->LoggerNameOffset), 
                       MAXIMUM_SESSION_NAME,
                       LoggerName);
     }
 
     if (LogFileName != NULL) {
-        StringCchCopy((LPWSTR)((PCHAR)TraceProperties + TraceProperties->LogFileNameOffset), 
+        StringCchCopyW((LPWSTR)((PCHAR)TraceProperties + TraceProperties->LogFileNameOffset), 
                       MAX_PATH, 
                       LogFileName);
     }
@@ -146,7 +146,7 @@ wmain()
     // Start trace session which can receive events from SystemTraceProvider.
     //
     
-    Status = StartTrace(&SessionHandle, LoggerName, TraceProperties);
+    Status = StartTraceW(&SessionHandle, LoggerName, TraceProperties);
     if (Status != ERROR_SUCCESS) {
         wprintf(L"StartTrace() failed with %lu\n", Status);
         goto Exit;
diff --git a/general/tracing/SystemTraceControl/SystemTraceControl.sln b/general/tracing/SystemTraceControl/SystemTraceControl.sln
index 2afb4ba4..f90d4b3d 100644
--- a/general/tracing/SystemTraceControl/SystemTraceControl.sln
+++ b/general/tracing/SystemTraceControl/SystemTraceControl.sln
@@ -1,26 +1,18 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0
-MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SystemTraceControl", "SystemTraceControl.vcxproj", "{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SystemTraceControl", "SystemTraceControl.vcxproj", "{69BD6A4C-5051-E271-F174-E5E67BC09464}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}.Debug|Win32.Build.0 = Debug|Win32
-		{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}.Release|Win32.ActiveCfg = Release|Win32
-		{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}.Release|Win32.Build.0 = Release|Win32
-		{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}.Debug|x64.ActiveCfg = Debug|x64
-		{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}.Debug|x64.Build.0 = Debug|x64
-		{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}.Release|x64.ActiveCfg = Release|x64
-		{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}.Release|x64.Build.0 = Release|x64
+		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Debug|Win32.ActiveCfg = Debug|Win32
+		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Debug|Win32.Build.0 = Debug|Win32
+		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Release|Win32.ActiveCfg = Release|Win32
+		{69BD6A4C-5051-E271-F174-E5E67BC09464}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj b/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj
index adc3b39e..6aeaa431 100644
--- a/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj
+++ b/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -9,170 +9,67 @@
       <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>{E4F6F3AB-051E-4B70-B942-2E5E17C12F6A}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{6C3A654A-1721-4D65-9EEC-E6C8CBEA4716}</SampleGuid>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{69BD6A4C-5051-E271-F174-E5E67BC09464}</ProjectGuid>
   </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>Application</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>Application</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
   </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 Label="ExtensionSettings">
   </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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </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')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>SystemTraceControl</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>SystemTraceControl</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>SystemTraceControl</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>SystemTraceControl</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <ExceptionHandling>
-      </ExceptionHandling>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
     </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <ExceptionHandling>
-      </ExceptionHandling>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;_UNICODE</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SDK_LIB_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="SystemTraceControl.cpp" />
   </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" />
+    <None Include="ReadMe.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
-\ No newline at end of file
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj.Filters b/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj.Filters
index f6f26513..575b76ca 100644
--- a/general/tracing/SystemTraceControl/SystemTraceControl.vcxproj.Filters
+++ b/general/tracing/SystemTraceControl/SystemTraceControl.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>{3B6D39BB-727A-4200-BB47-9DBB3C2B1976}</UniqueIdentifier>
+      <UniqueIdentifier>{CA2B3951-E1B8-494F-93BB-603ACAB74855}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{684A7E16-CFF9-4768-84ED-6E58F714AD74}</UniqueIdentifier>
+      <UniqueIdentifier>{EA9117C8-07C0-4427-A610-83A12B10202F}</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>{706A7968-4A64-4FC5-B349-598AF05146FC}</UniqueIdentifier>
+      <UniqueIdentifier>{3DBF8590-C024-4409-9170-2CE16201AA6F}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -19,4 +19,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj b/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj
index 91136ea2..7f6177a2 100644
--- a/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj
+++ b/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}</ProjectGuid>
+    <ProjectGuid>{A13F7165-72F7-4A07-90E6-CD1AB76F7751}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{289B3077-48C8-425F-9F0F-ACC1D952D174}</SampleGuid>
+    <SampleGuid>{1430EA0E-DE3B-46BB-B18D-00C489CAC4DF}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj.Filters b/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj.Filters
index 992d3374..e6756f28 100644
--- a/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj.Filters
+++ b/general/tracing/evntdrv/Eventdrv/Eventdrv.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>{16BE6722-D66E-42AD-8D3A-537B024A5240}</UniqueIdentifier>
+      <UniqueIdentifier>{34C00302-11F2-4356-8F1A-47490291C4C8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{B85CD8EB-3F58-42C9-85A3-D261714CF85C}</UniqueIdentifier>
+      <UniqueIdentifier>{9ECE9FAE-7B70-42CE-BFAF-AE51DF99AD4B}</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>{5F8F8ABD-E5D2-467E-A709-3105C86DB79F}</UniqueIdentifier>
+      <UniqueIdentifier>{5AB4AB07-A152-4693-A3D0-B006B3BD07EF}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{983C0BB6-79E6-4C60-B678-49B68E167DBD}</UniqueIdentifier>
+      <UniqueIdentifier>{BB530C02-0487-49C3-9894-5F13CC50701C}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/tracing/evntdrv/eventdrv.sln b/general/tracing/evntdrv/eventdrv.sln
index 653dc1b1..44f2e85a 100644
--- a/general/tracing/evntdrv/eventdrv.sln
+++ b/general/tracing/evntdrv/eventdrv.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Eventdrv", "Eventdrv", "{7424CDFF-B958-4C5C-BE6B-B17FCB5F25FC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Eventdrv", "Eventdrv", "{4D9C55AF-C916-4D79-8D9E-D09D3B717A41}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Evntctrl", "Evntctrl", "{783F6114-71F8-41E4-BCC2-185C18B3ADAB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Evntctrl", "Evntctrl", "{E13C595A-34F3-445A-B020-98FBD86CAAB3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Eventdrv", "Eventdrv\Eventdrv.vcxproj", "{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Eventdrv", "Eventdrv\Eventdrv.vcxproj", "{A13F7165-72F7-4A07-90E6-CD1AB76F7751}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "evntctrl", "evntctrl\evntctrl.vcxproj", "{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "evntctrl", "evntctrl\evntctrl.vcxproj", "{8829FAED-4C91-417C-929D-D076B1DB24C1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}.Debug|Win32.Build.0 = Debug|Win32
-		{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}.Release|Win32.ActiveCfg = Release|Win32
-		{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}.Release|Win32.Build.0 = Release|Win32
-		{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}.Debug|x64.ActiveCfg = Debug|x64
-		{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}.Debug|x64.Build.0 = Debug|x64
-		{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}.Release|x64.ActiveCfg = Release|x64
-		{4E197F82-2DC1-43FF-A99E-98B048E9C3D8}.Release|x64.Build.0 = Release|x64
-		{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}.Debug|Win32.Build.0 = Debug|Win32
-		{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}.Release|Win32.ActiveCfg = Release|Win32
-		{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}.Release|Win32.Build.0 = Release|Win32
-		{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}.Debug|x64.ActiveCfg = Debug|x64
-		{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}.Debug|x64.Build.0 = Debug|x64
-		{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}.Release|x64.ActiveCfg = Release|x64
-		{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}.Release|x64.Build.0 = Release|x64
+		{A13F7165-72F7-4A07-90E6-CD1AB76F7751}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A13F7165-72F7-4A07-90E6-CD1AB76F7751}.Debug|Win32.Build.0 = Debug|Win32
+		{A13F7165-72F7-4A07-90E6-CD1AB76F7751}.Release|Win32.ActiveCfg = Release|Win32
+		{A13F7165-72F7-4A07-90E6-CD1AB76F7751}.Release|Win32.Build.0 = Release|Win32
+		{A13F7165-72F7-4A07-90E6-CD1AB76F7751}.Debug|x64.ActiveCfg = Debug|x64
+		{A13F7165-72F7-4A07-90E6-CD1AB76F7751}.Debug|x64.Build.0 = Debug|x64
+		{A13F7165-72F7-4A07-90E6-CD1AB76F7751}.Release|x64.ActiveCfg = Release|x64
+		{A13F7165-72F7-4A07-90E6-CD1AB76F7751}.Release|x64.Build.0 = Release|x64
+		{8829FAED-4C91-417C-929D-D076B1DB24C1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8829FAED-4C91-417C-929D-D076B1DB24C1}.Debug|Win32.Build.0 = Debug|Win32
+		{8829FAED-4C91-417C-929D-D076B1DB24C1}.Release|Win32.ActiveCfg = Release|Win32
+		{8829FAED-4C91-417C-929D-D076B1DB24C1}.Release|Win32.Build.0 = Release|Win32
+		{8829FAED-4C91-417C-929D-D076B1DB24C1}.Debug|x64.ActiveCfg = Debug|x64
+		{8829FAED-4C91-417C-929D-D076B1DB24C1}.Debug|x64.Build.0 = Debug|x64
+		{8829FAED-4C91-417C-929D-D076B1DB24C1}.Release|x64.ActiveCfg = Release|x64
+		{8829FAED-4C91-417C-929D-D076B1DB24C1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{4E197F82-2DC1-43FF-A99E-98B048E9C3D8} = {7424CDFF-B958-4C5C-BE6B-B17FCB5F25FC}
-		{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9} = {783F6114-71F8-41E4-BCC2-185C18B3ADAB}
+		{A13F7165-72F7-4A07-90E6-CD1AB76F7751} = {4D9C55AF-C916-4D79-8D9E-D09D3B717A41}
+		{8829FAED-4C91-417C-929D-D076B1DB24C1} = {E13C595A-34F3-445A-B020-98FBD86CAAB3}
 	EndGlobalSection
 EndGlobal
diff --git a/general/tracing/evntdrv/evntctrl/evntctrl.vcxproj b/general/tracing/evntdrv/evntctrl/evntctrl.vcxproj
index 3a76a909..83d793ef 100644
--- a/general/tracing/evntdrv/evntctrl/evntctrl.vcxproj
+++ b/general/tracing/evntdrv/evntctrl/evntctrl.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{F8C2B5F9-4838-4427-9C15-37EA99DD4DB9}</ProjectGuid>
+    <ProjectGuid>{8829FAED-4C91-417C-929D-D076B1DB24C1}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{7DB91795-3010-4412-9B49-0E2FA0D06E45}</SampleGuid>
+    <SampleGuid>{AB0E11AF-4F78-4B28-90F0-2E0F406D318D}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/tracing/evntdrv/evntctrl/evntctrl.vcxproj.Filters b/general/tracing/evntdrv/evntctrl/evntctrl.vcxproj.Filters
index ece40e38..af5f0a0b 100644
--- a/general/tracing/evntdrv/evntctrl/evntctrl.vcxproj.Filters
+++ b/general/tracing/evntdrv/evntctrl/evntctrl.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>{94268968-6C96-413B-84E4-EF86A33B459E}</UniqueIdentifier>
+      <UniqueIdentifier>{ACD68933-30A4-40C8-A9F7-BF7ACC870F6C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{44C9DD55-05C1-41E5-B952-5B39D5AE06A5}</UniqueIdentifier>
+      <UniqueIdentifier>{37EA9F00-8DF3-407E-9180-7A04E57C53F3}</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>{D535F9F2-0117-4AA3-A0AB-7168A5D53D41}</UniqueIdentifier>
+      <UniqueIdentifier>{5AFD57C0-3C9E-4065-AEDB-338DDC3B00D8}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/tracing/tracedriver/tracectl/tracectl.vcxproj b/general/tracing/tracedriver/tracectl/tracectl.vcxproj
index 54910060..fb27137f 100644
--- a/general/tracing/tracedriver/tracectl/tracectl.vcxproj
+++ b/general/tracing/tracedriver/tracectl/tracectl.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{20F77495-27B1-41EE-96F1-49163E52FA3E}</ProjectGuid>
+    <ProjectGuid>{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{FEF5126F-48E0-43E4-A4BA-4F878B3E27A3}</SampleGuid>
+    <SampleGuid>{70EA1745-DAC1-4C42-81B2-5B68B196B499}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/tracing/tracedriver/tracectl/tracectl.vcxproj.Filters b/general/tracing/tracedriver/tracectl/tracectl.vcxproj.Filters
index 7d9d3ff5..089bb5f1 100644
--- a/general/tracing/tracedriver/tracectl/tracectl.vcxproj.Filters
+++ b/general/tracing/tracedriver/tracectl/tracectl.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>{D6531772-EF8C-451A-81CA-C5152CAD1C11}</UniqueIdentifier>
+      <UniqueIdentifier>{FD73E67E-3429-4E1D-8263-8C7FBEFEE6CC}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{34A13EE0-94EC-46AB-AEAD-AF35CE120EFD}</UniqueIdentifier>
+      <UniqueIdentifier>{00892118-A6E3-498D-BE7C-11BE7880A7E8}</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>{2D93CD19-45A2-44F3-A274-0DC36195669B}</UniqueIdentifier>
+      <UniqueIdentifier>{2131E6C1-11F9-4766-B244-DA433BE778A9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/tracing/tracedriver/tracedrv.sln b/general/tracing/tracedriver/tracedrv.sln
index 8a32d2b1..abfe37fc 100644
--- a/general/tracing/tracedriver/tracedrv.sln
+++ b/general/tracing/tracedriver/tracedrv.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tracectl", "Tracectl", "{1D6048E3-023F-42F8-A4D3-30727C5CCB40}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tracectl", "Tracectl", "{AE9015FC-D924-4403-AB5B-E6C590CE4C98}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tracedrv", "Tracedrv", "{EA04F055-585E-4A70-BA18-CB21DF0317A5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tracedrv", "Tracedrv", "{7EC8709D-EC0B-41AF-80B7-8B6F310B6793}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tracectl", "tracectl\tracectl.vcxproj", "{20F77495-27B1-41EE-96F1-49163E52FA3E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tracectl", "tracectl\tracectl.vcxproj", "{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tracedrv", "tracedrv\tracedrv.vcxproj", "{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tracedrv", "tracedrv\tracedrv.vcxproj", "{83A89A56-3A26-4016-95FC-4D19D192727E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{20F77495-27B1-41EE-96F1-49163E52FA3E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{20F77495-27B1-41EE-96F1-49163E52FA3E}.Debug|Win32.Build.0 = Debug|Win32
-		{20F77495-27B1-41EE-96F1-49163E52FA3E}.Release|Win32.ActiveCfg = Release|Win32
-		{20F77495-27B1-41EE-96F1-49163E52FA3E}.Release|Win32.Build.0 = Release|Win32
-		{20F77495-27B1-41EE-96F1-49163E52FA3E}.Debug|x64.ActiveCfg = Debug|x64
-		{20F77495-27B1-41EE-96F1-49163E52FA3E}.Debug|x64.Build.0 = Debug|x64
-		{20F77495-27B1-41EE-96F1-49163E52FA3E}.Release|x64.ActiveCfg = Release|x64
-		{20F77495-27B1-41EE-96F1-49163E52FA3E}.Release|x64.Build.0 = Release|x64
-		{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}.Debug|Win32.Build.0 = Debug|Win32
-		{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}.Release|Win32.ActiveCfg = Release|Win32
-		{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}.Release|Win32.Build.0 = Release|Win32
-		{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}.Debug|x64.ActiveCfg = Debug|x64
-		{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}.Debug|x64.Build.0 = Debug|x64
-		{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}.Release|x64.ActiveCfg = Release|x64
-		{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}.Release|x64.Build.0 = Release|x64
+		{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}.Debug|Win32.Build.0 = Debug|Win32
+		{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}.Release|Win32.ActiveCfg = Release|Win32
+		{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}.Release|Win32.Build.0 = Release|Win32
+		{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}.Debug|x64.ActiveCfg = Debug|x64
+		{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}.Debug|x64.Build.0 = Debug|x64
+		{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}.Release|x64.ActiveCfg = Release|x64
+		{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F}.Release|x64.Build.0 = Release|x64
+		{83A89A56-3A26-4016-95FC-4D19D192727E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{83A89A56-3A26-4016-95FC-4D19D192727E}.Debug|Win32.Build.0 = Debug|Win32
+		{83A89A56-3A26-4016-95FC-4D19D192727E}.Release|Win32.ActiveCfg = Release|Win32
+		{83A89A56-3A26-4016-95FC-4D19D192727E}.Release|Win32.Build.0 = Release|Win32
+		{83A89A56-3A26-4016-95FC-4D19D192727E}.Debug|x64.ActiveCfg = Debug|x64
+		{83A89A56-3A26-4016-95FC-4D19D192727E}.Debug|x64.Build.0 = Debug|x64
+		{83A89A56-3A26-4016-95FC-4D19D192727E}.Release|x64.ActiveCfg = Release|x64
+		{83A89A56-3A26-4016-95FC-4D19D192727E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{20F77495-27B1-41EE-96F1-49163E52FA3E} = {1D6048E3-023F-42F8-A4D3-30727C5CCB40}
-		{984FEF4C-00E5-40B8-96A8-04CDD124BC3A} = {EA04F055-585E-4A70-BA18-CB21DF0317A5}
+		{3A4AE064-7AFC-43E2-8054-A7019C4BAE5F} = {AE9015FC-D924-4403-AB5B-E6C590CE4C98}
+		{83A89A56-3A26-4016-95FC-4D19D192727E} = {7EC8709D-EC0B-41AF-80B7-8B6F310B6793}
 	EndGlobalSection
 EndGlobal
diff --git a/general/tracing/tracedriver/tracedrv/tracedrv.vcxproj b/general/tracing/tracedriver/tracedrv/tracedrv.vcxproj
index 74b6cbfc..00c1465d 100644
--- a/general/tracing/tracedriver/tracedrv/tracedrv.vcxproj
+++ b/general/tracing/tracedriver/tracedrv/tracedrv.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{984FEF4C-00E5-40B8-96A8-04CDD124BC3A}</ProjectGuid>
+    <ProjectGuid>{83A89A56-3A26-4016-95FC-4D19D192727E}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{F4226244-8FCF-48DD-9DF7-0A94935660D8}</SampleGuid>
+    <SampleGuid>{E5CA0192-7536-4BBE-B3BE-57458384A0D7}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/tracing/tracedriver/tracedrv/tracedrv.vcxproj.Filters b/general/tracing/tracedriver/tracedrv/tracedrv.vcxproj.Filters
index 472ebc32..fcbd8d5b 100644
--- a/general/tracing/tracedriver/tracedrv/tracedrv.vcxproj.Filters
+++ b/general/tracing/tracedriver/tracedrv/tracedrv.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>{913AB4A1-B44D-412D-AB23-77CB7A8A3EB3}</UniqueIdentifier>
+      <UniqueIdentifier>{5F135B7C-AEB6-4141-8734-070B26247C8F}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{662E59C8-472B-4305-BC87-986241758908}</UniqueIdentifier>
+      <UniqueIdentifier>{3D1D61AF-2A52-4C29-B741-C9D6540013E8}</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>{A138E98B-E594-4896-BEB1-5EC7D6AB48FE}</UniqueIdentifier>
+      <UniqueIdentifier>{7F04CBDE-2ACB-4E2A-8607-94E54D55F69D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{C5A203CB-517B-45B2-BF2B-E96F16FBAEA3}</UniqueIdentifier>
+      <UniqueIdentifier>{417B5036-356E-4722-9776-E3F014CAA1F9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/umdfSkeleton/UMDFSkeleton.vcxproj b/general/umdfSkeleton/UMDFSkeleton.vcxproj
index 95f66045..54fa7d0f 100644
--- a/general/umdfSkeleton/UMDFSkeleton.vcxproj
+++ b/general/umdfSkeleton/UMDFSkeleton.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{3434D648-433A-4D74-822F-DDBE22400E6D}</ProjectGuid>
+    <ProjectGuid>{6C720AF2-E419-4BA6-927C-607BE3E771F1}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
@@ -27,7 +27,7 @@
     <KMDF_VERSION_MINOR>9</KMDF_VERSION_MINOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{86CA24C3-2AB5-4664-9B33-3D9F1F5CDA36}</SampleGuid>
+    <SampleGuid>{B7203DC7-2002-4983-AB0B-E567DC6BD66C}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -84,16 +84,6 @@
       <WppDllMacro>true</WppDllMacro>
       <WppScanConfigurationData>internal.h</WppScanConfigurationData>
     </ClCompile>
-    <Inf Include="UMDFSkeleton_OSR.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\UMDFSkeleton_OSR.inf</CopyOutput>
-    </Inf>
-    <Inf Include="UMDFSkeleton_Root.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\UMDFSkeleton_Root.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="Skeleton.rc">
       <WppEnabled>true</WppEnabled>
       <WppDllMacro>true</WppDllMacro>
diff --git a/general/umdfSkeleton/UMDFSkeleton.vcxproj.Filters b/general/umdfSkeleton/UMDFSkeleton.vcxproj.Filters
index 45fa3257..7da6c076 100644
--- a/general/umdfSkeleton/UMDFSkeleton.vcxproj.Filters
+++ b/general/umdfSkeleton/UMDFSkeleton.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>{74888656-E3AB-4255-BBFE-4122D66F5FEB}</UniqueIdentifier>
+      <UniqueIdentifier>{B6F807E5-006F-4FBD-BB35-CC706D5CB468}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{BB9F8E9F-F645-4AC6-92EC-13CBBF59E4DF}</UniqueIdentifier>
+      <UniqueIdentifier>{66714BFC-1D46-4D92-A154-1C6DFF39E4D4}</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>{D7FA8D20-66EC-4F15-B0EA-0E7435261BE2}</UniqueIdentifier>
+      <UniqueIdentifier>{B398CF71-A6A3-49C5-A7EC-47876A953477}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{752766FE-0F66-4394-B24F-D1A229EC5B85}</UniqueIdentifier>
+      <UniqueIdentifier>{1A124126-5375-4543-880D-28113FEF151C}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -36,14 +36,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="UMDFSkeleton_OSR.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-    <Inf Include="UMDFSkeleton_Root.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="Skeleton.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/umdfSkeleton/UMDFSkeleton_OSR.inx b/general/umdfSkeleton/UMDFSkeleton_OSR.inx
index 70a7b47c..3da01ae6 100644
--- a/general/umdfSkeleton/UMDFSkeleton_OSR.inx
+++ b/general/umdfSkeleton/UMDFSkeleton_OSR.inx
diff --git a/general/umdfSkeleton/UMDFSkeleton_Root.inx b/general/umdfSkeleton/UMDFSkeleton_Root.inx
index 3a31df12..63d9f94c 100644
--- a/general/umdfSkeleton/UMDFSkeleton_Root.inx
+++ b/general/umdfSkeleton/UMDFSkeleton_Root.inx
diff --git a/general/umdfSkeleton/umdfSkeleton.sln b/general/umdfSkeleton/umdfSkeleton.sln
index dd9e04c7..c8432e90 100644
--- a/general/umdfSkeleton/umdfSkeleton.sln
+++ b/general/umdfSkeleton/umdfSkeleton.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UMDFSkeleton", "UMDFSkeleton.vcxproj", "{3434D648-433A-4D74-822F-DDBE22400E6D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UMDFSkeleton", "UMDFSkeleton.vcxproj", "{6C720AF2-E419-4BA6-927C-607BE3E771F1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3434D648-433A-4D74-822F-DDBE22400E6D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3434D648-433A-4D74-822F-DDBE22400E6D}.Debug|Win32.Build.0 = Debug|Win32
-		{3434D648-433A-4D74-822F-DDBE22400E6D}.Release|Win32.ActiveCfg = Release|Win32
-		{3434D648-433A-4D74-822F-DDBE22400E6D}.Release|Win32.Build.0 = Release|Win32
-		{3434D648-433A-4D74-822F-DDBE22400E6D}.Debug|x64.ActiveCfg = Debug|x64
-		{3434D648-433A-4D74-822F-DDBE22400E6D}.Debug|x64.Build.0 = Debug|x64
-		{3434D648-433A-4D74-822F-DDBE22400E6D}.Release|x64.ActiveCfg = Release|x64
-		{3434D648-433A-4D74-822F-DDBE22400E6D}.Release|x64.Build.0 = Release|x64
+		{6C720AF2-E419-4BA6-927C-607BE3E771F1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6C720AF2-E419-4BA6-927C-607BE3E771F1}.Debug|Win32.Build.0 = Debug|Win32
+		{6C720AF2-E419-4BA6-927C-607BE3E771F1}.Release|Win32.ActiveCfg = Release|Win32
+		{6C720AF2-E419-4BA6-927C-607BE3E771F1}.Release|Win32.Build.0 = Release|Win32
+		{6C720AF2-E419-4BA6-927C-607BE3E771F1}.Debug|x64.ActiveCfg = Debug|x64
+		{6C720AF2-E419-4BA6-927C-607BE3E771F1}.Debug|x64.Build.0 = Debug|x64
+		{6C720AF2-E419-4BA6-927C-607BE3E771F1}.Release|x64.ActiveCfg = Release|x64
+		{6C720AF2-E419-4BA6-927C-607BE3E771F1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
author	karlf <[email protected]>	2016-08-11 13:28:13 -0700
committer	karlf <[email protected]>	2016-08-11 13:28:13 -0700
commit	96eb96dfb613e4c745db6bd1f53a92fe7e2290fc (patch)
tree	ad5f3ede5cbcd6b598677ce41bcf8318471bdd92 /general
parent	687b274aa38fd05c8c26e3068932121876d7f745 (diff)