diff --git a/.ci/vcpkg/overlay-ports/angle/portfile.cmake b/.ci/vcpkg/overlay-ports/angle/portfile.cmake index 610434cba6c..fc703475dda 100644 --- a/.ci/vcpkg/overlay-ports/angle/portfile.cmake +++ b/.ci/vcpkg/overlay-ports/angle/portfile.cmake @@ -45,9 +45,6 @@ vcpkg_from_github( 002-fix-builder-error.patch 003-fix-mingw.patch wz-mingw-headers.patch -# wz-mingw-headers-2.patch - wz-mingw-headers-3.patch - wz-mingw-headers-4.patch ) # Generate angle_commit.h diff --git a/.ci/vcpkg/overlay-ports/angle/wz-mingw-headers-2.patch b/.ci/vcpkg/overlay-ports/angle/wz-mingw-headers-2.patch deleted file mode 100644 index 36983cde685..00000000000 --- a/.ci/vcpkg/overlay-ports/angle/wz-mingw-headers-2.patch +++ /dev/null @@ -1,848 +0,0 @@ -diff --git a/third_party/wz-mingw-headers/windows.foundation.h b/third_party/wz-mingw-headers/windows.foundation.h -new file mode 100644 ---- /dev/null -+++ b/third_party/wz-mingw-headers/windows.foundation.h -@@ -0,0 +1,843 @@ -+/*** Autogenerated by WIDL 6.4 from include/windows.foundation.idl - Do not edit ***/ -+ -+#ifdef _WIN32 -+#ifndef __REQUIRED_RPCNDR_H_VERSION__ -+#define __REQUIRED_RPCNDR_H_VERSION__ 475 -+#endif -+#include -+#include -+#endif -+ -+#ifndef COM_NO_WINDOWS_H -+#include -+#include -+#endif -+ -+#ifndef __windows_foundation_h__ -+#define __windows_foundation_h__ -+ -+/* Forward declarations */ -+ -+#ifndef ____x_ABI_CWindows_CFoundation_CIStringable_FWD_DEFINED__ -+#define ____x_ABI_CWindows_CFoundation_CIStringable_FWD_DEFINED__ -+typedef interface __x_ABI_CWindows_CFoundation_CIStringable __x_ABI_CWindows_CFoundation_CIStringable; -+#ifdef __cplusplus -+#define __x_ABI_CWindows_CFoundation_CIStringable ABI::Windows::Foundation::IStringable -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ interface IStringable; -+ } -+ } -+} -+#endif /* __cplusplus */ -+#endif -+ -+#ifndef ____FIAsyncOperationCompletedHandler_1_boolean_FWD_DEFINED__ -+#define ____FIAsyncOperationCompletedHandler_1_boolean_FWD_DEFINED__ -+typedef interface __FIAsyncOperationCompletedHandler_1_boolean __FIAsyncOperationCompletedHandler_1_boolean; -+#ifdef __cplusplus -+#define __FIAsyncOperationCompletedHandler_1_boolean ABI::Windows::Foundation::IAsyncOperationCompletedHandler -+#endif /* __cplusplus */ -+#endif -+ -+#ifndef ____FIAsyncOperation_1_boolean_FWD_DEFINED__ -+#define ____FIAsyncOperation_1_boolean_FWD_DEFINED__ -+typedef interface __FIAsyncOperation_1_boolean __FIAsyncOperation_1_boolean; -+#ifdef __cplusplus -+#define __FIAsyncOperation_1_boolean ABI::Windows::Foundation::IAsyncOperation -+#endif /* __cplusplus */ -+#endif -+ -+#ifndef ____FIVectorView_1_HSTRING_FWD_DEFINED__ -+#define ____FIVectorView_1_HSTRING_FWD_DEFINED__ -+typedef interface __FIVectorView_1_HSTRING __FIVectorView_1_HSTRING; -+#ifdef __cplusplus -+#define __FIVectorView_1_HSTRING ABI::Windows::Foundation::Collections::IVectorView -+#endif /* __cplusplus */ -+#endif -+ -+/* Headers for imported files */ -+ -+#include -+#include -+#include -+#include -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#if WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 -+#ifdef __cplusplus -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ enum PropertyType { -+ PropertyType_Empty = 0, -+ PropertyType_UInt8 = 1, -+ PropertyType_Int16 = 2, -+ PropertyType_UInt16 = 3, -+ PropertyType_Int32 = 4, -+ PropertyType_UInt32 = 5, -+ PropertyType_Int64 = 6, -+ PropertyType_UInt64 = 7, -+ PropertyType_Single = 8, -+ PropertyType_Double = 9, -+ PropertyType_Char16 = 10, -+ PropertyType_Boolean = 11, -+ PropertyType_String = 12, -+ PropertyType_Inspectable = 13, -+ PropertyType_DateTime = 14, -+ PropertyType_TimeSpan = 15, -+ PropertyType_Guid = 16, -+ PropertyType_Point = 17, -+ PropertyType_Size = 18, -+ PropertyType_Rect = 19, -+ PropertyType_OtherType = 20, -+ PropertyType_UInt8Array = 1025, -+ PropertyType_Int16Array = 1026, -+ PropertyType_UInt16Array = 1027, -+ PropertyType_Int32Array = 1028, -+ PropertyType_UInt32Array = 1029, -+ PropertyType_Int64Array = 1030, -+ PropertyType_UInt64Array = 1031, -+ PropertyType_SingleArray = 1032, -+ PropertyType_DoubleArray = 1033, -+ PropertyType_Char16Array = 1034, -+ PropertyType_BooleanArray = 1035, -+ PropertyType_StringArray = 1036, -+ PropertyType_InspectableArray = 1037, -+ PropertyType_DateTimeArray = 1038, -+ PropertyType_TimeSpanArray = 1039, -+ PropertyType_GuidArray = 1040, -+ PropertyType_PointArray = 1041, -+ PropertyType_SizeArray = 1042, -+ PropertyType_RectArray = 1043, -+ PropertyType_OtherTypeArray = 1044 -+ }; -+ } -+ } -+} -+extern "C" { -+#else -+enum __x_ABI_CWindows_CFoundation_CPropertyType { -+ PropertyType_Empty = 0, -+ PropertyType_UInt8 = 1, -+ PropertyType_Int16 = 2, -+ PropertyType_UInt16 = 3, -+ PropertyType_Int32 = 4, -+ PropertyType_UInt32 = 5, -+ PropertyType_Int64 = 6, -+ PropertyType_UInt64 = 7, -+ PropertyType_Single = 8, -+ PropertyType_Double = 9, -+ PropertyType_Char16 = 10, -+ PropertyType_Boolean = 11, -+ PropertyType_String = 12, -+ PropertyType_Inspectable = 13, -+ PropertyType_DateTime = 14, -+ PropertyType_TimeSpan = 15, -+ PropertyType_Guid = 16, -+ PropertyType_Point = 17, -+ PropertyType_Size = 18, -+ PropertyType_Rect = 19, -+ PropertyType_OtherType = 20, -+ PropertyType_UInt8Array = 1025, -+ PropertyType_Int16Array = 1026, -+ PropertyType_UInt16Array = 1027, -+ PropertyType_Int32Array = 1028, -+ PropertyType_UInt32Array = 1029, -+ PropertyType_Int64Array = 1030, -+ PropertyType_UInt64Array = 1031, -+ PropertyType_SingleArray = 1032, -+ PropertyType_DoubleArray = 1033, -+ PropertyType_Char16Array = 1034, -+ PropertyType_BooleanArray = 1035, -+ PropertyType_StringArray = 1036, -+ PropertyType_InspectableArray = 1037, -+ PropertyType_DateTimeArray = 1038, -+ PropertyType_TimeSpanArray = 1039, -+ PropertyType_GuidArray = 1040, -+ PropertyType_PointArray = 1041, -+ PropertyType_SizeArray = 1042, -+ PropertyType_RectArray = 1043, -+ PropertyType_OtherTypeArray = 1044 -+}; -+#ifdef WIDL_using_Windows_Foundation -+#define PropertyType __x_ABI_CWindows_CFoundation_CPropertyType -+#endif /* WIDL_using_Windows_Foundation */ -+#endif -+ -+#endif /* WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 */ -+#if WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 -+#ifdef __cplusplus -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ struct Point { -+ FLOAT X; -+ FLOAT Y; -+ }; -+ } -+ } -+} -+extern "C" { -+#else -+struct __x_ABI_CWindows_CFoundation_CPoint { -+ FLOAT X; -+ FLOAT Y; -+}; -+#ifdef WIDL_using_Windows_Foundation -+#define Point __x_ABI_CWindows_CFoundation_CPoint -+#endif /* WIDL_using_Windows_Foundation */ -+#endif -+ -+#endif /* WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 */ -+#if WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 -+#ifdef __cplusplus -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ struct Size { -+ FLOAT Width; -+ FLOAT Height; -+ }; -+ } -+ } -+} -+extern "C" { -+#else -+struct __x_ABI_CWindows_CFoundation_CSize { -+ FLOAT Width; -+ FLOAT Height; -+}; -+#ifdef WIDL_using_Windows_Foundation -+#define Size __x_ABI_CWindows_CFoundation_CSize -+#endif /* WIDL_using_Windows_Foundation */ -+#endif -+ -+#endif /* WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 */ -+#if WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 -+#ifdef __cplusplus -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ struct Rect { -+ FLOAT X; -+ FLOAT Y; -+ FLOAT Width; -+ FLOAT Height; -+ }; -+ } -+ } -+} -+extern "C" { -+#else -+struct __x_ABI_CWindows_CFoundation_CRect { -+ FLOAT X; -+ FLOAT Y; -+ FLOAT Width; -+ FLOAT Height; -+}; -+#ifdef WIDL_using_Windows_Foundation -+#define Rect __x_ABI_CWindows_CFoundation_CRect -+#endif /* WIDL_using_Windows_Foundation */ -+#endif -+ -+#endif /* WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 */ -+#if WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 -+#ifdef __cplusplus -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ struct DateTime { -+ INT64 UniversalTime; -+ }; -+ } -+ } -+} -+extern "C" { -+#else -+struct __x_ABI_CWindows_CFoundation_CDateTime { -+ INT64 UniversalTime; -+}; -+#ifdef WIDL_using_Windows_Foundation -+#define DateTime __x_ABI_CWindows_CFoundation_CDateTime -+#endif /* WIDL_using_Windows_Foundation */ -+#endif -+ -+#endif /* WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 */ -+#if WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 -+#ifdef __cplusplus -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ struct TimeSpan { -+ INT64 Duration; -+ }; -+ } -+ } -+} -+extern "C" { -+#else -+struct __x_ABI_CWindows_CFoundation_CTimeSpan { -+ INT64 Duration; -+}; -+#ifdef WIDL_using_Windows_Foundation -+#define TimeSpan __x_ABI_CWindows_CFoundation_CTimeSpan -+#endif /* WIDL_using_Windows_Foundation */ -+#endif -+ -+#endif /* WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 */ -+/***************************************************************************** -+ * IStringable interface -+ */ -+#if WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 -+#ifndef ____x_ABI_CWindows_CFoundation_CIStringable_INTERFACE_DEFINED__ -+#define ____x_ABI_CWindows_CFoundation_CIStringable_INTERFACE_DEFINED__ -+ -+DEFINE_GUID(IID___x_ABI_CWindows_CFoundation_CIStringable, 0x96369f54, 0x8eb6, 0x48f0, 0xab,0xce, 0xc1,0xb2,0x11,0xe6,0x27,0xc3); -+#if defined(__cplusplus) && !defined(CINTERFACE) -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ MIDL_INTERFACE("96369f54-8eb6-48f0-abce-c1b211e627c3") -+ IStringable : public IInspectable -+ { -+ virtual HRESULT STDMETHODCALLTYPE ToString( -+ HSTRING *value) = 0; -+ -+ }; -+ } -+ } -+} -+extern "C" { -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(__x_ABI_CWindows_CFoundation_CIStringable, 0x96369f54, 0x8eb6, 0x48f0, 0xab,0xce, 0xc1,0xb2,0x11,0xe6,0x27,0xc3) -+#endif -+#else -+typedef struct __x_ABI_CWindows_CFoundation_CIStringableVtbl { -+ BEGIN_INTERFACE -+ -+ /*** IUnknown methods ***/ -+ HRESULT (STDMETHODCALLTYPE *QueryInterface)( -+ __x_ABI_CWindows_CFoundation_CIStringable *This, -+ REFIID riid, -+ void **ppvObject); -+ -+ ULONG (STDMETHODCALLTYPE *AddRef)( -+ __x_ABI_CWindows_CFoundation_CIStringable *This); -+ -+ ULONG (STDMETHODCALLTYPE *Release)( -+ __x_ABI_CWindows_CFoundation_CIStringable *This); -+ -+ /*** IInspectable methods ***/ -+ HRESULT (STDMETHODCALLTYPE *GetIids)( -+ __x_ABI_CWindows_CFoundation_CIStringable *This, -+ ULONG *iidCount, -+ IID **iids); -+ -+ HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( -+ __x_ABI_CWindows_CFoundation_CIStringable *This, -+ HSTRING *className); -+ -+ HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( -+ __x_ABI_CWindows_CFoundation_CIStringable *This, -+ TrustLevel *trustLevel); -+ -+ /*** IStringable methods ***/ -+ HRESULT (STDMETHODCALLTYPE *ToString)( -+ __x_ABI_CWindows_CFoundation_CIStringable *This, -+ HSTRING *value); -+ -+ END_INTERFACE -+} __x_ABI_CWindows_CFoundation_CIStringableVtbl; -+ -+interface __x_ABI_CWindows_CFoundation_CIStringable { -+ CONST_VTBL __x_ABI_CWindows_CFoundation_CIStringableVtbl* lpVtbl; -+}; -+ -+#ifdef COBJMACROS -+#ifndef WIDL_C_INLINE_WRAPPERS -+/*** IUnknown methods ***/ -+#define __x_ABI_CWindows_CFoundation_CIStringable_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -+#define __x_ABI_CWindows_CFoundation_CIStringable_AddRef(This) (This)->lpVtbl->AddRef(This) -+#define __x_ABI_CWindows_CFoundation_CIStringable_Release(This) (This)->lpVtbl->Release(This) -+/*** IInspectable methods ***/ -+#define __x_ABI_CWindows_CFoundation_CIStringable_GetIids(This,iidCount,iids) (This)->lpVtbl->GetIids(This,iidCount,iids) -+#define __x_ABI_CWindows_CFoundation_CIStringable_GetRuntimeClassName(This,className) (This)->lpVtbl->GetRuntimeClassName(This,className) -+#define __x_ABI_CWindows_CFoundation_CIStringable_GetTrustLevel(This,trustLevel) (This)->lpVtbl->GetTrustLevel(This,trustLevel) -+/*** IStringable methods ***/ -+#define __x_ABI_CWindows_CFoundation_CIStringable_ToString(This,value) (This)->lpVtbl->ToString(This,value) -+#else -+/*** IUnknown methods ***/ -+static FORCEINLINE HRESULT __x_ABI_CWindows_CFoundation_CIStringable_QueryInterface(__x_ABI_CWindows_CFoundation_CIStringable* This,REFIID riid,void **ppvObject) { -+ return This->lpVtbl->QueryInterface(This,riid,ppvObject); -+} -+static FORCEINLINE ULONG __x_ABI_CWindows_CFoundation_CIStringable_AddRef(__x_ABI_CWindows_CFoundation_CIStringable* This) { -+ return This->lpVtbl->AddRef(This); -+} -+static FORCEINLINE ULONG __x_ABI_CWindows_CFoundation_CIStringable_Release(__x_ABI_CWindows_CFoundation_CIStringable* This) { -+ return This->lpVtbl->Release(This); -+} -+/*** IInspectable methods ***/ -+static FORCEINLINE HRESULT __x_ABI_CWindows_CFoundation_CIStringable_GetIids(__x_ABI_CWindows_CFoundation_CIStringable* This,ULONG *iidCount,IID **iids) { -+ return This->lpVtbl->GetIids(This,iidCount,iids); -+} -+static FORCEINLINE HRESULT __x_ABI_CWindows_CFoundation_CIStringable_GetRuntimeClassName(__x_ABI_CWindows_CFoundation_CIStringable* This,HSTRING *className) { -+ return This->lpVtbl->GetRuntimeClassName(This,className); -+} -+static FORCEINLINE HRESULT __x_ABI_CWindows_CFoundation_CIStringable_GetTrustLevel(__x_ABI_CWindows_CFoundation_CIStringable* This,TrustLevel *trustLevel) { -+ return This->lpVtbl->GetTrustLevel(This,trustLevel); -+} -+/*** IStringable methods ***/ -+static FORCEINLINE HRESULT __x_ABI_CWindows_CFoundation_CIStringable_ToString(__x_ABI_CWindows_CFoundation_CIStringable* This,HSTRING *value) { -+ return This->lpVtbl->ToString(This,value); -+} -+#endif -+#ifdef WIDL_using_Windows_Foundation -+#define IID_IStringable IID___x_ABI_CWindows_CFoundation_CIStringable -+#define IStringableVtbl __x_ABI_CWindows_CFoundation_CIStringableVtbl -+#define IStringable __x_ABI_CWindows_CFoundation_CIStringable -+#define IStringable_QueryInterface __x_ABI_CWindows_CFoundation_CIStringable_QueryInterface -+#define IStringable_AddRef __x_ABI_CWindows_CFoundation_CIStringable_AddRef -+#define IStringable_Release __x_ABI_CWindows_CFoundation_CIStringable_Release -+#define IStringable_GetIids __x_ABI_CWindows_CFoundation_CIStringable_GetIids -+#define IStringable_GetRuntimeClassName __x_ABI_CWindows_CFoundation_CIStringable_GetRuntimeClassName -+#define IStringable_GetTrustLevel __x_ABI_CWindows_CFoundation_CIStringable_GetTrustLevel -+#define IStringable_ToString __x_ABI_CWindows_CFoundation_CIStringable_ToString -+#endif /* WIDL_using_Windows_Foundation */ -+#endif -+ -+#endif -+ -+#endif /* ____x_ABI_CWindows_CFoundation_CIStringable_INTERFACE_DEFINED__ */ -+#endif /* WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 */ -+ -+#ifndef ____FIAsyncOperation_1_boolean_FWD_DEFINED__ -+#define ____FIAsyncOperation_1_boolean_FWD_DEFINED__ -+typedef interface __FIAsyncOperation_1_boolean __FIAsyncOperation_1_boolean; -+#ifdef __cplusplus -+#define __FIAsyncOperation_1_boolean ABI::Windows::Foundation::IAsyncOperation -+#endif /* __cplusplus */ -+#endif -+ -+#ifndef ____FIVectorView_1_HSTRING_FWD_DEFINED__ -+#define ____FIVectorView_1_HSTRING_FWD_DEFINED__ -+typedef interface __FIVectorView_1_HSTRING __FIVectorView_1_HSTRING; -+#ifdef __cplusplus -+#define __FIVectorView_1_HSTRING ABI::Windows::Foundation::Collections::IVectorView -+#endif /* __cplusplus */ -+#endif -+ -+/***************************************************************************** -+ * IAsyncOperationCompletedHandler interface -+ */ -+#ifndef ____FIAsyncOperationCompletedHandler_1_boolean_INTERFACE_DEFINED__ -+#define ____FIAsyncOperationCompletedHandler_1_boolean_INTERFACE_DEFINED__ -+ -+DEFINE_GUID(IID___FIAsyncOperationCompletedHandler_1_boolean, 0xc1d3d1a2, 0xae17, 0x5a5f, 0xb5,0xa2, 0xbd,0xcc,0x88,0x44,0x88,0x9a); -+#if defined(__cplusplus) && !defined(CINTERFACE) -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ template<> -+ MIDL_INTERFACE("c1d3d1a2-ae17-5a5f-b5a2-bdcc8844889a") -+ IAsyncOperationCompletedHandler : IAsyncOperationCompletedHandler_impl -+ { -+ }; -+ } -+ } -+} -+extern "C" { -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(__FIAsyncOperationCompletedHandler_1_boolean, 0xc1d3d1a2, 0xae17, 0x5a5f, 0xb5,0xa2, 0xbd,0xcc,0x88,0x44,0x88,0x9a) -+#endif -+#else -+typedef struct __FIAsyncOperationCompletedHandler_1_booleanVtbl { -+ BEGIN_INTERFACE -+ -+ /*** IUnknown methods ***/ -+ HRESULT (STDMETHODCALLTYPE *QueryInterface)( -+ __FIAsyncOperationCompletedHandler_1_boolean *This, -+ REFIID riid, -+ void **ppvObject); -+ -+ ULONG (STDMETHODCALLTYPE *AddRef)( -+ __FIAsyncOperationCompletedHandler_1_boolean *This); -+ -+ ULONG (STDMETHODCALLTYPE *Release)( -+ __FIAsyncOperationCompletedHandler_1_boolean *This); -+ -+ /*** IAsyncOperationCompletedHandler methods ***/ -+ HRESULT (STDMETHODCALLTYPE *Invoke)( -+ __FIAsyncOperationCompletedHandler_1_boolean *This, -+ __FIAsyncOperation_1_boolean *info, -+ AsyncStatus status); -+ -+ END_INTERFACE -+} __FIAsyncOperationCompletedHandler_1_booleanVtbl; -+ -+interface __FIAsyncOperationCompletedHandler_1_boolean { -+ CONST_VTBL __FIAsyncOperationCompletedHandler_1_booleanVtbl* lpVtbl; -+}; -+ -+#ifdef COBJMACROS -+#ifndef WIDL_C_INLINE_WRAPPERS -+/*** IUnknown methods ***/ -+#define __FIAsyncOperationCompletedHandler_1_boolean_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -+#define __FIAsyncOperationCompletedHandler_1_boolean_AddRef(This) (This)->lpVtbl->AddRef(This) -+#define __FIAsyncOperationCompletedHandler_1_boolean_Release(This) (This)->lpVtbl->Release(This) -+/*** IAsyncOperationCompletedHandler methods ***/ -+#define __FIAsyncOperationCompletedHandler_1_boolean_Invoke(This,info,status) (This)->lpVtbl->Invoke(This,info,status) -+#else -+/*** IUnknown methods ***/ -+static FORCEINLINE HRESULT __FIAsyncOperationCompletedHandler_1_boolean_QueryInterface(__FIAsyncOperationCompletedHandler_1_boolean* This,REFIID riid,void **ppvObject) { -+ return This->lpVtbl->QueryInterface(This,riid,ppvObject); -+} -+static FORCEINLINE ULONG __FIAsyncOperationCompletedHandler_1_boolean_AddRef(__FIAsyncOperationCompletedHandler_1_boolean* This) { -+ return This->lpVtbl->AddRef(This); -+} -+static FORCEINLINE ULONG __FIAsyncOperationCompletedHandler_1_boolean_Release(__FIAsyncOperationCompletedHandler_1_boolean* This) { -+ return This->lpVtbl->Release(This); -+} -+/*** IAsyncOperationCompletedHandler methods ***/ -+static FORCEINLINE HRESULT __FIAsyncOperationCompletedHandler_1_boolean_Invoke(__FIAsyncOperationCompletedHandler_1_boolean* This,__FIAsyncOperation_1_boolean *info,AsyncStatus status) { -+ return This->lpVtbl->Invoke(This,info,status); -+} -+#endif -+#ifdef WIDL_using_Windows_Foundation -+#define IID_IAsyncOperationCompletedHandler_boolean IID___FIAsyncOperationCompletedHandler_1_boolean -+#define IAsyncOperationCompletedHandler_booleanVtbl __FIAsyncOperationCompletedHandler_1_booleanVtbl -+#define IAsyncOperationCompletedHandler_boolean __FIAsyncOperationCompletedHandler_1_boolean -+#define IAsyncOperationCompletedHandler_boolean_QueryInterface __FIAsyncOperationCompletedHandler_1_boolean_QueryInterface -+#define IAsyncOperationCompletedHandler_boolean_AddRef __FIAsyncOperationCompletedHandler_1_boolean_AddRef -+#define IAsyncOperationCompletedHandler_boolean_Release __FIAsyncOperationCompletedHandler_1_boolean_Release -+#define IAsyncOperationCompletedHandler_boolean_Invoke __FIAsyncOperationCompletedHandler_1_boolean_Invoke -+#endif /* WIDL_using_Windows_Foundation */ -+#endif -+ -+#endif -+ -+#endif /* ____FIAsyncOperationCompletedHandler_1_boolean_INTERFACE_DEFINED__ */ -+ -+/***************************************************************************** -+ * IAsyncOperation interface -+ */ -+#ifndef ____FIAsyncOperation_1_boolean_INTERFACE_DEFINED__ -+#define ____FIAsyncOperation_1_boolean_INTERFACE_DEFINED__ -+ -+DEFINE_GUID(IID___FIAsyncOperation_1_boolean, 0xcdb5efb3, 0x5788, 0x509d, 0x9b,0xe1, 0x71,0xcc,0xb8,0xa3,0x36,0x2a); -+#if defined(__cplusplus) && !defined(CINTERFACE) -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ template<> -+ MIDL_INTERFACE("cdb5efb3-5788-509d-9be1-71ccb8a3362a") -+ IAsyncOperation : IAsyncOperation_impl -+ { -+ }; -+ } -+ } -+} -+extern "C" { -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(__FIAsyncOperation_1_boolean, 0xcdb5efb3, 0x5788, 0x509d, 0x9b,0xe1, 0x71,0xcc,0xb8,0xa3,0x36,0x2a) -+#endif -+#else -+typedef struct __FIAsyncOperation_1_booleanVtbl { -+ BEGIN_INTERFACE -+ -+ /*** IUnknown methods ***/ -+ HRESULT (STDMETHODCALLTYPE *QueryInterface)( -+ __FIAsyncOperation_1_boolean *This, -+ REFIID riid, -+ void **ppvObject); -+ -+ ULONG (STDMETHODCALLTYPE *AddRef)( -+ __FIAsyncOperation_1_boolean *This); -+ -+ ULONG (STDMETHODCALLTYPE *Release)( -+ __FIAsyncOperation_1_boolean *This); -+ -+ /*** IInspectable methods ***/ -+ HRESULT (STDMETHODCALLTYPE *GetIids)( -+ __FIAsyncOperation_1_boolean *This, -+ ULONG *iidCount, -+ IID **iids); -+ -+ HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( -+ __FIAsyncOperation_1_boolean *This, -+ HSTRING *className); -+ -+ HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( -+ __FIAsyncOperation_1_boolean *This, -+ TrustLevel *trustLevel); -+ -+ /*** IAsyncOperation methods ***/ -+ HRESULT (STDMETHODCALLTYPE *put_Completed)( -+ __FIAsyncOperation_1_boolean *This, -+ __FIAsyncOperationCompletedHandler_1_boolean *handler); -+ -+ HRESULT (STDMETHODCALLTYPE *get_Completed)( -+ __FIAsyncOperation_1_boolean *This, -+ __FIAsyncOperationCompletedHandler_1_boolean **handler); -+ -+ HRESULT (STDMETHODCALLTYPE *GetResults)( -+ __FIAsyncOperation_1_boolean *This, -+ boolean **results); -+ -+ END_INTERFACE -+} __FIAsyncOperation_1_booleanVtbl; -+ -+interface __FIAsyncOperation_1_boolean { -+ CONST_VTBL __FIAsyncOperation_1_booleanVtbl* lpVtbl; -+}; -+ -+#ifdef COBJMACROS -+#ifndef WIDL_C_INLINE_WRAPPERS -+/*** IUnknown methods ***/ -+#define __FIAsyncOperation_1_boolean_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -+#define __FIAsyncOperation_1_boolean_AddRef(This) (This)->lpVtbl->AddRef(This) -+#define __FIAsyncOperation_1_boolean_Release(This) (This)->lpVtbl->Release(This) -+/*** IInspectable methods ***/ -+#define __FIAsyncOperation_1_boolean_GetIids(This,iidCount,iids) (This)->lpVtbl->GetIids(This,iidCount,iids) -+#define __FIAsyncOperation_1_boolean_GetRuntimeClassName(This,className) (This)->lpVtbl->GetRuntimeClassName(This,className) -+#define __FIAsyncOperation_1_boolean_GetTrustLevel(This,trustLevel) (This)->lpVtbl->GetTrustLevel(This,trustLevel) -+/*** IAsyncOperation methods ***/ -+#define __FIAsyncOperation_1_boolean_put_Completed(This,handler) (This)->lpVtbl->put_Completed(This,handler) -+#define __FIAsyncOperation_1_boolean_get_Completed(This,handler) (This)->lpVtbl->get_Completed(This,handler) -+#define __FIAsyncOperation_1_boolean_GetResults(This,results) (This)->lpVtbl->GetResults(This,results) -+#else -+/*** IUnknown methods ***/ -+static FORCEINLINE HRESULT __FIAsyncOperation_1_boolean_QueryInterface(__FIAsyncOperation_1_boolean* This,REFIID riid,void **ppvObject) { -+ return This->lpVtbl->QueryInterface(This,riid,ppvObject); -+} -+static FORCEINLINE ULONG __FIAsyncOperation_1_boolean_AddRef(__FIAsyncOperation_1_boolean* This) { -+ return This->lpVtbl->AddRef(This); -+} -+static FORCEINLINE ULONG __FIAsyncOperation_1_boolean_Release(__FIAsyncOperation_1_boolean* This) { -+ return This->lpVtbl->Release(This); -+} -+/*** IInspectable methods ***/ -+static FORCEINLINE HRESULT __FIAsyncOperation_1_boolean_GetIids(__FIAsyncOperation_1_boolean* This,ULONG *iidCount,IID **iids) { -+ return This->lpVtbl->GetIids(This,iidCount,iids); -+} -+static FORCEINLINE HRESULT __FIAsyncOperation_1_boolean_GetRuntimeClassName(__FIAsyncOperation_1_boolean* This,HSTRING *className) { -+ return This->lpVtbl->GetRuntimeClassName(This,className); -+} -+static FORCEINLINE HRESULT __FIAsyncOperation_1_boolean_GetTrustLevel(__FIAsyncOperation_1_boolean* This,TrustLevel *trustLevel) { -+ return This->lpVtbl->GetTrustLevel(This,trustLevel); -+} -+/*** IAsyncOperation methods ***/ -+static FORCEINLINE HRESULT __FIAsyncOperation_1_boolean_put_Completed(__FIAsyncOperation_1_boolean* This,__FIAsyncOperationCompletedHandler_1_boolean *handler) { -+ return This->lpVtbl->put_Completed(This,handler); -+} -+static FORCEINLINE HRESULT __FIAsyncOperation_1_boolean_get_Completed(__FIAsyncOperation_1_boolean* This,__FIAsyncOperationCompletedHandler_1_boolean **handler) { -+ return This->lpVtbl->get_Completed(This,handler); -+} -+static FORCEINLINE HRESULT __FIAsyncOperation_1_boolean_GetResults(__FIAsyncOperation_1_boolean* This,boolean **results) { -+ return This->lpVtbl->GetResults(This,results); -+} -+#endif -+#ifdef WIDL_using_Windows_Foundation -+#define IID_IAsyncOperation_boolean IID___FIAsyncOperation_1_boolean -+#define IAsyncOperation_booleanVtbl __FIAsyncOperation_1_booleanVtbl -+#define IAsyncOperation_boolean __FIAsyncOperation_1_boolean -+#define IAsyncOperation_boolean_QueryInterface __FIAsyncOperation_1_boolean_QueryInterface -+#define IAsyncOperation_boolean_AddRef __FIAsyncOperation_1_boolean_AddRef -+#define IAsyncOperation_boolean_Release __FIAsyncOperation_1_boolean_Release -+#define IAsyncOperation_boolean_GetIids __FIAsyncOperation_1_boolean_GetIids -+#define IAsyncOperation_boolean_GetRuntimeClassName __FIAsyncOperation_1_boolean_GetRuntimeClassName -+#define IAsyncOperation_boolean_GetTrustLevel __FIAsyncOperation_1_boolean_GetTrustLevel -+#define IAsyncOperation_boolean_put_Completed __FIAsyncOperation_1_boolean_put_Completed -+#define IAsyncOperation_boolean_get_Completed __FIAsyncOperation_1_boolean_get_Completed -+#define IAsyncOperation_boolean_GetResults __FIAsyncOperation_1_boolean_GetResults -+#endif /* WIDL_using_Windows_Foundation */ -+#endif -+ -+#endif -+ -+#endif /* ____FIAsyncOperation_1_boolean_INTERFACE_DEFINED__ */ -+ -+/***************************************************************************** -+ * IVectorView interface -+ */ -+#ifndef ____FIVectorView_1_HSTRING_INTERFACE_DEFINED__ -+#define ____FIVectorView_1_HSTRING_INTERFACE_DEFINED__ -+ -+DEFINE_GUID(IID___FIVectorView_1_HSTRING, 0xfca5679c, 0xbfd4, 0x5187, 0x8b,0x2d, 0xde,0x22,0x50,0x49,0xb3,0x46); -+#if defined(__cplusplus) && !defined(CINTERFACE) -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace Foundation { -+ namespace Collections { -+ template<> -+ MIDL_INTERFACE("fca5679c-bfd4-5187-8b2d-de225049b346") -+ IVectorView : IVectorView_impl -+ { -+ }; -+ } -+ } -+ } -+} -+extern "C" { -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(__FIVectorView_1_HSTRING, 0xfca5679c, 0xbfd4, 0x5187, 0x8b,0x2d, 0xde,0x22,0x50,0x49,0xb3,0x46) -+#endif -+#else -+typedef struct __FIVectorView_1_HSTRINGVtbl { -+ BEGIN_INTERFACE -+ -+ /*** IUnknown methods ***/ -+ HRESULT (STDMETHODCALLTYPE *QueryInterface)( -+ __FIVectorView_1_HSTRING *This, -+ REFIID riid, -+ void **ppvObject); -+ -+ ULONG (STDMETHODCALLTYPE *AddRef)( -+ __FIVectorView_1_HSTRING *This); -+ -+ ULONG (STDMETHODCALLTYPE *Release)( -+ __FIVectorView_1_HSTRING *This); -+ -+ /*** IInspectable methods ***/ -+ HRESULT (STDMETHODCALLTYPE *GetIids)( -+ __FIVectorView_1_HSTRING *This, -+ ULONG *iidCount, -+ IID **iids); -+ -+ HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( -+ __FIVectorView_1_HSTRING *This, -+ HSTRING *className); -+ -+ HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( -+ __FIVectorView_1_HSTRING *This, -+ TrustLevel *trustLevel); -+ -+ /*** IVectorView methods ***/ -+ HRESULT (STDMETHODCALLTYPE *GetAt)( -+ __FIVectorView_1_HSTRING *This, -+ UINT32 index, -+ HSTRING *value); -+ -+ HRESULT (STDMETHODCALLTYPE *get_Size)( -+ __FIVectorView_1_HSTRING *This, -+ UINT32 *value); -+ -+ HRESULT (STDMETHODCALLTYPE *IndexOf)( -+ __FIVectorView_1_HSTRING *This, -+ HSTRING element, -+ UINT32 *index, -+ BOOLEAN *value); -+ -+ HRESULT (STDMETHODCALLTYPE *GetMany)( -+ __FIVectorView_1_HSTRING *This, -+ UINT32 start_index, -+ UINT32 items_size, -+ HSTRING *items, -+ UINT32 *value); -+ -+ END_INTERFACE -+} __FIVectorView_1_HSTRINGVtbl; -+ -+interface __FIVectorView_1_HSTRING { -+ CONST_VTBL __FIVectorView_1_HSTRINGVtbl* lpVtbl; -+}; -+ -+#ifdef COBJMACROS -+#ifndef WIDL_C_INLINE_WRAPPERS -+/*** IUnknown methods ***/ -+#define __FIVectorView_1_HSTRING_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -+#define __FIVectorView_1_HSTRING_AddRef(This) (This)->lpVtbl->AddRef(This) -+#define __FIVectorView_1_HSTRING_Release(This) (This)->lpVtbl->Release(This) -+/*** IInspectable methods ***/ -+#define __FIVectorView_1_HSTRING_GetIids(This,iidCount,iids) (This)->lpVtbl->GetIids(This,iidCount,iids) -+#define __FIVectorView_1_HSTRING_GetRuntimeClassName(This,className) (This)->lpVtbl->GetRuntimeClassName(This,className) -+#define __FIVectorView_1_HSTRING_GetTrustLevel(This,trustLevel) (This)->lpVtbl->GetTrustLevel(This,trustLevel) -+/*** IVectorView methods ***/ -+#define __FIVectorView_1_HSTRING_GetAt(This,index,value) (This)->lpVtbl->GetAt(This,index,value) -+#define __FIVectorView_1_HSTRING_get_Size(This,value) (This)->lpVtbl->get_Size(This,value) -+#define __FIVectorView_1_HSTRING_IndexOf(This,element,index,value) (This)->lpVtbl->IndexOf(This,element,index,value) -+#define __FIVectorView_1_HSTRING_GetMany(This,start_index,items_size,items,value) (This)->lpVtbl->GetMany(This,start_index,items_size,items,value) -+#else -+/*** IUnknown methods ***/ -+static FORCEINLINE HRESULT __FIVectorView_1_HSTRING_QueryInterface(__FIVectorView_1_HSTRING* This,REFIID riid,void **ppvObject) { -+ return This->lpVtbl->QueryInterface(This,riid,ppvObject); -+} -+static FORCEINLINE ULONG __FIVectorView_1_HSTRING_AddRef(__FIVectorView_1_HSTRING* This) { -+ return This->lpVtbl->AddRef(This); -+} -+static FORCEINLINE ULONG __FIVectorView_1_HSTRING_Release(__FIVectorView_1_HSTRING* This) { -+ return This->lpVtbl->Release(This); -+} -+/*** IInspectable methods ***/ -+static FORCEINLINE HRESULT __FIVectorView_1_HSTRING_GetIids(__FIVectorView_1_HSTRING* This,ULONG *iidCount,IID **iids) { -+ return This->lpVtbl->GetIids(This,iidCount,iids); -+} -+static FORCEINLINE HRESULT __FIVectorView_1_HSTRING_GetRuntimeClassName(__FIVectorView_1_HSTRING* This,HSTRING *className) { -+ return This->lpVtbl->GetRuntimeClassName(This,className); -+} -+static FORCEINLINE HRESULT __FIVectorView_1_HSTRING_GetTrustLevel(__FIVectorView_1_HSTRING* This,TrustLevel *trustLevel) { -+ return This->lpVtbl->GetTrustLevel(This,trustLevel); -+} -+/*** IVectorView methods ***/ -+static FORCEINLINE HRESULT __FIVectorView_1_HSTRING_GetAt(__FIVectorView_1_HSTRING* This,UINT32 index,HSTRING *value) { -+ return This->lpVtbl->GetAt(This,index,value); -+} -+static FORCEINLINE HRESULT __FIVectorView_1_HSTRING_get_Size(__FIVectorView_1_HSTRING* This,UINT32 *value) { -+ return This->lpVtbl->get_Size(This,value); -+} -+static FORCEINLINE HRESULT __FIVectorView_1_HSTRING_IndexOf(__FIVectorView_1_HSTRING* This,HSTRING element,UINT32 *index,BOOLEAN *value) { -+ return This->lpVtbl->IndexOf(This,element,index,value); -+} -+static FORCEINLINE HRESULT __FIVectorView_1_HSTRING_GetMany(__FIVectorView_1_HSTRING* This,UINT32 start_index,UINT32 items_size,HSTRING *items,UINT32 *value) { -+ return This->lpVtbl->GetMany(This,start_index,items_size,items,value); -+} -+#endif -+#ifdef WIDL_using_Windows_Foundation_Collections -+#define IID_IVectorView_HSTRING IID___FIVectorView_1_HSTRING -+#define IVectorView_HSTRINGVtbl __FIVectorView_1_HSTRINGVtbl -+#define IVectorView_HSTRING __FIVectorView_1_HSTRING -+#define IVectorView_HSTRING_QueryInterface __FIVectorView_1_HSTRING_QueryInterface -+#define IVectorView_HSTRING_AddRef __FIVectorView_1_HSTRING_AddRef -+#define IVectorView_HSTRING_Release __FIVectorView_1_HSTRING_Release -+#define IVectorView_HSTRING_GetIids __FIVectorView_1_HSTRING_GetIids -+#define IVectorView_HSTRING_GetRuntimeClassName __FIVectorView_1_HSTRING_GetRuntimeClassName -+#define IVectorView_HSTRING_GetTrustLevel __FIVectorView_1_HSTRING_GetTrustLevel -+#define IVectorView_HSTRING_GetAt __FIVectorView_1_HSTRING_GetAt -+#define IVectorView_HSTRING_get_Size __FIVectorView_1_HSTRING_get_Size -+#define IVectorView_HSTRING_IndexOf __FIVectorView_1_HSTRING_IndexOf -+#define IVectorView_HSTRING_GetMany __FIVectorView_1_HSTRING_GetMany -+#endif /* WIDL_using_Windows_Foundation_Collections */ -+#endif -+ -+#endif -+ -+#endif /* ____FIVectorView_1_HSTRING_INTERFACE_DEFINED__ */ -+ -+/* Begin additional prototypes for all interfaces */ -+ -+ULONG __RPC_USER HSTRING_UserSize (ULONG *, ULONG, HSTRING *); -+unsigned char * __RPC_USER HSTRING_UserMarshal (ULONG *, unsigned char *, HSTRING *); -+unsigned char * __RPC_USER HSTRING_UserUnmarshal(ULONG *, unsigned char *, HSTRING *); -+void __RPC_USER HSTRING_UserFree (ULONG *, HSTRING *); -+ -+/* End additional prototypes */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* __windows_foundation_h__ */ diff --git a/.ci/vcpkg/overlay-ports/angle/wz-mingw-headers-3.patch b/.ci/vcpkg/overlay-ports/angle/wz-mingw-headers-3.patch deleted file mode 100644 index 5c605e2c8cd..00000000000 --- a/.ci/vcpkg/overlay-ports/angle/wz-mingw-headers-3.patch +++ /dev/null @@ -1,184 +0,0 @@ -diff --git a/third_party/wz-mingw-headers/dispatcherqueue.h b/third_party/wz-mingw-headers/dispatcherqueue.h -new file mode 100644 ---- /dev/null -+++ b/third_party/wz-mingw-headers/dispatcherqueue.h -@@ -0,0 +1,179 @@ -+/** -+ * This file has no copyright assigned and is placed in the Public Domain. -+ * This file is part of the mingw-w64 runtime package. -+ * No warranty is given; refer to the file DISCLAIMER.PD within this package. -+ */ -+ -+#ifndef _DISPATCHERQUEUE_H_ -+#define _DISPATCHERQUEUE_H_ -+ -+#include -+ -+// MARK: - Older windows.system.h defines (missing in newer headers??) -+// From: https://sourceforge.net/p/mingw-w64/mingw-w64/ci/ebdb3ae198736df2f8b2236d72318cedf22bb476/tree/mingw-w64-headers/include/windows.system.h -+ -+/* Forward declarations */ -+ -+#ifndef ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_FWD_DEFINED__ -+#define ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_FWD_DEFINED__ -+typedef interface __x_ABI_CWindows_CSystem_CIDispatcherQueueController __x_ABI_CWindows_CSystem_CIDispatcherQueueController; -+#ifdef __cplusplus -+#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController ABI::Windows::System::IDispatcherQueueController -+namespace ABI { -+ namespace Windows { -+ namespace System { -+ interface IDispatcherQueueController; -+ } -+ } -+} -+#endif /* __cplusplus */ -+#endif -+ -+/* Headers for imported files */ -+ -+#include -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/***************************************************************************** -+ * IDispatcherQueueController interface -+ */ -+#ifndef ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_INTERFACE_DEFINED__ -+#define ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_INTERFACE_DEFINED__ -+ -+DEFINE_GUID(IID___x_ABI_CWindows_CSystem_CIDispatcherQueueController, 0x22f34e66, 0x50db, 0x4e36, 0xa9,0x8d, 0x61,0xc0,0x1b,0x38,0x4d,0x20); -+#if defined(__cplusplus) && !defined(CINTERFACE) -+} /* extern "C" */ -+namespace ABI { -+ namespace Windows { -+ namespace System { -+ MIDL_INTERFACE("22f34e66-50db-4e36-a98d-61c01b384d20") -+ IDispatcherQueueController : public IInspectable -+ { -+ }; -+ } -+ } -+} -+extern "C" { -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(__x_ABI_CWindows_CSystem_CIDispatcherQueueController, 0x22f34e66, 0x50db, 0x4e36, 0xa9,0x8d, 0x61,0xc0,0x1b,0x38,0x4d,0x20) -+#endif -+#else -+typedef struct __x_ABI_CWindows_CSystem_CIDispatcherQueueControllerVtbl { -+ BEGIN_INTERFACE -+ -+ /*** IUnknown methods ***/ -+ HRESULT (STDMETHODCALLTYPE *QueryInterface)( -+ __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This, -+ REFIID riid, -+ void **ppvObject); -+ -+ ULONG (STDMETHODCALLTYPE *AddRef)( -+ __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This); -+ -+ ULONG (STDMETHODCALLTYPE *Release)( -+ __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This); -+ -+ /*** IInspectable methods ***/ -+ HRESULT (STDMETHODCALLTYPE *GetIids)( -+ __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This, -+ ULONG *iidCount, -+ IID **iids); -+ -+ HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( -+ __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This, -+ HSTRING *className); -+ -+ HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( -+ __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This, -+ TrustLevel *trustLevel); -+ -+ END_INTERFACE -+} __x_ABI_CWindows_CSystem_CIDispatcherQueueControllerVtbl; -+ -+interface __x_ABI_CWindows_CSystem_CIDispatcherQueueController { -+ CONST_VTBL __x_ABI_CWindows_CSystem_CIDispatcherQueueControllerVtbl* lpVtbl; -+}; -+ -+#ifdef COBJMACROS -+#ifndef WIDL_C_INLINE_WRAPPERS -+/*** IUnknown methods ***/ -+#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -+#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_AddRef(This) (This)->lpVtbl->AddRef(This) -+#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_Release(This) (This)->lpVtbl->Release(This) -+/*** IInspectable methods ***/ -+#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetIids(This,iidCount,iids) (This)->lpVtbl->GetIids(This,iidCount,iids) -+#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetRuntimeClassName(This,className) (This)->lpVtbl->GetRuntimeClassName(This,className) -+#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetTrustLevel(This,trustLevel) (This)->lpVtbl->GetTrustLevel(This,trustLevel) -+#else -+/*** IUnknown methods ***/ -+static FORCEINLINE HRESULT __x_ABI_CWindows_CSystem_CIDispatcherQueueController_QueryInterface(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This,REFIID riid,void **ppvObject) { -+ return This->lpVtbl->QueryInterface(This,riid,ppvObject); -+} -+static FORCEINLINE ULONG __x_ABI_CWindows_CSystem_CIDispatcherQueueController_AddRef(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This) { -+ return This->lpVtbl->AddRef(This); -+} -+static FORCEINLINE ULONG __x_ABI_CWindows_CSystem_CIDispatcherQueueController_Release(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This) { -+ return This->lpVtbl->Release(This); -+} -+/*** IInspectable methods ***/ -+static FORCEINLINE HRESULT __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetIids(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This,ULONG *iidCount,IID **iids) { -+ return This->lpVtbl->GetIids(This,iidCount,iids); -+} -+static FORCEINLINE HRESULT __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetRuntimeClassName(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This,HSTRING *className) { -+ return This->lpVtbl->GetRuntimeClassName(This,className); -+} -+static FORCEINLINE HRESULT __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetTrustLevel(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This,TrustLevel *trustLevel) { -+ return This->lpVtbl->GetTrustLevel(This,trustLevel); -+} -+#endif -+#ifdef WIDL_using_Windows_System -+#define IID_IDispatcherQueueController IID___x_ABI_CWindows_CSystem_CIDispatcherQueueController -+#define IDispatcherQueueControllerVtbl __x_ABI_CWindows_CSystem_CIDispatcherQueueControllerVtbl -+#define IDispatcherQueueController __x_ABI_CWindows_CSystem_CIDispatcherQueueController -+#define IDispatcherQueueController_QueryInterface __x_ABI_CWindows_CSystem_CIDispatcherQueueController_QueryInterface -+#define IDispatcherQueueController_AddRef __x_ABI_CWindows_CSystem_CIDispatcherQueueController_AddRef -+#define IDispatcherQueueController_Release __x_ABI_CWindows_CSystem_CIDispatcherQueueController_Release -+#define IDispatcherQueueController_GetIids __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetIids -+#define IDispatcherQueueController_GetRuntimeClassName __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetRuntimeClassName -+#define IDispatcherQueueController_GetTrustLevel __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetTrustLevel -+#endif /* WIDL_using_Windows_System */ -+#endif -+ -+#endif -+ -+#endif /* ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_INTERFACE_DEFINED__ */ -+ -+/* Begin additional prototypes for all interfaces */ -+ -+ -+/* End additional prototypes */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+// MARK: - Original dispatcherqueue.h -+ -+enum DISPATCHERQUEUE_THREAD_APARTMENTTYPE { -+ DQTAT_COM_NONE = 0, -+ DQTAT_COM_ASTA = 1, -+ DQTAT_COM_STA = 2 -+}; -+ -+enum DISPATCHERQUEUE_THREAD_TYPE { -+ DQTYPE_THREAD_DEDICATED = 1, -+ DQTYPE_THREAD_CURRENT = 2 -+}; -+ -+struct DispatcherQueueOptions { -+ DWORD dwSize; -+ DISPATCHERQUEUE_THREAD_TYPE threadType; -+ DISPATCHERQUEUE_THREAD_APARTMENTTYPE apartmentType; -+}; -+ -+EXTERN_C HRESULT WINAPI CreateDispatcherQueueController(DispatcherQueueOptions,ABI::Windows::System::IDispatcherQueueController**); -+ -+#endif /* _DISPATCHERQUEUE_H_ */ diff --git a/.ci/vcpkg/overlay-ports/angle/wz-mingw-headers-4.patch b/.ci/vcpkg/overlay-ports/angle/wz-mingw-headers-4.patch deleted file mode 100644 index 6795a9d195a..00000000000 --- a/.ci/vcpkg/overlay-ports/angle/wz-mingw-headers-4.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/third_party/wz-mingw-headers/d3d11.h b/third_party/wz-mingw-headers/d3d11.h -new file mode 100644 ---- /dev/null -+++ b/third_party/wz-mingw-headers/d3d11.h -@@ -0,0 +1,17 @@ -+// SPDX-License-Identifier: CC0-1.0 -+ -+#ifndef _MINGW_COMPAT_FIX_HEADERS_D3D11_H_ -+#define _MINGW_COMPAT_FIX_HEADERS_D3D11_H_ -+ -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wgnu-include-next" -+ -+#include_next -+ -+#ifndef D3D11_CLIP_OR_CULL_DISTANCE_COUNT -+#define D3D11_CLIP_OR_CULL_DISTANCE_COUNT ( 8 ) -+#endif -+ -+#pragma clang diagnostic pop -+ -+#endif /* _MINGW_COMPAT_FIX_HEADERS_D3D11_H_ */ diff --git a/.github/workflows/CI_windows.yml b/.github/workflows/CI_windows.yml index 7b04421b811..41a063f04e2 100644 --- a/.github/workflows/CI_windows.yml +++ b/.github/workflows/CI_windows.yml @@ -386,10 +386,10 @@ jobs: $VerbosePreference = "Continue" . "${env:WZ_REPO_PATH}\.ci\powershell\request.ps1" - $LLVM_MINGW_RELEASE = "20230614"; + $LLVM_MINGW_RELEASE = "20231017"; $LLVM_MINGW_PKG = "llvm-mingw-${LLVM_MINGW_RELEASE}-ucrt-x86_64" $LLVM_MINGW_DL_URL = "https://github.com/mstorsjo/llvm-mingw/releases/download/${LLVM_MINGW_RELEASE}/${LLVM_MINGW_PKG}.zip" - $LLVM_MINGW_DL_SHA512 = "880429f4ef91cb079d64bfb56ef02ca1170cecc082c229d7fb6b02f4ed70a70e64d18e7ca61e95c47e483a970fb3996c5265c95c2dc118bb2fc97e28fd36c2e7" + $LLVM_MINGW_DL_SHA512 = "1dd3b107e58d7757f176eec7e5d4079ee63543153f2c1327c9b46e86eb9989271757977b9c88a74af57b70007edfe5e2365787e2a057af27656d66ba72e2fb28" $LLVM_MINGW_DL_BASEDIR = "${{ github.workspace }}\dl" $LLVM_MINGW_DL_PATH = "${LLVM_MINGW_DL_BASEDIR}\llvm-mingw.zip" diff --git a/cmake/FetchSentryNative.cmake b/cmake/FetchSentryNative.cmake index 0c7ade5e800..a8d07c416fc 100644 --- a/cmake/FetchSentryNative.cmake +++ b/cmake/FetchSentryNative.cmake @@ -63,6 +63,7 @@ FetchContent_Declare( sentrynative ${_sentrynative_fetch_download_options} SOURCE_DIR "${_sentrynative_source_dir}" + PATCH_COMMAND ${CMAKE_COMMAND} "-DSOURCE_DIR=" -P "${CMAKE_SOURCE_DIR}/lib/exceptionhandler/3rdparty/sentry/PatchSentryNative.cmake" ) FetchContent_GetProperties(sentrynative) set(SENTRY_BUILD_SHARED_LIBS OFF CACHE BOOL "Sentry build shared libs" FORCE) diff --git a/lib/exceptionhandler/3rdparty/sentry/PatchSentryNative.cmake b/lib/exceptionhandler/3rdparty/sentry/PatchSentryNative.cmake new file mode 100644 index 00000000000..ef104925ac9 --- /dev/null +++ b/lib/exceptionhandler/3rdparty/sentry/PatchSentryNative.cmake @@ -0,0 +1,14 @@ +if(NOT CMAKE_SCRIPT_MODE_FILE) + message(FATAL_ERROR "This script currently only supports being run via `cmake -P` script mode") +endif() +set(_fullPathToThisScript "${CMAKE_SCRIPT_MODE_FILE}") +get_filename_component(_scriptFolder "${_fullPathToThisScript}" DIRECTORY) + +if((NOT DEFINED SOURCE_DIR) OR (SOURCE_DIR STREQUAL "")) + message(FATAL_ERROR "SOURCE_DIR must be specified on command-line") +endif() + +# Remove compat/mingw/werapi.h (no longer needed) +if (EXISTS "${SOURCE_DIR}/external/crashpad/compat/mingw/werapi.h") + file(REMOVE "${SOURCE_DIR}/external/crashpad/compat/mingw/werapi.h") +endif()