winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2009
----- 2025 -----
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
866 discussions
Start a n
N
ew thread
Jacek Caban : jscript: Fixed NULL IDispatch comparistion.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: 6888ea3913e5318a0fdbc5f61c715b47699d07a5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6888ea3913e5318a0fdbc5f61…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 17 01:06:13 2009 +0200 jscript: Fixed NULL IDispatch comparistion. --- dlls/jscript/engine.c | 4 ++-- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 783b6e5..5ae829e 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -261,8 +261,8 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) return S_OK; } - if(!disp1) { - *ret = !disp2; + if(!disp1 || !disp2) { + *ret = FALSE; return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 08caa73..bc77110 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -943,6 +943,8 @@ ok(getVT(true && nullDisp) === "VT_DISPATCH", "getVT(0 && nullDisp) = " + getVT(true && nullDisp)); ok(!nullDisp === true, "!nullDisp = " + !nullDisp); ok(String(nullDisp) === "null", "String(nullDisp) = " + String(nullDisp)); +ok(nullDisp != new Object(), "nullDisp == new Object()"); +ok(new Object() != nullDisp, "new Object() == nullDisp"); function do_test() {} function nosemicolon() {} nosemicolon();
1
0
0
0
Jacek Caban : jscript: Added Object function invocation implementation.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: dcaf066936a6718c2084a05a495ad609b55cb5db URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dcaf066936a6718c2084a05a4…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 17 01:05:55 2009 +0200 jscript: Added Object function invocation implementation. --- dlls/jscript/object.c | 23 ++++++++++++++++++++++- dlls/jscript/tests/api.js | 12 ++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 8170e71..66e4b53 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -163,13 +163,34 @@ static const builtin_info_t Object_info = { }; static HRESULT ObjectConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { HRESULT hres; TRACE("\n"); switch(flags) { + case DISPATCH_METHOD: + if(arg_cnt(dp)) { + VARIANT *arg = get_arg(dp,0); + + if(V_VT(arg) != VT_EMPTY && V_VT(arg) != VT_NULL) { + IDispatch *disp; + + hres = to_object(dispex->ctx, arg, &disp); + if(FAILED(hres)) + return hres; + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = disp; + }else { + IDispatch_Release(disp); + } + return S_OK; + } + } + /* fall through */ case DISPATCH_CONSTRUCT: { DispatchEx *obj; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d3e08c8..291154c 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -88,6 +88,17 @@ ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f()); (tmp = new String).f = Object.prototype.toString; ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f()); +ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); +ok(Object("") instanceof String, "Object('') is not instance of String"); +ok(Object(false) instanceof Boolean, "Object(false) is not instance of Boolean"); + +obj = new Object(); +ok(Object(obj) === obj, "Object(obj) !== obj"); + +ok(typeof(Object()) === "object", "typeof(Object()) !== 'object'"); +ok(typeof(Object(undefined)) === "object", "typeof(Object(undefined)) !== 'object'"); +ok(typeof(Object(null)) === "object", "typeof(Object(null)) !== 'object'"); + var obj = new Object(); obj.toString = function (x) { ok(arguments.length === 0, "arguments.length = " + arguments.length); @@ -95,6 +106,7 @@ obj.toString = function (x) { }; ok((tmp = obj.toLocaleString()) === "test", "obj.toLocaleString() = " + tmp); ok((tmp = obj.toLocaleString(1)) === "test", "obj.toLocaleString(1) = " + tmp); +ok(obj === obj.valueOf(), "obj !== obj.valueOf"); ok("".length === 0, "\"\".length = " + "".length); ok(getVT("".length) == "VT_I4", "\"\".length = " + "".length);
1
0
0
0
Jacek Caban : jscript: Fixed debugstr_variant for NULL argument.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: a94c25f3ae8e75d88a2553a4a8d414c7c2a9d3d8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a94c25f3ae8e75d88a2553a4a…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 17 01:05:10 2009 +0200 jscript: Fixed debugstr_variant for NULL argument. --- dlls/jscript/jsutils.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a51518c..cef141a 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -31,11 +31,14 @@ WINE_DECLARE_DEBUG_CHANNEL(heap); const char *debugstr_variant(const VARIANT *v) { + if(!v) + return "(null)"; + switch(V_VT(v)) { case VT_EMPTY: - return wine_dbg_sprintf("{VT_EMPTY}"); + return "{VT_EMPTY}"; case VT_NULL: - return wine_dbg_sprintf("{VT_NULL}"); + return "{VT_NULL}"; case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); case VT_R8:
1
0
0
0
Jacek Caban : jscript: Added Function. toString implementation for builtin functions.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: d918a1890bf15fd699505bfcf70469bfae5109c6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d918a1890bf15fd699505bfcf…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 17 01:04:44 2009 +0200 jscript: Added Function.toString implementation for builtin functions. --- dlls/jscript/array.c | 4 +++- dlls/jscript/bool.c | 4 +++- dlls/jscript/date.c | 4 +++- dlls/jscript/dispex.c | 3 ++- dlls/jscript/error.c | 2 +- dlls/jscript/function.c | 32 +++++++++++++++++++++++++------- dlls/jscript/jscript.h | 2 +- dlls/jscript/number.c | 4 +++- dlls/jscript/object.c | 4 +++- dlls/jscript/regexp.c | 4 +++- dlls/jscript/string.c | 5 ++++- dlls/jscript/tests/api.js | 11 +++++++++++ 12 files changed, 62 insertions(+), 17 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=d918a1890bf15fd699505…
1
0
0
0
Jacek Caban : mshtml: Use node event_target for HTMLDocument.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: 522d0bf973b361ac2cb4a3069061cedbdbc33a08 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=522d0bf973b361ac2cb4a3069…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:14:55 2009 +0200 mshtml: Use node event_target for HTMLDocument. --- dlls/mshtml/htmldoc.c | 3 --- dlls/mshtml/htmlevent.c | 3 ++- dlls/mshtml/htmlevent.h | 4 ++-- dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e3fde65..f7c7190 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1741,9 +1741,6 @@ static void destroy_htmldoc(HTMLDocument *This) { remove_doc_tasks(This); - if(This->event_target) - release_event_target(This->event_target); - ConnectionPointContainer_Destroy(&This->cp_container); if(This->nsdoc) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index abf4621..8c0104f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -795,7 +795,8 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, nsIDOMNode *target, nsIDOM } } - call_event_handlers(doc, event_obj, doc->basedoc.event_target, eid, (IDispatch*)HTMLDOC(&doc->basedoc)); + call_event_handlers(doc, event_obj, doc->basedoc.doc_node->node.event_target, eid, + (IDispatch*)HTMLDOC(&doc->basedoc)); break; default: diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 2c4bef3..4446aa9 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -63,12 +63,12 @@ static inline HRESULT get_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT * static inline HRESULT set_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var) { - return set_event_handler(&doc->event_target, doc, eid, var); + return set_node_event(&doc->doc_node->node, eid, var); } static inline HRESULT get_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var) { - return get_event_handler(&doc->event_target, eid, var); + return get_node_event(&doc->doc_node->node, eid, var); } static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6a93d28..73daf01 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -278,7 +278,6 @@ struct HTMLDocument { HTMLWindow *window; nsIDOMHTMLDocument *nsdoc; - event_target_t *event_target; ConnectionPointContainer cp_container; ConnectionPoint cp_htmldocevents; ConnectionPoint cp_htmldocevents2;
1
0
0
0
Jacek Caban : mshtml: Use node' s IDispatchEx implementation in HTMLDocumentNode.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: 7eca0bcae4eece128007985dc84e05ce82fc0f18 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7eca0bcae4eece128007985dc…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:14:38 2009 +0200 mshtml: Use node's IDispatchEx implementation in HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 89 +++++++++++++++++++++++++----------------- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/tests/dom.c | 3 + 3 files changed, 58 insertions(+), 37 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=7eca0bcae4eece1280079…
1
0
0
0
Jacek Caban : mshtml: Get rid of htmldoc_vtbl_t.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: f750bc40595ce067375bab3a4bdc772364d44823 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f750bc40595ce067375bab3a4…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:14:21 2009 +0200 mshtml: Get rid of htmldoc_vtbl_t. --- dlls/mshtml/htmldoc.c | 102 +++++++++--------------------------------- dlls/mshtml/mshtml_private.h | 15 ++---- 2 files changed, 27 insertions(+), 90 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4999e72..500723a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1728,13 +1728,14 @@ static dispex_static_data_t HTMLDocument_dispex = { HTMLDocument_iface_tids }; -static void init_doc(HTMLDocument *doc, const htmldoc_vtbl_t *vtbl) +static void init_doc(HTMLDocument *doc, IUnknown *unk_impl) { - doc->vtbl = vtbl; doc->lpHTMLDocument2Vtbl = &HTMLDocumentVtbl; doc->lpIDispatchExVtbl = &DocDispatchExVtbl; doc->lpSupportErrorInfoVtbl = &SupportErrorInfoVtbl; + doc->unk_impl = unk_impl; + HTMLDocument_HTMLDocument3_Init(doc); HTMLDocument_HTMLDocument5_Init(doc); HTMLDocument_Persist_Init(doc); @@ -1768,37 +1769,6 @@ static void destroy_htmldoc(HTMLDocument *This) nsIDOMHTMLDocument_Release(This->nsdoc); } -#define HTMLDOCNODE_THIS(base) DEFINE_THIS2(HTMLDocumentNode, basedoc, base) - -static HRESULT HTMLDocumentNode_QueryInterface(HTMLDocument *base, REFIID riid, void **ppv) -{ - HTMLDocumentNode *This = HTMLDOCNODE_THIS(base); - - return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->node), riid, ppv); -} - -static ULONG HTMLDocumentNode_AddRef(HTMLDocument *base) -{ - HTMLDocumentNode *This = HTMLDOCNODE_THIS(base); - - return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->node)); -} - -static ULONG HTMLDocumentNode_Release(HTMLDocument *base) -{ - HTMLDocumentNode *This = HTMLDOCNODE_THIS(base); - - return IHTMLDOMNode_Release(HTMLDOMNODE(&This->node)); -} - -#undef HTMLDOCNODE_THIS - -static const htmldoc_vtbl_t HTMLDocumentNodeVtbl = { - HTMLDocumentNode_QueryInterface, - HTMLDocumentNode_AddRef, - HTMLDocumentNode_Release -}; - #define HTMLDOCNODE_NODE_THIS(iface) DEFINE_THIS2(HTMLDocumentNode, node, iface) static HRESULT HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) @@ -1839,7 +1809,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob doc->basedoc.doc_node = doc; doc->basedoc.doc_obj = doc_obj; - init_doc(&doc->basedoc, &HTMLDocumentNodeVtbl); + init_doc(&doc->basedoc, (IUnknown*)HTMLDOMNODE(&doc->node)); doc->ref = 1; nsIDOMHTMLDocument_AddRef(nsdoc); @@ -1866,42 +1836,6 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, void **ppv) { HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); - return IHTMLDocument2_QueryInterface(HTMLDOC(&This->basedoc), riid, ppv); -} - -static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) -{ - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); - return IHTMLDocument2_AddRef(HTMLDOC(&This->basedoc)); -} - -static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) -{ - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); - return IHTMLDocument_Release(HTMLDOC(&This->basedoc)); -} - -static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) -{ - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, pUIHandler); - return E_NOTIMPL; -} - -#undef CUSTOMDOC_THIS - -static const ICustomDocVtbl CustomDocVtbl = { - CustomDoc_QueryInterface, - CustomDoc_AddRef, - CustomDoc_Release, - CustomDoc_SetUIHandler -}; - -#define HTMLDOCOBJ_THIS(base) DEFINE_THIS2(HTMLDocumentObj, basedoc, base) - -static HRESULT HTMLDocumentObj_QueryInterface(HTMLDocument *base, REFIID riid, void **ppv) -{ - HTMLDocumentObj *This = HTMLDOCOBJ_THIS(base); if(htmldoc_qi(&This->basedoc, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; @@ -1919,9 +1853,9 @@ static HRESULT HTMLDocumentObj_QueryInterface(HTMLDocument *base, REFIID riid, v return S_OK; } -static ULONG HTMLDocumentObj_AddRef(HTMLDocument *base) +static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) { - HTMLDocumentObj *This = HTMLDOCOBJ_THIS(base); + HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); @@ -1929,9 +1863,9 @@ static ULONG HTMLDocumentObj_AddRef(HTMLDocument *base) return ref; } -static ULONG HTMLDocumentObj_Release(HTMLDocument *base) +static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) { - HTMLDocumentObj *This = HTMLDOCOBJ_THIS(base); + HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); @@ -1975,12 +1909,20 @@ static ULONG HTMLDocumentObj_Release(HTMLDocument *base) return ref; } -#undef HTMLDOCOBJ_THIS +static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) +{ + HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + FIXME("(%p)->(%p)\n", This, pUIHandler); + return E_NOTIMPL; +} + +#undef CUSTOMDOC_THIS -static const htmldoc_vtbl_t HTMLDocumentObjVtbl = { - HTMLDocumentObj_QueryInterface, - HTMLDocumentObj_AddRef, - HTMLDocumentObj_Release +static const ICustomDocVtbl CustomDocVtbl = { + CustomDoc_QueryInterface, + CustomDoc_AddRef, + CustomDoc_Release, + CustomDoc_SetUIHandler }; HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) @@ -1995,7 +1937,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) if(!doc) return E_OUTOFMEMORY; - init_doc(&doc->basedoc, &HTMLDocumentObjVtbl); + init_doc(&doc->basedoc, (IUnknown*)CUSTOMDOC(doc)); doc->lpCustomDocVtbl = &CustomDocVtbl; doc->ref = 1; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index eb85c42..b5c6cd8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -246,15 +246,8 @@ struct ConnectionPoint { ConnectionPoint *next; }; -typedef struct { - HRESULT (*query_interface)(HTMLDocument*,REFIID,void**); - ULONG (*addref)(HTMLDocument*); - ULONG (*release)(HTMLDocument*); -} htmldoc_vtbl_t; - struct HTMLDocument { DispatchEx dispex; - const htmldoc_vtbl_t *vtbl; const IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; const IHTMLDocument3Vtbl *lpHTMLDocument3Vtbl; const IHTMLDocument4Vtbl *lpHTMLDocument4Vtbl; @@ -277,6 +270,8 @@ struct HTMLDocument { const IDispatchExVtbl *lpIDispatchExVtbl; const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; + IUnknown *unk_impl; + HTMLDocumentObj *doc_obj; HTMLDocumentNode *doc_node; @@ -292,17 +287,17 @@ struct HTMLDocument { static inline HRESULT htmldoc_query_interface(HTMLDocument *This, REFIID riid, void **ppv) { - return This->vtbl->query_interface(This, riid, ppv); + return IUnknown_QueryInterface(This->unk_impl, riid, ppv); } static inline ULONG htmldoc_addref(HTMLDocument *This) { - return This->vtbl->addref(This); + return IUnknown_AddRef(This->unk_impl); } static inline ULONG htmldoc_release(HTMLDocument *This) { - return This->vtbl->release(This); + return IUnknown_Release(This->unk_impl); } struct HTMLDocumentObj {
1
0
0
0
Jacek Caban : mshmtl: Moved ICustomDoc implementation to HTMLDocumentObj.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: 10c714b43ae4499309e17ae88049fca97bdc9fd5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=10c714b43ae4499309e17ae88…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:14:05 2009 +0200 mshmtl: Moved ICustomDoc implementation to HTMLDocumentObj. --- dlls/mshtml/htmldoc.c | 58 +++++++++++++++++++++++++++++++++++++---- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/oleobj.c | 41 ----------------------------- dlls/mshtml/tests/dom.c | 6 ++++ 4 files changed, 59 insertions(+), 48 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3bd6ddf..4999e72 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1682,9 +1682,6 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppv); *ppv = PERSTRINIT(This); - }else if(IsEqualGUID(&IID_ICustomDoc, riid)) { - TRACE("(%p)->(IID_ICustomDoc %p)\n", This, ppv); - *ppv = CUSTOMDOC(This); }else if(IsEqualGUID(&DIID_DispHTMLDocument, riid)) { TRACE("(%p)->(DIID_DispHTMLDocument %p)\n", This, ppv); *ppv = HTMLDOC(This); @@ -1860,6 +1857,46 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob return S_OK; } +/********************************************************** + * ICustomDoc implementation + */ + +#define CUSTOMDOC_THIS(iface) DEFINE_THIS(HTMLDocumentObj, CustomDoc, iface) + +static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, void **ppv) +{ + HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(&This->basedoc), riid, ppv); +} + +static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) +{ + HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(&This->basedoc)); +} + +static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) +{ + HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + return IHTMLDocument_Release(HTMLDOC(&This->basedoc)); +} + +static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) +{ + HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + FIXME("(%p)->(%p)\n", This, pUIHandler); + return E_NOTIMPL; +} + +#undef CUSTOMDOC_THIS + +static const ICustomDocVtbl CustomDocVtbl = { + CustomDoc_QueryInterface, + CustomDoc_AddRef, + CustomDoc_Release, + CustomDoc_SetUIHandler +}; + #define HTMLDOCOBJ_THIS(base) DEFINE_THIS2(HTMLDocumentObj, basedoc, base) static HRESULT HTMLDocumentObj_QueryInterface(HTMLDocument *base, REFIID riid, void **ppv) @@ -1869,9 +1906,17 @@ static HRESULT HTMLDocumentObj_QueryInterface(HTMLDocument *base, REFIID riid, v if(htmldoc_qi(&This->basedoc, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - FIXME("Unimplemented interface %s\n", debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; + if(IsEqualGUID(&IID_ICustomDoc, riid)) { + TRACE("(%p)->(IID_ICustomDoc %p)\n", This, ppv); + *ppv = CUSTOMDOC(This); + }else { + FIXME("Unimplemented interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG HTMLDocumentObj_AddRef(HTMLDocument *base) @@ -1952,6 +1997,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) init_doc(&doc->basedoc, &HTMLDocumentObjVtbl); + doc->lpCustomDocVtbl = &CustomDocVtbl; doc->ref = 1; doc->basedoc.doc_obj = doc; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 828aebb..eb85c42 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -274,7 +274,6 @@ struct HTMLDocument { const IOleControlVtbl *lpOleControlVtbl; const IHlinkTargetVtbl *lpHlinkTargetVtbl; const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; - const ICustomDocVtbl *lpCustomDocVtbl; const IDispatchExVtbl *lpIDispatchExVtbl; const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; @@ -308,6 +307,7 @@ static inline ULONG htmldoc_release(HTMLDocument *This) struct HTMLDocumentObj { HTMLDocument basedoc; + const ICustomDocVtbl *lpCustomDocVtbl; LONG ref; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 5a2f3de..e9cb204 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -705,46 +705,6 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; -/********************************************************** - * ICustomDoc implementation - */ - -#define CUSTOMDOC_THIS(iface) DEFINE_THIS(HTMLDocument, CustomDoc, iface) - -static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, void **ppv) -{ - HTMLDocument *This = CUSTOMDOC_THIS(iface); - return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); -} - -static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) -{ - HTMLDocument *This = CUSTOMDOC_THIS(iface); - return IHTMLDocument2_AddRef(HTMLDOC(This)); -} - -static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) -{ - HTMLDocument *This = CUSTOMDOC_THIS(iface); - return IHTMLDocument_Release(HTMLDOC(This)); -} - -static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) -{ - HTMLDocument *This = CUSTOMDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, pUIHandler); - return E_NOTIMPL; -} - -#undef CUSTOMDOC_THIS - -static const ICustomDocVtbl CustomDocVtbl = { - CustomDoc_QueryInterface, - CustomDoc_AddRef, - CustomDoc_Release, - CustomDoc_SetUIHandler -}; - void HTMLDocument_LockContainer(HTMLDocumentObj *This, BOOL fLock) { IOleContainer *container; @@ -766,5 +726,4 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->lpOleObjectVtbl = &OleObjectVtbl; This->lpOleDocumentVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; - This->lpCustomDocVtbl = &CustomDocVtbl; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bc6f699..5bbb54a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4095,6 +4095,7 @@ static void test_window(IHTMLDocument2 *doc) IHTMLWindow2 *window, *window2, *self; IHTMLDocument2 *doc2 = NULL; IDispatch *disp; + IUnknown *unk; BSTR str; HRESULT hres; @@ -4110,6 +4111,11 @@ static void test_window(IHTMLDocument2 *doc) test_ifaces((IUnknown*)doc2, doc_node_iids); test_ifaces((IUnknown*)doc, doc_obj_iids); + unk = (void*)0xdeadbeef; + hres = IHTMLDocument2_QueryInterface(doc2, &IID_ICustomDoc, (void**)&unk); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_ICustomDoc) returned: %08x\n", hres); + ok(!unk, "unk = %p\n", unk); + IHTMLDocument_Release(doc2); hres = IHTMLWindow2_get_window(window, &window2);
1
0
0
0
Jacek Caban : mshtml: Inherit HTMLDocumentNode from HTMLDOMNode.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: 2fb0d1e4566319895ee34c3a7dc646574e06a7ab URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2fb0d1e4566319895ee34c3a7…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:13:49 2009 +0200 mshtml: Inherit HTMLDocumentNode from HTMLDOMNode. --- dlls/mshtml/htmldoc.c | 79 +++++++++++++++++++++++++++--------------- dlls/mshtml/htmlnode.c | 3 +- dlls/mshtml/mshtml_private.h | 23 ++++++------ dlls/mshtml/tests/dom.c | 28 +++++++++++++++ 4 files changed, 93 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9c9bed2..3bd6ddf 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1597,7 +1597,7 @@ static const IDispatchExVtbl DocDispatchExVtbl = { DocDispatchEx_GetNameSpaceParent }; -static HRESULT htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) +static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -1696,25 +1696,25 @@ static HRESULT htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = PERSISTHIST(This); }else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); - return E_NOINTERFACE; + *ppv = NULL; }else if(IsEqualGUID(&IID_IRunnableObject, riid)) { TRACE("(%p)->(IID_IRunnableObject %p) returning NULL\n", This, ppv); - return E_NOINTERFACE; + *ppv = NULL; }else if(IsEqualGUID(&IID_IPersistPropertyBag, riid)) { TRACE("(%p)->(IID_IPersistPropertyBag %p) returning NULL\n", This, ppv); - return E_NOINTERFACE; + *ppv = NULL; }else if(IsEqualGUID(&IID_IMarshal, riid)) { TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv); - return E_NOINTERFACE; + *ppv = NULL; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { - return *ppv ? S_OK : E_NOINTERFACE; + return TRUE; }else { - FIXME("(%p)->(%s %p) interface not supported\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + return FALSE; } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + if(*ppv) + IUnknown_AddRef((IUnknown*)*ppv); + return TRUE; } static const tid_t HTMLDocument_iface_tids[] = { @@ -1777,35 +1777,21 @@ static HRESULT HTMLDocumentNode_QueryInterface(HTMLDocument *base, REFIID riid, { HTMLDocumentNode *This = HTMLDOCNODE_THIS(base); - return htmldoc_qi(&This->basedoc, riid, ppv); + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->node), riid, ppv); } static ULONG HTMLDocumentNode_AddRef(HTMLDocument *base) { HTMLDocumentNode *This = HTMLDOCNODE_THIS(base); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref = %u\n", This, ref); - return ref; + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->node)); } static ULONG HTMLDocumentNode_Release(HTMLDocument *base) { HTMLDocumentNode *This = HTMLDOCNODE_THIS(base); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref = %u\n", This, ref); - if(!ref) { - detach_selection(This); - detach_ranges(This); - release_nodes(This); - destroy_htmldoc(&This->basedoc); - heap_free(This); - } - - return ref; + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->node)); } #undef HTMLDOCNODE_THIS @@ -1816,6 +1802,35 @@ static const htmldoc_vtbl_t HTMLDocumentNodeVtbl = { HTMLDocumentNode_Release }; +#define HTMLDOCNODE_NODE_THIS(iface) DEFINE_THIS2(HTMLDocumentNode, node, iface) + +static HRESULT HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +{ + HTMLDocumentNode *This = HTMLDOCNODE_NODE_THIS(iface); + + if(htmldoc_qi(&This->basedoc, riid, ppv)) + return *ppv ? S_OK : E_NOINTERFACE; + + return HTMLDOMNode_QI(&This->node, riid, ppv); +} + +void HTMLDocumentNode_destructor(HTMLDOMNode *iface) +{ + HTMLDocumentNode *This = HTMLDOCNODE_NODE_THIS(iface); + + detach_selection(This); + detach_ranges(This); + release_nodes(This); + destroy_htmldoc(&This->basedoc); +} + +#undef HTMLDOCNODE_NODE_THIS + +static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { + HTMLDocumentNode_QI, + HTMLDocumentNode_destructor +}; + HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; @@ -1838,6 +1853,9 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob list_init(&doc->selection_list); list_init(&doc->range_list); + HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); + doc->node.vtbl = &HTMLDocumentNodeImplVtbl; + *ret = doc; return S_OK; } @@ -1848,7 +1866,12 @@ static HRESULT HTMLDocumentObj_QueryInterface(HTMLDocument *base, REFIID riid, v { HTMLDocumentObj *This = HTMLDOCOBJ_THIS(base); - return htmldoc_qi(&This->basedoc, riid, ppv); + if(htmldoc_qi(&This->basedoc, riid, ppv)) + return *ppv ? S_OK : E_NOINTERFACE; + + FIXME("Unimplemented interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } static ULONG HTMLDocumentObj_AddRef(HTMLDocument *base) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index cdfa6fa..399355b 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -972,6 +972,7 @@ void release_nodes(HTMLDocumentNode *This) for(iter = This->nodes; iter; iter = next) { next = iter->next; iter->doc = NULL; - IHTMLDOMNode_Release(HTMLDOMNODE(iter)); + if(&This->node != iter) + IHTMLDOMNode_Release(HTMLDOMNODE(iter)); } } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b823093..828aebb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -306,17 +306,6 @@ static inline ULONG htmldoc_release(HTMLDocument *This) return This->vtbl->release(This); } -struct HTMLDocumentNode { - HTMLDocument basedoc; - - LONG ref; - - HTMLDOMNode *nodes; - - struct list selection_list; - struct list range_list; -}; - struct HTMLDocumentObj { HTMLDocument basedoc; @@ -477,6 +466,18 @@ typedef struct { ConnectionPoint cp; } HTMLTextContainer; +struct HTMLDocumentNode { + HTMLDOMNode node; + HTMLDocument basedoc; + + LONG ref; + + HTMLDOMNode *nodes; + + struct list selection_list; + struct list range_list; +}; + #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b69705d..bc6f699 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -94,6 +94,31 @@ static const IID * const none_iids[] = { NULL }; +static const IID * const doc_node_iids[] = { + &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, + &IID_IHTMLDocument, + &IID_IHTMLDocument2, + &IID_IHTMLDocument3, + &IID_IHTMLDocument4, + &IID_IHTMLDocument5, + &IID_IDispatchEx, + &IID_IConnectionPointContainer, + NULL +}; + +static const IID * const doc_obj_iids[] = { + &IID_IHTMLDocument, + &IID_IHTMLDocument2, + &IID_IHTMLDocument3, + &IID_IHTMLDocument4, + &IID_IHTMLDocument5, + &IID_IDispatchEx, + &IID_IConnectionPointContainer, + &IID_ICustomDoc, + NULL +}; + static const IID * const elem_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLDOMNode2, @@ -4082,6 +4107,9 @@ static void test_window(IHTMLDocument2 *doc) ok(hres == S_OK, "get_document failed: %08x\n", hres); ok(doc2 != NULL, "doc2 == NULL\n"); + test_ifaces((IUnknown*)doc2, doc_node_iids); + test_ifaces((IUnknown*)doc, doc_obj_iids); + IHTMLDocument_Release(doc2); hres = IHTMLWindow2_get_window(window, &window2);
1
0
0
0
Jacek Caban : mshtml: Move node list to HTMLDocumentNode.
by Alexandre Julliard
17 Sep '09
17 Sep '09
Module: wine Branch: master Commit: 64d4efe967a22a81f9562c7e9ef3c3426642d24f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=64d4efe967a22a81f9562c7e9…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:13:31 2009 +0200 mshtml: Move node list to HTMLDocumentNode. --- dlls/mshtml/htmlbody.c | 10 +++++----- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmldoc.c | 18 +++++++++--------- dlls/mshtml/htmldoc3.c | 8 ++++---- dlls/mshtml/htmldoc5.c | 2 +- dlls/mshtml/htmlelem.c | 16 ++++++++-------- dlls/mshtml/htmlelem2.c | 2 +- dlls/mshtml/htmlelemcol.c | 6 +++--- dlls/mshtml/htmlevent.c | 38 +++++++++++++++++++------------------- dlls/mshtml/htmlevent.h | 6 +++--- dlls/mshtml/htmliframe.c | 4 ++-- dlls/mshtml/htmlnode.c | 16 ++++++++-------- dlls/mshtml/htmloption.c | 6 +++--- dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/mshtml_private.h | 22 +++++++++++----------- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/txtrange.c | 2 +- 20 files changed, 86 insertions(+), 86 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=64d4efe967a22a81f9562…
1
0
0
0
← Newer
1
...
38
39
40
41
42
43
44
...
87
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
Results per page:
10
25
50
100
200