August 2015 - Wine-commits - list.winehq.org

Zhenbo Li : mshtml: Add IHTMLSelectElement::size property implementation.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 6419ac0f139c2a3d9cbcd71e5b43e3f89d6336cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6419ac0f139c2a3d9cbcd71e5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Aug 7 18:12:27 2015 +0800 mshtml: Add IHTMLSelectElement::size property implementation. --- dlls/mshtml/htmlselect.c | 30 ++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ebac427..152d855 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -142,15 +142,37 @@ static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, LONG v) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + if(v < 0) + return CTL_E_INVALIDPROPERTYVALUE; + + nsres = nsIDOMHTMLSelectElement_SetSize(This->nsselect, v); + if(NS_FAILED(nsres)) { + ERR("SetSize failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + DWORD val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + if(!p) + return E_INVALIDARG; + + nsres = nsIDOMHTMLSelectElement_GetSize(This->nsselect, &val); + if(NS_FAILED(nsres)) { + ERR("GetSize failed: %08x\n", nsres); + return E_FAIL; + } + *p = val; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_multiple(IHTMLSelectElement *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f5dee76..02eeb78 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2193,6 +2193,30 @@ static void _test_select_set_multiple(unsigned line, IHTMLSelectElement *select, _test_select_multiple(line, select, val); } +#define test_select_size(s,v) _test_select_size(__LINE__,s,v) +static void _test_select_size(unsigned line, IHTMLSelectElement *select, LONG exval) +{ + HRESULT hres; + LONG val; + + hres = IHTMLSelectElement_get_size(select, NULL); + ok_(__FILE__,line) (hres == E_INVALIDARG, "got %08x, expected E_INVALIDARG\n", hres); + + val = 0xdeadbeef; + hres = IHTMLSelectElement_get_size(select, &val); + ok_(__FILE__,line) (hres == S_OK, "get_size failed: %08x\n", hres); + ok_(__FILE__,line) (val == exval, "size = %d, expected %d\n", val, exval); +} + +#define test_select_set_size(s,v,e) _test_select_set_size(__LINE__,s,v,e) +static void _test_select_set_size(unsigned line, IHTMLSelectElement *select, LONG val, HRESULT exhres) +{ + HRESULT hres; + + hres = IHTMLSelectElement_put_size(select, val); + ok_(__FILE__,line) (hres == exhres, "put_size(%d) got %08x, expect %08x\n", val, hres, exhres); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -4882,6 +4906,15 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_set_value(select, "val1"); test_select_value(select, "val1"); + test_select_size(select, 0); + test_select_set_size(select, 1, S_OK); + test_select_size(select, 1); + + test_select_set_size(select, -1, CTL_E_INVALIDPROPERTYVALUE); + test_select_size(select, 1); + test_select_set_size(select, 3, S_OK); + test_select_size(select, 3); + test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); test_select_set_disabled(select, VARIANT_FALSE);

1 0

Zhenbo Li : mshtml: Fix error handler in IHTMLSelectElement::remove().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: b0dd7c79d3b764b8fd019679a9aeaf8263396848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dd7c79d3b764b8fd019679a… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Aug 7 18:12:58 2015 +0800 mshtml: Fix error handler in IHTMLSelectElement::remove(). --- dlls/mshtml/htmlselect.c | 3 +++ dlls/mshtml/tests/dom.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 152d855..e55d7ea 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -432,6 +432,9 @@ static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG i HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); nsresult nsres; TRACE("(%p)->(%d)\n", This, index); + if(index < 0) + return E_INVALIDARG; + nsres = nsIDOMHTMLSelectElement_select_Remove(This->nsselect, index); if(NS_FAILED(nsres)) { ERR("Remove failed: %08x\n", nsres); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02eeb78..7088c52 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2872,7 +2872,6 @@ static void test_select_remove(IHTMLSelectElement *select) test_select_length(select, 2); hres = IHTMLSelectElement_remove(select, -1); - todo_wine ok(hres == E_INVALIDARG, "remove failed: %08x, expected E_INVALIDARG\n", hres); test_select_length(select, 2);

1 0

Alexandre Julliard : Release 1.7.49.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 06e68ff6613042e78a5dd4b9066713d9beab0c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e68ff6613042e78a5dd4b90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 8 00:56:07 2015 +0900 Release 1.7.49. --- ANNOUNCE | 641 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 309 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e68ff6613042e78a5dd…

1 0

Tag wine-1.7.49 : Alexandre Julliard : Release 1.7.49
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: refs/tags/wine-1.7.49 Tag: 2b80c468354931217a88a01cc638fcaab06181fd URL: http://source.winehq.org/git/wine.git/?a=tag;h=2b80c468354931217a88a01cc638… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 8 00:56:08 2015 +0900 Release 1.7.49

1 0

Nikolay Sivov : dwrite: Implement CreateGlyphRunAnalysis() from IDWriteFactory2.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 14e4996f6c33adddc310185780fffd185bb59715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e4996f6c33adddc31018578… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:42:48 2015 +0300 dwrite: Implement CreateGlyphRunAnalysis() from IDWriteFactory2. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 2 +- dlls/dwrite/main.c | 15 +++++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4418c92..caa4177 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -129,7 +129,8 @@ extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *refer extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory2*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; -extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_MEASURING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; +extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_MEASURING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,DWRITE_GRID_FIT_MODE, + DWRITE_TEXT_ANTIALIAS_MODE,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 56a3655..db02566 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3218,7 +3218,7 @@ static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { }; HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_GLYPH_RUN const *run, - FLOAT ppdip, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) + FLOAT ppdip, DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 5673bba..9f8756d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1079,7 +1079,8 @@ static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory2 *ifac TRACE("(%p)->(%p %.2f %p %d %d %.2f %.2f %p)\n", This, run, ppdip, transform, rendering_mode, measuring_mode, originX, originY, analysis); - return create_glyphrunanalysis(rendering_mode, measuring_mode, run, ppdip, originX, originY, analysis); + return create_glyphrunanalysis(rendering_mode, measuring_mode, run, 1.0f, DWRITE_GRID_FIT_MODE_DEFAULT, + DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE, originX, originY, analysis); } static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory2 *iface, IDWriteFontCollection **collection, @@ -1155,14 +1156,16 @@ static HRESULT WINAPI dwritefactory2_CreateCustomRenderingParams(IDWriteFactory2 } static HRESULT WINAPI dwritefactory2_CreateGlyphRunAnalysis(IDWriteFactory2 *iface, const DWRITE_GLYPH_RUN *run, - const DWRITE_MATRIX *transform, DWRITE_RENDERING_MODE renderingMode, DWRITE_MEASURING_MODE measuringMode, - DWRITE_GRID_FIT_MODE gridFitMode, DWRITE_TEXT_ANTIALIAS_MODE antialiasMode, FLOAT originX, FLOAT originY, + const DWRITE_MATRIX *transform, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%p %p %d %d %d %d %.2f %.2f %p): stub\n", This, run, transform, renderingMode, measuringMode, - gridFitMode, antialiasMode, originX, originY, analysis); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %d %d %d %d %.2f %.2f %p)\n", This, run, transform, rendering_mode, measuring_mode, + gridfit_mode, aa_mode, originX, originY, analysis); + + return create_glyphrunanalysis(rendering_mode, measuring_mode, run, 1.0f, gridfit_mode, aa_mode, originX, originY, analysis); } static const struct IDWriteFactory2Vtbl dwritefactoryvtbl = {

1 0

Nikolay Sivov : dwrite: Implement GetColorPaletteCount().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 20571725f370460a2ba000d1ab9a232e84607f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20571725f370460a2ba000d1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:43:23 2015 +0300 dwrite: Implement GetColorPaletteCount(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 15 +++++++++++++-- dlls/dwrite/opentype.c | 25 +++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index caa4177..7668bc9 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -153,6 +153,7 @@ extern void opentype_get_font_metrics(IDWriteFontFileStream*,DWRITE_FONT_FACE_TY extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; +extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; enum gasp_flags { GASP_GRIDFIT = 0x0001, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index db02566..1ee97fa 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') +#define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') static const IID IID_issystemcollection = {0x14d88047,0x331f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; @@ -154,6 +155,7 @@ struct dwrite_fontface { struct dwrite_fonttable cmap; struct dwrite_fonttable vdmx; struct dwrite_fonttable gasp; + struct dwrite_fonttable cpal; DWRITE_GLYPH_METRICS *glyphs[GLYPH_MAX/GLYPH_BLOCK_SIZE]; }; @@ -262,6 +264,11 @@ static inline void* get_fontface_gasp(struct dwrite_fontface *fontface, UINT32 * return ptr; } +static inline void* get_fontface_cpal(struct dwrite_fontface *fontface) +{ + return get_fontface_table(fontface, MS_CPAL_TAG, &fontface->cpal); +} + static void release_font_data(struct dwrite_font_data *data) { int i; @@ -338,6 +345,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) IDWriteFontFace2_ReleaseFontTable(iface, This->vdmx.context); if (This->gasp.context) IDWriteFontFace2_ReleaseFontTable(iface, This->gasp.context); + if (This->cpal.context) + IDWriteFontFace2_ReleaseFontTable(iface, This->cpal.context); for (i = 0; i < This->file_count; i++) { if (This->streams[i]) IDWriteFontFileStream_Release(This->streams[i]); @@ -948,8 +957,8 @@ static BOOL WINAPI dwritefontface2_IsColorFont(IDWriteFontFace2 *iface) static UINT32 WINAPI dwritefontface2_GetColorPaletteCount(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return opentype_get_cpal_palettecount(get_fontface_cpal(This)); } static UINT32 WINAPI dwritefontface2_GetPaletteEntryCount(IDWriteFontFace2 *iface) @@ -2476,9 +2485,11 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW memset(&fontface->cmap, 0, sizeof(fontface->cmap)); memset(&fontface->vdmx, 0, sizeof(fontface->vdmx)); memset(&fontface->gasp, 0, sizeof(fontface->gasp)); + memset(&fontface->cpal, 0, sizeof(fontface->cpal)); fontface->cmap.exists = TRUE; fontface->vdmx.exists = TRUE; fontface->gasp.exists = TRUE; + fontface->cpal.exists = TRUE; fontface->index = index; fontface->simulations = simulations; memset(fontface->glyphs, 0, sizeof(fontface->glyphs)); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 3cb8afb..389183f 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -668,6 +668,25 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIP OPENTYPE_STRING_POSTSCRIPT_CID_NAME }; +/* CPAL table */ +struct CPAL_Header_0 +{ + USHORT version; + USHORT numPaletteEntries; + USHORT numPalette; + USHORT numColorRecords; + ULONG offsetFirstColorRecord; + USHORT colorRecordIndices[1]; +}; + +/* for version == 1, this comes after full CPAL_Header_0 */ +struct CPAL_SubHeader_1 +{ + ULONG offsetPaletteTypeArray; + ULONG offsetPaletteLabelArray; + ULONG offsetPaletteEntryLabelArray; +}; + BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE type) { return (type == DWRITE_FONT_FACE_TYPE_CFF) || @@ -1403,3 +1422,9 @@ WORD opentype_get_gasp_flags(const WORD *ptr, UINT32 size, INT emsize) done: return flags; } + +UINT32 opentype_get_cpal_palettecount(const void *cpal) +{ + const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; + return header ? GET_BE_WORD(header->numPalette) : 0; +}

1 0

Nikolay Sivov : dwrite: Implement GetPaletteEntryCount().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 5734c2ed9825c61d5a5299a17e7fd922ee86132a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5734c2ed9825c61d5a5299a17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:43:41 2015 +0300 dwrite: Implement GetPaletteEntryCount(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 ++-- dlls/dwrite/opentype.c | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7668bc9..a849406 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -154,6 +154,7 @@ extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONA extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; +extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; enum gasp_flags { GASP_GRIDFIT = 0x0001, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1ee97fa..266f7ef 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -964,8 +964,8 @@ static UINT32 WINAPI dwritefontface2_GetColorPaletteCount(IDWriteFontFace2 *ifac static UINT32 WINAPI dwritefontface2_GetPaletteEntryCount(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return opentype_get_cpal_paletteentrycount(get_fontface_cpal(This)); } static HRESULT WINAPI dwritefontface2_GetPaletteEntries(IDWriteFontFace2 *iface, UINT32 palette_index, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 389183f..7be9df3 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1428,3 +1428,9 @@ UINT32 opentype_get_cpal_palettecount(const void *cpal) const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; return header ? GET_BE_WORD(header->numPalette) : 0; } + +UINT32 opentype_get_cpal_paletteentrycount(const void *cpal) +{ + const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; + return header ? GET_BE_WORD(header->numPaletteEntries) : 0; +}

1 0

Nikolay Sivov : dwrite/tests: Basic test for GetPaletteEntries().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 4df29eb02f9c29df09539ab0613c58bd28089c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df29eb02f9c29df09539ab06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:43:58 2015 +0300 dwrite/tests: Basic test for GetPaletteEntries(). --- dlls/dwrite/tests/font.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9a75abc..6c5cb82 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -39,6 +39,7 @@ #define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') #define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') #define MS_GASP_TAG MS_MAKE_TAG('g','a','s','p') +#define MS_CPAL_TAG MS_MAKE_TAG('C','P','A','L') #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -4754,6 +4755,111 @@ static void test_IsSymbolFont(void) IDWriteFactory_Release(factory); } +struct CPAL_Header_0 +{ + USHORT version; + USHORT numPaletteEntries; + USHORT numPalette; + USHORT numColorRecords; + ULONG offsetFirstColorRecord; + USHORT colorRecordIndices[1]; +}; + +static void test_GetPaletteEntries(void) +{ + static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','j','i',0}; + IDWriteFontFace2 *fontface2; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFont *font; + DWRITE_COLOR_F color; + UINT32 palettecount, entrycount, size, colorrecords; + void *ctxt; + const struct CPAL_Header_0 *cpal_header; + HRESULT hr; + BOOL exists; + + factory = create_factory(); + + /* Tahoma, no color support */ + fontface = create_fontface(factory); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); + IDWriteFontFace_Release(fontface); + if (hr != S_OK) { + IDWriteFactory_Release(factory); + win_skip("GetPaletteEntries() is not supported.\n"); + return; + } + + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 1, &color); +todo_wine + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + IDWriteFontFace2_Release(fontface2); + + /* Segoe UI Emoji, with color support */ + font = get_font(factory, emojiW, DWRITE_FONT_STYLE_NORMAL); + if (!font) { + IDWriteFactory_Release(factory); + skip("Segoe UI Emoji font not found.\n"); + return; + } + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); + IDWriteFontFace_Release(fontface); + + palettecount = IDWriteFontFace2_GetColorPaletteCount(fontface2); + ok(palettecount >= 1, "got %u\n", palettecount); + + entrycount = IDWriteFontFace2_GetPaletteEntryCount(fontface2); + ok(entrycount >= 1, "got %u\n", entrycount); + + exists = FALSE; + hr = IDWriteFontFace2_TryGetFontTable(fontface2, MS_CPAL_TAG, (const void**)&cpal_header, &size, &ctxt, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists, "got %d\n", exists); + colorrecords = GET_BE_WORD(cpal_header->numColorRecords); + ok(colorrecords >= 1, "got %u\n", colorrecords); + + /* invalid palette index */ + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, palettecount, 0, 1, &color); +todo_wine + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); + + /* invalid entry index */ + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount, 1, &color); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); + + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount - 1, 1, &color); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(color.r != 123.0 && color.g != 123.0 && color.b != 123.0 && color.a != 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); +} + + /* zero return length */ + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 0, &color); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); + + IDWriteFontFace2_Release(fontface2); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -4804,6 +4910,7 @@ START_TEST(font) test_GetAlphaBlendParams(); test_CreateAlphaTexture(); test_IsSymbolFont(); + test_GetPaletteEntries(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement GetPaletteEntries().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: fd35a1af6acc78e36c270a2395ec381a73065d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd35a1af6acc78e36c270a239… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:44:27 2015 +0300 dwrite: Implement GetPaletteEntries(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 ++-- dlls/dwrite/opentype.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 6 ------ 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a849406..48078d9 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -155,6 +155,7 @@ extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32, extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_cpal_entries(const void*,UINT32,UINT32,UINT32,DWRITE_COLOR_F*) DECLSPEC_HIDDEN; enum gasp_flags { GASP_GRIDFIT = 0x0001, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 266f7ef..80a209f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -972,8 +972,8 @@ static HRESULT WINAPI dwritefontface2_GetPaletteEntries(IDWriteFontFace2 *iface, UINT32 first_entry_index, UINT32 entry_count, DWRITE_COLOR_F *entries) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%u %u %u %p): stub\n", This, palette_index, first_entry_index, entry_count, entries); - return E_NOTIMPL; + TRACE("(%p)->(%u %u %u %p)\n", This, palette_index, first_entry_index, entry_count, entries); + return opentype_get_cpal_entries(get_fontface_cpal(This), palette_index, first_entry_index, entry_count, entries); } static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFace2 *iface, FLOAT emSize, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7be9df3..f8c66fc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -687,6 +687,14 @@ struct CPAL_SubHeader_1 ULONG offsetPaletteEntryLabelArray; }; +struct CPAL_ColorRecord +{ + BYTE blue; + BYTE green; + BYTE red; + BYTE alpha; +}; + BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE type) { return (type == DWRITE_FONT_FACE_TYPE_CFF) || @@ -1434,3 +1442,33 @@ UINT32 opentype_get_cpal_paletteentrycount(const void *cpal) const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; return header ? GET_BE_WORD(header->numPaletteEntries) : 0; } + +HRESULT opentype_get_cpal_entries(const void *cpal, UINT32 palette, UINT32 first_entry_index, UINT32 entry_count, + DWRITE_COLOR_F *entries) +{ + const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; + const struct CPAL_ColorRecord *records; + UINT32 palettecount, entrycount, i; + + if (!header) return DWRITE_E_NOCOLOR; + + palettecount = GET_BE_WORD(header->numPalette); + if (palette >= palettecount) + return DWRITE_E_NOCOLOR; + + entrycount = GET_BE_WORD(header->numPaletteEntries); + if (first_entry_index + entry_count > entrycount) + return E_INVALIDARG; + + records = (const struct CPAL_ColorRecord*)((BYTE*)cpal + GET_BE_DWORD(header->offsetFirstColorRecord)); + first_entry_index += GET_BE_WORD(header->colorRecordIndices[palette]); + + for (i = 0; i < entry_count; i++) { + entries[i].r = records[first_entry_index + i].red / 255.0f; + entries[i].g = records[first_entry_index + i].green / 255.0f; + entries[i].b = records[first_entry_index + i].blue / 255.0f; + entries[i].a = records[first_entry_index + i].alpha / 255.0f; + } + + return S_OK; +} diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 6c5cb82..0664a9a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4792,7 +4792,6 @@ static void test_GetPaletteEntries(void) } hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 1, &color); -todo_wine ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); IDWriteFontFace2_Release(fontface2); @@ -4827,7 +4826,6 @@ todo_wine /* invalid palette index */ color.r = color.g = color.b = color.a = 123.0; hr = IDWriteFontFace2_GetPaletteEntries(fontface2, palettecount, 0, 1, &color); -todo_wine ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); @@ -4835,23 +4833,19 @@ todo_wine /* invalid entry index */ color.r = color.g = color.b = color.a = 123.0; hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount, 1, &color); -todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); color.r = color.g = color.b = color.a = 123.0; hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount - 1, 1, &color); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(color.r != 123.0 && color.g != 123.0 && color.b != 123.0 && color.a != 123.0, "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); -} /* zero return length */ color.r = color.g = color.b = color.a = 123.0; hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 0, &color); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a);

1 0

Nikolay Sivov : dwrite: Added IDWriteColorGlyphRunEnumerator stub.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 93d24de308471d665d95b38b7b79ffb2125b4908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d24de308471d665d95b38b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:44:53 2015 +0300 dwrite: Added IDWriteColorGlyphRunEnumerator stub. --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/font.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 8 ++-- 3 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 48078d9..1b7bd3a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -136,6 +136,8 @@ extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DEC extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; extern BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE) DECLSPEC_HIDDEN; extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT create_colorglyphenum(FLOAT,FLOAT,const DWRITE_GLYPH_RUN*,const DWRITE_GLYPH_RUN_DESCRIPTION*,DWRITE_MEASURING_MODE, + const DWRITE_MATRIX*,UINT32,IDWriteColorGlyphRunEnumerator**) DECLSPEC_HIDDEN; /* Opentype font table functions */ struct dwrite_font_props { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 80a209f..1f4e565 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -131,6 +131,11 @@ struct dwrite_glyphrunanalysis { BYTE *bitmap; }; +struct dwrite_colorglyphenum { + IDWriteColorGlyphRunEnumerator IDWriteColorGlyphRunEnumerator_iface; + LONG ref; +}; + #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT) #define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) @@ -199,6 +204,11 @@ static inline struct dwrite_glyphrunanalysis *impl_from_IDWriteGlyphRunAnalysis( return CONTAINING_RECORD(iface, struct dwrite_glyphrunanalysis, IDWriteGlyphRunAnalysis_iface); } +static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator(IDWriteColorGlyphRunEnumerator *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator_iface); +} + static inline const char *debugstr_tag(UINT32 tag) { return wine_dbg_sprintf("%c%c%c%c", tag >> 24, (tag >> 16) & 0xff, (tag >> 8) & 0xff, tag & 0xff); @@ -3321,3 +3331,82 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA *ret = &analysis->IDWriteGlyphRunAnalysis_iface; return S_OK; } + +/* IDWriteColorGlyphRunEnumerator */ +static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator *iface, REFIID riid, void **ppv) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + IDWriteColorGlyphRunEnumerator_AddRef(iface); + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator *iface) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator *iface) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator *iface, BOOL *has_run) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + FIXME("(%p)->(%p): stub\n", This, has_run); + return E_NOTIMPL; +} + +static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator *iface, DWRITE_COLOR_GLYPH_RUN const **run) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + FIXME("(%p)->(%p): stub\n", This, run); + return E_NOTIMPL; +} + +static const IDWriteColorGlyphRunEnumeratorVtbl colorglyphenumvtbl = { + colorglyphenum_QueryInterface, + colorglyphenum_AddRef, + colorglyphenum_Release, + colorglyphenum_MoveNext, + colorglyphenum_GetCurrentRun +}; + +HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_RUN *run, const DWRITE_GLYPH_RUN_DESCRIPTION *rundescr, + DWRITE_MEASURING_MODE mode, const DWRITE_MATRIX *transform, UINT32 palette, IDWriteColorGlyphRunEnumerator **ret) +{ + struct dwrite_colorglyphenum *colorglyphenum; + + *ret = NULL; + colorglyphenum = heap_alloc(sizeof(*colorglyphenum)); + if (!colorglyphenum) + return E_OUTOFMEMORY; + + colorglyphenum->IDWriteColorGlyphRunEnumerator_iface.lpVtbl = &colorglyphenumvtbl; + colorglyphenum->ref = 1; + + *ret = &colorglyphenum->IDWriteColorGlyphRunEnumerator_iface; + return S_OK; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9f8756d..01a4012 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1137,12 +1137,12 @@ static HRESULT WINAPI dwritefactory2_CreateFontFallbackBuilder(IDWriteFactory2 * static HRESULT WINAPI dwritefactory2_TranslateColorGlyphRun(IDWriteFactory2 *iface, FLOAT originX, FLOAT originY, const DWRITE_GLYPH_RUN *run, const DWRITE_GLYPH_RUN_DESCRIPTION *rundescr, DWRITE_MEASURING_MODE mode, - const DWRITE_MATRIX *transform, UINT32 palette_index, IDWriteColorGlyphRunEnumerator **colorlayers) + const DWRITE_MATRIX *transform, UINT32 palette, IDWriteColorGlyphRunEnumerator **colorlayers) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%.2f %.2f %p %p %d %p %u %p): stub\n", This, originX, originY, run, rundescr, mode, - transform, palette_index, colorlayers); - return E_NOTIMPL; + TRACE("(%p)->(%.2f %.2f %p %p %d %p %u %p)\n", This, originX, originY, run, rundescr, mode, + transform, palette, colorlayers); + return create_colorglyphenum(originX, originY, run, rundescr, mode, transform, palette, colorlayers); } static HRESULT WINAPI dwritefactory2_CreateCustomRenderingParams(IDWriteFactory2 *iface, FLOAT gamma, FLOAT contrast,

1 0