mingw-foundation_redef.patch (7839B)
1 From c8a7600f9bee5d605b5559dda16b7ae09a17beba Mon Sep 17 00:00:00 2001 2 From: Biswapriyo Nath <nathbappai@gmail.com> 3 Date: Tue, 5 Nov 2024 06:33:12 +0000 4 Subject: [PATCH] headers-git: Workaround redefinition error in 5 windows.foundation.h 6 7 diff --git a/mingw-w64-headers/include/windows.foundation.h b/mingw-w64-headers/include/windows.foundation.h 8 index 8be88e4..95aa62d 100644 9 --- a/mingw-w64-headers/include/windows.foundation.h 10 +++ b/mingw-w64-headers/include/windows.foundation.h 11 @@ -898,14 +898,6 @@ typedef interface __FIReference_1_TimeSpan __FIReference_1_TimeSpan; 12 #endif /* __cplusplus */ 13 #endif 14 15 -#ifndef ____FIReference_1_boolean_FWD_DEFINED__ 16 -#define ____FIReference_1_boolean_FWD_DEFINED__ 17 -typedef interface __FIReference_1_boolean __FIReference_1_boolean; 18 -#ifdef __cplusplus 19 -#define __FIReference_1_boolean ABI::Windows::Foundation::IReference<boolean > 20 -#endif /* __cplusplus */ 21 -#endif 22 - 23 #ifndef ____FITypedEventHandler_2_IInspectable_IInspectable_FWD_DEFINED__ 24 #define ____FITypedEventHandler_2_IInspectable_IInspectable_FWD_DEFINED__ 25 typedef interface __FITypedEventHandler_2_IInspectable_IInspectable __FITypedEventHandler_2_IInspectable_IInspectable; 26 @@ -1798,14 +1790,6 @@ typedef interface __FIReference_1_TimeSpan __FIReference_1_TimeSpan; 27 #endif /* __cplusplus */ 28 #endif 29 30 -#ifndef ____FIReference_1_boolean_FWD_DEFINED__ 31 -#define ____FIReference_1_boolean_FWD_DEFINED__ 32 -typedef interface __FIReference_1_boolean __FIReference_1_boolean; 33 -#ifdef __cplusplus 34 -#define __FIReference_1_boolean ABI::Windows::Foundation::IReference<boolean > 35 -#endif /* __cplusplus */ 36 -#endif 37 - 38 /***************************************************************************** 39 * IAsyncActionCompletedHandler interface 40 */ 41 @@ -13624,128 +13608,6 @@ static inline HRESULT __FIReference_1_TimeSpan_get_Value(__FIReference_1_TimeSpa 42 43 #endif /* ____FIReference_1_TimeSpan_INTERFACE_DEFINED__ */ 44 45 -/***************************************************************************** 46 - * IReference<boolean > interface 47 - */ 48 -#ifndef ____FIReference_1_boolean_INTERFACE_DEFINED__ 49 -#define ____FIReference_1_boolean_INTERFACE_DEFINED__ 50 - 51 -DEFINE_GUID(IID___FIReference_1_boolean, 0x3c00fd60, 0x2950, 0x5939, 0xa2,0x1a, 0x2d,0x12,0xc5,0xa0,0x1b,0x8a); 52 -#if defined(__cplusplus) && !defined(CINTERFACE) 53 -} /* extern "C" */ 54 -namespace ABI { 55 - namespace Windows { 56 - namespace Foundation { 57 - template<> 58 - MIDL_INTERFACE("3c00fd60-2950-5939-a21a-2d12c5a01b8a") 59 - IReference<boolean > : IReference_impl<boolean > 60 - { 61 - }; 62 - } 63 - } 64 -} 65 -extern "C" { 66 -#ifdef __CRT_UUID_DECL 67 -__CRT_UUID_DECL(__FIReference_1_boolean, 0x3c00fd60, 0x2950, 0x5939, 0xa2,0x1a, 0x2d,0x12,0xc5,0xa0,0x1b,0x8a) 68 -#endif 69 -#else 70 -typedef struct __FIReference_1_booleanVtbl { 71 - BEGIN_INTERFACE 72 - 73 - /*** IUnknown methods ***/ 74 - HRESULT (STDMETHODCALLTYPE *QueryInterface)( 75 - __FIReference_1_boolean *This, 76 - REFIID riid, 77 - void **ppvObject); 78 - 79 - ULONG (STDMETHODCALLTYPE *AddRef)( 80 - __FIReference_1_boolean *This); 81 - 82 - ULONG (STDMETHODCALLTYPE *Release)( 83 - __FIReference_1_boolean *This); 84 - 85 - /*** IInspectable methods ***/ 86 - HRESULT (STDMETHODCALLTYPE *GetIids)( 87 - __FIReference_1_boolean *This, 88 - ULONG *iidCount, 89 - IID **iids); 90 - 91 - HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( 92 - __FIReference_1_boolean *This, 93 - HSTRING *className); 94 - 95 - HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( 96 - __FIReference_1_boolean *This, 97 - TrustLevel *trustLevel); 98 - 99 - /*** IReference<boolean > methods ***/ 100 - HRESULT (STDMETHODCALLTYPE *get_Value)( 101 - __FIReference_1_boolean *This, 102 - boolean *value); 103 - 104 - END_INTERFACE 105 -} __FIReference_1_booleanVtbl; 106 - 107 -interface __FIReference_1_boolean { 108 - CONST_VTBL __FIReference_1_booleanVtbl* lpVtbl; 109 -}; 110 - 111 -#ifdef COBJMACROS 112 -#ifndef WIDL_C_INLINE_WRAPPERS 113 -/*** IUnknown methods ***/ 114 -#define __FIReference_1_boolean_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) 115 -#define __FIReference_1_boolean_AddRef(This) (This)->lpVtbl->AddRef(This) 116 -#define __FIReference_1_boolean_Release(This) (This)->lpVtbl->Release(This) 117 -/*** IInspectable methods ***/ 118 -#define __FIReference_1_boolean_GetIids(This,iidCount,iids) (This)->lpVtbl->GetIids(This,iidCount,iids) 119 -#define __FIReference_1_boolean_GetRuntimeClassName(This,className) (This)->lpVtbl->GetRuntimeClassName(This,className) 120 -#define __FIReference_1_boolean_GetTrustLevel(This,trustLevel) (This)->lpVtbl->GetTrustLevel(This,trustLevel) 121 -/*** IReference<boolean > methods ***/ 122 -#define __FIReference_1_boolean_get_Value(This,value) (This)->lpVtbl->get_Value(This,value) 123 -#else 124 -/*** IUnknown methods ***/ 125 -static inline HRESULT __FIReference_1_boolean_QueryInterface(__FIReference_1_boolean* This,REFIID riid,void **ppvObject) { 126 - return This->lpVtbl->QueryInterface(This,riid,ppvObject); 127 -} 128 -static inline ULONG __FIReference_1_boolean_AddRef(__FIReference_1_boolean* This) { 129 - return This->lpVtbl->AddRef(This); 130 -} 131 -static inline ULONG __FIReference_1_boolean_Release(__FIReference_1_boolean* This) { 132 - return This->lpVtbl->Release(This); 133 -} 134 -/*** IInspectable methods ***/ 135 -static inline HRESULT __FIReference_1_boolean_GetIids(__FIReference_1_boolean* This,ULONG *iidCount,IID **iids) { 136 - return This->lpVtbl->GetIids(This,iidCount,iids); 137 -} 138 -static inline HRESULT __FIReference_1_boolean_GetRuntimeClassName(__FIReference_1_boolean* This,HSTRING *className) { 139 - return This->lpVtbl->GetRuntimeClassName(This,className); 140 -} 141 -static inline HRESULT __FIReference_1_boolean_GetTrustLevel(__FIReference_1_boolean* This,TrustLevel *trustLevel) { 142 - return This->lpVtbl->GetTrustLevel(This,trustLevel); 143 -} 144 -/*** IReference<boolean > methods ***/ 145 -static inline HRESULT __FIReference_1_boolean_get_Value(__FIReference_1_boolean* This,boolean *value) { 146 - return This->lpVtbl->get_Value(This,value); 147 -} 148 -#endif 149 -#ifdef WIDL_using_Windows_Foundation 150 -#define IID_IReference_boolean IID___FIReference_1_boolean 151 -#define IReference_booleanVtbl __FIReference_1_booleanVtbl 152 -#define IReference_boolean __FIReference_1_boolean 153 -#define IReference_boolean_QueryInterface __FIReference_1_boolean_QueryInterface 154 -#define IReference_boolean_AddRef __FIReference_1_boolean_AddRef 155 -#define IReference_boolean_Release __FIReference_1_boolean_Release 156 -#define IReference_boolean_GetIids __FIReference_1_boolean_GetIids 157 -#define IReference_boolean_GetRuntimeClassName __FIReference_1_boolean_GetRuntimeClassName 158 -#define IReference_boolean_GetTrustLevel __FIReference_1_boolean_GetTrustLevel 159 -#define IReference_boolean_get_Value __FIReference_1_boolean_get_Value 160 -#endif /* WIDL_using_Windows_Foundation */ 161 -#endif 162 - 163 -#endif 164 - 165 -#endif /* ____FIReference_1_boolean_INTERFACE_DEFINED__ */ 166 - 167 /***************************************************************************** 168 * ITypedEventHandler<IInspectable*,IInspectable* > interface 169 */ 170 diff --git a/mingw-w64-headers/include/windows.foundation.idl b/mingw-w64-headers/include/windows.foundation.idl 171 index 88a9f57..7a64459 100644 172 --- a/mingw-w64-headers/include/windows.foundation.idl 173 +++ b/mingw-w64-headers/include/windows.foundation.idl 174 @@ -150,7 +150,6 @@ namespace Windows.Foundation { 175 interface Windows.Foundation.IReference<Windows.Foundation.Rect>; 176 interface Windows.Foundation.IReference<Windows.Foundation.Size>; 177 interface Windows.Foundation.IReference<Windows.Foundation.TimeSpan>; 178 - interface Windows.Foundation.IReference<boolean>; 179 interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>; 180 interface Windows.Foundation.TypedEventHandler<Windows.Foundation.IMemoryBufferReference *, IInspectable *>; 181 }