forked from mirrors/gecko-dev
f096af1fc5
In the time since we last bumped MinGW many of our patches no longer apply. The enum patch had one of the fixes incorporated, but not the other. The winrt patch added several files that were added to MinGW - but not all the classes we need were added, so I've copied them into a new patch in a subsequent commit. While we're here, also add the mingw patches as resources so they trigger rebuilds when edited. Differential Revision: https://phabricator.services.mozilla.com/D168831
87 lines
5.8 KiB
Diff
87 lines
5.8 KiB
Diff
From a9804765e442063be37338933b9c40e3e3d01aac Mon Sep 17 00:00:00 2001
|
|
From: Sanketh Menda <me@snkth.com>
|
|
Date: Thu, 2 Feb 2023 12:29:03 -0500
|
|
Subject: [PATCH 4/7] dwrite_3.h: rename GetGlyphImageFormats_ to
|
|
GetGlyphImageFormats
|
|
|
|
Wine's WIDL currently doesn't support overloading functions, so till
|
|
that is fixed patch dwrite_3.h to rename GlyphImageFormats_ to
|
|
GetGlyphImageFormats.
|
|
---
|
|
mingw-w64-headers/include/dwrite_3.h | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/mingw-w64-headers/include/dwrite_3.h b/mingw-w64-headers/include/dwrite_3.h
|
|
index 205c47f04..352731bf1 100644
|
|
--- a/mingw-w64-headers/include/dwrite_3.h
|
|
+++ b/mingw-w64-headers/include/dwrite_3.h
|
|
@@ -8181,7 +8181,7 @@ DEFINE_GUID(IID_IDWriteFontFace4, 0x27f2a904, 0x4eb8, 0x441d, 0x96,0x78, 0x05,0x
|
|
MIDL_INTERFACE("27f2a904-4eb8-441d-9678-0563f53e3e2f")
|
|
IDWriteFontFace4 : public IDWriteFontFace3
|
|
{
|
|
- virtual HRESULT STDMETHODCALLTYPE GetGlyphImageFormats_(
|
|
+ virtual HRESULT STDMETHODCALLTYPE GetGlyphImageFormats(
|
|
UINT16 glyph,
|
|
UINT32 ppem_first,
|
|
UINT32 ppem_last,
|
|
@@ -8481,7 +8481,7 @@ typedef struct IDWriteFontFace4Vtbl {
|
|
WINBOOL *are_local);
|
|
|
|
/*** IDWriteFontFace4 methods ***/
|
|
- HRESULT (STDMETHODCALLTYPE *GetGlyphImageFormats_)(
|
|
+ HRESULT (STDMETHODCALLTYPE *GetGlyphImageFormats)(
|
|
IDWriteFontFace4 *This,
|
|
UINT16 glyph,
|
|
UINT32 ppem_first,
|
|
@@ -8562,7 +8562,7 @@ interface IDWriteFontFace4 {
|
|
#define IDWriteFontFace4_AreCharactersLocal(This,characters,count,enqueue_if_not,are_local) (This)->lpVtbl->AreCharactersLocal(This,characters,count,enqueue_if_not,are_local)
|
|
#define IDWriteFontFace4_AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local) (This)->lpVtbl->AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local)
|
|
/*** IDWriteFontFace4 methods ***/
|
|
-#define IDWriteFontFace4_GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats) (This)->lpVtbl->GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats)
|
|
+#define IDWriteFontFace4_GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats) (This)->lpVtbl->GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats)
|
|
#define IDWriteFontFace4_GetGlyphImageFormats(This) (This)->lpVtbl->GetGlyphImageFormats(This)
|
|
#define IDWriteFontFace4_GetGlyphImageData(This,glyph,ppem,format,data,context) (This)->lpVtbl->GetGlyphImageData(This,glyph,ppem,format,data,context)
|
|
#define IDWriteFontFace4_ReleaseGlyphImageData(This,context) (This)->lpVtbl->ReleaseGlyphImageData(This,context)
|
|
@@ -8705,8 +8705,8 @@ static __WIDL_INLINE HRESULT IDWriteFontFace4_AreGlyphsLocal(IDWriteFontFace4* T
|
|
return This->lpVtbl->AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local);
|
|
}
|
|
/*** IDWriteFontFace4 methods ***/
|
|
-static __WIDL_INLINE HRESULT IDWriteFontFace4_GetGlyphImageFormats_(IDWriteFontFace4* This,UINT16 glyph,UINT32 ppem_first,UINT32 ppem_last,DWRITE_GLYPH_IMAGE_FORMATS *formats) {
|
|
- return This->lpVtbl->GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats);
|
|
+static __WIDL_INLINE HRESULT IDWriteFontFace4_GetGlyphImageFormats(IDWriteFontFace4* This,UINT16 glyph,UINT32 ppem_first,UINT32 ppem_last,DWRITE_GLYPH_IMAGE_FORMATS *formats) {
|
|
+ return This->lpVtbl->GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats);
|
|
}
|
|
static __WIDL_INLINE DWRITE_GLYPH_IMAGE_FORMATS IDWriteFontFace4_GetGlyphImageFormats(IDWriteFontFace4* This) {
|
|
return This->lpVtbl->GetGlyphImageFormats(This);
|
|
@@ -9033,7 +9033,7 @@ typedef struct IDWriteFontFace5Vtbl {
|
|
WINBOOL *are_local);
|
|
|
|
/*** IDWriteFontFace4 methods ***/
|
|
- HRESULT (STDMETHODCALLTYPE *GetGlyphImageFormats_)(
|
|
+ HRESULT (STDMETHODCALLTYPE *GetGlyphImageFormats)(
|
|
IDWriteFontFace5 *This,
|
|
UINT16 glyph,
|
|
UINT32 ppem_first,
|
|
@@ -9134,7 +9134,7 @@ interface IDWriteFontFace5 {
|
|
#define IDWriteFontFace5_AreCharactersLocal(This,characters,count,enqueue_if_not,are_local) (This)->lpVtbl->AreCharactersLocal(This,characters,count,enqueue_if_not,are_local)
|
|
#define IDWriteFontFace5_AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local) (This)->lpVtbl->AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local)
|
|
/*** IDWriteFontFace4 methods ***/
|
|
-#define IDWriteFontFace5_GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats) (This)->lpVtbl->GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats)
|
|
+#define IDWriteFontFace5_GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats) (This)->lpVtbl->GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats)
|
|
#define IDWriteFontFace5_GetGlyphImageFormats(This) (This)->lpVtbl->GetGlyphImageFormats(This)
|
|
#define IDWriteFontFace5_GetGlyphImageData(This,glyph,ppem,format,data,context) (This)->lpVtbl->GetGlyphImageData(This,glyph,ppem,format,data,context)
|
|
#define IDWriteFontFace5_ReleaseGlyphImageData(This,context) (This)->lpVtbl->ReleaseGlyphImageData(This,context)
|
|
@@ -9283,8 +9283,8 @@ static __WIDL_INLINE HRESULT IDWriteFontFace5_AreGlyphsLocal(IDWriteFontFace5* T
|
|
return This->lpVtbl->AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local);
|
|
}
|
|
/*** IDWriteFontFace4 methods ***/
|
|
-static __WIDL_INLINE HRESULT IDWriteFontFace5_GetGlyphImageFormats_(IDWriteFontFace5* This,UINT16 glyph,UINT32 ppem_first,UINT32 ppem_last,DWRITE_GLYPH_IMAGE_FORMATS *formats) {
|
|
- return This->lpVtbl->GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats);
|
|
+static __WIDL_INLINE HRESULT IDWriteFontFace5_GetGlyphImageFormats(IDWriteFontFace5* This,UINT16 glyph,UINT32 ppem_first,UINT32 ppem_last,DWRITE_GLYPH_IMAGE_FORMATS *formats) {
|
|
+ return This->lpVtbl->GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats);
|
|
}
|
|
static __WIDL_INLINE DWRITE_GLYPH_IMAGE_FORMATS IDWriteFontFace5_GetGlyphImageFormats(IDWriteFontFace5* This) {
|
|
return This->lpVtbl->GetGlyphImageFormats(This);
|
|
--
|
|
2.25.1
|
|
|