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

dwrite: Block attempts of registering local file loader.

This commit is contained in:
Nikolay Sivov 2014-10-27 11:24:47 +03:00 committed by Alexandre Julliard
parent be69977cd5
commit 5b10a69c3a
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/dwrite/main.c
View File

@ -813,6 +813,9 @@ static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface
if (!loader)
return E_INVALIDARG;
if ((IDWriteFontFileLoader*)This->localfontfileloader == loader)
return S_OK;
if (factory_get_file_loader(This, loader))
return DWRITE_E_ALREADYREGISTERED;
@ -838,6 +841,9 @@ static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *ifa
if (!loader)
return E_INVALIDARG;
if ((IDWriteFontFileLoader*)This->localfontfileloader == loader)
return S_OK;
found = factory_get_file_loader(This, loader);
if (!found)
return E_INVALIDARG;

16
dlls/dwrite/tests/font.c
View File

@ -885,8 +885,7 @@ static void test_system_fontcollection(void)
ok(coll2 == collection, "got %p, was %p\n", coll2, collection);
IDWriteFontCollection_Release(coll2);
hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory2);
ok(hr == S_OK, "got 0x%08x\n", hr);
factory2 = create_factory();
hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(coll2 != collection, "got %p, was %p\n", coll2, collection);
@ -943,6 +942,19 @@ if (file) {
ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr);
hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader);
ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr);
/* try with a different factory */
factory2 = create_factory();
hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader);
ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr);
hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader);
ok(hr == DWRITE_E_ALREADYREGISTERED, "got 0x%08x\n", hr);
hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader);
ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr);
hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
IDWriteFactory_Release(factory2);
IDWriteFontFileLoader_Release(loader);
}
ret = TRUE;