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

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Wed Jan 25 00:54:13 2017 +0300

dwrite: Use OpenType 1.8 'head' table structure.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)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 c829813..f4ed51f 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -113,7 +113,8 @@ enum OPENTYPE_CMAP_TABLE_FORMAT
 #include "pshpack2.h"
 typedef struct
 {
-    ULONG version;
+    USHORT majorVersion;
+    USHORT minorVersion;
     ULONG revision;
     ULONG checksumadj;
     ULONG magic;
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index ba9866a..9382569 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -113,7 +113,8 @@ static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','
 #include "pshpack2.h"
 typedef struct
 {
-    ULONG version;
+    USHORT majorVersion;
+    USHORT minorVersion;
     ULONG revision;
     ULONG checksumadj;
     ULONG magic;