November 2014 - Wine-commits

Nikolay Sivov : dwrite: Use public APIs to get file streams from fontface.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 90753adaafb8ef925983a6e1837aa52eb06cbc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90753adaafb8ef925983a6e18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 5 23:30:32 2014 +0300 dwrite: Use public APIs to get file streams from fontface. --- dlls/dwrite/font.c | 99 +++++++++++++++++++++++++----------------------------- 1 file changed, 46 insertions(+), 53 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d5d6b41..6c62056 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -105,6 +105,7 @@ struct dwrite_fontface { IDWriteFontFace2 IDWriteFontFace2_iface; LONG ref; + IDWriteFontFileStream **streams; IDWriteFontFile **files; UINT32 file_count; UINT32 index; @@ -170,25 +171,6 @@ static inline void* get_fontface_cmap(struct dwrite_fontface *fontface) return fontface->cmap.data; } -static HRESULT _dwritefontfile_GetFontFileStream(IDWriteFontFile *iface, IDWriteFontFileStream **stream) -{ - HRESULT hr; - struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); - if (!This->stream) - { - hr = IDWriteFontFileLoader_CreateStreamFromKey(This->loader, This->reference_key, This->key_size, &This->stream); - if (FAILED(hr)) - return hr; - } - if (This->stream) - { - IDWriteFontFileStream_AddRef(This->stream); - *stream = This->stream; - return S_OK; - } - return E_FAIL; -} - static void release_font_data(struct dwrite_font_data *data) { int i; @@ -264,8 +246,12 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) if (This->cmap.context) IDWriteFontFace2_ReleaseFontTable(iface, This->cmap.context); - for (i = 0; i < This->file_count; i++) - IDWriteFontFile_Release(This->files[i]); + for (i = 0; i < This->file_count; i++) { + if (This->streams[i]) + IDWriteFontFileStream_Release(This->streams[i]); + if (This->files[i]) + IDWriteFontFile_Release(This->files[i]); + } heap_free(This); } @@ -381,15 +367,8 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace2 *iface, UI *exists = FALSE; for (i = 0; i < This->file_count && !(*exists); i++) { - IDWriteFontFileStream *stream; - hr = _dwritefontfile_GetFontFileStream(This->files[i], &stream); - if (FAILED(hr)) - continue; + hr = opentype_get_font_table(This->streams[i], This->type, This->index, table_tag, table_data, &tablecontext->context, table_size, exists); tablecontext->file_index = i; - - hr = opentype_get_font_table(stream, This->type, This->index, table_tag, table_data, &tablecontext->context, table_size, exists); - - IDWriteFontFileStream_Release(stream); } if (FAILED(hr) && !*exists) heap_free(tablecontext); @@ -403,8 +382,7 @@ static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace2 *iface, void { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); struct dwrite_fonttablecontext *tablecontext = (struct dwrite_fonttablecontext*)table_context; - IDWriteFontFileStream *stream; - HRESULT hr; + TRACE("(%p)->(%p)\n", This, table_context); if (tablecontext->magic != DWRITE_FONTTABLE_MAGIC) @@ -413,11 +391,7 @@ static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace2 *iface, void return; } - hr = _dwritefontfile_GetFontFileStream(This->files[tablecontext->file_index], &stream); - if (FAILED(hr)) - return; - IDWriteFontFileStream_ReleaseFileFragment(stream, tablecontext->context); - IDWriteFontFileStream_Release(stream); + IDWriteFontFileStream_ReleaseFileFragment(This->streams[tablecontext->file_index], tablecontext->context); heap_free(tablecontext); } @@ -1904,6 +1878,30 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } +static HRESULT get_stream_from_file(IDWriteFontFile *file, IDWriteFontFileStream **stream) +{ + IDWriteFontFileLoader *loader; + UINT32 key_size; + const void *key; + HRESULT hr; + + *stream = NULL; + hr = IDWriteFontFile_GetLoader(file, &loader); + if (FAILED(hr)) + return hr; + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + if (FAILED(hr)) { + IDWriteFontFileLoader_Release(loader); + return hr; + } + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, key, key_size, stream); + IDWriteFontFileLoader_Release(loader); + + return hr; +} + HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace2 **ret) { @@ -1915,8 +1913,12 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW if (!fontface) return E_OUTOFMEMORY; - fontface->files = heap_alloc(sizeof(*fontface->files) * files_number); - if (!fontface->files) { + fontface->files = heap_alloc_zero(sizeof(*fontface->files) * files_number); + fontface->streams = heap_alloc_zero(sizeof(*fontface->streams) * files_number); + + if (!fontface->files || !fontface->streams) { + heap_free(fontface->files); + heap_free(fontface->streams); heap_free(fontface); return E_OUTOFMEMORY; } @@ -1929,22 +1931,13 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW fontface->cmap.context = NULL; fontface->cmap.size = 0; - /* Verify font file streams */ - for (i = 0; i < fontface->file_count && SUCCEEDED(hr); i++) - { - IDWriteFontFileStream *stream; - hr = _dwritefontfile_GetFontFileStream(font_files[i], &stream); - if (SUCCEEDED(hr)) - IDWriteFontFileStream_Release(stream); - } - - if (FAILED(hr)) { - heap_free(fontface->files); - heap_free(fontface); - return hr; - } - for (i = 0; i < fontface->file_count; i++) { + hr = get_stream_from_file(font_files[i], &fontface->streams[i]); + if (FAILED(hr)) { + IDWriteFontFace2_Release(&fontface->IDWriteFontFace2_iface); + return hr; + } + fontface->files[i] = font_files[i]; IDWriteFontFile_AddRef(font_files[i]); }

1 0

Nikolay Sivov : dwrite: Implement GetMetrics() for fontface.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: c8bc7ea849d4cca6d9b40ce27cd33d9b79743cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8bc7ea849d4cca6d9b40ce27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 6 08:50:12 2014 +0300 dwrite: Implement GetMetrics() for fontface. --- dlls/dwrite/font.c | 16 +++++++++++++--- dlls/dwrite/tests/font.c | 21 +++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6c62056..e6154b4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -112,6 +112,7 @@ struct dwrite_fontface { USHORT simulations; DWRITE_FONT_FACE_TYPE type; + DWRITE_FONT_METRICS metrics; struct dwrite_fonttable cmap; }; @@ -313,7 +314,8 @@ static BOOL WINAPI dwritefontface_IsSymbolFont(IDWriteFontFace2 *iface) static void WINAPI dwritefontface_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FONT_METRICS *metrics) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%p): stub\n", This, metrics); + TRACE("(%p)->(%p)\n", This, metrics); + *metrics = This->metrics; } static UINT16 WINAPI dwritefontface_GetGlyphCount(IDWriteFontFace2 *iface) @@ -615,11 +617,18 @@ static void get_font_properties_from_stream(IDWriteFontFileStream *stream, DWRIT { const void *tt_os2 = NULL, *tt_head = NULL, *tt_post = NULL; void *os2_context, *head_context, *post_context; + DWRITE_FONT_STRETCH fontstretch; + DWRITE_FONT_WEIGHT fontweight; + DWRITE_FONT_STYLE fontstyle; opentype_get_font_table(stream, face_type, face_index, MS_OS2_TAG, &tt_os2, &os2_context, NULL, NULL); opentype_get_font_table(stream, face_type, face_index, MS_HEAD_TAG, &tt_head, &head_context, NULL, NULL); opentype_get_font_table(stream, face_type, face_index, MS_POST_TAG, &tt_post, &post_context, NULL, NULL); + if (!stretch) stretch = &fontstretch; + if (!weight) weight = &fontweight; + if (!style) style = &fontstyle; + opentype_get_font_properties(tt_os2, tt_head, stretch, weight, style); opentype_get_font_metrics(tt_os2, tt_head, tt_post, metrics); @@ -1930,6 +1939,8 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW fontface->cmap.data = NULL; fontface->cmap.context = NULL; fontface->cmap.size = 0; + fontface->index = index; + fontface->simulations = simulations; for (i = 0; i < fontface->file_count; i++) { hr = get_stream_from_file(font_files[i], &fontface->streams[i]); @@ -1942,8 +1953,7 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW IDWriteFontFile_AddRef(font_files[i]); } - fontface->index = index; - fontface->simulations = simulations; + get_font_properties_from_stream(fontface->streams[0], facetype, index, &fontface->metrics, NULL, NULL, NULL); *ret = &fontface->IDWriteFontFace2_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e51b702..51a07c7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -957,6 +957,7 @@ static void test_GetMetrics(void) { IDWriteGdiInterop *interop; DWRITE_FONT_METRICS metrics; + IDWriteFontFace *fontface; IDWriteFactory *factory; OUTLINETEXTMETRICW otm; IDWriteFont *font; @@ -1009,6 +1010,26 @@ todo_wine ok(metrics.strikethroughPosition > 0, "strikethroughPosition %d\n", metrics.strikethroughPosition); ok(metrics.strikethroughThickness != 0, "strikethroughThickness %u\n", metrics.strikethroughThickness); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&metrics, 0, sizeof(metrics)); + IDWriteFontFace_GetMetrics(fontface, &metrics); + + ok(metrics.designUnitsPerEm != 0, "designUnitsPerEm %u\n", metrics.designUnitsPerEm); + ok(metrics.ascent != 0, "ascent %u\n", metrics.ascent); + ok(metrics.descent != 0, "descent %u\n", metrics.descent); +todo_wine + ok(metrics.lineGap == 0, "lineGap %d\n", metrics.lineGap); + ok(metrics.capHeight, "capHeight %u\n", metrics.capHeight); + ok(metrics.xHeight != 0, "xHeight %u\n", metrics.xHeight); + ok(metrics.underlinePosition < 0, "underlinePosition %d\n", metrics.underlinePosition); + ok(metrics.underlineThickness != 0, "underlineThickness %u\n", metrics.underlineThickness); + ok(metrics.strikethroughPosition > 0, "strikethroughPosition %d\n", metrics.strikethroughPosition); + ok(metrics.strikethroughThickness != 0, "strikethroughThickness %u\n", metrics.strikethroughThickness); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop); IDWriteFactory_Release(factory);

1 0

Henri Verbeet : d2d1: Add an initial d2d_d3d_render_target_FillRectangle() implementation.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 7a72eb2dcd6ad8b0b6c1f8374ec5b0e4dda68cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a72eb2dcd6ad8b0b6c1f8374… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:14 2014 +0100 d2d1: Add an initial d2d_d3d_render_target_FillRectangle() implementation. --- dlls/d2d1/brush.c | 19 ++- dlls/d2d1/d2d1_private.h | 30 +++- dlls/d2d1/render_target.c | 348 ++++++++++++++++++++++++++++++---------------- 3 files changed, 269 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a72eb2dcd6ad8b0b6c1f…

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_SetColor().
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 94cd81a45d2ebcb6b737a37842860fc5b0277932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cd81a45d2ebcb6b737a3784… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:15 2014 +0100 d2d1: Implement d2d_solid_color_brush_SetColor(). --- dlls/d2d1/brush.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b2a1664..04b273a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -243,7 +243,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColor static void STDMETHODCALLTYPE d2d_solid_color_brush_SetColor(ID2D1SolidColorBrush *iface, const D2D1_COLOR_F *color) { - FIXME("iface %p, color %p stub!\n", iface, color); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + + TRACE("iface %p, color %p.\n", iface, color); + + brush->u.solid.color = *color; } static D2D1_COLOR_F * STDMETHODCALLTYPE d2d_solid_color_brush_GetColor(ID2D1SolidColorBrush *iface, D2D1_COLOR_F *color)

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_GetColor().
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: fd8b3ae57298bff9dcb1c7db36a67d4d3818400f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8b3ae57298bff9dcb1c7db3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:16 2014 +0100 d2d1: Implement d2d_solid_color_brush_GetColor(). --- dlls/d2d1/brush.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 04b273a..eacbebb 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -252,11 +252,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_SetColor(ID2D1SolidColorBrus static D2D1_COLOR_F * STDMETHODCALLTYPE d2d_solid_color_brush_GetColor(ID2D1SolidColorBrush *iface, D2D1_COLOR_F *color) { - static const D2D1_COLOR_F black = {0.0f, 0.0f, 0.0f, 1.0f}; + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); - FIXME("iface %p, color %p stub!\n", iface, color); + TRACE("iface %p, color %p.\n", iface, color); - *color = black; + *color = brush->u.solid.color; return color; }

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_SetOpacity().
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 743d80fea590c61ac2c6fb89c305ce6a6694813c URL: http://source.winehq.org/git/wine.git/?a=commit;h=743d80fea590c61ac2c6fb89c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:17 2014 +0100 d2d1: Implement d2d_solid_color_brush_SetOpacity(). --- dlls/d2d1/brush.c | 7 ++++++- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/render_target.c | 11 +++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index eacbebb..8837cee 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -149,6 +149,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_ta { brush->ID2D1Brush_iface.lpVtbl = vtbl; brush->refcount = 1; + brush->opacity = desc ? desc->opacity : 1.0f; brush->type = type; } @@ -210,7 +211,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_GetFactory(ID2D1SolidColorBr static void STDMETHODCALLTYPE d2d_solid_color_brush_SetOpacity(ID2D1SolidColorBrush *iface, float opacity) { - FIXME("iface %p, opacity %.8e stub!\n", iface, opacity); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + + TRACE("iface %p, opacity %.8e.\n", iface, opacity); + + brush->opacity = opacity; } static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColorBrush *iface, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0a99633..8504e68 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -107,6 +107,8 @@ struct d2d_brush ID2D1Brush ID2D1Brush_iface; LONG refcount; + float opacity; + enum d2d_brush_type type; union { diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 1dd5122..0f5907f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -501,6 +501,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; + D2D1_COLOR_F color; float tmp_x, tmp_y; HRESULT hr; struct @@ -558,8 +559,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - buffer_desc.ByteWidth = sizeof(brush_impl->u.solid.color); - buffer_data.pSysMem = &brush_impl->u.solid.color; + color = brush_impl->u.solid.color; + color.r *= brush_impl->opacity; + color.g *= brush_impl->opacity; + color.b *= brush_impl->opacity; + color.a *= brush_impl->opacity; + + buffer_desc.ByteWidth = sizeof(color); + buffer_data.pSysMem = &color; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ps_cb))) {

1 0

Chen Yuan : mshtml: Add IHTMLStyle5::maxWidth property implementation.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 94209192e7666ffcfd521091c632146688a380ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=94209192e7666ffcfd521091c… Author: Chen Yuan <huddsinyuan2014(a)gmail.com> Date: Wed Nov 5 01:32:42 2014 +0800 mshtml: Add IHTMLStyle5::maxWidth property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 52d15f9..755507c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -144,6 +144,8 @@ static const WCHAR attrMarginRight[] = {'m','a','r','g','i','n','-','r','i','g','h','t',0}; static const WCHAR attrMarginTop[] = {'m','a','r','g','i','n','-','t','o','p',0}; +static const WCHAR attrMaxWidth[] = + {'m','a','x','-','w','i','d','t','h',0}; static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; static const WCHAR attrMinWidth[] = @@ -264,6 +266,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, + {attrMaxWidth, DISPID_IHTMLSTYLE5_MAXWIDTH}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrMinWidth, DISPID_IHTMLSTYLE5_MINWIDTH}, {attrOutline, DISPID_IHTMLSTYLE6_OUTLINE}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 1ae8d8c..d2834ac 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -87,6 +87,7 @@ typedef enum { STYLEID_MARGIN_LEFT, STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, + STYLEID_MAX_WIDTH, STYLEID_MIN_HEIGHT, STYLEID_MIN_WIDTH, STYLEID_OUTLINE, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index c704f08..658f879 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -562,15 +562,19 @@ static HRESULT WINAPI HTMLStyle5_get_minWidth(IHTMLStyle5 *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle5_put_maxWidth(IHTMLStyle5 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_WIDTH, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle5_get_maxWidth(IHTMLStyle5 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_WIDTH, p, 0); } static const IHTMLStyle5Vtbl HTMLStyle5Vtbl = { diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index ed9338d..1c230f4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -548,6 +548,38 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_put_minWidth(style5, vdefault); ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); VariantClear(&vdefault); + + /* maxWidth */ + hres = IHTMLStyle5_get_maxWidth(style5, &vdefault); + ok(hres == S_OK, "get_maxWidth failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("200px"); + hres = IHTMLStyle5_put_maxWidth(style5, v); + ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxWidth(style5, &v); + ok(hres == S_OK, "get_maxWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n",V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "200px"), "expect 200px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("70%"); + hres = IHTMLStyle5_put_maxWidth(style5, v); + ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxWidth(style5, &v); + ok(hres == S_OK, "get maxWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "70%"), "expect 70%% got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle5_put_maxWidth(style5,vdefault); + ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); + VariantClear(&vdefault); } static void test_style6(IHTMLStyle6 *style)

1 0

Chen Yuan : mshtml: Add IHTMLStyle5::maxHeight property implementation.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 9c7b91336a5f0c98776b8594673667645ce89e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7b91336a5f0c98776b85946… Author: Chen Yuan <huddsinyuan2014(a)gmail.com> Date: Wed Nov 5 01:36:10 2014 +0800 mshtml: Add IHTMLStyle5::maxHeight property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 755507c..d9898a9 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -144,6 +144,8 @@ static const WCHAR attrMarginRight[] = {'m','a','r','g','i','n','-','r','i','g','h','t',0}; static const WCHAR attrMarginTop[] = {'m','a','r','g','i','n','-','t','o','p',0}; +static const WCHAR attrMaxHeight[] = + {'m','a','x','-','h','e','i','g','h','t',0}; static const WCHAR attrMaxWidth[] = {'m','a','x','-','w','i','d','t','h',0}; static const WCHAR attrMinHeight[] = @@ -266,6 +268,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, + {attrMaxHeight, DISPID_IHTMLSTYLE5_MAXHEIGHT}, {attrMaxWidth, DISPID_IHTMLSTYLE5_MAXWIDTH}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrMinWidth, DISPID_IHTMLSTYLE5_MINWIDTH}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index d2834ac..de6f37e 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -87,6 +87,7 @@ typedef enum { STYLEID_MARGIN_LEFT, STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, + STYLEID_MAX_HEIGHT, STYLEID_MAX_WIDTH, STYLEID_MIN_HEIGHT, STYLEID_MIN_WIDTH, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 658f879..6532bf4 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -530,15 +530,19 @@ static HRESULT WINAPI HTMLStyle5_get_msInterpolationMode(IHTMLStyle5 *iface, BST static HRESULT WINAPI HTMLStyle5_put_maxHeight(IHTMLStyle5 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_HEIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle5_get_maxHeight(IHTMLStyle5 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, debugstr_variant(p)); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_HEIGHT, p, 0); } static HRESULT WINAPI HTMLStyle5_put_minWidth(IHTMLStyle5 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 1c230f4..ec66a71 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -580,6 +580,50 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_put_maxWidth(style5,vdefault); ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); VariantClear(&vdefault); + + /* maxHeight */ + hres = IHTMLStyle5_get_maxHeight(style5, &vdefault); + ok(hres == S_OK, "get maxHeight failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("200px"); + hres = IHTMLStyle5_put_maxHeight(style5, v); + ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxHeight(style5, &v); + ok(hres == S_OK, "get maxHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "200px"), "expect 200px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("70%"); + hres = IHTMLStyle5_put_maxHeight(style5, v); + ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxHeight(style5, &v); + ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "70%"), "expect 70%% got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("100"); + hres = IHTMLStyle5_put_maxHeight(style5, v); + ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxHeight(style5, &v); + ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "100px"), "expect 100 got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle5_put_maxHeight(style5, vdefault); + ok(hres == S_OK, "put maxHeight failed:%08x\n", hres); + VariantClear(&vdefault); } static void test_style6(IHTMLStyle6 *style)

1 0

Sebastian Lackner : usp10: Silence repeated GSUB_apply_ChainContext[ Subst|Pos] FIXMEs.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: ebd1b86bbb0b4fa8f36ada68dbf61eeb828a05ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd1b86bbb0b4fa8f36ada68d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 18 00:38:15 2014 +0200 usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs. --- dlls/usp10/opentype.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index dd9c8c4..e7f2dfd 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -937,12 +937,16 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset); if (GET_BE_WORD(ccsf1->SubstFormat) == 1) { - FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { - FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) @@ -1648,12 +1652,16 @@ static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpo if (GET_BE_WORD(ccpf3->PosFormat) == 1) { - FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); continue; } else if (GET_BE_WORD(ccpf3->PosFormat) == 2) { - FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n"); continue; } else if (GET_BE_WORD(ccpf3->PosFormat) == 3)

1 0

Sebastian Lackner : user32/tests: Add tests for MsgWaitForMultipleObjectsEx.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 3326cad0dd7acca41d5e0286861a93423967c7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3326cad0dd7acca41d5e02868… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 6 00:13:42 2014 +0100 user32/tests: Add tests for MsgWaitForMultipleObjectsEx. --- dlls/user32/tests/msg.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90b87cb..a55852b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4542,6 +4542,11 @@ static const struct message WmZOrder[] = { { 0 } }; +static void CALLBACK apc_test_proc(ULONG_PTR param) +{ + /* nothing */ +} + static void test_MsgWaitForMultipleObjects(HWND hwnd) { DWORD ret; @@ -4583,6 +4588,37 @@ static void test_MsgWaitForMultipleObjects(HWND hwnd) ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* MWMO_INPUTAVAILABLE should succeed even if the message was already seen */ + PostMessageA( hwnd, WM_USER, 0, 0 ); + ok(PeekMessageA( &msg, 0, 0, 0, PM_NOREMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, MWMO_INPUTAVAILABLE ); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjectsEx returned %x\n", ret); + + ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* without MWMO_ALERTABLE the result is never WAIT_IO_COMPLETION */ + ret = QueueUserAPC( apc_test_proc, GetCurrentThread(), 0 ); + ok(ret, "QueueUserAPC failed %u\n", GetLastError()); + + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, 0 ); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjectsEx returned %x\n", ret); + + /* but even with MWMO_ALERTABLE window events are preferred */ + PostMessageA( hwnd, WM_USER, 0, 0 ); + + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, MWMO_ALERTABLE ); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjectsEx returned %x\n", ret); + + ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* the APC call is still queued */ + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, MWMO_ALERTABLE ); + ok(ret == WAIT_IO_COMPLETION, "MsgWaitForMultipleObjectsEx returned %x\n", ret); } /* test if we receive the right sequence of messages */

1 0