October 2009 - Wine-commits

Henri Verbeet : wined3d: Remove some code that doesn't make sense.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 8949a2c1ad2a6969b5fb53f754586c80593c7dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8949a2c1ad2a6969b5fb53f75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 10:38:04 2009 +0200 wined3d: Remove some code that doesn't make sense. This was introduced by abb11f30cd418c6337a93a26981763b20c059172, but I don't see how it could ever do something useful. Perhaps that's a lack of imagination on my part, but the only situation in which device->stateBlock should be NULL is while creating the initial stateblock, and in that case we just returned in the line above. Setting the stream frequency of all streams to 0x01010101 doesn't make sense either. --- dlls/wined3d/stateblock.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e574d3a..6e6dac7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1658,16 +1658,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * * state block. */ if (type == WINED3DSBT_INIT || type == WINED3DSBT_RECORDED) return WINED3D_OK; - /* Otherwise, might as well set the whole state block to the appropriate values */ - if (device->stateBlock) - { - /* Saved values */ - stateblock_copy_values(stateblock, device->stateBlock, gl_info); - } - else - { - memset(stateblock->streamFreq, 1, sizeof(stateblock->streamFreq)); - } + stateblock_copy_values(stateblock, device->stateBlock, gl_info); TRACE("Updating changed flags appropriate for type %#x.\n", type);

1 0

Andrew Eikum : include: Remove redundant #defines in mshtmdid.h.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: c940ec572a2e58f24fa32533f1f230d3377c9e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c940ec572a2e58f24fa32533f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 12 13:39:12 2009 -0500 include: Remove redundant #defines in mshtmdid.h. --- include/mshtmdid.h | 93 ---------------------------------------------------- 1 files changed, 0 insertions(+), 93 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 7dc257a..ba8a977 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -638,99 +638,6 @@ #define DISPID_EVMETH_ONPAGE DISPID_ONPAGE #define DISPID_EVMETH_ONLINKEDOVERFLOW DISPID_ONLINKEDOVERFLOW #define DISPID_EVMETH_ONMOUSEWHEEL DISPID_ONMOUSEWHEEL -#define DISPID_EVMETH_ONBEFOREDEACTIVAT DISPID_ONBEFOREDEACTIVATE -#define DISPID_EVMETH_ONMOVE DISPID_ONMOVE -#define DISPID_EVMETH_ONCONTROLSELECT DISPID_ONCONTROLSELECT -#define DISPID_EVMETH_ONSELECTIONCHANGE DISPID_ONSELECTIONCHANGE -#define DISPID_EVMETH_ONMOVESTART DISPID_ONMOVESTART -#define DISPID_EVMETH_ONMOVEEND DISPID_ONMOVEEND -#define DISPID_EVMETH_ONRESIZESTART DISPID_ONRESIZESTART -#define DISPID_EVMETH_ONRESIZEEND DISPID_ONRESIZEEND -#define DISPID_EVMETH_ONMOUSEENTER DISPID_ONMOUSEENTER -#define DISPID_EVMETH_ONMOUSELEAVE DISPID_ONMOUSELEAVE -#define DISPID_EVMETH_ONACTIVATE DISPID_ONACTIVATE -#define DISPID_EVMETH_ONDEACTIVATE DISPID_ONDEACTIVATE -#define DISPID_EVMETH_ONMULTILAYOUTCLEANUP DISPID_ONMULTILAYOUTCLEANUP -#define DISPID_EVMETH_ONBEFOREACTIVATE DISPID_ONBEFOREACTIVATE -#define DISPID_EVMETH_ONFOCUSIN DISPID_ONFOCUSIN -#define DISPID_EVMETH_ONFOCUSOUT DISPID_ONFOCUSOUT -#define DISPID_EVPROPS_COUNT 93 - - -#define DISPID_EVMETH_ONMOUSEOVER STDDISPID_XOBJ_ONMOUSEOVER -#define DISPID_EVMETH_ONMOUSEOUT STDDISPID_XOBJ_ONMOUSEOUT -#define DISPID_EVMETH_ONMOUSEDOWN DISPID_MOUSEDOWN -#define DISPID_EVMETH_ONMOUSEUP DISPID_MOUSEUP -#define DISPID_EVMETH_ONMOUSEMOVE DISPID_MOUSEMOVE -#define DISPID_EVMETH_ONKEYDOWN DISPID_KEYDOWN -#define DISPID_EVMETH_ONKEYUP DISPID_KEYUP -#define DISPID_EVMETH_ONKEYPRESS DISPID_KEYPRESS -#define DISPID_EVMETH_ONCLICK DISPID_CLICK -#define DISPID_EVMETH_ONDBLCLICK DISPID_DBLCLICK -#define DISPID_EVMETH_ONSELECT DISPID_ONSELECT -#define DISPID_EVMETH_ONSUBMIT DISPID_ONSUBMIT -#define DISPID_EVMETH_ONRESET DISPID_ONRESET -#define DISPID_EVMETH_ONHELP STDDISPID_XOBJ_ONHELP -#define DISPID_EVMETH_ONFOCUS STDDISPID_XOBJ_ONFOCUS -#define DISPID_EVMETH_ONBLUR STDDISPID_XOBJ_ONBLUR -#define DISPID_EVMETH_ONROWEXIT STDDISPID_XOBJ_ONROWEXIT -#define DISPID_EVMETH_ONROWENTER STDDISPID_XOBJ_ONROWENTER -#define DISPID_EVMETH_ONBOUNCE DISPID_ONBOUNCE -#define DISPID_EVMETH_ONBEFOREUPDATE STDDISPID_XOBJ_BEFOREUPDATE -#define DISPID_EVMETH_ONAFTERUPDATE STDDISPID_XOBJ_AFTERUPDATE -#define DISPID_EVMETH_ONBEFOREDRAGOVER EVENTID_CommonCtrlEvent_BeforeDragOver -#define DISPID_EVMETH_ONBEFOREDROPORPASTE EVENTID_CommonCtrlEvent_BeforeDropOrPaste -#define DISPID_EVMETH_ONREADYSTATECHANGE DISPID_READYSTATECHANGE -#define DISPID_EVMETH_ONFINISH DISPID_ONFINISH -#define DISPID_EVMETH_ONSTART DISPID_ONSTART -#define DISPID_EVMETH_ONABORT DISPID_ONABORT -#define DISPID_EVMETH_ONERROR DISPID_ONERROR -#define DISPID_EVMETH_ONCHANGE DISPID_ONCHANGE -#define DISPID_EVMETH_ONSCROLL DISPID_ONSCROLL -#define DISPID_EVMETH_ONLOAD DISPID_ONLOAD -#define DISPID_EVMETH_ONUNLOAD DISPID_ONUNLOAD -#define DISPID_EVMETH_ONLAYOUT DISPID_ONLAYOUT -#define DISPID_EVMETH_ONDRAGSTART STDDISPID_XOBJ_ONDRAGSTART -#define DISPID_EVMETH_ONRESIZE DISPID_ONRESIZE -#define DISPID_EVMETH_ONSELECTSTART STDDISPID_XOBJ_ONSELECTSTART -#define DISPID_EVMETH_ONERRORUPDATE STDDISPID_XOBJ_ERRORUPDATE -#define DISPID_EVMETH_ONBEFOREUNLOAD DISPID_ONBEFOREUNLOAD -#define DISPID_EVMETH_ONDATASETCHANGED STDDISPID_XOBJ_ONDATASETCHANGED -#define DISPID_EVMETH_ONDATAAVAILABLE STDDISPID_XOBJ_ONDATAAVAILABLE -#define DISPID_EVMETH_ONDATASETCOMPLETE STDDISPID_XOBJ_ONDATASETCOMPLETE -#define DISPID_EVMETH_ONFILTER STDDISPID_XOBJ_ONFILTER -#define DISPID_EVMETH_ONCHANGEFOCUS DISPID_ONCHANGEFOCUS -#define DISPID_EVMETH_ONCHANGEBLUR DISPID_ONCHANGEBLUR -#define DISPID_EVMETH_ONLOSECAPTURE STDDISPID_XOBJ_ONLOSECAPTURE -#define DISPID_EVMETH_ONPROPERTYCHANGE STDDISPID_XOBJ_ONPROPERTYCHANGE -#define DISPID_EVMETH_ONPERSISTSAVE DISPID_ONPERSISTSAVE -#define DISPID_EVMETH_ONDRAG STDDISPID_XOBJ_ONDRAG -#define DISPID_EVMETH_ONDRAGEND STDDISPID_XOBJ_ONDRAGEND -#define DISPID_EVMETH_ONDRAGENTER STDDISPID_XOBJ_ONDRAGENTER -#define DISPID_EVMETH_ONDRAGOVER STDDISPID_XOBJ_ONDRAGOVER -#define DISPID_EVMETH_ONDRAGLEAVE STDDISPID_XOBJ_ONDRAGLEAVE -#define DISPID_EVMETH_ONDROP STDDISPID_XOBJ_ONDROP -#define DISPID_EVMETH_ONCUT STDDISPID_XOBJ_ONCUT -#define DISPID_EVMETH_ONCOPY STDDISPID_XOBJ_ONCOPY -#define DISPID_EVMETH_ONPASTE STDDISPID_XOBJ_ONPASTE -#define DISPID_EVMETH_ONBEFORECUT STDDISPID_XOBJ_ONBEFORECUT -#define DISPID_EVMETH_ONBEFORECOPY STDDISPID_XOBJ_ONBEFORECOPY -#define DISPID_EVMETH_ONBEFOREPASTE STDDISPID_XOBJ_ONBEFOREPASTE -#define DISPID_EVMETH_ONPERSISTLOAD DISPID_ONPERSISTLOAD -#define DISPID_EVMETH_ONROWSDELETE STDDISPID_XOBJ_ONROWSDELETE -#define DISPID_EVMETH_ONROWSINSERTED STDDISPID_XOBJ_ONROWSINSERTED -#define DISPID_EVMETH_ONCELLCHANGE STDDISPID_XOBJ_ONCELLCHANGE -#define DISPID_EVMETH_ONCONTEXTMENU DISPID_ONCONTEXTMENU -#define DISPID_EVMETH_ONBEFOREPRINT DISPID_ONBEFOREPRINT -#define DISPID_EVMETH_ONAFTERPRINT DISPID_ONAFTERPRINT -#define DISPID_EVMETH_ONSTOP DISPID_ONSTOP -#define DISPID_EVMETH_ONBEFOREEDITFOCUS DISPID_ONBEFOREEDITFOCUS -#define DISPID_EVMETH_ONMOUSEHOVER DISPID_ONMOUSEHOVER -#define DISPID_EVMETH_ONCONTENTREADY DISPID_ONCONTENTREADY -#define DISPID_EVMETH_ONLAYOUTCOMPLETE DISPID_ONLAYOUTCOMPLETE -#define DISPID_EVMETH_ONPAGE DISPID_ONPAGE -#define DISPID_EVMETH_ONLINKEDOVERFLOW DISPID_ONLINKEDOVERFLOW -#define DISPID_EVMETH_ONMOUSEWHEEL DISPID_ONMOUSEWHEEL #define DISPID_EVMETH_ONBEFOREDEACTIVATE DISPID_ONBEFOREDEACTIVATE #define DISPID_EVMETH_ONMOVE DISPID_ONMOVE #define DISPID_EVMETH_ONCONTROLSELECT DISPID_ONCONTROLSELECT

1 0

Andrew Eikum : mshtml.idl: Add IHTMLDocumentCompatibleInfo[Collection] dispifaces.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: ba16fc9064ab6208d09a70bcdfb8e739527a2c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba16fc9064ab6208d09a70bcd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 12 13:39:16 2009 -0500 mshtml.idl: Add IHTMLDocumentCompatibleInfo[Collection] dispifaces. --- include/mshtmdid.h | 10 ++++++++++ include/mshtml.idl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index ba8a977..d4a20d6 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -98,6 +98,8 @@ #define DISPID_DOMTEXTNODE DISPID_NORMAL_FIRST #define DISPID_GENERIC DISPID_NORMAL_FIRST #define DISPID_DOMIMPLEMENTATION DISPID_NORMAL_FIRST +#define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST +#define DISPID_DOCUMENTCOMPATIBLEINFOCOLLECTION DISPID_NORMAL_FIRST #define DISPID_IE8_ANCHOR DISPID_IE8_NORMAL_FIRST #define DISPID_IE8_AREA DISPID_IE8_NORMAL_FIRST @@ -2002,6 +2004,14 @@ #define DISPID_IHTMLDOMATTRIBUTE2_HASCHILDNODES DISPID_DOMATTRIBUTE+19 #define DISPID_IHTMLDOMATTRIBUTE2_CLONENODE DISPID_DOMATTRIBUTE+20 +/* IHTMLDocumentCompatibleInfo */ +#define DISPID_IHTMLDOCUMENTCOMPATIBLEINFO_USERAGENT DISPID_DOCUMENTCOMPATIBLEINFO +#define DISPID_IHTMLDOCUMENTCOMPATIBLEINFO_VERSION DISPID_DOCUMENTCOMPATIBLEINFO+1 + +/* IHTMLDocumentCompatibleInfoCollection */ +#define DISPID_IHTMLDOCUMENTCOMPATIBLEINFOCOLLECTION_ITEM DISPID_DOCUMENTCOMPATIBLEINFOCOLLECTION +#define DISPID_IHTMLDOCUMENTCOMPATIBLEINFOCOLLECTION_LENGTH DISPID_DOCUMENTCOMPATIBLEINFOCOLLECTION+1 + /* IHTMLBodyElement */ #define DISPID_IHTMLBODYELEMENT_BACKGROUND DISPID_A_BACKGROUNDIMAGE #define DISPID_IHTMLBODYELEMENT_BGPROPERTIES DISPID_A_BACKGROUNDATTACHMENT diff --git a/include/mshtml.idl b/include/mshtml.idl index 6b694e1..e84f485 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -3686,6 +3686,42 @@ interface IHTMLDOMImplementation : IDispatch } /***************************************************************************** + * IHTMLDocumentCompatibleInfo interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051041a-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLDocumentCompatibleInfo : IDispatch +{ + [propget, id(DISPID_IHTMLDOCUMENTCOMPATIBLEINFO_USERAGENT)] + HRESULT userAgent([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLDOCUMENTCOMPATIBLEINFO_VERSION)] + HRESULT version([retval, out] BSTR *p); +} + +/***************************************************************************** + * IHTMLDocumentCompatibleInfoCollection interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510418-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLDocumentCompatibleInfoCollection : IDispatch +{ + [propget, id(DISPID_IHTMLDOCUMENTCOMPATIBLEINFOCOLLECTION_LENGTH)] + HRESULT length([retval, out] long *p); + + [id(DISPID_IHTMLDOCUMENTCOMPATIBLEINFOCOLLECTION_ITEM)] + HRESULT item([in] long i, [retval, out]IHTMLDocumentCompatibleInfo **p); +} + +/***************************************************************************** * DispHTMLDOMTextNode dispinterface */ [

1 0

Andrew Eikum : mshtml.idl: Add IHTMLDocument6 dispiface.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 44df672a38ff9ab7fb0720141a828fef9fd141df URL: http://source.winehq.org/git/wine.git/?a=commit;h=44df672a38ff9ab7fb0720141… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 12 13:39:19 2009 -0500 mshtml.idl: Add IHTMLDocument6 dispiface. --- include/mshtmdid.h | 15 +++++++++++- include/mshtml.idl | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index d4a20d6..59b04a4 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -564,7 +564,9 @@ #define DISPID_EVPROP_ONBEFOREACTIVATE (DISPID_EVENTS+90) #define DISPID_EVPROP_ONFOCUSIN (DISPID_EVENTS+91) #define DISPID_EVPROP_ONFOCUSOUT (DISPID_EVENTS+92) -#define DISPID_EVPROPS_COUNT 93 +#define DISPID_EVPROP_ONSTORAGE (DISPID_EVENTS+93) +#define DISPID_EVPROP_ONSTORAGECOMMIT (DISPID_EVENTS+94) +#define DISPID_EVPROPS_COUNT 95 #define DISPID_EVMETH_ONMOUSEOVER STDDISPID_XOBJ_ONMOUSEOVER #define DISPID_EVMETH_ONMOUSEOUT STDDISPID_XOBJ_ONMOUSEOUT @@ -656,6 +658,8 @@ #define DISPID_EVMETH_ONBEFOREACTIVATE DISPID_ONBEFOREACTIVATE #define DISPID_EVMETH_ONFOCUSIN DISPID_ONFOCUSIN #define DISPID_EVMETH_ONFOCUSOUT DISPID_ONFOCUSOUT +#define DISPID_EVMETH_ONSTORAGE DISPID_ONSTORAGE +#define DISPID_EVMETH_ONSTORAGECOMMIT DISPID_ONSTORAGECOMMIT #define DISPID_ONABORT (DISPID_NORMAL_FIRST) #define DISPID_ONCHANGE (DISPID_NORMAL_FIRST+1) @@ -704,6 +708,8 @@ #define DISPID_ONBEFOREACTIVATE (DISPID_NORMAL_FIRST+47) #define DISPID_ONFOCUSIN (DISPID_NORMAL_FIRST+48) #define DISPID_ONFOCUSOUT (DISPID_NORMAL_FIRST+49) +#define DISPID_ONSTORAGE (DISPID_NORMAL_FIRST+50) +#define DISPID_ONSTORAGECOMMIT (DISPID_NORMAL_FIRST+51) /* HTMLDocumentEvents */ #define DISPID_HTMLDOCUMENTEVENTS_ONHELP DISPID_EVMETH_ONHELP @@ -923,6 +929,13 @@ #define DISPID_IHTMLDOCUMENT5_ONBEFOREDEACTIVATE DISPID_EVPROP_ONBEFOREDEACTIVATE #define DISPID_IHTMLDOCUMENT5_COMPATMODE DISPID_OMDOCUMENT+102 +/* IHTMLDocument6 */ +#define DISPID_IHTMLDOCUMENT6_COMPATIBLE DISPID_OMDOCUMENT+103 +#define DISPID_IHTMLDOCUMENT6_DOCUMENTMODE DISPID_OMDOCUMENT+104 +#define DISPID_IHTMLDOCUMENT6_ONSTORAGE DISPID_EVPROP_ONSTORAGE +#define DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT DISPID_EVPROP_ONSTORAGECOMMIT +#define DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID DISPID_OMDOCUMENT+105 +#define DISPID_IHTMLDOCUMENT6_UPDATESETTINGS DISPID_OMDOCUMENT+106 /* IHTMLElementCollection */ #define DISPID_IHTMLELEMENTCOLLECTION_LENGTH DISPID_COLLECTION diff --git a/include/mshtml.idl b/include/mshtml.idl index e84f485..51088d1 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11777,6 +11777,44 @@ interface IHTMLDocument5 : IDispatch } /***************************************************************************** + * IHTMLDocument6 interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510417-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLDocument6 : IDispatch +{ + [propget, id(DISPID_IHTMLDOCUMENT6_COMPATIBLE)] + HRESULT compatible([retval, out] IHTMLDocumentCompatibleInfoCollection **p); + + [propget, id(DISPID_IHTMLDOCUMENT6_DOCUMENTMODE)] + HRESULT documentMode([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLDOCUMENT6_ONSTORAGE), displaybind, bindable] + HRESULT onstorage([in] VARIANT v); + + [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGE), displaybind, bindable] + HRESULT onstorage([out] VARIANT *p); + + [propput, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable] + HRESULT onstoragecommit([in] VARIANT v); + + [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable] + HRESULT onstoragecommit([out] VARIANT *p); + + [id(DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID)] + HRESULT getElementById( + [in] BSTR bstrId, + [retval, out] IHTMLElement2 **p); + + [id(DISPID_IHTMLDOCUMENT6_UPDATESETTINGS)] + HRESULT updateSettings(); +} + +/***************************************************************************** * DispHTMLDocument dispinterface */ [ @@ -12352,6 +12390,30 @@ methods: [propget, id(DISPID_IHTMLDOCUMENT5_COMPATMODE)] BSTR compatMode(); + [propget, id(DISPID_IHTMLDOCUMENT6_COMPATIBLE)] + IHTMLDocumentCompatibleInfoCollection *compatible(); + + [propget, id(DISPID_IHTMLDOCUMENT6_DOCUMENTMODE)] + VARIANT documentMode(); + + [propput, id(DISPID_IHTMLDOCUMENT6_ONSTORAGE), displaybind, bindable] + void onstorage(VARIANT v); + + [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGE), displaybind, bindable] + VARIANT onstorage(); + + [propput, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable] + void onstoragecommit(VARIANT v); + + [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable] + VARIANT onstoragecommit(); + + [id(DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID)] + IHTMLElement2 *ie8_getElementById([in] BSTR bstrId); + + [id(DISPID_IHTMLDOCUMENT6_UPDATESETTINGS)] + void updateSettings(); + WINE_HTMLDOMNODE_DISPINTERFACE_DECL; } @@ -12370,6 +12432,7 @@ coclass HTMLDocument interface IHTMLDocument3; interface IHTMLDocument4; interface IHTMLDocument5; + interface IHTMLDocument6; interface IHTMLDOMNode; interface IHTMLDOMNode2; }

1 0

Andrew Eikum : mshtml: Add stub implementation for IHTMLDocument6.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 1622fd0e7a7290d7a42facc96cb9e88b7ecf5b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1622fd0e7a7290d7a42facc96… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 12 13:39:23 2009 -0500 mshtml: Add stub implementation for IHTMLDocument6. --- dlls/mshtml/htmldoc.c | 3 + dlls/mshtml/htmldoc5.c | 134 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 3 files changed, 139 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index bb5d968..ef3085e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1626,6 +1626,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLDocument5, riid)) { TRACE("(%p)->(IID_IHTMLDocument5, %p)\n", This, ppv); *ppv = HTMLDOC5(This); + }else if(IsEqualGUID(&IID_IHTMLDocument6, riid)) { + TRACE("(%p)->(IID_IHTMLDocument6, %p)\n", This, ppv); + *ppv = HTMLDOC6(This); }else if(IsEqualGUID(&IID_IPersist, riid)) { TRACE("(%p)->(IID_IPersist, %p)\n", This, ppv); *ppv = PERSIST(This); diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index 59b223b..4c8d173 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -299,7 +299,141 @@ static const IHTMLDocument5Vtbl HTMLDocument5Vtbl = { HTMLDocument5_get_compatMode }; +#define HTMLDOC6_THIS(iface) DEFINE_THIS(HTMLDocument, HTMLDocument6, iface) + +static HRESULT WINAPI HTMLDocument6_QueryInterface(IHTMLDocument6 *iface, + REFIID riid, void **ppv) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI HTMLDocument6_AddRef(IHTMLDocument6 *iface) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI HTMLDocument6_Release(IHTMLDocument6 *iface) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI HTMLDocument6_GetTypeInfoCount(IHTMLDocument6 *iface, UINT *pctinfo) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); +} + +static HRESULT WINAPI HTMLDocument6_GetTypeInfo(IHTMLDocument6 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDocument6_GetIDsOfNames(IHTMLDocument6 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDocument6_Invoke(IHTMLDocument6 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDocument6_get_compatible(IHTMLDocument6 *iface, + IHTMLDocumentCompatibleInfoCollection **p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, + VARIANT *p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_get_onstorage(IHTMLDocument6 *iface, + VARIANT *p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_put_onstorage(IHTMLDocument6 *iface, + VARIANT p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(v)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_get_onstoragecommit(IHTMLDocument6 *iface, + VARIANT *p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_put_onstoragecommit(IHTMLDocument6 *iface, + VARIANT p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(v)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_getElementById(IHTMLDocument6 *iface, + BSTR bstrId, IHTMLElement2 **p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrId), p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_updateSettings(IHTMLDocument6 *iface) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +#undef HTMLDOC6_THIS + +static const IHTMLDocument6Vtbl HTMLDocument6Vtbl = { + HTMLDocument6_QueryInterface, + HTMLDocument6_AddRef, + HTMLDocument6_Release, + HTMLDocument6_GetTypeInfoCount, + HTMLDocument6_GetTypeInfo, + HTMLDocument6_GetIDsOfNames, + HTMLDocument6_Invoke, + HTMLDocument6_get_compatible, + HTMLDocument6_get_documentMode, + HTMLDocument6_put_onstorage, + HTMLDocument6_get_onstorage, + HTMLDocument6_put_onstoragecommit, + HTMLDocument6_get_onstoragecommit, + HTMLDocument6_getElementById, + HTMLDocument6_updateSettings +}; + void HTMLDocument_HTMLDocument5_Init(HTMLDocument *This) { This->lpHTMLDocument5Vtbl = &HTMLDocument5Vtbl; + This->lpHTMLDocument6Vtbl = &HTMLDocument6Vtbl; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51074ed..c92bb25 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -253,6 +253,7 @@ struct HTMLDocument { const IHTMLDocument3Vtbl *lpHTMLDocument3Vtbl; const IHTMLDocument4Vtbl *lpHTMLDocument4Vtbl; const IHTMLDocument5Vtbl *lpHTMLDocument5Vtbl; + const IHTMLDocument6Vtbl *lpHTMLDocument6Vtbl; const IPersistMonikerVtbl *lpPersistMonikerVtbl; const IPersistFileVtbl *lpPersistFileVtbl; const IPersistHistoryVtbl *lpPersistHistoryVtbl; @@ -488,6 +489,7 @@ struct HTMLDocumentNode { #define HTMLDOC3(x) ((IHTMLDocument3*) &(x)->lpHTMLDocument3Vtbl) #define HTMLDOC4(x) ((IHTMLDocument4*) &(x)->lpHTMLDocument4Vtbl) #define HTMLDOC5(x) ((IHTMLDocument5*) &(x)->lpHTMLDocument5Vtbl) +#define HTMLDOC6(x) ((IHTMLDocument6*) &(x)->lpHTMLDocument6Vtbl) #define PERSIST(x) ((IPersist*) &(x)->lpPersistFileVtbl) #define PERSISTMON(x) ((IPersistMoniker*) &(x)->lpPersistMonikerVtbl) #define PERSISTFILE(x) ((IPersistFile*) &(x)->lpPersistFileVtbl)

1 0

Alexandre Julliard : oleaut32/tests: Fix some test failures on Win64.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 6310ff1d7bb3a80090eae59cbeff09220698244b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6310ff1d7bb3a80090eae59cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 19:45:06 2009 +0200 oleaut32/tests: Fix some test failures on Win64. --- dlls/oleaut32/tests/vartype.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 65a6a4b..b7528c4 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4020,6 +4020,12 @@ static void test_VarCyInt(void) scl, sgn, hi, (LONG)(mid), (LONG)(lo), S(U(out)).scale, \ S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres) +/* expect either a positive or negative zero */ +#define EXPECTDECZERO() ok(hres == S_OK && S(U(out)).scale == 0 && \ + (S(U(out)).sign == 0 || S(U(out)).sign == 0x80) && out.Hi32 == 0 && U1(out).Lo64 == 0, \ + "expected zero, got (%d,%d,%d,(%x %x)) hres 0x%08x\n", \ + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres) + #define EXPECTDECI if (i < 0) EXPECTDEC(0, 0x80, 0, -i); else EXPECTDEC(0, 0, 0, i) static void test_VarDecFromI1(void) @@ -4263,11 +4269,11 @@ static void test_VarDecAdd(void) SETDEC(l,0,0,0,1); SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(0,0,0,1); SETDEC(l,0,0,0,1); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0,0,2); - SETDEC(l,0,0,0,1); SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,0); /* '-0'! */ + SETDEC(l,0,0,0,1); SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd); EXPECTDECZERO(); SETDEC(l,0,0,0,1); SETDEC(r,0,0x80,0,2); MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,1); SETDEC(l,0,0x80,0,0); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0,0,1); - SETDEC(l,0,0x80,0,1); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0,0,0); + SETDEC(l,0,0x80,0,1); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDECZERO(); SETDEC(l,0,0x80,0,1); SETDEC(r,0,0,0,2); MATH2(VarDecAdd); EXPECTDEC(0,0,0,1); SETDEC(l,0,0x80,0,1); SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,2); SETDEC(l,0,0x80,0,2); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,1); @@ -4304,9 +4310,9 @@ static void test_VarDecSub(void) MATHVARS2; CHECKPTR(VarDecSub); - SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecSub); EXPECTDEC(0,0x80,0,0); + SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecSub); EXPECTDECZERO(); SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,1); MATH2(VarDecSub); EXPECTDEC(0,0x80,0,1); - SETDEC(l,0,0,0,1); SETDEC(r,0,0,0,1); MATH2(VarDecSub); EXPECTDEC(0,0x80,0,0); + SETDEC(l,0,0,0,1); SETDEC(r,0,0,0,1); MATH2(VarDecSub); EXPECTDECZERO(); SETDEC(l,0,0,0,1); SETDEC(r,0,0x80,0,1); MATH2(VarDecSub); EXPECTDEC(0,0,0,2); } @@ -4377,12 +4383,14 @@ static void test_VarDecDiv(void) SETDEC(l,0,0,0,45); SETDEC(r,1,0,0,9); MATH2(VarDecDiv); EXPECTDEC(0,0,0,50); SETDEC(l,1,0,0,45); SETDEC(r,2,0,0,9); MATH2(VarDecDiv); EXPECTDEC(0,0,0,50); /* these last three results suggest that native oleaut32 scales both operands down to zero - before the division, but does *not* try to scale the result, even if it is possible - - analogous to multiplication behavior + before the division, but does not always try to scale the result, even if it is possible - + analogous to multiplication behavior. */ SETDEC(l,1,0,0,45); SETDEC(r,1,0,0,9); MATH2(VarDecDiv); EXPECTDEC(0,0,0,5); - SETDEC(l,2,0,0,450); SETDEC(r,1,0,0,9); MATH2(VarDecDiv); EXPECTDEC(1,0,0,50); - + SETDEC(l,2,0,0,450); SETDEC(r,1,0,0,9); MATH2(VarDecDiv); + if (S(U(out)).scale == 1) EXPECTDEC(1,0,0,50); + else EXPECTDEC(0,0,0,5); + /* inexact divisions */ SETDEC(l,0,0,0,1); SETDEC(r,0,0,0,3); MATH2(VarDecDiv); EXPECTDEC64(28,0,180700362,0x14b700cb,0x05555555); SETDEC(l,1,0,0,1); SETDEC(r,0,0,0,3); MATH2(VarDecDiv); EXPECTDEC64(28,0,18070036,0x35458014,0x4d555555); @@ -4854,7 +4862,10 @@ static void test_VarBstrFromR4(void) ok(hres == S_OK, "got hres 0x%08x\n", hres); if (bstr) { - ok(memcmp(bstr, szZero, sizeof(szZero)) == 0, "negative zero (got %s)\n", wtoascii(bstr)); + if (bstr[0] == '-') + ok(memcmp(bstr + 1, szZero, sizeof(szZero)) == 0, "negative zero (got %s)\n", wtoascii(bstr)); + else + ok(memcmp(bstr, szZero, sizeof(szZero)) == 0, "negative zero (got %s)\n", wtoascii(bstr)); } /* The following tests that lcid is used for decimal separator even without LOCALE_USE_NLS */

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::name property implementation.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 2d4236bfda3c1a9ed6fd78911e897e5866d1693b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4236bfda3c1a9ed6fd78911… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 00:41:11 2009 +0200 mshtml: Added IHTMLWindow2::name property implementation. --- dlls/mshtml/htmlwindow.c | 42 +++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f8d62a3..c5c2e78 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -438,15 +438,49 @@ static HRESULT WINAPI HTMLWindow2_get_navigator(IHTMLWindow2 *iface, IOmNavigato static HRESULT WINAPI HTMLWindow2_put_name(IHTMLWindow2 *iface, BSTR v) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&name_str, v); + nsres = nsIDOMWindow_SetName(This->nswindow, &name_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) + ERR("SetName failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_name(IHTMLWindow2 *iface, BSTR *p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + nsres = nsIDOMWindow_GetName(This->nswindow, &name_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *name; + + nsAString_GetData(&name_str, &name); + if(*name) { + *p = SysAllocString(name); + hres = *p ? S_OK : E_OUTOFMEMORY; + }else { + *p = NULL; + hres = S_OK; + } + }else { + ERR("GetName failed: %08x\n", nsres); + hres = E_FAIL; + } + nsAString_Finish(&name_str); + + return hres; } static HRESULT WINAPI HTMLWindow2_get_parent(IHTMLWindow2 *iface, IHTMLWindow2 **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c13c0a8..bb97429 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -656,6 +656,20 @@ static IHTMLDocument2 *_get_owner_doc(unsigned line, IUnknown *unk) return doc; } +#define get_doc_window(d) _get_doc_window(__LINE__,d) +static IHTMLWindow2 *_get_doc_window(unsigned line, IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + HRESULT hres; + + window = NULL; + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok_(__FILE__,line)(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok_(__FILE__,line)(window != NULL, "window == NULL\n"); + + return window; +} + #define clone_node(n,d) _clone_node(__LINE__,n,d) static IHTMLDOMNode *_clone_node(unsigned line, IUnknown *unk, VARIANT_BOOL deep) { @@ -809,6 +823,35 @@ static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) return ret; } +#define test_window_name(d,e) _test_window_name(__LINE__,d,e) +static void _test_window_name(unsigned line, IHTMLWindow2 *window, const char *exname) +{ + BSTR name; + HRESULT hres; + + hres = IHTMLWindow2_get_name(window, &name); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(exname) + ok_(__FILE__,line)(!strcmp_wa(name, exname), "name = %s\n", wine_dbgstr_w(name)); + else + ok_(__FILE__,line)(!name, "name = %s\n", wine_dbgstr_w(name)); +} + +#define set_window_name(w,n) _set_window_name(__LINE__,w,n) +static void _set_window_name(unsigned line, IHTMLWindow2 *window, const char *name) +{ + BSTR str; + HRESULT hres; + + str = a2bstr(name); + hres = IHTMLWindow2_put_name(window, str); + SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + + _test_window_name(line, window, name); +} + + static void test_get_set_attr(IHTMLDocument2 *doc) { IHTMLElement *elem; @@ -4369,6 +4412,9 @@ static void test_window(IHTMLDocument2 *doc) ok(!strcmp_wa(str, "[object]"), "toString returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); + test_window_name(window, NULL); + set_window_name(window, "test"); + IHTMLWindow2_Release(window); } @@ -4738,6 +4784,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMChildrenCollection *child_col; IHTMLElement *elem, *elem2, *elem3; IHTMLDOMNode *node, *node2; + IHTMLWindow2 *window; IDispatch *disp; LONG type; HRESULT hres; @@ -5151,6 +5198,11 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); IHTMLDocument3_Release(doc3); + + window = get_doc_window(doc); + test_window_name(window, NULL); + set_window_name(window, "test name"); + IHTMLWindow2_Release(window); } static void test_create_elems(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::get_length implementation.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 3e0fa120a867bff2b1c0040ff0f3c8666b0145c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e0fa120a867bff2b1c0040ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 00:41:28 2009 +0200 mshtml: Added IHTMLWindow2::get_length implementation. --- dlls/mshtml/htmlwindow.c | 23 +++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 15 ++++++++++++++- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c5c2e78..40df40c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -177,8 +177,27 @@ static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, static HRESULT WINAPI HTMLWindow2_get_length(IHTMLWindow2 *iface, LONG *p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMWindowCollection *nscollection; + PRUint32 length; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMWindow_GetFrames(This->nswindow, &nscollection); + if(NS_FAILED(nsres)) { + ERR("GetFrames failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMWindowCollection_GetLength(nscollection, &length); + nsIDOMWindowCollection_Release(nscollection); + if(NS_FAILED(nsres)) { + ERR("GetLength failed: %08x\n", nsres); + return E_FAIL; + } + + *p = length; + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_frames(IHTMLWindow2 *iface, IHTMLFramesCollection2 **p) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 571c023..7429c60 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -89,6 +89,7 @@ interface nsIDocumentStateListener; interface nsIDOMCSSStyleSheet; interface nsIDOMDocumentView; interface nsIDocumentObserver; +interface nsIDOMWindow; interface IMoniker; @@ -109,7 +110,6 @@ typedef nsISupports nsISHistory; typedef nsISupports nsIWidget; typedef nsISupports nsIHttpHeaderVisitor; typedef nsISupports nsIDOMBarProp; -typedef nsISupports nsIDOMWindowCollection; typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; typedef nsISupports nsIDOMNamedNodeMap; @@ -1108,6 +1108,19 @@ interface nsISelection : nsISupports [ object, + uuid(a6cf906f-15b3-11d2-932e-00805f8add32), + local + /* FROZEN */ +] +interface nsIDOMWindowCollection : nsISupports +{ + nsresult GetLength(PRUint32 *aLength); + nsresult Item(PRUint32 index, nsIDOMWindow **_retval); + nsresult NamedItem(const nsAString *name, nsIDOMWindow **_retval); +} + +[ + object, uuid(a6cf906b-15b3-11d2-932e-00805f8add32), local /* FROZEN */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bb97429..f826a01 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -851,6 +851,16 @@ static void _set_window_name(unsigned line, IHTMLWindow2 *window, const char *na _test_window_name(line, window, name); } +#define test_window_length(w,l) _test_window_length(__LINE__,w,l) +static void _test_window_length(unsigned line, IHTMLWindow2 *window, LONG exlen) +{ + LONG length = -1; + HRESULT hres; + + hres = IHTMLWindow2_get_length(window, &length); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); + ok_(__FILE__,line)(length == exlen, "length = %d, expected %d\n", length, exlen); +} static void test_get_set_attr(IHTMLDocument2 *doc) { @@ -4414,6 +4424,7 @@ static void test_window(IHTMLDocument2 *doc) test_window_name(window, NULL); set_window_name(window, "test"); + test_window_length(window, 0); IHTMLWindow2_Release(window); } @@ -4648,6 +4659,8 @@ static void test_iframe_elem(IHTMLElement *elem) ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); ok(content_window != NULL, "contentWindow = NULL\n"); + test_window_length(content_window, 0); + content_doc = NULL; hres = IHTMLWindow2_get_document(content_window, &content_doc); IHTMLWindow2_Release(content_window); @@ -5202,6 +5215,7 @@ static void test_elems(IHTMLDocument2 *doc) window = get_doc_window(doc); test_window_name(window, NULL); set_window_name(window, "test name"); + test_window_length(window, 1); IHTMLWindow2_Release(window); }

1 0

Jacek Caban : mshtml: Create nsIDOMEvent in create_event if not available.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 672bca557a1f58b0f38fb4eae308e8bd759c175c URL: http://source.winehq.org/git/wine.git/?a=commit;h=672bca557a1f58b0f38fb4eae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 00:41:44 2009 +0200 mshtml: Create nsIDOMEvent in create_event if not available. --- dlls/mshtml/htmlevent.c | 85 +++++++++++++++++++++++++++++++++++----------- dlls/mshtml/nsiface.idl | 12 +++++++ 2 files changed, 76 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8c0104f..73e0540 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -96,9 +96,28 @@ static const WCHAR onreadystatechangeW[] = {'o','n','r','e','a','d','y','s','t', static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0}; static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t','a','r','t',0}; +static const WCHAR HTMLEventsW[] = {'H','T','M','L','E','v','e','n','t','s',0}; +static const WCHAR KeyboardEventW[] = {'K','e','y','b','o','a','r','d','E','v','e','n','t',0}; +static const WCHAR MouseEventW[] = {'M','o','u','s','e','E','v','e','n','t',0}; + +enum { + EVENTT_NONE, + EVENTT_HTML, + EVENTT_KEY, + EVENTT_MOUSE +}; + +static const WCHAR *event_types[] = { + NULL, + HTMLEventsW, + KeyboardEventW, + MouseEventW +}; + typedef struct { LPCWSTR name; LPCWSTR attr_name; + DWORD type; DWORD flags; } event_info_t; @@ -107,24 +126,24 @@ typedef struct { #define EVENT_FORWARDBODY 0x0004 static const event_info_t event_info[] = { - {beforeunloadW, onbeforeunloadW, EVENT_DEFAULTLISTENER|EVENT_FORWARDBODY}, - {blurW, onblurW, EVENT_DEFAULTLISTENER}, - {changeW, onchangeW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {dblclickW, ondblclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {dragW, ondragW, 0}, - {dragstartW, ondragstartW, 0}, - {focusW, onfocusW, EVENT_DEFAULTLISTENER}, - {keydownW, onkeydownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {keyupW, onkeyupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {loadW, onloadW, 0}, - {mousedownW, onmousedownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {mouseoutW, onmouseoutW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {mouseupW, onmouseupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {pasteW, onpasteW, 0}, - {readystatechangeW, onreadystatechangeW, 0}, - {selectstartW, onselectstartW, 0} + {beforeunloadW, onbeforeunloadW, EVENTT_NONE, EVENT_DEFAULTLISTENER|EVENT_FORWARDBODY}, + {blurW, onblurW, EVENTT_HTML, EVENT_DEFAULTLISTENER}, + {changeW, onchangeW, EVENTT_HTML, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {clickW, onclickW, EVENTT_MOUSE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {dblclickW, ondblclickW, EVENTT_MOUSE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {dragW, ondragW, EVENTT_MOUSE, 0}, + {dragstartW, ondragstartW, EVENTT_MOUSE, 0}, + {focusW, onfocusW, EVENTT_HTML, EVENT_DEFAULTLISTENER}, + {keydownW, onkeydownW, EVENTT_KEY, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {keyupW, onkeyupW, EVENTT_KEY, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {loadW, onloadW, EVENTT_HTML, 0}, + {mousedownW, onmousedownW, EVENTT_MOUSE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mouseoutW, onmouseoutW, EVENTT_MOUSE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mouseoverW, onmouseoverW, EVENTT_MOUSE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mouseupW, onmouseupW, EVENTT_MOUSE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {pasteW, onpasteW, EVENTT_NONE, 0}, + {readystatechangeW, onreadystatechangeW, EVENTT_NONE, 0}, + {selectstartW, onselectstartW, EVENTT_MOUSE, 0} }; eventid_t str_to_eid(LPCWSTR str) @@ -680,15 +699,39 @@ static IHTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEve HTMLEventObj *ret; ret = heap_alloc(sizeof(*ret)); + if(!ret) + return NULL; + ret->lpIHTMLEventObjVtbl = &HTMLEventObjVtbl; ret->ref = 1; ret->type = event_info+eid; - ret->target = target; - IHTMLDOMNode_AddRef(HTMLDOMNODE(target)); ret->nsevent = nsevent; - if(nsevent) + if(nsevent) { nsIDOMEvent_AddRef(nsevent); + }else if(event_types[event_info[eid].type]) { + nsIDOMDocumentEvent *doc_event; + nsresult nsres; + + nsres = nsIDOMHTMLDocument_QueryInterface(target->doc->basedoc.nsdoc, &IID_nsIDOMDocumentEvent, + (void**)&doc_event); + if(NS_SUCCEEDED(nsres)) { + nsAString type_str; + + nsAString_Init(&type_str, event_types[event_info[eid].type]); + nsres = nsIDOMDocumentEvent_CreateEvent(doc_event, &type_str, &ret->nsevent); + nsAString_Finish(&type_str); + nsIDOMDocumentEvent_Release(doc_event); + } + if(NS_FAILED(nsres)) { + ERR("Could not create event: %08x\n", nsres); + IHTMLEventObj_Release(HTMLEVENTOBJ(ret)); + return NULL; + } + } + + ret->target = target; + IHTMLDOMNode_AddRef(HTMLDOMNODE(target)); init_dispex(&ret->dispex, (IUnknown*)HTMLEVENTOBJ(ret), &HTMLEventObj_dispex); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7429c60..b469ffe 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1013,6 +1013,18 @@ interface nsIDOMDocumentView : nsISupports [ object, + uuid(46b91d66-28e2-11d4-ab1e-0010830123b4), + local + /* FROZEN */ +] +interface nsIDOMDocumentEvent : nsISupports +{ +cpp_quote("#undef CreateEvent") + nsresult CreateEvent(const nsAString *eventType, nsIDOMEvent **_retval); +} + +[ + object, uuid(a6cf90ce-15b3-11d2-932e-00805f8add32), local /* FROZEN */

1 0

Jacek Caban : mshtml: Added IHTMLElement3::fireEvent implementation.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 946bd4ae1c3c0c7a596de138e8b865e6656f970e URL: http://source.winehq.org/git/wine.git/?a=commit;h=946bd4ae1c3c0c7a596de138e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 00:42:02 2009 +0200 mshtml: Added IHTMLElement3::fireEvent implementation. --- dlls/mshtml/htmlelem3.c | 8 ++++++-- dlls/mshtml/htmlevent.c | 24 ++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index 22c93a9..30c8546 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -29,6 +29,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -292,8 +293,11 @@ static HRESULT WINAPI HTMLElement3_fireEvent(IHTMLElement3 *iface, BSTR bstrEven VARIANT *pvarEventObject, VARIANT_BOOL *pfCancelled) { HTMLElement *This = HTMLELEM3_THIS(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(bstrEventName), pvarEventObject, pfCancelled); - return E_NOTIMPL; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(bstrEventName), debugstr_variant(pvarEventObject), + pfCancelled); + + return dispatch_event(&This->node, bstrEventName, pvarEventObject, pfCancelled); } static HRESULT WINAPI HTMLElement3_put_onresizestart(IHTMLElement3 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 73e0540..b006478 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -853,6 +853,30 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, nsIDOMNode *target, nsIDOM doc->basedoc.window->event = prev_event; } +HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_obj, VARIANT_BOOL *cancelled) +{ + eventid_t eid; + + eid = attr_to_eid(event_name); + if(eid == EVENTID_LAST) { + WARN("unknown event %s\n", debugstr_w(event_name)); + return E_INVALIDARG; + } + + if(event_obj && V_VT(event_obj) != VT_EMPTY && V_VT(event_obj) != VT_ERROR) + FIXME("event_obj not implemented\n"); + + if(!(event_info[eid].flags & EVENT_DEFAULTLISTENER)) { + FIXME("not EVENT_DEFAULTEVENTHANDLER\n"); + return E_NOTIMPL; + } + + fire_event(node->doc, eid, node->nsnode, NULL); + + *cancelled = VARIANT_TRUE; /* FIXME */ + return S_OK; +} + static inline event_target_t *get_event_target(event_target_t **event_target_ptr) { if(!*event_target_ptr) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 4446aa9..6c716a8 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -45,6 +45,7 @@ void fire_event(HTMLDocumentNode*,eventid_t,nsIDOMNode*,nsIDOMEvent*); HRESULT set_event_handler(event_target_t**,HTMLDocument*,eventid_t,VARIANT*); HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*); +HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*); static inline event_target_t **get_node_event_target(HTMLDOMNode *node) {

1 0