audio: Updates for Windows 10 22000 (#655)

* Updates for Windows 10 22000.
* Change how WIL is consumed.

7 files changed, 52 insertions, 614 deletions

diff --git a/audio/tests/wavetest/PreComp.h b/audio/tests/wavetest/PreComp.h
deleted file mode 100644
index 76210090..00000000
--- a/audio/tests/wavetest/PreComp.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// ------------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft. All rights reserved.
-//
-// File Name:
-//
-//  PreComp.h
-//
-// Abstract:
-//
-//  Precompiled common headers
-//
-// -------------------------------------------------------------------------------
-
-#include <basiclog.h>
-#include <BasicLogHelper.h>
-#include <mmsystem.h>
-#include <atlbase.h>
-#include <atlcom.h>
-#include <initguid.h>
-
-#include <AudioEngineEndpoint.h>
-#include <AudioEngineEndpointP.h>
-#include <Audioclient.h>
-#include <mmdeviceapi.h>
-#include <mmdeviceapip.h>
-#include <devicetopologyp.h> 
-#include <propvarutil.h>
-
-#include <wil\com.h>
-
-#include <KsLib.h>
-#include <Waveutil.h>
-#include <aecommon.h>
-#include <ilog.h>
-#include <shlflags.h>
-#include <basicprintf.h>
-#include <wextestclass.h>
-#include <resourcelist.h>
-
-// ------------------------------------------------------------------------------
-// Log
-#define LOG(log, ...) BasicLogPrintf( log, XMSG, 1, __VA_ARGS__ )
-#define SKIP(log, ...) BasicLogPrintf( log, XSKIP, 1, __VA_ARGS__ )
-#define WARN(log, ...) BasicLogPrintf( log, XWARN, 1, __VA_ARGS__ )
-#define BLOCK(log, ...) BasicLogPrintf( log, XBLOCK, 1, __VA_ARGS__ )
-#define ERR(log, ...) BasicLogPrintf( log, XFAIL, 1, __VA_ARGS__ )
diff --git a/audio/tests/wavetest/TestResourceBuild.cpp b/audio/tests/wavetest/TestResourceBuild.cpp
deleted file mode 100644
index 5ca2ff0d..00000000
--- a/audio/tests/wavetest/TestResourceBuild.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-// ------------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft. All rights reserved.
-//
-// File Name:
-//
-//  TestResourceBuild.cpp
-//
-// Abstract:
-//
-//  TAEF BuildResourceList implementation
-//
-// ------------------------------------------------------------------------------
-#include "PreComp.h"
-#include <TestResource.h>
-#include <PropertyHelper.h>
-
-using namespace WEX::Common;
-using namespace WEX::Logging;
-using namespace WEX::TestExecution;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// CreateTestResource
-//
-// Create the test resource with MMDevice, device id, device name, data flow, connector type, connector id, mode,
-// list of formats
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT CreateTestResource
-(
-    ResourceList&           resourceList,
-    DeviceDescriptor        descriptor
-)
-{
-    HRESULT                         hr = S_OK;
-    
-    CComHeapPtr<CHalfApp>                        spHalfApp;
-    wil::com_ptr_nothrow<ITestResource>          spTestResource;
-    GUID                            ResourceGUID;
-    CComBSTR                        szResourceName;
-
-    // Create HalfApp
-    spHalfApp.Attach(new CHalfApp(descriptor));
-    if (!VERIFY_IS_NOT_NULL(spHalfApp)) {
-        hr = E_OUTOFMEMORY;
-        return hr;
-    }
-
-    // Create PinTestResource
-    if (!VERIFY_SUCCEEDED(hr = CoCreateGuid(&ResourceGUID))) {
-        return hr;
-    }
-    if (!VERIFY_SUCCEEDED(hr = CPinTestResource::CreateInstance(
-        spHalfApp, ResourceGUID, &spTestResource))) {
-        return hr;
-    }
-
-    // Add to resource list
-    spHalfApp.Detach();
-    if (!VERIFY_SUCCEEDED(hr = resourceList.Add(spTestResource.get()))) {
-        return hr;
-    }
-    if (!VERIFY_SUCCEEDED(hr = spTestResource->GetValue(CComBSTR(TestResourceProperty::c_szName), &szResourceName))) {
-        return hr;
-    }
-    Log::Comment(String().Format(L"Test Resource (%s) added", (PCWSTR)szResourceName));
-    
-    return hr;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// GetProcessingModesForConnector
-//
-// For host/keyword detector pin, processing mode info is cached in property store and can be directly read. For offload
-// pin, query for ks processing mode property. For loopback pin, it doesn't support any processing modes, return GUID_NULL.
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT GetProcessingModesForConnector
-(
-    IMMDevice*              pDevice,
-    UINT                    uConnectorId,
-    EndpointConnectorType   eConnectorType,
-    ULONG                   *pCount,
-    AUDIO_SIGNALPROCESSINGMODE **ppModes
-)
-{
-    HRESULT hr = S_OK;
-
-    *pCount = 0;
-    *ppModes = NULL;
-
-    if (eConnectorType == eHostProcessConnector || eConnectorType == eKeywordDetectorConnector) {
-        if (!VERIFY_SUCCEEDED(hr = GetCachedProcessingModes(pDevice, eConnectorType, pCount, ppModes))) {
-            return hr;
-        }
-    }
-    else if (eConnectorType == eOffloadConnector) {
-        if (!VERIFY_SUCCEEDED(hr = GetProcessingModes(pDevice, uConnectorId, pCount, ppModes))) {
-            return hr;
-        }
-    }
-    else if (eConnectorType == eLoopbackConnector) {
-        // Loopback pin doesn't support any processing modes, so put 1 GUID_NULL
-        CComHeapPtr<AUDIO_SIGNALPROCESSINGMODE>     spModes;
-
-        if (!spModes.Allocate(1))
-            return E_OUTOFMEMORY;
-
-        spModes[0] = GUID_NULL;
-
-        *pCount = 1;
-        *ppModes = spModes.Detach();
-    }
-
-    return hr;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// GetDefaultFormatForConnector
-//
-// Read audio engine device format from property store as default format. 
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT GetDefaultFormatForConnector
-(
-    IMMDevice*              pDevice,
-    EndpointConnectorType   eConnectorType,
-    WAVEFORMATEX            **ppDefaultFormat
-)
-{
-    HRESULT hr = S_OK;
-
-    *ppDefaultFormat = NULL;
-    if (!VERIFY_SUCCEEDED(hr = GetCachedDefaultFormat(pDevice, eConnectorType, ppDefaultFormat))){
-        return hr;
-    }
-   
-    return hr;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// GetSupportedFormatsForConnector
-//
-// For host/keyword detector pin, supported formats info is cached in property store and can be directly read. For offload
-// pin, provide with a predefined list of formats and check whether format is supported. For loopback pin, it matches the format
-// of host pin so put 0 format record.
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT GetSupportedFormatRecordsForConnector
-(
-    IMMDevice*              pDevice,
-    UINT                    uConnectorId,
-    EndpointConnectorType   eConnectorType,
-    AUDIO_SIGNALPROCESSINGMODE mode,
-    STACKWISE_DATAFLOW  dataFlow,
-    ULONG *pCount,
-    FORMAT_RECORD **ppFormatRecords
-)
-{
-    HRESULT hr = S_OK;
-
-    *pCount = 0;
-    *ppFormatRecords = NULL;
-
-    if (eConnectorType == eHostProcessConnector || eConnectorType == eKeywordDetectorConnector) {
-        if (!VERIFY_SUCCEEDED(hr = GetCachedSupportedFormatRecords(pDevice, eConnectorType, mode, pCount, ppFormatRecords))) {
-            return hr;
-        }
-    }
-    else if (eConnectorType == eOffloadConnector) {
-        if (!VERIFY_SUCCEEDED(hr = GetSupportedFormatRecords(pDevice, uConnectorId, eConnectorType, mode, dataFlow, pCount, ppFormatRecords))) {
-            return hr;
-        }
-    }
-    else if (eConnectorType == eLoopbackConnector) {
-        *pCount = 0;
-        *ppFormatRecords = NULL;
-    }
-
-    return hr;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// GetPreferredFormatForConnector
-//
-// If KSPROPERTY_PIN_PROPOSEDATAFORMAT2 is supported, use the proposed format for mode as preferred format for mode.
-// Otherwise, use default format as preferred format.
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT GetPreferredFormatForConnector
-(
-    IMMDevice*                  pDevice,
-    UINT                        uConnectorId,
-    EndpointConnectorType       eConnectorType,
-    AUDIO_SIGNALPROCESSINGMODE  mode,
-    WAVEFORMATEX                **ppPreferredFormat
-)
-{
-    HRESULT                                     hr = S_OK;
-    wil::unique_cotaskmem_ptr<WAVEFORMATEX>     pDefaultFormat;
-    wil::unique_cotaskmem_ptr<WAVEFORMATEX>     pProposedFormat;
-
-    *ppPreferredFormat = NULL;
-
-
-    // Get default format for connector
-    if (!VERIFY_SUCCEEDED(hr = GetDefaultFormatForConnector(pDevice, eConnectorType, wil::out_param(pDefaultFormat)))) {
-        return hr;
-    }
-
-    // Return the processing mode specific format proposed by the driver
-    hr = GetProposedFormatForProcessingMode(pDevice, uConnectorId, mode, wil::out_param(pProposedFormat));
-    if (hr == S_OK) {
-        CloneWaveFormat(pProposedFormat.get(), ppPreferredFormat);
-    }
-    else {
-        CloneWaveFormat(pDefaultFormat.get(), ppPreferredFormat);
-        hr = S_OK;
-    }
-
-    return hr;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// GetPreferredFormatPeriodicityCharacteristicsForConnector
-//
-// Get periodicity characteristics for format. For host/keyword detector pin, periodicity info is cached along with format
-// in property store and can be searched from supported format list. For offload pin, it should be calculate from
-// DiscoverPeriodicityCharacteristicsForFormat.
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT GetPreferredFormatPeriodicityCharacteristicsForConnector
-(
-    IMMDevice*                  pDevice,
-    EndpointConnectorType       eConnectorType,
-    AUDIO_SIGNALPROCESSINGMODE  mode,
-    STACKWISE_DATAFLOW          dataFlow,
-    WAVEFORMATEX                *pPreferredFormat,
-    ULONG                       cFormatRecords,
-    PFORMAT_RECORD              pFormatRecords,
-    UINT32                      *pDefaultPeriodicityInFrames,
-    UINT32                      *pFundamentalPeriodicityInFrames,
-    UINT32                      *pMinPeriodicityInFrames,
-    UINT32                      *pMaxPeriodicityInFrames,
-    UINT32                      *pMaxPeriodicityInFramesExtended
-)
-{
-    HRESULT hr = S_OK;  
-    bool    bFormatInList = false;
-
-    for (ULONG i = 0; i < cFormatRecords; i++) {
-        if (CompareWaveFormat((WAVEFORMATEX *)&pFormatRecords[i].wfxEx, pPreferredFormat)) {
-            bFormatInList = true;
-            *pDefaultPeriodicityInFrames = pFormatRecords[i].defaultPeriodInFrames;
-            *pFundamentalPeriodicityInFrames = pFormatRecords[i].fundamentalPeriodInFrames;
-            *pMinPeriodicityInFrames = pFormatRecords[i].minPeriodInFrames;
-            *pMaxPeriodicityInFrames = pFormatRecords[i].maxPeriodInFrames;
-            *pMaxPeriodicityInFramesExtended = pFormatRecords[i].maxPeriodInFramesExtended;
-            break;
-        }
-    }
-
-    if (eConnectorType == eHostProcessConnector || eConnectorType == eKeywordDetectorConnector) {
-        if (!VERIFY_IS_TRUE(bFormatInList)) {
-            hr = E_NOTFOUND;
-            return hr;
-        }
-    }
-    else if (eConnectorType == eOffloadConnector || eConnectorType == eLoopbackConnector) {
-        if (!VERIFY_SUCCEEDED(hr = DiscoverPeriodicityCharacteristicsForFormat(pDevice, eConnectorType, mode, pPreferredFormat, dataFlow, pDefaultPeriodicityInFrames, pFundamentalPeriodicityInFrames, pMinPeriodicityInFrames, pMaxPeriodicityInFrames, pMaxPeriodicityInFramesExtended))) {
-            return hr;
-        }
-    }
-
-    return hr;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// AddTestResourceForConnector
-//
-// For each connector, read connector id, get all processing modes, identify default and preferred format for each mode
-// and also enumerate a list of supported formats for each mode. Store all the infos in test resource.
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT AddTestResourceForConnector
-(
-    ResourceList&           resourceList,
-    LPWSTR                  deviceId,
-    LPWSTR                  deviceName,
-    IMMDevice*              pDevice,
-    EndpointConnectorType   eConnectorType,
-    STACKWISE_DATAFLOW      dataFlow
-)
-{
-    HRESULT                                     hr = S_OK;
-    bool                                        bHasConnector = false;
-    UINT                                        uConnectorId;
-    ULONG                                       cModes = 0;
-    CComHeapPtr<AUDIO_SIGNALPROCESSINGMODE>     spModes;
-    AUDIO_SIGNALPROCESSINGMODE                  mode;
-    ULONG                                       cFormatRecords = 0;
-    CComHeapPtr<FORMAT_RECORD>                  spFormatRecords;
-    wil::unique_cotaskmem_ptr<WAVEFORMATEX>     pPreferredFormat;
-    UINT32                                      u32DefaultPeriodicityInFrames;
-    UINT32                                      u32FundamentalPeriodicityInFrames;
-    UINT32                                      u32MinPeriodicityInFrames;
-    UINT32                                      u32MaxPeriodicityInFrames;
-    UINT32                                      u32MaxPeriodicityInFramesExtended;
-    bool                                        isAVStream = false;
-
-    // Get connector id
-    if (!VERIFY_SUCCEEDED(hr = GetConnectorId(pDevice, eConnectorType, &bHasConnector, &uConnectorId))) {
-        return hr;
-    }
-    if (!bHasConnector) {
-        return hr;
-    }
-
-    Log::Comment(String().Format(L"Adding Test Resource for pin [%u]:", (uConnectorId & PARTID_MASK)));
-
-
-    // Get all signal processing modes for connector
-    if (!VERIFY_SUCCEEDED(hr = GetProcessingModesForConnector(pDevice, uConnectorId, eConnectorType, &cModes, &spModes))) {
-        return hr;
-    }
-
-    // Loop through each mode, get preferred format and list of formats and create test resource for each mode
-    for (ULONG i = 0; i < cModes; i++) {
-
-        mode = spModes[i];
-        
-        if (!VERIFY_SUCCEEDED(hr = GetSupportedFormatRecordsForConnector(pDevice, uConnectorId, eConnectorType, mode, dataFlow, &cFormatRecords, &spFormatRecords))) {
-            return hr;
-        }
-
-        if (!VERIFY_SUCCEEDED(hr = GetPreferredFormatForConnector(pDevice, uConnectorId, eConnectorType, mode, wil::out_param(pPreferredFormat)))) {
-            return hr;
-        }
-
-        if (!VERIFY_SUCCEEDED(hr = GetPreferredFormatPeriodicityCharacteristicsForConnector(pDevice, eConnectorType, mode, dataFlow, pPreferredFormat.get(), cFormatRecords, spFormatRecords, &u32DefaultPeriodicityInFrames, &u32FundamentalPeriodicityInFrames, &u32MinPeriodicityInFrames, &u32MaxPeriodicityInFrames, &u32MaxPeriodicityInFramesExtended))) {
-            return hr;
-        }
-
-        // Check if audio endpoint is AVStream
-        if (!VERIFY_SUCCEEDED(hr = IsAVStream(pDevice, &isAVStream))) {
-            return hr;
-        }
-
-        DeviceDescriptor descriptor = { 0 };
-        descriptor.pDevice = pDevice;
-        descriptor.pwstrAudioEndpointId = deviceId;
-        descriptor.pwstrAudioEndpointFriendlyName = deviceName;
-        descriptor.dataFlow = dataFlow;
-        descriptor.eConnectorType = eConnectorType;
-        descriptor.uConnectorId = uConnectorId;
-        descriptor.mode = mode;
-        descriptor.cModes = cModes;
-        descriptor.pModes = spModes;
-        descriptor.cFormatRecords = cFormatRecords;
-        descriptor.pFormatRecords = spFormatRecords;
-        descriptor.pPreferredFormat = pPreferredFormat.get();
-        descriptor.u32DefaultPeriodicityInFrames = u32DefaultPeriodicityInFrames;
-        descriptor.u32FundamentalPeriodicityInFrames = u32FundamentalPeriodicityInFrames;
-        descriptor.u32MinPeriodicityInFrames = u32MinPeriodicityInFrames;
-        descriptor.u32MaxPeriodicityInFrames = u32MaxPeriodicityInFrames;
-        descriptor.bIsAVStream = isAVStream;
-
-        if (!VERIFY_SUCCEEDED(hr = CreateTestResource(resourceList, descriptor))) {
-            return hr;
-        }
-    }
-
-    return hr;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// AddTestResourcesForDevice
-//
-// Identify the existence of all pin types and add test resources for each pin 
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT AddTestResourcesForDevice
-(
-    ResourceList&       resourceList,
-    LPWSTR              deviceId,
-    LPWSTR              deviceName,
-    STACKWISE_DATAFLOW  dataFlow
-)
-{
-    HRESULT                                     hr = S_OK;
-    wil::com_ptr_nothrow<IMMDeviceEnumerator>   spEnumerator;
-    wil::com_ptr_nothrow<IMMDevice>             spDevice;
-
-    Log::Comment(String().Format(L"Adding Test Resource for Device [%s]:", deviceName));
-
-    // Read the default device format from the property store
-    if (!VERIFY_SUCCEEDED(hr = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator), (void **)&spEnumerator))) {
-        return hr;
-    }
-    if (!VERIFY_SUCCEEDED(hr = spEnumerator->GetDevice(deviceId, &spDevice))) {
-        return hr;
-    }
-
-    // Identify existence of host pin. Add test resources for host pin.
-    if (!VERIFY_SUCCEEDED(hr = AddTestResourceForConnector(resourceList, deviceId, deviceName, spDevice.get(), eHostProcessConnector, dataFlow))) {
-        return hr;
-    }
-
-    // Identify existence of offload pin. Add test resources for offload pin.
-    if (!VERIFY_SUCCEEDED(hr = AddTestResourceForConnector(resourceList, deviceId, deviceName, spDevice.get(), eOffloadConnector, dataFlow))) {
-        return hr;
-    }
-    
-    // Identify existence of loopback pin. Add test resources for loopback pin. 
-    if (!VERIFY_SUCCEEDED(hr = AddTestResourceForConnector(resourceList, deviceId, deviceName, spDevice.get(), eLoopbackConnector, capture ))) {
-        return hr;
-    }
-
-    /*
-    // Identify existence of keyword detector pin. Add test resources for keyword detector pin.
-    if (!VERIFY_SUCCEEDED(hr = AddTestResourceForConnector(resourceList, deviceId, deviceName, spDevice.get(), eKeywordDetectorConnector, dataFlow))) {
-        return hr;
-    }
-    */
-
-    return hr;
-}
-
-HRESULT __cdecl BuildResourceList(ResourceList& resourceList)
-{
-    HRESULT hr = S_OK;
-    wil::com_ptr_nothrow<IMMDeviceEnumerator>    spEnumerator;
-    wil::com_ptr_nothrow<IMMDeviceCollection>    spRenderEndpoints;
-    wil::com_ptr_nothrow<IMMDeviceCollection>    spCaptureEndpoints;
-    wil::com_ptr_nothrow<IMMDevice>              spEndpoint;
-    UINT                                         cRenderDevices = 0;
-    UINT                                         cCaptureDevices = 0;
-    UINT                                         i = 0;
-    wil::unique_cotaskmem_string                 id;
-    wil::unique_cotaskmem_string                 friendlyName;
-
-    SetVerifyOutput verifySettings(VerifyOutputSettings::LogOnlyFailures);
-    DisableVerifyExceptions disable;
-
-    VERIFY_SUCCEEDED(::CoInitializeEx(NULL, COINIT_MULTITHREADED));
-
-    Log::Comment(L"In BuildResourceList");
-
-    // Create IMMDevice Enumerator
-    VERIFY_SUCCEEDED(CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator), (void **)&spEnumerator));
-
-    // Enumerate all render endpoints
-    VERIFY_SUCCEEDED(spEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &spRenderEndpoints));
-    VERIFY_SUCCEEDED(spRenderEndpoints->GetCount(&cRenderDevices));
-  
-    // Enumerate all capture endpoints
-    VERIFY_SUCCEEDED(spEnumerator->EnumAudioEndpoints(eCapture, DEVICE_STATE_ACTIVE, &spCaptureEndpoints));
-    VERIFY_SUCCEEDED(spCaptureEndpoints->GetCount(&cCaptureDevices));
-
-    if (!VERIFY_IS_TRUE(cRenderDevices | cCaptureDevices))
-    {
-        hr = E_FAIL;
-        Log::Comment(L"No device was found!");
-        goto Exit;
-    }
-
-    Log::Comment(String().Format(L"Found %d viable rendering device!", cRenderDevices));
-    // Add test resources for render endpoints
-    if (cRenderDevices) {
-        for (i = 0; i < cRenderDevices; i++) {
-            VERIFY_SUCCEEDED(spRenderEndpoints->Item(i, &spEndpoint));
-            VERIFY_SUCCEEDED(spEndpoint->GetId(&id));
-            VERIFY_SUCCEEDED(GetEndpointFriendlyName(spEndpoint.get(), &friendlyName));
-
-            Log::Comment(String().Format(L"\\\\ Device: %s (%s)", friendlyName.get(), id.get()));
-            VERIFY_SUCCEEDED(AddTestResourcesForDevice(resourceList, id.get(), friendlyName.get(), render));
-        }
-    }
-
-    Log::Comment(String().Format(L"Found %d viable capture device!", cCaptureDevices));
-    // Add test resources for capture endpoints
-    if (cCaptureDevices) {
-        for (i = 0; i < cCaptureDevices; i++) {
-            VERIFY_SUCCEEDED(spCaptureEndpoints->Item(i, &spEndpoint));
-            VERIFY_SUCCEEDED(spEndpoint->GetId(&id));
-            VERIFY_SUCCEEDED(GetEndpointFriendlyName(spEndpoint.get(), &friendlyName));
-
-            Log::Comment(String().Format(L"\\\\ Device: %s (%s)", friendlyName.get(), id.get()));
-            VERIFY_SUCCEEDED(AddTestResourcesForDevice(resourceList, id.get(), friendlyName.get(), capture));
-        }
-    }
-
-    Log::Comment(L"Resource enumeration complete.");
-    Log::Comment(String().Format(L"Enumerated %u resources", resourceList.Count()));
-
-Exit:
-    return hr;
-}
diff --git a/audio/tests/wavetest/WaveTestTaef.cpp b/audio/tests/wavetest/WaveTestTaef.cpp
index be5d47f3..e4a008d3 100644
--- a/audio/tests/wavetest/WaveTestTaef.cpp
+++ b/audio/tests/wavetest/WaveTestTaef.cpp
@@ -1,6 +1,6 @@
 // ------------------------------------------------------------------------------
 //
-// Copyright (C) Microsoft. All rights reserved.
+// Copyright (C) Microsoft Corporation. All rights reserved.
 //
 // File Name:
 //
@@ -14,6 +14,7 @@
 #include "PreComp.h"
 #include "WaveTestTaef.h"
 #include "tests.h"
+#include <TestResourceHelper.h>
 
 using namespace WEX::Common;
 using namespace WEX::Logging;
@@ -127,6 +128,12 @@ bool WDMAudio::WaveTest::TestCaseCleanUp()
 }
 
 // -------------------------------------------------------------------------------
+void WDMAudio::WaveTestPreTest::TAEF_VerifyAllEndpointsPluggedIn()
+{
+    VerifyAllEndpointsPluggedIn();
+}
+
+// -------------------------------------------------------------------------------
 void WDMAudio::WaveTest::TAEF_StreamStateControl()
 {
     RUN_TEST_CASE(Test_StreamStateControl)
diff --git a/audio/tests/wavetest/WaveTestTaef.h b/audio/tests/wavetest/WaveTestTaef.h
index 8c87a7f8..4e9b8c57 100644
--- a/audio/tests/wavetest/WaveTestTaef.h
+++ b/audio/tests/wavetest/WaveTestTaef.h
@@ -1,6 +1,6 @@
 // ------------------------------------------------------------------------------
 //
-// Copyright (C) Microsoft. All rights reserved.
+// Copyright (C) Microsoft Corporation. All rights reserved.
 //
 // File Name:
 //
@@ -30,6 +30,28 @@ namespace WEX {
 
 namespace WDMAudio
 {
+    class WaveTestPreTest
+    {
+        BEGIN_TEST_CLASS(WaveTestPreTest)
+            TEST_CLASS_PROPERTY(L"Kits.SupportedOS", L"Windows v10.0 Client x86")
+            TEST_CLASS_PROPERTY(L"Kits.SupportedOS", L"Windows v10.0 Client x64")
+            TEST_CLASS_PROPERTY(L"Kits.SupportedOS", L"Windows v10.0 Client ARM")
+            TEST_CLASS_PROPERTY(L"Kits.SupportedOS", L"Windows v10.0 Client ARM64")
+            TEST_CLASS_PROPERTY(L"Kits.SupportedOS", L"Windows v10.0 Server x64")
+            TEST_CLASS_PROPERTY(L"Kits.MinRelease", L"19H1")
+            TEST_CLASS_PROPERTY(L"Kits.CorePackageComposition", L"Full")
+            TEST_CLASS_PROPERTY(L"Kits.CorePackageComposition", L"OnecoreUAP")
+            TEST_CLASS_PROPERTY(L"Kits.IsInProc", L"True")
+            TEST_CLASS_PROPERTY(L"Kits.PublishingOrganization", L"Microsoft Corporation")
+            TEST_CLASS_PROPERTY(L"Kits.TestType", L"Development")
+            TEST_CLASS_PROPERTY(L"Kits.DevelopmentPhase", L"Development and Integration")
+            TEST_CLASS_PROPERTY(L"ThreadingModel", L"MTA")
+        END_TEST_CLASS()
+
+            BEGIN_TEST_METHOD(TAEF_VerifyAllEndpointsPluggedIn)
+                TEST_METHOD_PROPERTY(L"TestClassification:Scope", L"Feature")
+            END_TEST_METHOD()
+    };
 
     class WaveTest
     {
@@ -50,9 +72,13 @@ namespace WDMAudio
             TEST_CLASS_PROPERTY(L"Kits.DevelopmentPhase", L"Development and Integration")
             TEST_CLASS_PROPERTY(L"Subfeature", L"Wave Driver Tests")
             TEST_CLASS_PROPERTY(L"ThreadingModel", L"MTA")
-            TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"onecore\\external\\ddk\\inc\\drmk.h")
-            TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"onecoreuap\\external\\ddk\\lib\\$(build.arch)\\drmk.lib")
-            TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"onecoreuap\\internal\\drivers\\inc\\private\\wdm\\audio\\inf\\wdmaudio.inf")
+
+
+
+
+
+
+
         END_TEST_CLASS()
 
             TEST_CLASS_SETUP(WaveTestSetup)
@@ -62,57 +88,41 @@ namespace WDMAudio
             TEST_METHOD_CLEANUP(TestCaseCleanUp)
             
             BEGIN_TEST_METHOD(TAEF_StreamStateControl)
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Functional")
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Certification")
                 TEST_METHOD_PROPERTY(L"TestClassification:Scope", L"Feature")
                 TEST_METHOD_PROPERTY(L"ResourceSelection", L"@Id = '*HOST*' OR @Id = '*OFFLOAD*'")
             END_TEST_METHOD()
 
             BEGIN_TEST_METHOD(TAEF_LoopbackStreamStateControl)
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Functional")
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Certification")
                 TEST_METHOD_PROPERTY(L"TestClassification:Scope", L"Feature")
                 TEST_METHOD_PROPERTY(L"ResourceSelection", L"@Id = '*LOOPBACK*'")
             END_TEST_METHOD()
             
             BEGIN_TEST_METHOD(TAEF_StreamMinBufferSize)
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Functional")
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Certification")
                 TEST_METHOD_PROPERTY(L"TestClassification:Scope", L"Feature")
                 TEST_METHOD_PROPERTY(L"ResourceSelection", L"@Id = '*HOST*' OR @Id = '*OFFLOAD*'")
             END_TEST_METHOD()
             
             BEGIN_TEST_METHOD(TAEF_StreamMaxBufferSize)
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Functional")
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Certification")
                 TEST_METHOD_PROPERTY(L"TestClassification:Scope", L"Feature")
                 TEST_METHOD_PROPERTY(L"ResourceSelection", L"@Id = '*HOST*' OR @Id = '*OFFLOAD*'")
             END_TEST_METHOD()
 
             BEGIN_TEST_METHOD(TAEF_StreamDifferentFormat)
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Functional")
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Certification")
                 TEST_METHOD_PROPERTY(L"TestClassification:Scope", L"Feature")
                 TEST_METHOD_PROPERTY(L"ResourceSelection", L"@Id = '*HOST*' OR @Id = '*OFFLOAD*'")
             END_TEST_METHOD()
 
             BEGIN_TEST_METHOD(TAEF_LoopbackStreamDifferentFormat)
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Functional")
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Certification")
                 TEST_METHOD_PROPERTY(L"TestClassification:Scope", L"Feature")
                 TEST_METHOD_PROPERTY(L"ResourceSelection", L"@Id = '*LOOPBACK*'")
             END_TEST_METHOD()
 
             BEGIN_TEST_METHOD(TAEF_StreamMultipleModes)
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Functional")
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Certification")
                 TEST_METHOD_PROPERTY(L"TestClassification:Scope", L"Feature")
                 TEST_METHOD_PROPERTY(L"ResourceSelection", L"@Id = '*RAW' OR @Id = '*DEFAULT'")
             END_TEST_METHOD()
            
             BEGIN_TEST_METHOD(TAEF_VerifyPinWaveRTConformance)
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Functional")
-                TEST_METHOD_PROPERTY(L"HCKCategory", L"Certification")
                 TEST_METHOD_PROPERTY(L"TestClassification:Scope", L"Feature")
                 TEST_METHOD_PROPERTY(L"ResourceSelection", L"@Type = 'Render' OR @Type = 'Capture'")
             END_TEST_METHOD()
diff --git a/audio/tests/wavetest/comptest.cpp b/audio/tests/wavetest/comptest.cpp
index db823156..6b0b4e86 100644
--- a/audio/tests/wavetest/comptest.cpp
+++ b/audio/tests/wavetest/comptest.cpp
@@ -1,6 +1,6 @@
 // ------------------------------------------------------------------------------
 //
-// Copyright (C) Microsoft. All rights reserved.
+// Copyright (C) Microsoft Corporation. All rights reserved.
 //
 // Module Name:
 //
@@ -28,9 +28,9 @@ void Test_VerifyPinWaveRTConformance(void)
 
     VERIFY_SUCCEEDED(pHalfApp->m_pAudioDeviceEndpoint->GetRTCaps(&bIsRTCapable));
 
-    // Check for our new requirement - new drivers must be WaveRT. Here we skip the test on AVStream (UAC1/HFP/A2dp)
+    // Check for our new requirement - new PortCls drivers must be WaveRT.
     // For other old drivers that are not WaveRT, may issue Errata to cover the failure.
-    if (!pHalfApp->m_bIsAVStream)
+    if (pHalfApp->m_bIsPortCls)
     {
         VERIFY_IS_TRUE(bIsRTCapable);
     }
diff --git a/audio/tests/wavetest/pintest.cpp b/audio/tests/wavetest/pintest.cpp
index a8b356c9..26924bb7 100644
--- a/audio/tests/wavetest/pintest.cpp
+++ b/audio/tests/wavetest/pintest.cpp
@@ -1,6 +1,6 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 //
-// Copyright (C) Microsoft. All rights reserved.
+// Copyright (C) Microsoft Corporation. All rights reserved.
 //
 // Module Name:
 //
@@ -26,13 +26,14 @@ static const struct
 }knownModes[] =
 {
     { GUID_NULL, L"NO_MODE" },
-{ AUDIO_SIGNALPROCESSINGMODE_RAW, L"RAW" },
-{ AUDIO_SIGNALPROCESSINGMODE_DEFAULT, L"DEFAULT" },
-{ AUDIO_SIGNALPROCESSINGMODE_COMMUNICATIONS, L"COMMUNICATIONS" },
-{ AUDIO_SIGNALPROCESSINGMODE_SPEECH, L"SPEECH" },
-{ AUDIO_SIGNALPROCESSINGMODE_MEDIA, L"MEDIA" },
-{ AUDIO_SIGNALPROCESSINGMODE_MOVIE, L"MOVIE" },
-{ AUDIO_SIGNALPROCESSINGMODE_NOTIFICATION, L"NOTIFICATION" },
+    { AUDIO_SIGNALPROCESSINGMODE_RAW, L"RAW" },
+    { AUDIO_SIGNALPROCESSINGMODE_DEFAULT, L"DEFAULT" },
+    { AUDIO_SIGNALPROCESSINGMODE_COMMUNICATIONS, L"COMMUNICATIONS" },
+    { AUDIO_SIGNALPROCESSINGMODE_SPEECH, L"SPEECH" },
+    { AUDIO_SIGNALPROCESSINGMODE_MEDIA, L"MEDIA" },
+    { AUDIO_SIGNALPROCESSINGMODE_MOVIE, L"MOVIE" },
+    { AUDIO_SIGNALPROCESSINGMODE_NOTIFICATION, L"NOTIFICATION" },
+    { AUDIO_SIGNALPROCESSINGMODE_FAR_FIELD_SPEECH, L"FAR_FIELD_SPEECH"},
 };
 
 
@@ -489,4 +490,4 @@ void Test_LoopbackStreamDifferentFormat(void)
     }
 
     delete pHostHalfApp;
-}
\ No newline at end of file
+}
diff --git a/audio/tests/wavetest/tests.h b/audio/tests/wavetest/tests.h
deleted file mode 100644
index e3ae0691..00000000
--- a/audio/tests/wavetest/tests.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// ------------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft. All rights reserved.
-//
-// Module Name:
-//
-//  tests.h
-//
-// Abstract:
-//
-//  Header for testcases
-//
-// -------------------------------------------------------------------------------
-#pragma once
-
-// Stream test
-void Test_StreamStateControl(void);
-void Test_LoopbackStreamStateControl(void);
-void Test_StreamMinBufferSize(void);
-void Test_StreamMaxBufferSize(void);
-void Test_StreamBufferSize(HNSTIME requestedPeriodicity);
-void Test_StreamDifferentFormat(void);
-void Test_LoopbackStreamDifferentFormat(void);
-void Test_StreamMultipleModes(void);
-
-// Compliance test
-void Test_VerifyPinWaveRTConformance(void);
\ No newline at end of file