Re: [Mingw-w64-public] IDWriteFontFace1 Fix

[Jacek Caban]

On 26.10.2017 20:13, Tom Ritter wrote:
> We missed one, here is the additional patch.

Looks good, I pushed it to the repo.

Thanks,
Jacek

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Re: [Mingw-w64-public] IDWriteFontFace1 Fix

[Tom Ritter]

We missed one, here is the additional patch.

-tom



On 18 October 2017 at 11:55, Jacek Caban  wrote:
> On 18.10.2017 18:50, Tom Ritter wrote:
>> On 18 October 2017 at 02:58, Jacek Caban  wrote:
>>> The attachment didn't make it to the mailing list.
>> Whoops, sorry, let me try with a .txt. If that fails:
>> https://pastebin.mozilla.org/9070416
>
> It looks good to me, I committed it.
>
> Thanks,
> Jacek
From bc0631e32a04a992fa9f4c4fe496473d9218baab Mon Sep 17 00:00:00 2001
From: Tom Ritter 
Date: Thu, 26 Oct 2017 13:07:31 -0500
Subject: [PATCH] Correct the declaration of IDWriteFontFace2::GetMetrics

The GetMetrics function in the derived class takes a parameter
of type DWRITE_FONT_METRICS1 rather than DWRITE_FONT_METRICS.

We missed this interface in the prior patch, per:
https://bugzilla.mozilla.org/show_bug.cgi?id=1409915#c6
---
 mingw-w64-headers/include/dwrite_2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-w64-headers/include/dwrite_2.h 
b/mingw-w64-headers/include/dwrite_2.h
index 6c5f4f7c..c939297b 100644
--- a/mingw-w64-headers/include/dwrite_2.h
+++ b/mingw-w64-headers/include/dwrite_2.h
@@ -447,7 +447,7 @@ DECLARE_INTERFACE_(IDWriteFontFace2,IDWriteFontFace1)
 WINBOOL isSideways __MINGW_DEF_ARG_VAL(FALSE)) PURE;
 
 /* IDWriteFontFace1 methods */
-STDMETHOD_(void, GetMetrics)(THIS_ DWRITE_FONT_METRICS*) PURE;
+STDMETHOD_(void, GetMetrics)(THIS_ DWRITE_FONT_METRICS1*) PURE;
 STDMETHOD(GetGdiCompatibleMetrics)(THIS_ FLOAT,FLOAT,DWRITE_MATRIX 
const*,DWRITE_FONT_METRICS1*) PURE;
 STDMETHOD_(void, GetCaretMetrics)(THIS_ DWRITE_CARET_METRICS*) PURE;
 STDMETHOD(GetUnicodeRanges)(THIS_ UINT32, DWRITE_UNICODE_RANGE*,UINT32*) 
PURE;
-- 
2.11.0

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Re: [Mingw-w64-public] IDWriteFontFace1 Fix

[Tom Ritter]

On 18 October 2017 at 02:58, Jacek Caban  wrote:
> The attachment didn't make it to the mailing list.

Whoops, sorry, let me try with a .txt. If that fails:
https://pastebin.mozilla.org/9070416

-tom
From 297ce100d033e69c41abf19cfd0839477050e6ae Mon Sep 17 00:00:00 2001
From: Tom Ritter 
Date: Tue, 17 Oct 2017 00:11:11 -0500
Subject: [PATCH] Correct the declaration of IDWriteFontFace1::GetMetrics

The GetMetrics function in the derived class takes a parameter
of type DWRITE_FONT_METRICS1 rather than DWRITE_FONT_METRICS.

From: https://bugzilla.mozilla.org/show_bug.cgi?id=1372958#c10
---
 mingw-w64-headers/include/dwrite_1.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-w64-headers/include/dwrite_1.h 
b/mingw-w64-headers/include/dwrite_1.h
index be0dd448..c0d15acb 100644
--- a/mingw-w64-headers/include/dwrite_1.h
+++ b/mingw-w64-headers/include/dwrite_1.h
@@ -132,7 +132,7 @@ DECLARE_INTERFACE_(IDWriteFontFace1, IDWriteFontFace)
 #endif

 /* IDWriteFontFace1 methods */
-STDMETHOD_(void, GetMetrics)(THIS_ DWRITE_FONT_METRICS*) PURE;
+STDMETHOD_(void, GetMetrics)(THIS_ DWRITE_FONT_METRICS1*) PURE;
 STDMETHOD(GetGdiCompatibleMetrics)(THIS_ FLOAT,FLOAT,DWRITE_MATRIX 
const*,DWRITE_FONT_METRICS1*) PURE;
 STDMETHOD_(void, GetCaretMetrics)(THIS_ DWRITE_CARET_METRICS*) PURE;
 STDMETHOD(GetUnicodeRanges)(THIS_ UINT32, DWRITE_UNICODE_RANGE*,UINT32*) 
PURE;
--
2.11.0--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Re: [Mingw-w64-public] IDWriteFontFace1 Fix

[Jacek Caban]

Hi Tom,


On 10/17/17 7:16 AM, Tom Ritter wrote:

Attached is a patch that I think, maybe, resolves the issue in
https://bugzilla.mozilla.org/show_bug.cgi?id=1372958#c10



The attachment didn't make it to the mailing list.

Thanks,
Jacek

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

[Mingw-w64-public] IDWriteFontFace1 Fix

[Tom Ritter]

Attached is a patch that I think, maybe, resolves the issue in
https://bugzilla.mozilla.org/show_bug.cgi?id=1372958#c10

-tom
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public