From 6f3aabd4704ea6c07fc97452871dcb4d5d0449a9 Mon Sep 17 00:00:00 2001
From: Steve Otteson <sotteson@microsoft.com>
Date: Wed, 30 Mar 2022 16:43:39 -0700
Subject: [PATCH] Fixes #856 - define HDEVINFO as a handle type

---
 generation/WinSDK/autoTypes.json          | 383 +++++++++++-----------
 scripts/BaselineWinmd/Windows.Win32.winmd |   2 +-
 2 files changed, 196 insertions(+), 189 deletions(-)

diff --git a/generation/WinSDK/autoTypes.json b/generation/WinSDK/autoTypes.json
index ec7577b5..ae728be7 100644
--- a/generation/WinSDK/autoTypes.json
+++ b/generation/WinSDK/autoTypes.json
@@ -20,7 +20,7 @@
     "Name": "HANDLE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "CloseHandle",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Foundation",
@@ -77,267 +77,267 @@
     "Namespace": "Windows.Win32.System.DataExchange",
     "Name": "HSZ",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.DataExchange",
     "Name": "HCONV",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.DataExchange",
     "Name": "HCONVLIST",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.DataExchange",
     "Name": "HDDEDATA",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Input.Touch",
     "Name": "HGESTUREINFO",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HGLRC",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "wglDeleteContext",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.TextServices",
     "Name": "HKL",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HMIDI",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HMIDIIN",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HMIDIOUT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HMIDISTRM",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HMIXER",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HMIXEROBJ",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HWAVE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HWAVEOUT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HWAVEIN",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Input",
     "Name": "HRAWINPUT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Foundation",
     "Name": "HRSRC",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HSURF",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Controls",
     "Name": "HSYNTHETICPOINTERDEVICE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media",
     "Name": "HTASK",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Input.Touch",
     "Name": "HTOUCHINPUT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HWINEVENTHOOK",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "UnhookWinEvent",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HWINSTA",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "CloseWindowStation",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HSTRING",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "WindowsDeleteString",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.WinRT",
     "Name": "HSTRING_BUFFER",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HDC",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "ReleaseDC",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "CreatedHDC",
     "ValueType": "IntPtr",
     "CloseApi": "DeleteDC",
     "AlsoUsableFor": "HDC",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Graphics.Gdi",
     "Name": "HGDIOBJ",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HBITMAP",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DeleteObject",
     "AlsoUsableFor": "HGDIOBJ",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HRGN",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DeleteObject",
     "AlsoUsableFor": "HGDIOBJ",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HPEN",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DeleteObject",
     "AlsoUsableFor": "HGDIOBJ",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HBRUSH",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DeleteObject",
     "AlsoUsableFor": "HGDIOBJ",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HFONT",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DeleteObject",
     "AlsoUsableFor": "HGDIOBJ",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HMETAFILE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DeleteMetaFile",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HENHMETAFILE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DeleteEnhMetaFile",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Graphics.Gdi",
     "Name": "HMONITOR",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HPALETTE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DeleteObject",
     "AlsoUsableFor": "HGDIOBJ",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HHOOK",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "UnhookWindowsHookEx",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HICON",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DestroyIcon",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HMENU",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DestroyMenu",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HCURSOR",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DestroyCursor",
     "AlsoUsableFor": "HICON",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "TimerQueueHandle",
     "ValueType": "IntPtr",
     "CloseApi": "DeleteTimerQueueEx",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Name": "PTP_POOL",
@@ -348,265 +348,265 @@
     "Name": "NamespaceHandle",
     "ValueType": "IntPtr",
     "CloseApi": "ClosePrivateNamespace",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "BoundaryDescriptorHandle",
     "ValueType": "IntPtr",
     "CloseApi": "DeleteBoundaryDescriptor",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FindFileHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FindClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FindFileNameHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FindClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FindStreamHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FindClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FindChangeNotificationHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FindCloseChangeNotification",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FindVolumeHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FindVolumeClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FindVolumeMointPointHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FindVolumeMountPointClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "EventLogHandle",
     "ValueType": "IntPtr",
     "CloseApi": "CloseEventLog",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "EventSourceHandle",
     "ValueType": "IntPtr",
     "CloseApi": "DeregisterEventSource",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HWSAEVENT",
     "ValueType": "IntPtr",
     "CloseApi": "WSACloseEvent",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HFILTER",
     "ValueType": "IntPtr",
     "CloseApi": "FilterClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "ShFindChangeNotificationHandle",
     "ValueType": "IntPtr",
     "CloseApi": "SHChangeNotification_Unlock",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "CriticalPolicySectionHandle",
     "ValueType": "IntPtr",
     "CloseApi": "LeaveCriticalPolicySection",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HwtsVirtualChannelHandle",
     "ValueType": "IntPtr",
     "CloseApi": "WTSVirtualChannelClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "IcmpHandle",
     "ValueType": "IntPtr",
     "CloseApi": "IcmpCloseHandle",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HdcMetdataFileHandle",
     "ValueType": "IntPtr",
     "CloseApi": "DeleteMetaFile",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HdcMetdataEnhFileHandle",
     "ValueType": "IntPtr",
     "CloseApi": "DeleteEnhMetaFile",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HeapHandle",
     "ValueType": "IntPtr",
     "CloseApi": "HeapDestroy",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HCOLORSPACE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DeleteColorSpace",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HDESK",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "CloseDesktop",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HACCEL",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DestroyAcceleratorTable",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HPROPSHEETPAGE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "DestroyPropertySheetPage",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HKEY",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "RegCloseKey",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HIMAGELIST",
     "ValueType": "IntPtr",
     "CloseApi": "ImageList_Destroy",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "NetEnumHandle",
     "ValueType": "IntPtr",
     "CloseApi": "WNetCloseEnum",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HCRYPTASYNC",
     "ValueType": "IntPtr",
     "CloseApi": "CryptCloseAsyncHandle",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HCERTCHAINENGINE",
     "ValueType": "IntPtr",
     "CloseApi": "CertFreeCertificateChainEngine",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HPOWERNOTIFY",
     "ValueType": "IntPtr",
     "CloseApi": "UnregisterPowerSettingNotification",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "LsaHandle",
     "ValueType": "IntPtr",
     "CloseApi": "LsaDeregisterLogonProcess",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "PerfProviderHandle",
     "ValueType": "IntPtr",
     "CloseApi": "PerfStopProvider",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "PerfQueryHandle",
     "ValueType": "IntPtr",
     "CloseApi": "PerfCloseQueryHandle",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "DnsContextHandle",
     "ValueType": "IntPtr",
     "CloseApi": "DnsReleaseContextHandle",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HFILTER_INSTANCE",
     "ValueType": "IntPtr",
     "CloseApi": "FilterInstanceClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FilterFindHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FilterFindClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FilterVolumeFindHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FilterVolumeFindClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FilterInstanceFindHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FilterInstanceFindClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "FilterVolumeInstanceFindHandle",
     "ValueType": "IntPtr",
     "CloseApi": "FilterVolumeInstanceFindClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "GetDcContextHandle",
     "ValueType": "IntPtr",
     "CloseApi": "DsGetDcCloseW",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "TDH_HANDLE",
     "ValueType": "IntPtr",
     "CloseApi": "TdhCloseDecodingHandle",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "COMPRESSOR_HANDLE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "CloseDecompressor",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "MSIHANDLE",
     "ValueType": "uint",
     "CloseApi": "MsiCloseHandle",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HREPORT",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "WerReportCloseHandle",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HREPORTSTORE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "WerStoreClose",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Animation",
@@ -617,427 +617,427 @@
     "Namespace": "Windows.Win32.UI.TabletPC",
     "Name": "HRECOALT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.TabletPC",
     "Name": "HRECOCONTEXT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.TabletPC",
     "Name": "HRECOGNIZER",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.TabletPC",
     "Name": "HRECOLATTICE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.TabletPC",
     "Name": "HRECOWORDLIST",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.Antimalware",
     "Name": "HAMSICONTEXT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.Antimalware",
     "Name": "HAMSISESSION",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Authorization",
     "Name": "AUTHZ_ACCESS_CHECK_RESULTS_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Authorization",
     "Name": "AUTHZ_CLIENT_CONTEXT_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Authorization",
     "Name": "AUTHZ_RESOURCE_MANAGER_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Authorization",
     "Name": "AUTHZ_AUDIT_EVENT_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Authorization",
     "Name": "AUTHZ_AUDIT_EVENT_TYPE_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Authorization",
     "Name": "AUTHZ_SECURITY_EVENT_PROVIDER_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.DeviceAndDriverInstallation",
     "Name": "HCMNOTIFICATION",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.Com",
     "Name": "CO_MTA_USAGE_COOKIE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.Com",
     "Name": "CO_DEVICE_CATALOG_COOKIE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.WindowsProgramming",
     "Name": "HWINWATCH",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "HDIAGNOSTIC_DATA_QUERY_SESSION",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "HDIAGNOSTIC_REPORT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "HDIAGNOSTIC_EVENT_TAG_DESCRIPTION",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "HDIAGNOSTIC_EVENT_PRODUCER_DESCRIPTION",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "HDIAGNOSTIC_EVENT_CATEGORY_DESCRIPTION",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "HDIAGNOSTIC_RECORD",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.WindowsProgramming",
     "Name": "FEATURE_STATE_CHANGE_SUBSCRIPTION",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.WindowsProgramming",
     "Name": "FH_SERVICE_PIPE_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Globalization",
     "Name": "HIMC",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Globalization",
     "Name": "HIMCC",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.InteractionContext",
     "Name": "HINTERACTIONCONTEXT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.NetworkManagement.IpHelper",
     "Name": "HIFTIMESTAMPCHANGE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.NetworkManagement.QoS",
     "Name": "LPM_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.NetworkManagement.QoS",
     "Name": "RHANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Multimedia",
     "Name": "HMMIO",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Multimedia",
     "Name": "HDRVR",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HACMDRIVERID",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HACMDRIVER",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HACMSTREAM",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Audio",
     "Name": "HACMOBJ",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.SerialCommunication",
     "Name": "HCOMDB",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "NCRYPT_DESCRIPTOR_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "NCRYPT_STREAM_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Storage.Xps",
     "Name": "HPTPROVIDER",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.Diagnostics.ProcessSnapshotting",
     "Name": "HPSS",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.Diagnostics.ProcessSnapshotting",
     "Name": "HPSSWALK",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Storage.ProjectedFileSystem",
     "Name": "PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.NetworkManagement.Rras",
     "Name": "HRASCONN",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Shell",
     "Name": "HDROP",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Shell",
     "Name": "HPSXA",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.Enumeration.Pnp",
     "Name": "HSWDEVICE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Accessibility",
     "Name": "HUIANODE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Accessibility",
     "Name": "HUIAPATTERNOBJECT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Accessibility",
     "Name": "HUIATEXTRANGE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Accessibility",
     "Name": "HUIAEVENT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Multimedia",
     "Name": "HIC",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Media.Multimedia",
     "Name": "HVIDEO",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Networking.WebSocket",
     "Name": "WEB_SOCKET_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Networking.WinInet",
     "Name": "HTTP_PUSH_WAIT_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Globalization",
     "Name": "HSAVEDUILANGUAGES",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "SAFER_LEVEL_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "SC_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.Services",
     "Name": "SERVICE_STATUS_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.HiDpi",
     "Name": "DPI_AWARENESS_CONTEXT",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.WinRT",
     "Name": "ROPARAMIIDHANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.WinRT",
     "Name": "APARTMENT_SHUTDOWN_REGISTRATION_COOKIE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Storage.ProjectedFileSystem",
     "Name": "PRJ_DIR_ENTRY_BUFFER_HANDLE",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HSEMAPHORE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "EngDeleteSemaphore",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HFASTMUTEX",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HDRVOBJ",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HDEV",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HBM",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.Display",
     "Name": "DHSURF",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.Display",
     "Name": "DHPDEV",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.SystemInformation",
@@ -1048,7 +1048,7 @@
     "Namespace": "Windows.Win32.Storage.CloudFilters",
     "Name": "CF_CONNECTION_KEY",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.AllJoyn",
@@ -1199,7 +1199,7 @@
     "Name": "HPCON",
     "ValueType": "IntPtr",
     "CloseApi": "ClosePseudoConsole",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Controls",
@@ -1210,13 +1210,13 @@
     "Namespace": "Windows.Win32.UI.Controls",
     "Name": "HDSA",
     "ValueType": "IntPtr",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.UI.Controls",
     "Name": "HDPA",
     "ValueType": "IntPtr",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.Threading",
@@ -1227,7 +1227,7 @@
     "Name": "WHV_PARTITION_HANDLE",
     "ValueType": "IntPtr",
     "CloseApi": "WHvDeletePartition",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Foundation",
@@ -1238,43 +1238,43 @@
     "Namespace": "Windows.Win32.Storage.StructuredStorage",
     "Name": "JET_HANDLE",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Storage.StructuredStorage",
     "Name": "JET_INSTANCE",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Storage.StructuredStorage",
     "Name": "JET_SESID",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Storage.StructuredStorage",
     "Name": "JET_TABLEID",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Storage.StructuredStorage",
     "Name": "JET_API_PTR",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Storage.Jet",
     "Name": "JET_OSSNAPID",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Storage.Jet",
     "Name": "JET_LS",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Foundation",
@@ -1295,104 +1295,111 @@
     "Name": "BCRYPT_ALG_HANDLE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "BCryptCloseAlgorithmProvider",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Name": "BCRYPT_KEY_HANDLE",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "BCryptDestroyKey",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Name": "HCS_OPERATION",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "HcsCloseOperation",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HCS_SYSTEM",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "HcsCloseComputeSystem",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Name": "HCS_PROCESS",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "HcsCloseProcess",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.System.HostCompute",
     "Name": "HCS_CALLBACK",
     "ValueType": "DECLARE_HANDLE",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Devices.Bluetooth",
     "Name": "HANDLE_SDP_TYPE",
     "ValueType": "ulong",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Cryptography",
     "Name": "NCRYPT_HANDLE",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Cryptography",
     "Name": "NCRYPT_PROV_HANDLE",
     "ValueType": "UIntPtr",
     "CloseApi": "NCryptFreeObject",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Cryptography",
     "Name": "NCRYPT_KEY_HANDLE",
     "ValueType": "UIntPtr",
     "CloseApi": "NCryptFreeObject",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Cryptography",
     "Name": "NCRYPT_HASH_HANDLE",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Cryptography",
     "Name": "NCRYPT_SECRET_HANDLE",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Cryptography",
     "Name": "HCRYPTPROV_LEGACY",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Cryptography",
     "Name": "HCRYPTPROV_OR_NCRYPT_KEY_HANDLE",
     "ValueType": "UIntPtr",
-    "InvalidHandleValues": [0]
+    "InvalidHandleValues": [ 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Cryptography",
     "Name": "HCERTSTORE",
     "ValueType": "void*",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security.Cryptography",
     "Name": "HCERTSTOREPROV",
     "ValueType": "void*",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
   },
   {
     "Namespace": "Windows.Win32.Security",
     "Name": "PSECURITY_DESCRIPTOR",
     "ValueType": "void*",
-    "InvalidHandleValues": [-1, 0]
+    "InvalidHandleValues": [ -1, 0 ]
+  },
+  {
+    "Namespace": "Windows.Win32.Devices.DeviceAndDriverInstallation",
+    "Name": "HDEVINFO",
+    "ValueType": "IntPtr",
+    "CloseApi": "SetupDiDestroyDeviceInfoList",
+    "InvalidHandleValues": [ -1, 0 ]
   }
 ]
diff --git a/scripts/BaselineWinmd/Windows.Win32.winmd b/scripts/BaselineWinmd/Windows.Win32.winmd
index ee83c8e4..7339e8ea 100644
--- a/scripts/BaselineWinmd/Windows.Win32.winmd
+++ b/scripts/BaselineWinmd/Windows.Win32.winmd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15a6604404ab97ae506ab060900ebf8ed37c4de9b254f3f3467367db6b21588d
+oid sha256:a62b259aee77b47b24d074089a02d9177ca0961836bb758ca725f7811f1a272f
 size 16089600