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

dwrite: Make font data reference assignment more compact. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-03-11 12:41:20 +03:00 committed by Alexandre Julliard
parent 45d21d0090
commit 24f085badd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/dwrite/font.c
View File

@ -496,9 +496,10 @@ static const struct dwrite_fonttable *get_fontface_cpal(struct dwrite_fontface *
return &fontface->cpal; return &fontface->cpal;
} }
static void addref_font_data(struct dwrite_font_data *data) static struct dwrite_font_data * addref_font_data(struct dwrite_font_data *data)
{ {
InterlockedIncrement(&data->ref); InterlockedIncrement(&data->ref);
return data;
} }
static void release_font_data(struct dwrite_font_data *data) static void release_font_data(struct dwrite_font_data *data)
@ -2645,9 +2646,7 @@ static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily2 *ifac
{ {
if (!func || func(family->data->fonts[i])) if (!func || func(family->data->fonts[i]))
{ {
fonts->fonts[fonts->font_count] = family->data->fonts[i]; fonts->fonts[fonts->font_count++] = addref_font_data(family->data->fonts[i]);
addref_font_data(family->data->fonts[i]);
fonts->font_count++;
} }
} }
@ -5006,8 +5005,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li
*/ */
if (desc->font_data) if (desc->font_data)
{ {
font_data = desc->font_data; font_data = addref_font_data(desc->font_data);
addref_font_data(font_data);
} }
else else
{ {