system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-18 16:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

dwrite: Use IDWriteFactory7 for collections internally.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2019-12-05 11:56:03 +03:00 committed by Alexandre Julliard
parent 4215984d8d
commit c95ebe7d9d
3 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/dwrite/dwrite_private.h
View file

@ -238,15 +238,15 @@ extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const W
extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN;
extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN;
extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN; extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN;
extern HRESULT get_system_fontcollection(IDWriteFactory5*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection1 **collection) DECLSPEC_HIDDEN;
extern HRESULT get_eudc_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection3 **collection) DECLSPEC_HIDDEN; extern HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 **collection) DECLSPEC_HIDDEN;
extern IDWriteTextAnalyzer *get_text_analyzer(void) DECLSPEC_HIDDEN; extern IDWriteTextAnalyzer *get_text_analyzer(void) DECLSPEC_HIDDEN;
extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN;
extern void init_local_fontfile_loader(void) DECLSPEC_HIDDEN; extern void init_local_fontfile_loader(void) DECLSPEC_HIDDEN;
extern IDWriteFontFileLoader *get_local_fontfile_loader(void) DECLSPEC_HIDDEN; extern IDWriteFontFileLoader *get_local_fontfile_loader(void) DECLSPEC_HIDDEN;
extern HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_list, extern HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_list,
IDWriteFontFace5 **fontface) DECLSPEC_HIDDEN; IDWriteFontFace5 **fontface) DECLSPEC_HIDDEN;
extern HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system, extern HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system,
IDWriteFontCollection3 **collection) DECLSPEC_HIDDEN; IDWriteFontCollection3 **collection) DECLSPEC_HIDDEN;
extern HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc*,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; extern HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc*,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN;
extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN;
@ -265,9 +265,9 @@ extern HRESULT create_matching_font(IDWriteFontCollection*,const WCHAR*,DWRITE_F
extern HRESULT create_fontfacereference(IDWriteFactory7 *factory, IDWriteFontFile *file, UINT32 face_index, extern HRESULT create_fontfacereference(IDWriteFactory7 *factory, IDWriteFontFile *file, UINT32 face_index,
DWRITE_FONT_SIMULATIONS simulations, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 axis_values_count, DWRITE_FONT_SIMULATIONS simulations, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 axis_values_count,
IDWriteFontFaceReference1 **reference) DECLSPEC_HIDDEN; IDWriteFontFaceReference1 **reference) DECLSPEC_HIDDEN;
extern HRESULT factory_get_cached_fontface(IDWriteFactory5*,IDWriteFontFile*const*,UINT32,DWRITE_FONT_SIMULATIONS, extern HRESULT factory_get_cached_fontface(IDWriteFactory7 *factory, IDWriteFontFile * const *files, UINT32 num_files,
struct list**,REFIID,void**) DECLSPEC_HIDDEN; DWRITE_FONT_SIMULATIONS simulations, struct list **cache, REFIID riid, void **obj) DECLSPEC_HIDDEN;
extern void factory_detach_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection3 *collection) DECLSPEC_HIDDEN; extern void factory_detach_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 *collection) DECLSPEC_HIDDEN;
extern void factory_detach_gdiinterop(IDWriteFactory5*,IDWriteGdiInterop1*) DECLSPEC_HIDDEN; extern void factory_detach_gdiinterop(IDWriteFactory5*,IDWriteGdiInterop1*) DECLSPEC_HIDDEN;
extern struct fontfacecached *factory_cache_fontface(IDWriteFactory7 *factory, struct list *fontfaces, extern struct fontfacecached *factory_cache_fontface(IDWriteFactory7 *factory, struct list *fontfaces,
IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN;

44
dlls/dwrite/font.c
View file

@ -119,7 +119,7 @@ struct dwrite_fontcollection
IDWriteFontCollection3 IDWriteFontCollection3_iface; IDWriteFontCollection3 IDWriteFontCollection3_iface;
LONG refcount; LONG refcount;
IDWriteFactory5 *factory; IDWriteFactory7 *factory;
struct dwrite_fontfamily_data **family_data; struct dwrite_fontfamily_data **family_data;
size_t size; size_t size;
size_t count; size_t count;
@ -1828,12 +1828,12 @@ static BOOL WINAPI dwritefont3_Equals(IDWriteFont3 *iface, IDWriteFont *font)
static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWriteFontFaceReference **reference) static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWriteFontFaceReference **reference)
{ {
struct dwrite_font *This = impl_from_IDWriteFont3(iface); struct dwrite_font *font = impl_from_IDWriteFont3(iface);
TRACE("(%p)->(%p)\n", This, reference); TRACE("%p, %p.\n", iface, reference);
return IDWriteFactory5_CreateFontFaceReference_(This->family->collection->factory, This->data->file, return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)font->family->collection->factory,
This->data->face_index, This->data->simulations, reference); font->data->file, font->data->face_index, font->data->simulations, reference);
} }
static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch)
@ -3970,7 +3970,7 @@ static void fontcollection_add_replacements(struct dwrite_fontcollection *collec
RegCloseKey(hkey); RegCloseKey(hkey);
} }
HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system, HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system,
IDWriteFontCollection3 **ret) IDWriteFontCollection3 **ret)
{ {
struct fontfile_enum { struct fontfile_enum {
@ -4126,7 +4126,7 @@ HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerat
fontcollection_add_replacements(collection); fontcollection_add_replacements(collection);
collection->factory = factory; collection->factory = factory;
IDWriteFactory5_AddRef(factory); IDWriteFactory7_AddRef(factory);
return hr; return hr;
} }
@ -4136,7 +4136,7 @@ struct system_fontfile_enumerator
IDWriteFontFileEnumerator IDWriteFontFileEnumerator_iface; IDWriteFontFileEnumerator IDWriteFontFileEnumerator_iface;
LONG ref; LONG ref;
IDWriteFactory5 *factory; IDWriteFactory7 *factory;
HKEY hkey; HKEY hkey;
int index; int index;
@ -4175,8 +4175,9 @@ static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator *
struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface);
ULONG ref = InterlockedDecrement(&enumerator->ref); ULONG ref = InterlockedDecrement(&enumerator->ref);
if (!ref) { if (!ref)
IDWriteFactory5_Release(enumerator->factory); {
IDWriteFactory7_Release(enumerator->factory);
RegCloseKey(enumerator->hkey); RegCloseKey(enumerator->hkey);
heap_free(enumerator->filename); heap_free(enumerator->filename);
heap_free(enumerator); heap_free(enumerator);
@ -4185,7 +4186,7 @@ static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator *
return ref; return ref;
} }
static HRESULT create_local_file_reference(IDWriteFactory5 *factory, const WCHAR *filename, IDWriteFontFile **file) static HRESULT create_local_file_reference(IDWriteFactory7 *factory, const WCHAR *filename, IDWriteFontFile **file)
{ {
HRESULT hr; HRESULT hr;
@ -4198,10 +4199,10 @@ static HRESULT create_local_file_reference(IDWriteFactory5 *factory, const WCHAR
strcatW(fullpathW, fontsW); strcatW(fullpathW, fontsW);
strcatW(fullpathW, filename); strcatW(fullpathW, filename);
hr = IDWriteFactory5_CreateFontFileReference(factory, fullpathW, NULL, file); hr = IDWriteFactory7_CreateFontFileReference(factory, fullpathW, NULL, file);
} }
else else
hr = IDWriteFactory5_CreateFontFileReference(factory, filename, NULL, file); hr = IDWriteFactory7_CreateFontFileReference(factory, filename, NULL, file);
return hr; return hr;
} }
@ -4283,7 +4284,7 @@ static const struct IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl =
systemfontfileenumerator_GetCurrentFontFile systemfontfileenumerator_GetCurrentFontFile
}; };
static HRESULT create_system_fontfile_enumerator(IDWriteFactory5 *factory, IDWriteFontFileEnumerator **ret) static HRESULT create_system_fontfile_enumerator(IDWriteFactory7 *factory, IDWriteFontFileEnumerator **ret)
{ {
struct system_fontfile_enumerator *enumerator; struct system_fontfile_enumerator *enumerator;
static const WCHAR fontslistW[] = { static const WCHAR fontslistW[] = {
@ -4309,11 +4310,12 @@ static HRESULT create_system_fontfile_enumerator(IDWriteFactory5 *factory, IDWri
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
IDWriteFactory5_AddRef(factory); IDWriteFactory7_AddRef(factory);
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, fontslistW, 0, GENERIC_READ, &enumerator->hkey)) { if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, fontslistW, 0, GENERIC_READ, &enumerator->hkey))
{
ERR("failed to open fonts list key\n"); ERR("failed to open fonts list key\n");
IDWriteFactory5_Release(factory); IDWriteFactory7_Release(factory);
heap_free(enumerator->filename); heap_free(enumerator->filename);
heap_free(enumerator); heap_free(enumerator);
return E_FAIL; return E_FAIL;
@ -4324,7 +4326,7 @@ static HRESULT create_system_fontfile_enumerator(IDWriteFactory5 *factory, IDWri
return S_OK; return S_OK;
} }
HRESULT get_system_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection1 **collection) HRESULT get_system_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection1 **collection)
{ {
IDWriteFontFileEnumerator *enumerator; IDWriteFontFileEnumerator *enumerator;
HRESULT hr; HRESULT hr;
@ -4341,7 +4343,7 @@ HRESULT get_system_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollectio
return hr; return hr;
} }
static HRESULT eudc_collection_add_family(IDWriteFactory5 *factory, struct dwrite_fontcollection *collection, static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrite_fontcollection *collection,
const WCHAR *keynameW, const WCHAR *pathW) const WCHAR *keynameW, const WCHAR *pathW)
{ {
static const WCHAR defaultfontW[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t','E','U','D','C','F','o','n','t',0}; static const WCHAR defaultfontW[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t','E','U','D','C','F','o','n','t',0};
@ -4429,7 +4431,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory5 *factory, struct dwrit
return hr; return hr;
} }
HRESULT get_eudc_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection3 **ret) HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 **ret)
{ {
static const WCHAR eudckeyfmtW[] = {'E','U','D','C','\\','%','u',0}; static const WCHAR eudckeyfmtW[] = {'E','U','D','C','\\','%','u',0};
struct dwrite_fontcollection *collection; struct dwrite_fontcollection *collection;
@ -4457,7 +4459,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection3
*ret = &collection->IDWriteFontCollection3_iface; *ret = &collection->IDWriteFontCollection3_iface;
collection->factory = factory; collection->factory = factory;
IDWriteFactory5_AddRef(factory); IDWriteFactory7_AddRef(factory);
/* return empty collection if EUDC fonts are not configured */ /* return empty collection if EUDC fonts are not configured */
sprintfW(eudckeypathW, eudckeyfmtW, GetACP()); sprintfW(eudckeypathW, eudckeyfmtW, GetACP());

18
dlls/dwrite/main.c
View file

@ -667,7 +667,7 @@ static IDWriteFontCollection1 *factory_get_system_collection(struct dwritefactor
return factory->system_collection; return factory->system_collection;
} }
if (FAILED(hr = get_system_fontcollection((IDWriteFactory5 *)&factory->IDWriteFactory7_iface, &collection))) if (FAILED(hr = get_system_fontcollection(&factory->IDWriteFactory7_iface, &collection)))
{ {
WARN("Failed to create system font collection, hr %#x.\n", hr); WARN("Failed to create system font collection, hr %#x.\n", hr);
return NULL; return NULL;
@ -757,7 +757,7 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory7 *
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
hr = create_font_collection((IDWriteFactory5 *)iface, enumerator, FALSE, (IDWriteFontCollection3 **)collection); hr = create_font_collection(iface, enumerator, FALSE, (IDWriteFontCollection3 **)collection);
IDWriteFontFileEnumerator_Release(enumerator); IDWriteFontFileEnumerator_Release(enumerator);
return hr; return hr;
} }
@ -859,10 +859,10 @@ void factory_unlock(IDWriteFactory7 *iface)
LeaveCriticalSection(&factory->cs); LeaveCriticalSection(&factory->cs);
} }
HRESULT factory_get_cached_fontface(IDWriteFactory5 *iface, IDWriteFontFile * const *font_files, UINT32 index, HRESULT factory_get_cached_fontface(IDWriteFactory7 *iface, IDWriteFontFile * const *font_files, UINT32 index,
DWRITE_FONT_SIMULATIONS simulations, struct list **cached_list, REFIID riid, void **obj) DWRITE_FONT_SIMULATIONS simulations, struct list **cached_list, REFIID riid, void **obj)
{ {
struct dwritefactory *factory = impl_from_IDWriteFactory7((IDWriteFactory7 *)iface); struct dwritefactory *factory = impl_from_IDWriteFactory7(iface);
struct fontfacecached *cached; struct fontfacecached *cached;
IDWriteFontFileLoader *loader; IDWriteFontFileLoader *loader;
struct list *fontfaces; struct list *fontfaces;
@ -1001,7 +1001,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory7 *iface, DWRIT
goto failed; goto failed;
} }
hr = factory_get_cached_fontface((IDWriteFactory5 *)iface, font_files, index, simulations, &fontfaces, hr = factory_get_cached_fontface(iface, font_files, index, simulations, &fontfaces,
&IID_IDWriteFontFace, (void **)fontface); &IID_IDWriteFontFace, (void **)fontface);
if (hr != S_FALSE) if (hr != S_FALSE)
goto failed; goto failed;
@ -1290,7 +1290,7 @@ static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory7 *ifac
else { else {
IDWriteFontCollection3 *eudc_collection; IDWriteFontCollection3 *eudc_collection;
if (FAILED(hr = get_eudc_fontcollection((IDWriteFactory5 *)iface, &eudc_collection))) if (FAILED(hr = get_eudc_fontcollection(iface, &eudc_collection)))
{ {
*collection = NULL; *collection = NULL;
WARN("Failed to get EUDC collection, hr %#x.\n", hr); WARN("Failed to get EUDC collection, hr %#x.\n", hr);
@ -1885,12 +1885,12 @@ static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYP
factory->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": dwritefactory.lock"); factory->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": dwritefactory.lock");
} }
void factory_detach_fontcollection(IDWriteFactory5 *iface, IDWriteFontCollection3 *collection) void factory_detach_fontcollection(IDWriteFactory7 *iface, IDWriteFontCollection3 *collection)
{ {
struct dwritefactory *factory = impl_from_IDWriteFactory7((IDWriteFactory7 *)iface); struct dwritefactory *factory = impl_from_IDWriteFactory7(iface);
InterlockedCompareExchangePointer((void **)&factory->system_collection, NULL, collection); InterlockedCompareExchangePointer((void **)&factory->system_collection, NULL, collection);
InterlockedCompareExchangePointer((void **)&factory->eudc_collection, NULL, collection); InterlockedCompareExchangePointer((void **)&factory->eudc_collection, NULL, collection);
IDWriteFactory5_Release(iface); IDWriteFactory7_Release(iface);
} }
void factory_detach_gdiinterop(IDWriteFactory5 *iface, IDWriteGdiInterop1 *interop) void factory_detach_gdiinterop(IDWriteFactory5 *iface, IDWriteGdiInterop1 *interop)