From 2158c940f23d3d5f39d90bfb0f7077412a50960e Mon Sep 17 00:00:00 2001
From: Frank Gorgenyi <frankgor@microsoft.com>
Date: Thu, 31 Jan 2019 20:10:12 -0800
Subject: [PATCH 1/2] Update BluetoothStack.wprp to include Natural Auth

Added Microsoft.Windows.Security.NaturalAuth.Service
---
 bluetooth/tracing/BluetoothStack.wprp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bluetooth/tracing/BluetoothStack.wprp b/bluetooth/tracing/BluetoothStack.wprp
index f4ce03c..78542c7 100644
--- a/bluetooth/tracing/BluetoothStack.wprp
+++ b/bluetooth/tracing/BluetoothStack.wprp
@@ -668,6 +668,13 @@
       </Keywords>
     </EventProvider>
 
+    <!-- Natural Authentication Providers -->
+    <EventProvider Id="Microsoft.Windows.Security.NaturalAuth.Service" Name="c632d944-dddb-599f-a131-baf37bf22ef0" Level="7" NonPagedMemory="true">
+      <Keywords>
+        <Keyword Value="0xfffffff"/>
+      </Keywords>
+    </EventProvider>
+    
     <!-- BthPort ETW provider. Kept separate for readability -->
     <EventProvider Id="Microsoft.Windows.Bluetooth.BTHPORT" Name="8a1f9517-3a8c-4a9e-a018-4f17a200f277" Level="4" NonPagedMemory="true">
       <Keywords>
@@ -861,6 +868,7 @@
             <EventProviderId Value="Microsoft.Windows.Apps.PhoneUtilsProviders"/>
             <EventProviderId Value="Microsoft.Windows.Apps.TelephonyInteractiveUser"/>
             <EventProviderId Value="Microsoft.Windows.TestExecution.WexLogger"/>
+            <EventProviderId Value="Microsoft.Windows.Security.NaturalAuth.Service"/>
           </EventProviders>
         </EventCollectorId>
 
@@ -1008,6 +1016,7 @@
             <EventProviderId Value="Microsoft.Windows.Apps.PhoneUtilsProviders"/>
             <EventProviderId Value="Microsoft.Windows.Apps.TelephonyInteractiveUser"/>
             <EventProviderId Value="Microsoft.Windows.TestExecution.WexLogger"/>
+            <EventProviderId Value="Microsoft.Windows.Security.NaturalAuth.Service"/>            
           </EventProviders>
         </EventCollectorId>
 

From 3835603c1bd086aa74c7949fefbaa36132036ccc Mon Sep 17 00:00:00 2001
From: Frank Gorgenyi <frankgor@microsoft.com>
Date: Fri, 1 Feb 2019 10:12:55 -0800
Subject: [PATCH 2/2] Update BluetoothStack.wprp

Set the keyword mask to the full range used by that logging provider.
---
 bluetooth/tracing/BluetoothStack.wprp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluetooth/tracing/BluetoothStack.wprp b/bluetooth/tracing/BluetoothStack.wprp
index 78542c7..5b1ca5c 100644
--- a/bluetooth/tracing/BluetoothStack.wprp
+++ b/bluetooth/tracing/BluetoothStack.wprp
@@ -671,7 +671,7 @@
     <!-- Natural Authentication Providers -->
     <EventProvider Id="Microsoft.Windows.Security.NaturalAuth.Service" Name="c632d944-dddb-599f-a131-baf37bf22ef0" Level="7" NonPagedMemory="true">
       <Keywords>
-        <Keyword Value="0xfffffff"/>
+        <Keyword Value="0xFFFFFFFFFFFFFFFF"/>
       </Keywords>
     </EventProvider>