Module: wine Branch: master Commit: d905919cfa6466ada5bd78487b74e08286ac13c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d905919cfa6466ada5bd78487...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Feb 1 14:35:23 2021 +0300
dwrite: Fix vtable variables types.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dwrite/analyzer.c | 6 ++++-- dlls/dwrite/font.c | 6 +++--- dlls/dwrite/gdiinterop.c | 8 +++++--- dlls/dwrite/main.c | 6 +++--- 4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7446665674a..8d573ed530d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1815,7 +1815,8 @@ static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAna return hr; }
-static const struct IDWriteTextAnalyzer2Vtbl textanalyzervtbl = { +static const IDWriteTextAnalyzer2Vtbl textanalyzervtbl = +{ dwritetextanalyzer_QueryInterface, dwritetextanalyzer_AddRef, dwritetextanalyzer_Release, @@ -1891,7 +1892,8 @@ static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution * return ref; }
-static const struct IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = { +static const IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = +{ dwritenumbersubstitution_QueryInterface, dwritenumbersubstitution_AddRef, dwritenumbersubstitution_Release diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 014240a1c8f..f1db6dd732b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4567,7 +4567,7 @@ err: return hr; }
-static const struct IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = +static const IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = { systemfontfileenumerator_QueryInterface, systemfontfileenumerator_AddRef, @@ -5450,7 +5450,7 @@ static HRESULT WINAPI localfontfileloader_GetLastWriteTimeFromKey(IDWriteLocalFo return S_OK; }
-static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = +static const IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = { localfontfileloader_QueryInterface, localfontfileloader_AddRef, @@ -5873,7 +5873,7 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys return S_OK; }
-static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = +static const IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { glyphrunanalysis_QueryInterface, glyphrunanalysis_AddRef, diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index ae421822a77..84d1f615f75 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -911,7 +911,8 @@ static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 * return E_NOTIMPL; }
-static const struct IDWriteGdiInterop1Vtbl gdiinteropvtbl = { +static const IDWriteGdiInterop1Vtbl gdiinteropvtbl = +{ gdiinterop_QueryInterface, gdiinterop_AddRef, gdiinterop_Release, @@ -1022,7 +1023,7 @@ static HRESULT WINAPI memresourcestream_GetLastWriteTime(IDWriteFontFileStream * return E_NOTIMPL; }
-static const struct IDWriteFontFileStreamVtbl memresourcestreamvtbl = +static const IDWriteFontFileStreamVtbl memresourcestreamvtbl = { memresourcestream_QueryInterface, memresourcestream_AddRef, @@ -1082,7 +1083,8 @@ static HRESULT WINAPI memresourceloader_CreateStreamFromKey(IDWriteFontFileLoade return S_OK; }
-static const struct IDWriteFontFileLoaderVtbl memresourceloadervtbl = { +static const IDWriteFontFileLoaderVtbl memresourceloadervtbl = +{ memresourceloader_QueryInterface, memresourceloader_AddRef, memresourceloader_Release, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 0cc0edd1ffc..f550c204b6d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -204,7 +204,7 @@ static DWRITE_RENDERING_MODE1 WINAPI renderingparams3_GetRenderingMode1(IDWriteR return params->mode; }
-static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = +static const IDWriteRenderingParams3Vtbl renderingparamsvtbl = { renderingparams_QueryInterface, renderingparams_AddRef, @@ -1756,7 +1756,7 @@ static HRESULT WINAPI dwritefactory7_GetSystemFontCollection(IDWriteFactory7 *if return E_NOTIMPL; }
-static const struct IDWriteFactory7Vtbl dwritefactoryvtbl = +static const IDWriteFactory7Vtbl dwritefactoryvtbl = { dwritefactory_QueryInterface, dwritefactory_AddRef, @@ -1831,7 +1831,7 @@ static ULONG WINAPI shareddwritefactory_Release(IDWriteFactory7 *iface) return 1; }
-static const struct IDWriteFactory7Vtbl shareddwritefactoryvtbl = +static const IDWriteFactory7Vtbl shareddwritefactoryvtbl = { dwritefactory_QueryInterface, shareddwritefactory_AddRef,