Dmitry Timoshkov : mlang: GetGlobalFontLinkObject() takes a non-zero number of arguments.

[Alexandre Julliard]

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

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Thu Feb 17 17:05:05 2011 +0800

mlang: GetGlobalFontLinkObject() takes a non-zero number of arguments.

---

 dlls/mlang/mlang.c       |    7 +++++--
 dlls/mlang/mlang.spec    |    2 +-
 dlls/mlang/tests/mlang.c |   18 ++++++++++++++++++
 include/mlang.idl        |    2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index e324aea..92fab82 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -3608,8 +3608,11 @@ HRESULT WINAPI DllUnregisterServer(void)
     return __wine_unregister_resources( instance, NULL );
 }
 
-HRESULT WINAPI GetGlobalFontLinkObject(void)
+HRESULT WINAPI GetGlobalFontLinkObject(void **unknown)
 {
-    FIXME("\n");
+    if (!unknown) return E_INVALIDARG;
+
+    FIXME("%p: stub\n", unknown);
+
     return S_FALSE;
 }
diff --git a/dlls/mlang/mlang.spec b/dlls/mlang/mlang.spec
index dc9630a..fd683a9 100644
--- a/dlls/mlang/mlang.spec
+++ b/dlls/mlang/mlang.spec
@@ -12,4 +12,4 @@
 @ stdcall -private DllGetClassObject(ptr ptr ptr)
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllUnregisterServer()
-@ stdcall GetGlobalFontLinkObject()
+@ stdcall GetGlobalFontLinkObject(ptr)
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index c8d098f..96a19a6 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -1931,6 +1931,23 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2)
     }
 }
 
+static void test_GetGlobalFontLinkObject(void)
+{
+    HRESULT ret;
+    void *unknown;
+
+    ret = GetGlobalFontLinkObject(NULL);
+    ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#x\n", ret);
+
+    unknown = (void *)0xdeadbeef;
+    ret = GetGlobalFontLinkObject(&unknown);
+todo_wine {
+    ok(ret == S_OK, "expected S_OK got %#x\n", ret);
+    ok(unknown != NULL && unknown != (void *)0xdeadbeef,
+       "GetGlobalFontLinkObject() returned %p\n", unknown);
+    }
+}
+
 START_TEST(mlang)
 {
     IMultiLanguage  *iML = NULL;
@@ -1949,6 +1966,7 @@ START_TEST(mlang)
     test_ConvertINetUnicodeToMultiByte();
     test_JapaneseConversion();
 
+    test_GetGlobalFontLinkObject();
 
     trace("IMultiLanguage\n");
     ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
diff --git a/include/mlang.idl b/include/mlang.idl
index 7664a22..7cdc970 100644
--- a/include/mlang.idl
+++ b/include/mlang.idl
@@ -739,7 +739,7 @@ cpp_quote("STDAPI Rfc1766ToLcidA(LCID *, LPCSTR);")
 cpp_quote("STDAPI Rfc1766ToLcidW(LCID *, LPCWSTR);")
 cpp_quote("#define Rfc1766ToLcid WINELIB_NAME_AW(Rfc1766ToLcid)")
 
-cpp_quote("STDAPI GetGlobalFontLinkObject(void);")
+cpp_quote("STDAPI GetGlobalFontLinkObject(void **unknown);")
 cpp_quote("STDAPI IsConvertINetStringAvailable(DWORD, DWORD);")
 cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);")
 cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);")