Nikolay Sivov : dwrite: Store vertical orientation property.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Mar 13 11:58:32 2015 +0300

dwrite: Store vertical orientation property.

---

 dlls/dwrite/layout.c       | 39 +++++++++++++++++++++++++++++++--------
 dlls/dwrite/tests/layout.c | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index d26751e..26d84a3 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -47,6 +47,7 @@ struct dwrite_textformat_data {
     DWRITE_TEXT_ALIGNMENT textalignment;
     DWRITE_FLOW_DIRECTION flow;
     DWRITE_LINE_SPACING_METHOD spacingmethod;
+    DWRITE_VERTICAL_GLYPH_ORIENTATION vertical_orientation;
 
     FLOAT spacing;
     FLOAT baseline;
@@ -1821,15 +1822,21 @@ static HRESULT WINAPI dwritetextlayout2_GetMetrics(IDWriteTextLayout2 *iface, DW
 static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextLayout2 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation)
 {
     struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface);
-    FIXME("(%p)->(%d): stub\n", This, orientation);
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%d)\n", This, orientation);
+
+    if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED)
+        return E_INVALIDARG;
+
+    This->format.vertical_orientation = orientation;
+    return S_OK;
 }
 
 static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextlayout2_GetVerticalGlyphOrientation(IDWriteTextLayout2 *iface)
 {
     struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface);
-    FIXME("(%p): stub\n", This);
-    return DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT;
+    TRACE("(%p)\n", This);
+    return This->format.vertical_orientation;
 }
 
 static HRESULT WINAPI dwritetextlayout2_SetLastLineWrapping(IDWriteTextLayout2 *iface, BOOL lastline_wrapping_enabled)
@@ -2174,6 +2181,7 @@ static const IDWriteTextAnalysisSourceVtbl dwritetextlayoutsourcevtbl = {
 
 static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format)
 {
+    IDWriteTextFormat1 *format1;
     UINT32 len;
     HRESULT hr;
 
@@ -2217,6 +2225,14 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I
         return hr;
     layout->format.family_len = len;
 
+    hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1);
+    if (hr == S_OK) {
+        layout->format.vertical_orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1);
+        IDWriteTextFormat1_Release(format1);
+    }
+    else
+        layout->format.vertical_orientation = DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT;
+
     return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection);
 }
 
@@ -2674,15 +2690,21 @@ static HRESULT WINAPI dwritetextformat_GetLocaleName(IDWriteTextFormat1 *iface,
 static HRESULT WINAPI dwritetextformat1_SetVerticalGlyphOrientation(IDWriteTextFormat1 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation)
 {
     struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface);
-    FIXME("(%p)->(%d): stub\n", This, orientation);
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%d)\n", This, orientation);
+
+    if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED)
+        return E_INVALIDARG;
+
+    This->format.vertical_orientation = orientation;
+    return S_OK;
 }
 
 static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_GetVerticalGlyphOrientation(IDWriteTextFormat1 *iface)
 {
     struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface);
-    FIXME("(%p): stub\n", This);
-    return DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT;
+    TRACE("(%p)\n", This);
+    return This->format.vertical_orientation;
 }
 
 static HRESULT WINAPI dwritetextformat1_SetLastLineWrapping(IDWriteTextFormat1 *iface, BOOL lastline_wrapping_enabled)
@@ -2792,6 +2814,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle
     This->format.readingdir = DWRITE_READING_DIRECTION_LEFT_TO_RIGHT;
     This->format.flow = DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM;
     This->format.spacingmethod = DWRITE_LINE_SPACING_METHOD_DEFAULT;
+    This->format.vertical_orientation = DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT;
     This->format.spacing = 0.0;
     This->format.baseline = 0.0;
     This->format.trimming.granularity = DWRITE_TRIMMING_GRANULARITY_NONE;
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index c796c12..eb00e53 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -1089,6 +1089,40 @@ if (0) { /* crashes on native */
     IDWriteTextLayout1_Release(layout1);
 }
 
+static void test_SetVerticalGlyphOrientation(void)
+{
+    static const WCHAR strW[] = {'a','b','c','d',0};
+    DWRITE_VERTICAL_GLYPH_ORIENTATION orientation;
+    IDWriteTextLayout2 *layout2;
+    IDWriteTextFormat *format;
+    IDWriteTextLayout *layout;
+    HRESULT hr;
+
+    hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+        DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    IDWriteTextFormat_Release(format);
+
+    hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2);
+    IDWriteTextLayout_Release(layout);
+
+    if (hr != S_OK) {
+        win_skip("SetVerticalGlyphOrientation() is not supported.\n");
+        return;
+    }
+
+    orientation = IDWriteTextLayout2_GetVerticalGlyphOrientation(layout2);
+    ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT, "got %d\n", orientation);
+
+    hr = IDWriteTextLayout2_SetVerticalGlyphOrientation(layout2, DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED+1);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    IDWriteTextLayout2_Release(layout2);
+}
+
 START_TEST(layout)
 {
     HRESULT hr;
@@ -1116,6 +1150,7 @@ START_TEST(layout)
     test_GetClusterMetrics();
     test_SetLocaleName();
     test_SetPairKerning();
+    test_SetVerticalGlyphOrientation();
 
     IDWriteFactory_Release(factory);
 }