From b663cfdca566f6c1dbf50ca845145d3a709faf80 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Thu, 21 May 2020 15:23:21 -0700
Subject: [PATCH] tools: update ntstatus.bat, winerror.bat for latest SDK's

---
 tools/ntstatus.bat | 7 ++++++-
 tools/winerror.bat | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/ntstatus.bat b/tools/ntstatus.bat
index fd2c0428..6c20a9f6 100755
--- a/tools/ntstatus.bat
+++ b/tools/ntstatus.bat
@@ -11,4 +11,9 @@ for /f "tokens=2,*" %%i in ('reg query %RegKey% /v %RegVal% ^| findstr %RegVal%'
     set KitRoot=%%j
 )
 
-findstr /R /I "\<0*[Xx]*%1[Ll]*\>" "%KitRoot%Include\10.0.10586.0\shared\%~n0.h"
+set KitVer=10.0.10586.0
+for /f "tokens=*" %%i in ('dir /ad/b "%KitRoot%Include\10.*"') do (
+    set KitVer=%%i
+)
+
+findstr /R /I "\<0*[Xx]*%1[Ll]*\>" "%KitRoot%Include\%KitVer%\shared\%~n0.h"
diff --git a/tools/winerror.bat b/tools/winerror.bat
index fd2c0428..6c20a9f6 100755
--- a/tools/winerror.bat
+++ b/tools/winerror.bat
@@ -11,4 +11,9 @@ for /f "tokens=2,*" %%i in ('reg query %RegKey% /v %RegVal% ^| findstr %RegVal%'
     set KitRoot=%%j
 )
 
-findstr /R /I "\<0*[Xx]*%1[Ll]*\>" "%KitRoot%Include\10.0.10586.0\shared\%~n0.h"
+set KitVer=10.0.10586.0
+for /f "tokens=*" %%i in ('dir /ad/b "%KitRoot%Include\10.*"') do (
+    set KitVer=%%i
+)
+
+findstr /R /I "\<0*[Xx]*%1[Ll]*\>" "%KitRoot%Include\%KitVer%\shared\%~n0.h"