From 8fb173637999e230e5461b3ae0ff5a208e4e8e71 Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Mon, 9 Dec 2024 14:13:31 -0600 Subject: [PATCH] Simpler bindings generation (#3367) --- crates/tools/bindings/src/core.txt | 26 +++---- crates/tools/bindings/src/core_com.txt | 32 ++++----- crates/tools/bindings/src/metadata.txt | 94 +++++++++++++------------- crates/tools/bindings/src/registry.txt | 58 ++++++++-------- crates/tools/bindings/src/result.txt | 40 +++++------ crates/tools/bindings/src/strings.txt | 12 ++-- 6 files changed, 131 insertions(+), 131 deletions(-) diff --git a/crates/tools/bindings/src/core.txt b/crates/tools/bindings/src/core.txt index 2c5134aeb5..9d2bedb2bc 100644 --- a/crates/tools/bindings/src/core.txt +++ b/crates/tools/bindings/src/core.txt @@ -5,16 +5,16 @@ --flat --sys --no-comment --no-core --filter - Windows.Win32.Foundation.CloseHandle - Windows.Win32.Foundation.FreeLibrary - Windows.Win32.System.Com.CoIncrementMTAUsage - Windows.Win32.System.Com.CoTaskMemAlloc - Windows.Win32.System.Com.CoTaskMemFree - Windows.Win32.System.Diagnostics.Debug.EncodePointer - Windows.Win32.System.LibraryLoader.GetProcAddress - Windows.Win32.System.LibraryLoader.LOAD_LIBRARY_SEARCH_DEFAULT_DIRS - Windows.Win32.System.LibraryLoader.LoadLibraryExA - Windows.Win32.System.Threading.CreateEventW - Windows.Win32.System.Threading.SetEvent - Windows.Win32.System.Threading.WaitForSingleObject - Windows.Win32.System.WinRT.RoGetActivationFactory + CloseHandle + CoIncrementMTAUsage + CoTaskMemAlloc + CoTaskMemFree + CreateEventW + EncodePointer + FreeLibrary + GetProcAddress + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS + LoadLibraryExA + RoGetActivationFactory + SetEvent + WaitForSingleObject diff --git a/crates/tools/bindings/src/core_com.txt b/crates/tools/bindings/src/core_com.txt index cf24ebdc2c..53421ea484 100644 --- a/crates/tools/bindings/src/core_com.txt +++ b/crates/tools/bindings/src/core_com.txt @@ -5,19 +5,19 @@ --flat --no-comment --filter - Windows.Win32.Foundation.CO_E_NOTINITIALIZED - Windows.Win32.Foundation.REGDB_E_CLASSNOTREG - Windows.Win32.Foundation.E_BOUNDS - Windows.Win32.Foundation.E_INVALIDARG - Windows.Win32.Foundation.E_NOINTERFACE - Windows.Win32.Foundation.E_POINTER - Windows.Win32.Foundation.JSCRIPT_E_CANTEXECUTE - Windows.Win32.Foundation.RPC_E_DISCONNECTED - Windows.Win32.Foundation.TYPE_E_TYPEMISMATCH - Windows.Win32.System.Com.CoCreateGuid - Windows.Win32.System.Com.IAgileObject - Windows.Win32.System.WinRT.AGILEREFERENCE_DEFAULT - Windows.Win32.System.WinRT.IAgileReference - Windows.Win32.System.WinRT.IWeakReference - Windows.Win32.System.WinRT.IWeakReferenceSource - Windows.Win32.System.WinRT.RoGetAgileReference + AGILEREFERENCE_DEFAULT + CO_E_NOTINITIALIZED + CoCreateGuid + E_BOUNDS + E_INVALIDARG + E_NOINTERFACE + E_POINTER + IAgileObject + IAgileReference + IWeakReference + IWeakReferenceSource + JSCRIPT_E_CANTEXECUTE + REGDB_E_CLASSNOTREG + RoGetAgileReference + RPC_E_DISCONNECTED + TYPE_E_TYPEMISMATCH diff --git a/crates/tools/bindings/src/metadata.txt b/crates/tools/bindings/src/metadata.txt index 5b95729cc3..0e1d45933b 100644 --- a/crates/tools/bindings/src/metadata.txt +++ b/crates/tools/bindings/src/metadata.txt @@ -3,50 +3,50 @@ --flat --sys --no-comment --filter - Windows.Win32.System.Diagnostics.Debug.IMAGE_COR20_HEADER - Windows.Win32.System.Diagnostics.Debug.IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR - Windows.Win32.System.Diagnostics.Debug.IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE - Windows.Win32.System.Diagnostics.Debug.IMAGE_DLLCHARACTERISTICS_NO_SEH - Windows.Win32.System.Diagnostics.Debug.IMAGE_DLLCHARACTERISTICS_NX_COMPAT - Windows.Win32.System.Diagnostics.Debug.IMAGE_FILE_32BIT_MACHINE - Windows.Win32.System.Diagnostics.Debug.IMAGE_FILE_DLL - Windows.Win32.System.Diagnostics.Debug.IMAGE_FILE_EXECUTABLE_IMAGE - Windows.Win32.System.Diagnostics.Debug.IMAGE_FILE_HEADER - Windows.Win32.System.Diagnostics.Debug.IMAGE_NT_OPTIONAL_HDR32_MAGIC - Windows.Win32.System.Diagnostics.Debug.IMAGE_NT_OPTIONAL_HDR64_MAGIC - Windows.Win32.System.Diagnostics.Debug.IMAGE_OPTIONAL_HEADER32 - Windows.Win32.System.Diagnostics.Debug.IMAGE_OPTIONAL_HEADER64 - Windows.Win32.System.Diagnostics.Debug.IMAGE_SECTION_HEADER - Windows.Win32.System.Diagnostics.Debug.IMAGE_SUBSYSTEM_WINDOWS_CUI - Windows.Win32.System.SystemInformation.IMAGE_FILE_MACHINE_I386 - Windows.Win32.System.SystemServices.IMAGE_DOS_HEADER - Windows.Win32.System.SystemServices.IMAGE_DOS_SIGNATURE - Windows.Win32.System.SystemServices.IMAGE_NT_SIGNATURE - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_ARRAY - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_BOOLEAN - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_BYREF - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_CHAR - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_CLASS - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_CMOD_OPT - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_CMOD_REQD - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_GENERICINST - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_I - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_I1 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_I2 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_I4 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_I8 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_OBJECT - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_PTR - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_R4 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_R8 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_STRING - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_SZARRAY - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_U - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_U1 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_U2 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_U4 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_U8 - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_VALUETYPE - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_VALUETYPE - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_VAR - Windows.Win32.System.WinRT.Metadata.ELEMENT_TYPE_VOID \ No newline at end of file + ELEMENT_TYPE_ARRAY + ELEMENT_TYPE_BOOLEAN + ELEMENT_TYPE_BYREF + ELEMENT_TYPE_CHAR + ELEMENT_TYPE_CLASS + ELEMENT_TYPE_CMOD_OPT + ELEMENT_TYPE_CMOD_REQD + ELEMENT_TYPE_GENERICINST + ELEMENT_TYPE_I + ELEMENT_TYPE_I1 + ELEMENT_TYPE_I2 + ELEMENT_TYPE_I4 + ELEMENT_TYPE_I8 + ELEMENT_TYPE_OBJECT + ELEMENT_TYPE_PTR + ELEMENT_TYPE_R4 + ELEMENT_TYPE_R8 + ELEMENT_TYPE_STRING + ELEMENT_TYPE_SZARRAY + ELEMENT_TYPE_U + ELEMENT_TYPE_U1 + ELEMENT_TYPE_U2 + ELEMENT_TYPE_U4 + ELEMENT_TYPE_U8 + ELEMENT_TYPE_VALUETYPE + ELEMENT_TYPE_VALUETYPE + ELEMENT_TYPE_VAR + ELEMENT_TYPE_VOID + IMAGE_COR20_HEADER + IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR + IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE + IMAGE_DLLCHARACTERISTICS_NO_SEH + IMAGE_DLLCHARACTERISTICS_NX_COMPAT + IMAGE_DOS_HEADER + IMAGE_DOS_SIGNATURE + IMAGE_FILE_32BIT_MACHINE + IMAGE_FILE_DLL + IMAGE_FILE_EXECUTABLE_IMAGE + IMAGE_FILE_HEADER + IMAGE_FILE_MACHINE_I386 + IMAGE_NT_OPTIONAL_HDR32_MAGIC + IMAGE_NT_OPTIONAL_HDR64_MAGIC + IMAGE_NT_SIGNATURE + IMAGE_OPTIONAL_HEADER32 + IMAGE_OPTIONAL_HEADER64 + IMAGE_SECTION_HEADER + IMAGE_SUBSYSTEM_WINDOWS_CUI \ No newline at end of file diff --git a/crates/tools/bindings/src/registry.txt b/crates/tools/bindings/src/registry.txt index 2fe6df635f..9668bef7ae 100644 --- a/crates/tools/bindings/src/registry.txt +++ b/crates/tools/bindings/src/registry.txt @@ -3,32 +3,32 @@ --flat --sys --no-core --no-comment --filter - Windows.Win32.Foundation.ERROR_INVALID_DATA - Windows.Win32.Foundation.ERROR_NO_MORE_ITEMS - Windows.Win32.System.Memory.GetProcessHeap - Windows.Win32.System.Memory.HeapAlloc - Windows.Win32.System.Memory.HeapFree - Windows.Win32.System.Registry.HKEY_CLASSES_ROOT - Windows.Win32.System.Registry.HKEY_CURRENT_CONFIG - Windows.Win32.System.Registry.HKEY_CURRENT_USER - Windows.Win32.System.Registry.HKEY_LOCAL_MACHINE - Windows.Win32.System.Registry.HKEY_USERS - Windows.Win32.System.Registry.KEY_READ - Windows.Win32.System.Registry.KEY_WRITE - Windows.Win32.System.Registry.REG_BINARY - Windows.Win32.System.Registry.REG_DWORD - Windows.Win32.System.Registry.REG_EXPAND_SZ - Windows.Win32.System.Registry.REG_MULTI_SZ - Windows.Win32.System.Registry.REG_OPTION_NON_VOLATILE - Windows.Win32.System.Registry.REG_QWORD - Windows.Win32.System.Registry.REG_SZ - Windows.Win32.System.Registry.RegCloseKey - Windows.Win32.System.Registry.RegCreateKeyExW - Windows.Win32.System.Registry.RegDeleteTreeW - Windows.Win32.System.Registry.RegDeleteValueW - Windows.Win32.System.Registry.RegEnumKeyExW - Windows.Win32.System.Registry.RegEnumValueW - Windows.Win32.System.Registry.RegOpenKeyExW - Windows.Win32.System.Registry.RegQueryInfoKeyW - Windows.Win32.System.Registry.RegQueryValueExW - Windows.Win32.System.Registry.RegSetValueExW + ERROR_INVALID_DATA + ERROR_NO_MORE_ITEMS + GetProcessHeap + HeapAlloc + HeapFree + HKEY_CLASSES_ROOT + HKEY_CURRENT_CONFIG + HKEY_CURRENT_USER + HKEY_LOCAL_MACHINE + HKEY_USERS + KEY_READ + KEY_WRITE + REG_BINARY + REG_DWORD + REG_EXPAND_SZ + REG_MULTI_SZ + REG_OPTION_NON_VOLATILE + REG_QWORD + REG_SZ + RegCloseKey + RegCreateKeyExW + RegDeleteTreeW + RegDeleteValueW + RegEnumKeyExW + RegEnumValueW + RegOpenKeyExW + RegQueryInfoKeyW + RegQueryValueExW + RegSetValueExW diff --git a/crates/tools/bindings/src/result.txt b/crates/tools/bindings/src/result.txt index 2e0277f1bf..cdc1c4f6ef 100644 --- a/crates/tools/bindings/src/result.txt +++ b/crates/tools/bindings/src/result.txt @@ -3,23 +3,23 @@ --flat --sys --no-core --no-comment --filter - Windows.Win32.Foundation.E_UNEXPECTED - Windows.Win32.Foundation.ERROR_INVALID_DATA - Windows.Win32.Foundation.ERROR_NO_UNICODE_TRANSLATION - Windows.Win32.Foundation.GetLastError - Windows.Win32.Foundation.SysFreeString - Windows.Win32.Foundation.SysStringLen - Windows.Win32.System.Com.GetErrorInfo - Windows.Win32.System.Com.IErrorInfo - Windows.Win32.System.Com.SetErrorInfo - Windows.Win32.System.Diagnostics.Debug.FORMAT_MESSAGE_ALLOCATE_BUFFER - Windows.Win32.System.Diagnostics.Debug.FORMAT_MESSAGE_FROM_HMODULE - Windows.Win32.System.Diagnostics.Debug.FORMAT_MESSAGE_FROM_SYSTEM - Windows.Win32.System.Diagnostics.Debug.FORMAT_MESSAGE_IGNORE_INSERTS - Windows.Win32.System.Diagnostics.Debug.FormatMessageW - Windows.Win32.System.LibraryLoader.LOAD_LIBRARY_SEARCH_DEFAULT_DIRS - Windows.Win32.System.LibraryLoader.LoadLibraryExA - Windows.Win32.System.Memory.GetProcessHeap - Windows.Win32.System.Memory.HeapFree - Windows.Win32.System.WinRT.IRestrictedErrorInfo - Windows.Win32.System.WinRT.RoOriginateErrorW + E_UNEXPECTED + ERROR_INVALID_DATA + ERROR_NO_UNICODE_TRANSLATION + FORMAT_MESSAGE_ALLOCATE_BUFFER + FORMAT_MESSAGE_FROM_HMODULE + FORMAT_MESSAGE_FROM_SYSTEM + FORMAT_MESSAGE_IGNORE_INSERTS + FormatMessageW + GetErrorInfo + GetLastError + GetProcessHeap + HeapFree + IErrorInfo + IRestrictedErrorInfo + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS + LoadLibraryExA + RoOriginateErrorW + SetErrorInfo + SysFreeString + SysStringLen diff --git a/crates/tools/bindings/src/strings.txt b/crates/tools/bindings/src/strings.txt index 0813f15a11..65c586ef17 100644 --- a/crates/tools/bindings/src/strings.txt +++ b/crates/tools/bindings/src/strings.txt @@ -5,9 +5,9 @@ --flat --sys --no-core --no-comment --filter - Windows.Win32.Foundation.SysAllocStringLen - Windows.Win32.Foundation.SysFreeString - Windows.Win32.Foundation.SysStringLen - Windows.Win32.System.Memory.GetProcessHeap - Windows.Win32.System.Memory.HeapAlloc - Windows.Win32.System.Memory.HeapFree + GetProcessHeap + HeapAlloc + HeapFree + SysAllocStringLen + SysFreeString + SysStringLen