Module: wine Branch: master Commit: e1a41faf76476c022a9a0d88c634acecdff101be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a41faf76476c022a9a0d88c6...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Sep 22 15:34:51 2017 +0300
dwrite: Add warning message for unsupported interfaces.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dwrite/analyzer.c | 8 ++++++++ dlls/dwrite/font.c | 30 ++++++++++++++++++++++++++++-- dlls/dwrite/gdiinterop.c | 6 ++++++ dlls/dwrite/layout.c | 12 ++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index db488a0..e26892f 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -818,6 +818,8 @@ static HRESULT WINAPI dwritetextanalyzer_QueryInterface(IDWriteTextAnalyzer2 *if return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -1863,6 +1865,8 @@ static HRESULT WINAPI dwritenumbersubstitution_QueryInterface(IDWriteNumberSubst return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL;
return E_NOINTERFACE; @@ -1948,6 +1952,8 @@ static HRESULT WINAPI fontfallback_QueryInterface(IDWriteFontFallback *iface, RE return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -2235,6 +2241,8 @@ static HRESULT WINAPI fontfallbackbuilder_QueryInterface(IDWriteFontFallbackBuil return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 46dfd30..16bff9b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -473,6 +473,8 @@ static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace4 *iface, REF return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -1421,6 +1423,8 @@ static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -1824,6 +1828,8 @@ static HRESULT WINAPI dwritefontlist_QueryInterface(IDWriteFontList1 *iface, REF return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -1961,6 +1967,8 @@ static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily1 *iface, return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -2295,6 +2303,8 @@ static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontColle if (IsEqualIID(riid, &IID_issystemcollection)) return S_OK;
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + return E_NOINTERFACE; }
@@ -2312,6 +2322,8 @@ static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection1 return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL;
return E_NOINTERFACE; @@ -3825,14 +3837,16 @@ static inline struct system_fontfile_enumerator *impl_from_IDWriteFontFileEnumer
static HRESULT WINAPI systemfontfileenumerator_QueryInterface(IDWriteFontFileEnumerator *iface, REFIID riid, void **obj) { - *obj = NULL; - if (IsEqualIID(riid, &IID_IDWriteFontFileEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { IDWriteFontFileEnumerator_AddRef(iface); *obj = iface; return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + + *obj = NULL; + return E_NOINTERFACE; }
@@ -4180,6 +4194,8 @@ static HRESULT WINAPI dwritefontfile_QueryInterface(IDWriteFontFile *iface, REFI return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4483,6 +4499,8 @@ static HRESULT WINAPI localfontfilestream_QueryInterface(IDWriteFontFileStream * return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4610,6 +4628,8 @@ static HRESULT WINAPI localfontfileloader_QueryInterface(IDWriteLocalFontFileLoa return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4828,6 +4848,8 @@ static HRESULT WINAPI glyphrunanalysis_QueryInterface(IDWriteGlyphRunAnalysis *i return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -5356,6 +5378,8 @@ static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerat return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -5672,6 +5696,8 @@ static HRESULT WINAPI fontfacereference_QueryInterface(IDWriteFontFaceReference return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL;
return E_NOINTERFACE; diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index ac1fc32..ad95e94 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -121,6 +121,8 @@ static HRESULT WINAPI rendertarget_sink_QueryInterface(ID2D1SimplifiedGeometrySi return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL;
return E_NOINTERFACE; @@ -221,6 +223,8 @@ static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget1 *if return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL;
return E_NOINTERFACE; @@ -611,6 +615,8 @@ static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop1 *iface, REFII return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4b67ce0..7975651 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2823,6 +2823,8 @@ static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout3 *iface, return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + return E_NOINTERFACE; }
@@ -4519,6 +4521,8 @@ static HRESULT WINAPI dwritetextlayout_sink_QueryInterface(IDWriteTextAnalysisSi return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4659,6 +4663,8 @@ static HRESULT WINAPI dwritetextlayout_source_QueryInterface(IDWriteTextAnalysis return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4991,6 +4997,8 @@ static HRESULT WINAPI dwritetrimmingsign_QueryInterface(IDWriteInlineObject *ifa return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -5162,6 +5170,8 @@ static HRESULT WINAPI dwritetextformat_QueryInterface(IDWriteTextFormat2 *iface, return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL;
return E_NOINTERFACE; @@ -5597,6 +5607,8 @@ static HRESULT WINAPI dwritetypography_QueryInterface(IDWriteTypography *iface, return S_OK; }
+ WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL;
return E_NOINTERFACE;