Module: wine Branch: master Commit: 8dd0738b1ca3fb8f75301edde9d8c078f810cbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd0738b1ca3fb8f75301edde9...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Thu Aug 20 20:33:29 2015 +0300
dwrite/tests: Fix layout test failure on Win10.
---
dlls/dwrite/tests/layout.c | 2 +- include/dwrite.idl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 9e2aaea..67d49d1 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -975,7 +975,7 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, -10.0, 0.0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
- hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_UNIFORM+1, 0.0, 0.0); + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_PROPORTIONAL+1, 0.0, 0.0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IDWriteTextFormat_SetTrimming(format, &trimming, NULL); diff --git a/include/dwrite.idl b/include/dwrite.idl index bb41b4f..f8644ba 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -219,7 +219,8 @@ typedef enum DWRITE_BREAK_CONDITION typedef enum DWRITE_LINE_SPACING_METHOD { DWRITE_LINE_SPACING_METHOD_DEFAULT, - DWRITE_LINE_SPACING_METHOD_UNIFORM + DWRITE_LINE_SPACING_METHOD_UNIFORM, + DWRITE_LINE_SPACING_METHOD_PROPORTIONAL } DWRITE_LINE_SPACING_METHOD;
cpp_quote("#define DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) ( \")