[PATCH 4/4] windows.globalization: Implement ILanguage2.

[Zhiyi Zhang]

From: Zhiyi Zhang

---
 dlls/windows.globalization/main.c             | 79 +++++++++++++++++++
 .../tests/globalization.c                     |  1 -
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c
index a7443bc21b3..b870c547d2f 100644
--- a/dlls/windows.globalization/main.c
+++ b/dlls/windows.globalization/main.c
@@ -412,6 +412,7 @@ struct language_factory
 struct language
 {
     ILanguage ILanguage_iface;
+    ILanguage2 ILanguage2_iface;
     LONG ref;
     WCHAR name[LOCALE_NAME_MAX_LENGTH];
 };
@@ -451,9 +452,16 @@ static inline struct language *impl_from_ILanguage(ILanguage *iface)
     return CONTAINING_RECORD(iface, struct language, ILanguage_iface);
 }

+static inline struct language *impl_from_ILanguage2(ILanguage2 *iface)
+{
+    return CONTAINING_RECORD(iface, struct language, ILanguage2_iface);
+}
+
 static HRESULT STDMETHODCALLTYPE language_QueryInterface(
         ILanguage *iface, REFIID iid, void **out)
 {
+    struct language *language = impl_from_ILanguage(iface);
+
     TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);

if (IsEqualGUID(iid, &IID_IUnknown) ||
@@ -465,6 +473,12 @@ static HRESULT STDMETHODCALLTYPE language_QueryInterface(
         *out = iface;
         return S_OK;
     }
+    else if (IsEqualGUID(iid, &IID_ILanguage2))
+    {
+        IUnknown_AddRef(&language->ILanguage2_iface);
+        *out = &language->ILanguage2_iface;
+        return S_OK;
+    }

FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
     *out = NULL;
@@ -562,6 +576,70 @@ static const struct ILanguageVtbl language_vtbl =
     language_get_Script,
 };

+static HRESULT STDMETHODCALLTYPE language2_QueryInterface(ILanguage2 *iface, REFIID iid, void **out)
+{
+    struct language *language = impl_from_ILanguage2(iface);
+    return language_QueryInterface(&language->ILanguage_iface, iid, out);
+}
+
+static ULONG STDMETHODCALLTYPE language2_AddRef(ILanguage2 *iface)
+{
+    struct language *language = impl_from_ILanguage2(iface);
+    return language_AddRef(&language->ILanguage_iface);
+}
+
+static ULONG STDMETHODCALLTYPE language2_Release(ILanguage2 *iface)
+{
+    struct language *language = impl_from_ILanguage2(iface);
+    return language_Release(&language->ILanguage_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE language2_GetIids(ILanguage2 *iface, ULONG *iid_count, IID **iids)
+{
+    FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids);
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE language2_GetRuntimeClassName(ILanguage2 *iface, HSTRING *class_name)
+{
+    FIXME("iface %p, class_name %p stub!\n", iface, class_name);
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE language2_GetTrustLevel(ILanguage2 *iface, TrustLevel *trust_level)
+{
+    FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE language2_get_LayoutDirection(ILanguage2 *iface, enum LanguageLayoutDirection *value)
+{
+    struct language *language = impl_from_ILanguage2(iface);
+    DWORD reading_layout;
+
+    TRACE("iface %p, value %p.\n", iface, value);
+
+    if (!GetLocaleInfoEx(language->name, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER,
+            (void *)&reading_layout, sizeof(reading_layout)))
+         return E_FAIL;
+
+    *value = (enum LanguageLayoutDirection)reading_layout;
+    return S_OK;
+}
+
+static const struct ILanguage2Vtbl language2_vtbl =
+{
+    language2_QueryInterface,
+    language2_AddRef,
+    language2_Release,
+    /* IInspectable methods */
+    language2_GetIids,
+    language2_GetRuntimeClassName,
+    language2_GetTrustLevel,
+    /* ILanguage2 methods */
+    language2_get_LayoutDirection,
+};
+
 static HRESULT STDMETHODCALLTYPE windows_globalization_QueryInterface(
         IActivationFactory *iface, REFIID iid, void **out)
 {
@@ -891,6 +969,7 @@ static HRESULT STDMETHODCALLTYPE language_factory_CreateLanguage(
         return E_OUTOFMEMORY;

language->ILanguage_iface.lpVtbl = &language_vtbl;
+    language->ILanguage2_iface.lpVtbl = &language2_vtbl;
     language->ref = 1;
     wcscpy(language->name, buffer);

diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c
index b3d4899a431..dd9b7027f7c 100644
--- a/dlls/windows.globalization/tests/globalization.c
+++ b/dlls/windows.globalization/tests/globalization.c
@@ -328,7 +328,6 @@ static void test_Language(void)
         WindowsDeleteString(str);

hr = ILanguage_QueryInterface(language, &IID_ILanguage2, (void **)&language2);
-        todo_wine
         ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* <= Windows 10 1507 */, "Unexpected hr %#lx.\n", hr);
         if (FAILED(hr))
         {