Nikolay Sivov : dwrite: Simplify collection object initialization.
Alexandre Julliard
julliard at winehq.org
Mon Apr 25 16:30:32 CDT 2022
Module: wine
Branch: master
Commit: e32f59461a10fe905ac5a24a6c35fd2501ccb1e5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32f59461a10fe905ac5a24a6c35fd2501ccb1e5
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Apr 25 13:31:44 2022 +0300
dwrite: Simplify collection object initialization.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dwrite/font.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index c663ed77b96..6b3aeebc8c3 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -2,7 +2,7 @@
* Font and collections
*
* Copyright 2011 Huw Davies
- * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers
+ * Copyright 2012, 2014-2022 Nikolay Sivov for CodeWeavers
* Copyright 2014 Aric Stewart for CodeWeavers
*
* This library is free software; you can redistribute it and/or
@@ -3524,13 +3524,13 @@ static HRESULT fontcollection_add_family(struct dwrite_fontcollection *collectio
return S_OK;
}
-static HRESULT init_font_collection(struct dwrite_fontcollection *collection, BOOL is_system)
+static HRESULT init_font_collection(struct dwrite_fontcollection *collection, IDWriteFactory7 *factory,
+ BOOL is_system)
{
collection->IDWriteFontCollection3_iface.lpVtbl = is_system ? &systemfontcollectionvtbl : &fontcollectionvtbl;
collection->refcount = 1;
- collection->count = 0;
- collection->size = 0;
- collection->family_data = NULL;
+ collection->factory = factory;
+ IDWriteFactory7_AddRef(collection->factory);
return S_OK;
}
@@ -4637,7 +4637,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat
if (!(collection = calloc(1, sizeof(*collection))))
return E_OUTOFMEMORY;
- hr = init_font_collection(collection, is_system);
+ hr = init_font_collection(collection, factory, is_system);
if (FAILED(hr))
{
free(collection);
@@ -4776,9 +4776,6 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat
if (is_system)
fontcollection_add_replacements(collection);
- collection->factory = factory;
- IDWriteFactory7_AddRef(factory);
-
return hr;
}
@@ -5092,7 +5089,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3
if (!(collection = calloc(1, sizeof(*collection))))
return E_OUTOFMEMORY;
- hr = init_font_collection(collection, FALSE);
+ hr = init_font_collection(collection, factory, FALSE);
if (FAILED(hr))
{
free(collection);
@@ -5100,8 +5097,6 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3
}
*ret = &collection->IDWriteFontCollection3_iface;
- collection->factory = factory;
- IDWriteFactory7_AddRef(factory);
/* return empty collection if EUDC fonts are not configured */
swprintf(eudckeypathW, ARRAY_SIZE(eudckeypathW), L"EUDC\\%u", GetACP());
More information about the wine-cvs
mailing list