From: Nikolay Sivov Subject: [PATCH 1/2] dwrite: Remove unused parameter Message-Id: <54475F03.9080505@codeweavers.com> Date: Wed, 22 Oct 2014 11:38:43 +0400 --- From d6e1b6b39284388c155ed9860ddfb498c99f68b7 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Tue, 21 Oct 2014 17:14:31 +0400 Subject: [PATCH 1/2] dwrite: Remove unused parameter --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fad7a21..5ac0852 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -105,7 +105,7 @@ extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDE extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; -extern HRESULT font_create_fontface(IDWriteFactory*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; +extern HRESULT font_create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 783b035..2b67543 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -747,7 +747,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 if (!font->face) { HRESULT hr = font->is_system ? create_system_fontface(font, &font->face) : - font_create_fontface(NULL, font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, + font_create_fontface(font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, font->data->face_data->index, font->data->face_data->simulations, &font->face); if (FAILED(hr)) return hr; } @@ -1676,7 +1676,7 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } -HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) +HRESULT font_create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) { int i; struct dwrite_fontface *This; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index bac0c78..3211ee3 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -629,7 +629,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, { struct dwritefactory *This = impl_from_IDWriteFactory(iface); TRACE("(%p)->(%d %u %p %u 0x%x %p)\n", This, facetype, files_number, font_files, index, sim_flags, font_face); - return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); + return font_create_fontface(facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); } static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params) -- 2.1.1