April 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/pager: Prevent excessive PGN_CALCSIZE notifications during PGM_SETCHILD.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 48c4edd9ba91e8236597f709c189ed1d5d41efad URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c4edd9ba91e8236597f709c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 13:16:02 2017 +0300 comctl32/pager: Prevent excessive PGN_CALCSIZE notifications during PGM_SETCHILD. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 21 +++++++++++---------- dlls/comctl32/tests/pager.c | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index ae759fb..e9bcbe8 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -271,7 +271,7 @@ PAGER_PositionChildWnd(PAGER_INFO* infoPtr) } static INT -PAGER_GetScrollRange(PAGER_INFO* infoPtr) +PAGER_GetScrollRange(PAGER_INFO* infoPtr, BOOL calc_size) { INT scrollRange = 0; @@ -281,7 +281,8 @@ PAGER_GetScrollRange(PAGER_INFO* infoPtr) RECT wndRect; GetWindowRect(infoPtr->hwndSelf, &wndRect); - PAGER_CalcSize(infoPtr); + if (calc_size) + PAGER_CalcSize(infoPtr); if (infoPtr->dwStyle & PGS_HORZ) { wndSize = wndRect.right - wndRect.left; @@ -362,9 +363,9 @@ PAGER_UpdateBtns(PAGER_INFO *infoPtr, INT scrollRange, BOOL hideGrayBtns) } static LRESULT -PAGER_SetPos(PAGER_INFO* infoPtr, INT newPos, BOOL fromBtnPress) +PAGER_SetPos(PAGER_INFO* infoPtr, INT newPos, BOOL fromBtnPress, BOOL calc_size) { - INT scrollRange = PAGER_GetScrollRange(infoPtr); + INT scrollRange = PAGER_GetScrollRange(infoPtr, calc_size); INT oldPos = infoPtr->nPos; if ((scrollRange <= 0) || (newPos < 0)) @@ -405,12 +406,12 @@ PAGER_RecalcSize(PAGER_INFO *infoPtr) if (infoPtr->hwndChild) { - INT scrollRange = PAGER_GetScrollRange(infoPtr); + INT scrollRange = PAGER_GetScrollRange(infoPtr, TRUE); if (scrollRange <= 0) { infoPtr->nPos = -1; - PAGER_SetPos(infoPtr, 0, FALSE); + PAGER_SetPos(infoPtr, 0, FALSE, TRUE); } else PAGER_PositionChildWnd(infoPtr); @@ -480,7 +481,7 @@ PAGER_SetChild (PAGER_INFO* infoPtr, HWND hwndChild) SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); infoPtr->nPos = -1; - PAGER_SetPos(infoPtr, 0, FALSE); + PAGER_SetPos(infoPtr, 0, FALSE, FALSE); } return 0; @@ -525,9 +526,9 @@ PAGER_Scroll(PAGER_INFO* infoPtr, INT dir) infoPtr->direction = dir; if (dir == PGF_SCROLLLEFT || dir == PGF_SCROLLUP) - PAGER_SetPos(infoPtr, infoPtr->nPos - nmpgScroll.iScroll, TRUE); + PAGER_SetPos(infoPtr, infoPtr->nPos - nmpgScroll.iScroll, TRUE, TRUE); else - PAGER_SetPos(infoPtr, infoPtr->nPos + nmpgScroll.iScroll, TRUE); + PAGER_SetPos(infoPtr, infoPtr->nPos + nmpgScroll.iScroll, TRUE, TRUE); } else infoPtr->direction = -1; @@ -1047,7 +1048,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return PAGER_SetChild (infoPtr, (HWND)lParam); case PGM_SETPOS: - return PAGER_SetPos(infoPtr, (INT)lParam, FALSE); + return PAGER_SetPos(infoPtr, (INT)lParam, FALSE, TRUE); case WM_CREATE: return PAGER_Create (hwnd, (LPCREATESTRUCTW)lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index afe6fc6..a9409ea 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -272,14 +272,14 @@ static void test_pager(void) flush_sequences( sequences, NUM_MSG_SEQUENCES ); SendMessageA( pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd ); - ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "set child", TRUE); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "set child", FALSE); GetWindowRect( pager, &rect ); ok( rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top ); flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child2_wnd); - ok_sequence(sequences, PAGER_SEQ_INDEX, switch_child_seq, "switch to invisible child", TRUE); + ok_sequence(sequences, PAGER_SEQ_INDEX, switch_child_seq, "switch to invisible child", FALSE); GetWindowRect(pager, &rect); ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top); @@ -287,7 +287,7 @@ static void test_pager(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); - ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "switch to visible child", TRUE); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "switch to visible child", FALSE); GetWindowRect(pager, &rect); ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top);

1 0

Nikolay Sivov : comctl32/tests: Trace test name only of failure.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 377d0e26b3f0c5700828361348fa1a256fb2f2d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=377d0e26b3f0c570082836134… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 14:03:57 2017 +0300 comctl32/tests: Trace test name only of failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 8cdef18..20be1ea 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -918,36 +918,34 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN char *data; HRESULT hr; - trace("%s\n", comment); - ret = ImageList_GetImageCount(himl); - ok(ret == cur, "expected image count %d got %d\n", cur, ret); + ok(ret == cur, "%s: expected image count %d got %d\n", comment, cur, ret); ret = ImageList_GetIconSize(himl, &cxx, &cyy); ok(ret, "ImageList_GetIconSize failed\n"); - ok(cxx == cx, "wrong cx %d (expected %d)\n", cxx, cx); - ok(cyy == cy, "wrong cy %d (expected %d)\n", cyy, cy); + ok(cxx == cx, "%s: wrong cx %d (expected %d)\n", comment, cxx, cx); + ok(cyy == cy, "%s: wrong cy %d (expected %d)\n", comment, cyy, cy); init_memstream(&stream); ret = ImageList_Write(himl, &stream.IStream_iface); - ok(ret, "ImageList_Write failed\n"); + ok(ret, "%s: ImageList_Write failed\n", comment); hr = GetHGlobalFromStream(stream.stream, &hglobal); - ok(hr == S_OK, "Failed to get hglobal, %#x\n", hr); + ok(hr == S_OK, "%s: Failed to get hglobal, %#x\n", comment, hr); IStream_Stat(stream.stream, &stat, STATFLAG_NONAME); data = GlobalLock(hglobal); - ok(data != 0, "ImageList_Write didn't write any data\n"); - ok(stat.cbSize.LowPart > sizeof(ILHEAD), "ImageList_Write wrote not enough data\n"); + ok(data != 0, "%s: ImageList_Write didn't write any data\n", comment); + ok(stat.cbSize.LowPart > sizeof(ILHEAD), "%s: ImageList_Write wrote not enough data\n", comment); check_ilhead_data(data, cx, cy, cur, max, grow, flags); size = check_bitmap_data(data + sizeof(ILHEAD), stat.cbSize.LowPart - sizeof(ILHEAD), width, height, flags & 0xfe, comment); if (size < stat.cbSize.LowPart - sizeof(ILHEAD)) /* mask is present */ { - ok( flags & ILC_MASK, "extra data %u/%u but mask not expected\n", stat.cbSize.LowPart, size ); + ok( flags & ILC_MASK, "%s: extra data %u/%u but mask not expected\n", comment, stat.cbSize.LowPart, size ); check_bitmap_data(data + sizeof(ILHEAD) + size, stat.cbSize.LowPart - sizeof(ILHEAD) - size, width, height, 1, comment); } @@ -956,7 +954,7 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN mv.QuadPart = 0; IStream_Seek(stream.stream, mv, STREAM_SEEK_SET, NULL); himl2 = ImageList_Read(&stream.IStream_iface); - ok(himl2 != NULL, "Failed to deserialize imagelist\n"); + ok(himl2 != NULL, "%s: Failed to deserialize imagelist\n", comment); ImageList_Destroy(himl2); GlobalUnlock(hglobal);

1 0

Nikolay Sivov : dwrite: Partially implement GetGlyphImageFormats().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: b0f50e7e5bee10adaa0541a24a1d92ab493449be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f50e7e5bee10adaa0541a24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 14:28:24 2017 +0300 dwrite: Partially implement GetGlyphImageFormats(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 8 ++++++-- dlls/dwrite/opentype.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 1 - 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 886beb7..7dca5fb 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -229,6 +229,7 @@ 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; extern HRESULT opentype_get_font_signature(struct file_stream_desc*,FONTSIGNATURE*) DECLSPEC_HIDDEN; extern BOOL opentype_has_vertical_variants(IDWriteFontFace4*) DECLSPEC_HIDDEN; +extern UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4*) DECLSPEC_HIDDEN; struct dwrite_colorglyph { USHORT layer; /* [0, num_layers) index indicating current layer */ diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c74b2bb..ca2d69a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -242,6 +242,7 @@ struct dwrite_fontface { DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; DWRITE_PANOSE panose; + UINT32 glyph_image_formats; LOGFONTW lf; }; @@ -1278,8 +1279,10 @@ static HRESULT WINAPI dwritefontface4_GetGlyphImageFormats_(IDWriteFontFace4 *if static DWRITE_GLYPH_IMAGE_FORMATS WINAPI dwritefontface4_GetGlyphImageFormats(IDWriteFontFace4 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); - FIXME("(%p): stub\n", This); - return DWRITE_GLYPH_IMAGE_FORMATS_NONE; + + TRACE("(%p)\n", This); + + return This->glyph_image_formats; } static HRESULT WINAPI dwritefontface4_GetGlyphImageData(IDWriteFontFace4 *iface, UINT16 glyph, @@ -4345,6 +4348,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->flags |= FONTFACE_IS_MONOSPACED; if (opentype_has_vertical_variants(&fontface->IDWriteFontFace4_iface)) fontface->flags |= FONTFACE_HAS_VERTICAL_VARIANTS; + fontface->glyph_image_formats = opentype_get_glyph_image_formats(&fontface->IDWriteFontFace4_iface); /* Font properties are reused from font object when 'normal' face creation path is used: collection -> family -> matching font -> fontface. diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7a3e641..b7e9d87 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -34,6 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_GPOS_TAG DWRITE_MAKE_OPENTYPE_TAG('G','P','O','S') #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') #define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') +#define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') +#define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') +#define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -2034,3 +2037,38 @@ BOOL opentype_has_vertical_variants(IDWriteFontFace4 *fontface) return ret; } + +static BOOL opentype_has_font_table(IDWriteFontFace4 *fontface, UINT32 tag) +{ + BOOL exists = FALSE; + const void *data; + void *context; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace4_TryGetFontTable(fontface, tag, &data, &size, &context, &exists); + if (FAILED(hr)) + return FALSE; + + if (exists) + IDWriteFontFace4_ReleaseFontTable(fontface, context); + + return exists; +} + +UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) +{ + UINT32 ret = DWRITE_GLYPH_IMAGE_FORMATS_NONE; + + if (opentype_has_font_table(fontface, MS_GLYF_TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE; + + if (opentype_has_font_table(fontface, MS_CFF__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_CFF; + + if (opentype_has_font_table(fontface, MS_COLR_TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; + + /* TODO: handle SVG and bitmap data */ + return ret; +} diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2c874df..4d5780c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7504,7 +7504,6 @@ static void test_GetGlyphImageFormats(void) /* Mask describes font as a whole. */ formats = IDWriteFontFace4_GetGlyphImageFormats(fontface4); expected_formats = get_face_glyph_image_formats(fontface4); - todo_wine ok(formats == expected_formats, "%s - %s, expected formats %#x, got formats %#x.\n", wine_dbgstr_w(familynameW), wine_dbgstr_w(facenameW), expected_formats, formats);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 6649f1224fc92d694d0509ea6f1e1500c7df10cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6649f1224fc92d694d0509ea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 14:37:52 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index 89b8d81..13aad05 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-20 15:18+0300\n" +"PO-Revision-Date: 2017-04-21 14:36+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -3708,7 +3708,7 @@ msgstr "Ожидается объект типа «Array»" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Библиотека ядра Wine" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine"

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 3f6b08e40d01c9bb41727ef0674892123c6fdc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6b08e40d01c9bb41727ef06… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Apr 21 11:33:38 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 9a5815d..1ddf3d0 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -3706,7 +3706,7 @@ msgstr "Forventet rekke-objekt" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine kjerne-DLL" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine"

1 0

Jacek Caban : mshtml: Added IProvideMultipleTypeInfo stub implementation for HTMLDocument object.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 18309c575a4c073a895dcd5e5f573ebae97bd4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18309c575a4c073a895dcd5e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 13:49:40 2017 +0200 mshtml: Added IProvideMultipleTypeInfo stub implementation for HTMLDocument object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 59 +++++++++++++++++++++++++++++++++----------- dlls/mshtml/main.c | 2 ++ dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 57679fc..e30d752 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4444,43 +4444,68 @@ static const IDispatchExVtbl DocDispatchExVtbl = { DocDispatchEx_GetNameSpaceParent }; -static inline HTMLDocument *impl_from_IProvideClassInfo(IProvideClassInfo *iface) +static inline HTMLDocument *impl_from_IProvideMultipleClassInfo(IProvideMultipleClassInfo *iface) { - return CONTAINING_RECORD(iface, HTMLDocument, IProvideClassInfo_iface); + return CONTAINING_RECORD(iface, HTMLDocument, IProvideMultipleClassInfo_iface); } -static HRESULT WINAPI ProvideClassInfo_QueryInterface(IProvideClassInfo *iface, +static HRESULT WINAPI ProvideClassInfo_QueryInterface(IProvideMultipleClassInfo *iface, REFIID riid, void **ppv) { - HTMLDocument *This = impl_from_IProvideClassInfo(iface); + HTMLDocument *This = impl_from_IProvideMultipleClassInfo(iface); return htmldoc_query_interface(This, riid, ppv); } -static ULONG WINAPI ProvideClassInfo_AddRef(IProvideClassInfo *iface) +static ULONG WINAPI ProvideClassInfo_AddRef(IProvideMultipleClassInfo *iface) { - HTMLDocument *This = impl_from_IProvideClassInfo(iface); + HTMLDocument *This = impl_from_IProvideMultipleClassInfo(iface); return htmldoc_addref(This); } -static ULONG WINAPI ProvideClassInfo_Release(IProvideClassInfo *iface) +static ULONG WINAPI ProvideClassInfo_Release(IProvideMultipleClassInfo *iface) { - HTMLDocument *This = impl_from_IProvideClassInfo(iface); + HTMLDocument *This = impl_from_IProvideMultipleClassInfo(iface); return htmldoc_release(This); } -static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo* iface, - ITypeInfo **ppTI) +static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideMultipleClassInfo *iface, ITypeInfo **ppTI) { - HTMLDocument *This = impl_from_IProvideClassInfo(iface); + HTMLDocument *This = impl_from_IProvideMultipleClassInfo(iface); TRACE("(%p)->(%p)\n", This, ppTI); return get_class_typeinfo(&CLSID_HTMLDocument, ppTI); } -static const IProvideClassInfoVtbl ProvideClassInfoVtbl = { +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideMultipleClassInfo *iface, DWORD dwGuidKind, GUID *pGUID) +{ + HTMLDocument *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%u %p)\n", This, dwGuidKind, pGUID); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProvideMultipleClassInfo_GetMultiTypeInfoCount(IProvideMultipleClassInfo *iface, ULONG *pcti) +{ + HTMLDocument *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%p)\n", This, pcti); + *pcti = 1; + return S_OK; +} + +static HRESULT WINAPI ProvideMultipleClassInfo_GetInfoOfIndex(IProvideMultipleClassInfo *iface, ULONG iti, + DWORD dwFlags, ITypeInfo **pptiCoClass, DWORD *pdwTIFlags, ULONG *pcdispidReserved, IID *piidPrimary, IID *piidSource) +{ + HTMLDocument *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%u %x %p %p %p %p %p)\n", This, iti, dwFlags, pptiCoClass, pdwTIFlags, pcdispidReserved, piidPrimary, piidSource); + return E_NOTIMPL; +} + +static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = { ProvideClassInfo_QueryInterface, ProvideClassInfo_AddRef, ProvideClassInfo_Release, - ProvideClassInfo_GetClassInfo + ProvideClassInfo_GetClassInfo, + ProvideClassInfo2_GetGUID, + ProvideMultipleClassInfo_GetMultiTypeInfoCount, + ProvideMultipleClassInfo_GetInfoOfIndex }; static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) @@ -4562,7 +4587,11 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) else if(IsEqualGUID(&IID_IObjectSafety, riid)) *ppv = &This->IObjectSafety_iface; else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) - *ppv = &This->IProvideClassInfo_iface; + *ppv = &This->IProvideMultipleClassInfo_iface; + else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) + *ppv = &This->IProvideMultipleClassInfo_iface; + else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) + *ppv = &This->IProvideMultipleClassInfo_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -4608,7 +4637,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IDispatchEx_iface.lpVtbl = &DocDispatchExVtbl; doc->IDocumentSelector_iface.lpVtbl = &DocumentSelectorVtbl; doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; - doc->IProvideClassInfo_iface.lpVtbl = &ProvideClassInfoVtbl; + doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 262fda6..af716d1 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -615,6 +615,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IPersistStreamInit); X(IID_IPropertyNotifySink); X(IID_IProvideClassInfo); + X(IID_IProvideClassInfo2); + X(IID_IProvideMultipleClassInfo); X(IID_IServiceProvider); X(IID_ISupportErrorInfo); X(IID_ITargetContainer); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c0b1d29..a0c0dab 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -575,7 +575,7 @@ struct HTMLDocument { IObjectWithSite IObjectWithSite_iface; IOleContainer IOleContainer_iface; IObjectSafety IObjectSafety_iface; - IProvideClassInfo IProvideClassInfo_iface; + IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; IUnknown *outer_unk; IDispatchEx *dispex;

1 0

Jacek Caban : mshtml: Added IProvideMultipleTypeInfo implementation for HTMLWindow object.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 78490956f945664a3c2a5d77d5a1049cada981db URL: http://source.winehq.org/git/wine.git/?a=commit;h=78490956f945664a3c2a5d77d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 13:49:51 2017 +0200 mshtml: Added IProvideMultipleTypeInfo implementation for HTMLWindow object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 72 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7387e10..b68579b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -184,6 +184,12 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii *ppv = &This->ITravelLogClient_iface; }else if(IsEqualGUID(&IID_IObjectIdentity, riid)) { *ppv = &This->IObjectIdentity_iface; + }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { + *ppv = &This->IProvideMultipleClassInfo_iface; + }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { + *ppv = &This->IProvideMultipleClassInfo_iface; + }else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) { + *ppv = &This->IProvideMultipleClassInfo_iface; }else if(IsEqualGUID(&IID_IMarshal, riid)) { *ppv = NULL; FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv); @@ -2463,6 +2469,70 @@ static const IObjectIdentityVtbl ObjectIdentityVtbl = { ObjectIdentity_IsEqualObject }; +static inline HTMLWindow *impl_from_IProvideMultipleClassInfo(IProvideMultipleClassInfo *iface) +{ + return CONTAINING_RECORD(iface, HTMLWindow, IProvideMultipleClassInfo_iface); +} + +static HRESULT WINAPI ProvideClassInfo_QueryInterface(IProvideMultipleClassInfo *iface, + REFIID riid, void **ppv) +{ + HTMLWindow *This = impl_from_IProvideMultipleClassInfo(iface); + return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); +} + +static ULONG WINAPI ProvideClassInfo_AddRef(IProvideMultipleClassInfo *iface) +{ + HTMLWindow *This = impl_from_IProvideMultipleClassInfo(iface); + return IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); +} + +static ULONG WINAPI ProvideClassInfo_Release(IProvideMultipleClassInfo *iface) +{ + HTMLWindow *This = impl_from_IProvideMultipleClassInfo(iface); + return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); +} + +static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideMultipleClassInfo *iface, ITypeInfo **ppTI) +{ + HTMLWindow *This = impl_from_IProvideMultipleClassInfo(iface); + TRACE("(%p)->(%p)\n", This, ppTI); + return get_class_typeinfo(&CLSID_HTMLWindow2, ppTI); +} + +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideMultipleClassInfo *iface, DWORD dwGuidKind, GUID *pGUID) +{ + HTMLWindow *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%u %p)\n", This, dwGuidKind, pGUID); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProvideMultipleClassInfo_GetMultiTypeInfoCount(IProvideMultipleClassInfo *iface, ULONG *pcti) +{ + HTMLWindow *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%p)\n", This, pcti); + *pcti = 1; + return S_OK; +} + +static HRESULT WINAPI ProvideMultipleClassInfo_GetInfoOfIndex(IProvideMultipleClassInfo *iface, ULONG iti, + DWORD dwFlags, ITypeInfo **pptiCoClass, DWORD *pdwTIFlags, ULONG *pcdispidReserved, IID *piidPrimary, IID *piidSource) +{ + HTMLWindow *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%u %x %p %p %p %p %p)\n", This, iti, dwFlags, pptiCoClass, pdwTIFlags, pcdispidReserved, piidPrimary, piidSource); + return E_NOTIMPL; +} + +static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = { + ProvideClassInfo_QueryInterface, + ProvideClassInfo_AddRef, + ProvideClassInfo_Release, + ProvideClassInfo_GetClassInfo, + ProvideClassInfo2_GetGUID, + ProvideMultipleClassInfo_GetMultiTypeInfoCount, + ProvideMultipleClassInfo_GetInfoOfIndex +}; + static inline HTMLWindow *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLWindow, IDispatchEx_iface); @@ -3004,6 +3074,7 @@ static void *alloc_window(size_t size) window->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; window->ITravelLogClient_iface.lpVtbl = &TravelLogClientVtbl; window->IObjectIdentity_iface.lpVtbl = &ObjectIdentityVtbl; + window->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; window->ref = 1; return window; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a0c0dab..e710a48 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -431,6 +431,7 @@ struct HTMLWindow { IServiceProvider IServiceProvider_iface; ITravelLogClient ITravelLogClient_iface; IObjectIdentity IObjectIdentity_iface; + IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; LONG ref;

1 0

Jacek Caban : mshtml: Added IProvideMultipleTypeInfo implementation for HTMLElement object.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 2b8b15c22e3f31d3dc6c478ef63a4e7682d1144e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8b15c22e3f31d3dc6c478ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 13:50:03 2017 +0200 mshtml: Added IProvideMultipleTypeInfo implementation for HTMLElement object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 72 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 42674a3..c6632b1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4832,6 +4832,70 @@ static const IElementSelectorVtbl ElementSelectorVtbl = { ElementSelector_querySelectorAll }; +static inline HTMLElement *impl_from_IProvideMultipleClassInfo(IProvideMultipleClassInfo *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IProvideMultipleClassInfo_iface); +} + +static HRESULT WINAPI ProvideClassInfo_QueryInterface(IProvideMultipleClassInfo *iface, + REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IProvideMultipleClassInfo(iface); + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI ProvideClassInfo_AddRef(IProvideMultipleClassInfo *iface) +{ + HTMLElement *This = impl_from_IProvideMultipleClassInfo(iface); + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI ProvideClassInfo_Release(IProvideMultipleClassInfo *iface) +{ + HTMLElement *This = impl_from_IProvideMultipleClassInfo(iface); + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideMultipleClassInfo *iface, ITypeInfo **ppTI) +{ + HTMLElement *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%p)\n", This, ppTI); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideMultipleClassInfo *iface, DWORD dwGuidKind, GUID *pGUID) +{ + HTMLElement *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%u %p)\n", This, dwGuidKind, pGUID); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProvideMultipleClassInfo_GetMultiTypeInfoCount(IProvideMultipleClassInfo *iface, ULONG *pcti) +{ + HTMLElement *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%p)\n", This, pcti); + *pcti = 1; + return S_OK; +} + +static HRESULT WINAPI ProvideMultipleClassInfo_GetInfoOfIndex(IProvideMultipleClassInfo *iface, ULONG iti, + DWORD dwFlags, ITypeInfo **pptiCoClass, DWORD *pdwTIFlags, ULONG *pcdispidReserved, IID *piidPrimary, IID *piidSource) +{ + HTMLElement *This = impl_from_IProvideMultipleClassInfo(iface); + FIXME("(%p)->(%u %x %p %p %p %p %p)\n", This, iti, dwFlags, pptiCoClass, pdwTIFlags, pcdispidReserved, piidPrimary, piidSource); + return E_NOTIMPL; +} + +static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = { + ProvideClassInfo_QueryInterface, + ProvideClassInfo_AddRef, + ProvideClassInfo_Release, + ProvideClassInfo_GetClassInfo, + ProvideClassInfo2_GetGUID, + ProvideMultipleClassInfo_GetMultiTypeInfoCount, + ProvideMultipleClassInfo_GetInfoOfIndex +}; + static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLElement, node); @@ -4861,6 +4925,12 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IElementSelector_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { *ppv = &This->cp_container.IConnectionPointContainer_iface; + }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { + *ppv = &This->IProvideMultipleClassInfo_iface; + }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { + *ppv = &This->IProvideMultipleClassInfo_iface; + }else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) { + *ppv = &This->IProvideMultipleClassInfo_iface; }else { return HTMLDOMNode_QI(&This->node, riid, ppv); } @@ -5137,6 +5207,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen This->IHTMLElement6_iface.lpVtbl = &HTMLElement6Vtbl; This->IHTMLUniqueName_iface.lpVtbl = &HTMLUniqueNameVtbl; This->IElementSelector_iface.lpVtbl = &ElementSelectorVtbl; + This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e710a48..4a4bc7f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -745,6 +745,7 @@ typedef struct { IHTMLElement6 IHTMLElement6_iface; IHTMLUniqueName IHTMLUniqueName_iface; IElementSelector IElementSelector_iface; + IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; nsIDOMHTMLElement *nselem; HTMLStyle *style;

1 0

Jacek Caban : mshtml.idl: Added HTMLAreaElement coclass declaration.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 331205d88c1bfa0f808ec214ea5dca624a717286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331205d88c1bfa0f808ec214e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 13:50:15 2017 +0200 mshtml.idl: Added HTMLAreaElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlarea.c | 4 ++-- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 3236b8c..1e51852 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -33,13 +33,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLAreaElement { HTMLElement element; IHTMLAreaElement IHTMLAreaElement_iface; nsIDOMHTMLAreaElement *nsarea; -} HTMLAreaElement; +}; static inline HTMLAreaElement *impl_from_IHTMLAreaElement(IHTMLAreaElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index a9d6502..4a8913f 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10039,6 +10039,23 @@ methods: } /***************************************************************************** + * HTMLAreaElement coclass + */ +[ + noncreatable, + uuid(3050f283-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLAreaElement +{ + [default] dispinterface DispHTMLAreaElement; + /* [source, default] dispinterface HTMLAreaEvents; */ + /* [source] dispinterface HTMLAreaEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLAreaElement; + /* interface IHTMLAreaElement2; */ +} + +/***************************************************************************** * IHTMLLabelElement interface */ [

1 0

Jacek Caban : mshtml/tests: Added area element tests.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 939eafcce0dd35e88211f22158373089f52f1c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=939eafcce0dd35e88211f2215… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 13:50:29 2017 +0200 mshtml/tests: Added area element tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cd763f2..8dab3b7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -132,7 +132,8 @@ typedef enum { ET_NOSCRIPT, ET_LINK, ET_LABEL, - ET_BUTTON + ET_BUTTON, + ET_AREA } elem_type_t; static const IID * const none_iids[] = { @@ -221,6 +222,13 @@ static const IID *const button_iids[] = { NULL }; +static const IID *const area_iids[] = { + ELEM_IFACES, + &IID_IHTMLAreaElement, + &IID_IConnectionPointContainer, + NULL +}; + static const IID * const label_iids[] = { ELEM_IFACES, &IID_IHTMLLabelElement, @@ -491,7 +499,8 @@ static const elem_type_info_t elem_type_infos[] = { {"NOSCRIPT", elem_iids, NULL /*&DIID_DispHTMLNoShowElement*/}, {"LINK", link_iids, &DIID_DispHTMLLinkElement}, {"LABEL", label_iids, &DIID_DispHTMLLabelElement}, - {"BUTTON", button_iids, &DIID_DispHTMLButtonElement} + {"BUTTON", button_iids, &DIID_DispHTMLButtonElement}, + {"AREA", area_iids, &DIID_DispHTMLAreaElement} }; static int strcmp_wa(LPCWSTR strw, const char *stra) @@ -1137,11 +1146,16 @@ static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) #define test_elem_type(ifc,t) _test_elem_type(__LINE__,ifc,t) static void _test_elem_type(unsigned line, IUnknown *unk, elem_type_t type) { + const char *expected_value = "[object]"; + _test_elem_tag(line, unk, elem_type_infos[type].tag); _test_ifaces(line, unk, elem_type_infos[type].iids); - if(elem_type_infos[type].dispiid && type != ET_A) - _test_disp(line, unk, elem_type_infos[type].dispiid, "[object]"); + if(elem_type_infos[type].dispiid && type != ET_A) { + if(type == ET_AREA) + expected_value = NULL; + _test_disp(line, unk, elem_type_infos[type].dispiid, expected_value); + } } #define get_node_type(n) _get_node_type(__LINE__,n) @@ -9290,6 +9304,13 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, "<map><area id=\"areaid\"></area></map>"); + elem = get_elem_by_id(doc, "areaid", TRUE); + if(elem) { + test_elem_type((IUnknown*)elem, ET_AREA); + IHTMLElement_Release(elem); + } + test_td_elem(doc, div); test_attr(doc, div); test_blocked(doc, div);

1 0