Module: wine Branch: master Commit: 886875f01e2f1e610cbc49b5617d9aaa71022976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=886875f01e2f1e610cbc49b561...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Apr 18 06:47:14 2016 +0300
dwrite/tests: Use existing macro to define font table tags.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dwrite/tests/font.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index dc9f64e..8ddc0d2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -32,18 +32,14 @@
#include "wine/test.h"
-#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - -#define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') -#define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') -#define MS_GASP_TAG MS_MAKE_TAG('g','a','s','p') -#define MS_CPAL_TAG MS_MAKE_TAG('C','P','A','L') -#define MS_0S2_TAG MS_MAKE_TAG('O','S','/','2') -#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') -#define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') -#define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') +#define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') +#define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') +#define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') +#define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') +#define MS_0S2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') +#define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') +#define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t')
#ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x)