ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Dmitry Timoshkov 2011-02-17 17:05:05 +08:00 committed by Alexandre Julliard
parent e2d4775233
commit 15c322c235
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/mlang/mlang.c
View File

@ -3608,8 +3608,11 @@ HRESULT WINAPI DllUnregisterServer(void)
return __wine_unregister_resources( instance, NULL ); 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; return S_FALSE;
} }

2
dlls/mlang/mlang.spec
View File

@ -12,4 +12,4 @@
@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllRegisterServer() @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() @ stdcall -private DllUnregisterServer()
@ stdcall GetGlobalFontLinkObject() @ stdcall GetGlobalFontLinkObject(ptr)

18
dlls/mlang/tests/mlang.c
View File

@ -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) START_TEST(mlang)
{ {
IMultiLanguage *iML = NULL; IMultiLanguage *iML = NULL;
@ -1949,6 +1966,7 @@ START_TEST(mlang)
test_ConvertINetUnicodeToMultiByte(); test_ConvertINetUnicodeToMultiByte();
test_JapaneseConversion(); test_JapaneseConversion();
test_GetGlobalFontLinkObject();
trace("IMultiLanguage\n"); trace("IMultiLanguage\n");
ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,

2
include/mlang.idl
View File

@ -739,7 +739,7 @@ cpp_quote("STDAPI Rfc1766ToLcidA(LCID *, LPCSTR);")
cpp_quote("STDAPI Rfc1766ToLcidW(LCID *, LPCWSTR);") cpp_quote("STDAPI Rfc1766ToLcidW(LCID *, LPCWSTR);")
cpp_quote("#define Rfc1766ToLcid WINELIB_NAME_AW(Rfc1766ToLcid)") 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 IsConvertINetStringAvailable(DWORD, DWORD);")
cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);") cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);")
cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);") cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);")