Nikolay Sivov : dwrite: Respond to IID_IDWriteTextLayout1 too.

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Fri Nov  7 09:25:33 2014 +0300

dwrite: Respond to IID_IDWriteTextLayout1 too.

---

dlls/dwrite/layout.c       |  1 +
 dlls/dwrite/tests/layout.c | 40 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 86ddf3c..6d8145d 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -525,6 +525,7 @@ static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout2 *iface,
     TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj);

if (IsEqualIID(riid, &IID_IDWriteTextLayout2) ||
+        IsEqualIID(riid, &IID_IDWriteTextLayout1) ||
         IsEqualIID(riid, &IID_IDWriteTextLayout) ||
         IsEqualIID(riid, &IID_IDWriteTextFormat) ||
         IsEqualIID(riid, &IID_IUnknown))
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index 0975ee8..bf872f0 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -1,7 +1,7 @@
 /*
  *    Text layout/format tests
  *
- * Copyright 2012 Nikolay Sivov for CodeWeavers
+ * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -309,7 +309,9 @@ static IDWriteTextRenderer testrenderer = { &testrenderervtbl };
 static void test_CreateTextLayout(void)
 {
     static const WCHAR strW[] = {'s','t','r','i','n','g',0};
+    IDWriteTextLayout2 *layout2;
     IDWriteTextLayout *layout;
+    IDWriteTextFormat *format;
     HRESULT hr;

hr = IDWriteFactory_CreateTextLayout(factory, NULL, 0, NULL, 0.0, 0.0, &layout);
@@ -326,6 +328,42 @@ static void test_CreateTextLayout(void)

hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 1000.0, 1000.0, &layout);
     ok(hr == E_INVALIDARG, "got 0x%08x\n", 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, 6, format, 1000.0, 1000.0, &layout);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2);
+    if (hr == S_OK) {
+        IDWriteTextLayout1 *layout1;
+        IDWriteTextFormat1 *format1;
+
+        hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextLayout1, (void**)&layout1);
+        ok(hr == S_OK, "got 0x%08x\n", hr);
+        IDWriteTextLayout1_Release(layout1);
+
+        hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1);
+todo_wine
+        ok(hr == S_OK, "got 0x%08x\n", hr);
+if (hr == S_OK)
+        IDWriteTextFormat1_Release(format1);
+
+        hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat1, (void**)&format1);
+todo_wine
+        ok(hr == S_OK, "got 0x%08x\n", hr);
+if (hr == S_OK)
+        IDWriteTextFormat1_Release(format1);
+
+        IDWriteTextLayout2_Release(layout2);
+    }
+    else
+        win_skip("IDWriteTextLayout2 is not supported.\n");
+
+    IDWriteTextLayout_Release(layout);
+    IDWriteTextFormat_Release(format);
 }

static void test_CreateGdiCompatibleTextLayout(void)