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

Alexandre Julliard : libwine: Clear the %fs register we got from Android to force allocating a new one.
by Alexandre Julliard April 21, 2017

April 21, 2017

Module: wine Branch: master Commit: 5142e56aeec8edd85906af021b9d4c886cff02d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5142e56aeec8edd85906af021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 19:25:39 2017 +0200 libwine: Clear the %fs register we got from Android to force allocating a new one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index b5b32cc..89ae935 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -887,7 +887,16 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo java_object = (*env)->NewGlobalRef( env, obj ); +#ifdef __i386__ + { + unsigned short java_fs = wine_get_fs(); + wine_set_fs( 0 ); + wine_init( argc, argv, error, sizeof(error) ); + wine_set_fs( java_fs ); + } +#else wine_init( argc, argv, error, sizeof(error) ); +#endif return (*env)->NewStringUTF( env, error ); }

1 0

Huw Davies : user32: Fix a potential buffer overflow.
by Alexandre Julliard April 21, 2017

April 21, 2017

Module: wine Branch: master Commit: e0843d234efc4d1b1636a9f8c077934bd8c87129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0843d234efc4d1b1636a9f8c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 21 15:07:31 2017 +0100 user32: Fix a potential buffer overflow. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 63c4ffe..67b052e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -548,7 +548,7 @@ static DWORD load_entry( struct sysparam_entry *entry, void *data, DWORD size ) if (RegQueryValueExW( base_key, entry->regval + 1, NULL, &type, data, &count )) count = 0; } /* make sure strings are null-terminated */ - if (size && count == size && type == REG_SZ) ((WCHAR *)data)[count - 1] = 0; + if (size && count == size && type == REG_SZ) ((WCHAR *)data)[count / sizeof(WCHAR) - 1] = 0; entry->loaded = TRUE; return count; }

1 0

Jacek Caban : mshtml: Added IProvideClassInfo2 implementation for HTMLXMLHttpRequest object.
by Alexandre Julliard April 21, 2017

April 21, 2017

Module: wine Branch: master Commit: 21a30da6bf8dcabdb560e6b8bd3910ab6440947e URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a30da6bf8dcabdb560e6b8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 13:50:59 2017 +0200 mshtml: Added IProvideClassInfo2 implementation for HTMLXMLHttpRequest object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 30389a4..1565f9b 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -101,6 +101,7 @@ typedef struct { struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; + IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; nsIXMLHttpRequest *nsxhr; XMLHttpReqEventListener *event_listener; @@ -218,6 +219,10 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa *ppv = &This->IHTMLXMLHttpRequest_iface; }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest, riid)) { *ppv = &This->IHTMLXMLHttpRequest_iface; + }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { + *ppv = &This->IProvideClassInfo2_iface; + }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { + *ppv = &This->IProvideClassInfo2_iface; }else if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -682,6 +687,51 @@ static const IHTMLXMLHttpRequestVtbl HTMLXMLHttpRequestVtbl = { HTMLXMLHttpRequest_setRequestHeader }; +static inline HTMLXMLHttpRequest *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IProvideClassInfo2_iface); +} + +static HRESULT WINAPI ProvideClassInfo_QueryInterface(IProvideClassInfo2 *iface, REFIID riid, void **ppv) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + return IHTMLXMLHttpRequest_QueryInterface(&This->IHTMLXMLHttpRequest_iface, riid, ppv); +} + +static ULONG WINAPI ProvideClassInfo_AddRef(IProvideClassInfo2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + return IHTMLXMLHttpRequest_AddRef(&This->IHTMLXMLHttpRequest_iface); +} + +static ULONG WINAPI ProvideClassInfo_Release(IProvideClassInfo2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + return IHTMLXMLHttpRequest_Release(&This->IHTMLXMLHttpRequest_iface); +} + +static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + TRACE("(%p)->(%p)\n", This, ppTI); + return get_class_typeinfo(&CLSID_HTMLXMLHttpRequest, ppTI); +} + +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + FIXME("(%p)->(%u %p)\n", This, dwGuidKind, pGUID); + return E_NOTIMPL; +} + +static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { + ProvideClassInfo_QueryInterface, + ProvideClassInfo_AddRef, + ProvideClassInfo_Release, + ProvideClassInfo_GetClassInfo, + ProvideClassInfo2_GetGUID, +}; + static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, event_target.dispex); @@ -849,6 +899,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->nsxhr = nsxhr; ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; + ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; init_event_target(&ret->event_target); init_dispex(&ret->event_target.dispex, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, &HTMLXMLHttpRequest_dispex);

1 0

Jacek Caban : mshtml: Added GetClassInfo implementation for HTMLElement objects.
by Alexandre Julliard April 21, 2017

April 21, 2017

Module: wine Branch: master Commit: 97c71b25fefa0ae904046bfd27480f36fa929a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c71b25fefa0ae904046bfd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 13:50:49 2017 +0200 mshtml: Added GetClassInfo implementation for HTMLElement objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlarea.c | 1 + dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlelem.c | 5 +++-- dlls/mshtml/htmlembed.c | 1 + dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 1 + dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 3 +++ dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 3 +++ dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmlmeta.c | 1 + dlls/mshtml/htmlnode.c | 1 + dlls/mshtml/htmlobject.c | 1 + dlls/mshtml/htmloption.c | 1 + dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmltable.c | 1 + dlls/mshtml/htmltablecell.c | 1 + dlls/mshtml/htmltablerow.c | 1 + dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextnode.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 28 files changed, 35 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97c71b25fefa0ae904046…

1 0

Jacek Caban : mshtml.idl: Added HTMLAreaElement coclass declaration.
by Alexandre Julliard April 21, 2017

April 21, 2017

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard April 21, 2017

April 21, 2017

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

Nikolay Sivov : comctl32/pager: Prevent excessive PGN_CALCSIZE notifications during PGM_SETCHILD.
by Alexandre Julliard April 21, 2017

April 21, 2017

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

Henri Verbeet : usp10: Validate substition record sequence indices in GSUB_apply_ContextSubst().
by Alexandre Julliard April 21, 2017

April 21, 2017

Module: wine Branch: master Commit: 30e8768d00fb3a93f2c4cb5ca5773f2ab78bb396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e8768d00fb3a93f2c4cb5ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 21 00:57:14 2017 +0200 usp10: Validate substition record sequence indices in GSUB_apply_ContextSubst(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 307b6a9..0351f4f 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1125,11 +1125,19 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) { - int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); - int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex); - TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); - newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + g = glyph_index + write_dir * sequence_index; + if (g >= *glyph_count) + { + WARN("Invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } + + TRACE(" SUBST: %u -> %u %u.\n", l, sequence_index, lookup_index); + newIndex = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count); if (newIndex == GSUB_E_NOGLYPH) { ERR(" Chain failed to generate a glyph\n"); @@ -1204,11 +1212,19 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) { - int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); - int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex); + + g = glyph_index + write_dir * sequence_index; + if (g >= *glyph_count) + { + WARN("Invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } - TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); - newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + TRACE(" SUBST: %u -> %u %u.\n", l, sequence_index, lookup_index); + newIndex = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count); if (newIndex == GSUB_E_NOGLYPH) { ERR(" Chain failed to generate a glyph\n");

1 0

Jacek Caban : mshtml/tests: Added area element tests.
by Alexandre Julliard April 21, 2017

April 21, 2017

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

Jacek Caban : mshtml: Added IProvideMultipleTypeInfo implementation for HTMLElement object.
by Alexandre Julliard April 21, 2017

April 21, 2017

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