Nikolay Sivov : dwrite: Use OpenType 1.8 'hhea' table structure.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 669d033ee160dfe3dd76e9ee14cc6868d10d90a3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=669d033ee160dfe3dd76e9ee14cc6868d10d90a3

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Jan 25 00:54:14 2017 +0300

dwrite: Use OpenType 1.8 'hhea' table structure.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dwrite/opentype.c   | 3 ++-
 dlls/dwrite/tests/font.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index f4ed51f..7a3e641 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -205,7 +205,8 @@ typedef struct
 } TT_OS2_V2;
 
 typedef struct {
-    ULONG  version;
+    USHORT majorVersion;
+    USHORT minorVersion;
     SHORT  ascender;
     SHORT  descender;
     SHORT  linegap;
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 9382569..c373d14 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -217,7 +217,8 @@ typedef struct {
 } TT_POST;
 
 typedef struct {
-    ULONG  version;
+    USHORT majorVersion;
+    USHORT minorVersion;
     SHORT  ascender;
     SHORT  descender;
     SHORT  linegap;