wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Tag wine-2.6 : Alexandre Julliard : Release 2.6
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: refs/tags/wine-2.6 Tag: 8dc23c59a0986fa41988c8120a2cfcff761ebaad URL: http://source.winehq.org/git/wine.git/?a=tag;h=8dc23c59a0986fa41988c8120a2c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 20:03:45 2017 +0200 Release 2.6

1 0

Alexandre Julliard : Release 2.6.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 709935314458bd0ce27aab3986ae98cc556cb663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709935314458bd0ce27aab398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 20:03:45 2017 +0200 Release 2.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 793 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 380 insertions(+), 434 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=709935314458bd0ce27aa…

1 0

Alistair Leslie-Hughes : mtxdm: Implement GetDispenserManager.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 3abb995842b2ec3cc85ed9197a714e6f46559e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abb995842b2ec3cc85ed9197… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 10 03:59:45 2017 +0000 mtxdm: Implement GetDispenserManager. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/mtxdm/Makefile.in | 5 +++++ dlls/mtxdm/mtxdm.spec | 1 + dlls/mtxdm/mtxdm_main.c | 36 ++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/mtxdm.h | 34 ++++++++++++++++++++++++++++++++++ 7 files changed, 80 insertions(+) diff --git a/configure b/configure index e4b9dd2..b9be11d 100755 --- a/configure +++ b/configure @@ -1332,6 +1332,7 @@ enable_msxml2 enable_msxml3 enable_msxml4 enable_msxml6 +enable_mtxdm enable_ncrypt enable_nddeapi enable_ndis_sys @@ -18213,6 +18214,7 @@ wine_fn_config_dll msxml3 enable_msxml3 clean wine_fn_config_test dlls/msxml3/tests msxml3_test clean wine_fn_config_dll msxml4 enable_msxml4 clean wine_fn_config_dll msxml6 enable_msxml6 clean +wine_fn_config_dll mtxdm enable_mtxdm wine_fn_config_dll ncrypt enable_ncrypt wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll ndis.sys enable_ndis_sys diff --git a/configure.ac b/configure.ac index a2fc66d..1a5b0de 100644 --- a/configure.ac +++ b/configure.ac @@ -3247,6 +3247,7 @@ WINE_CONFIG_DLL(msxml3,,[clean]) WINE_CONFIG_TEST(dlls/msxml3/tests,[clean]) WINE_CONFIG_DLL(msxml4,,[clean]) WINE_CONFIG_DLL(msxml6,,[clean]) +WINE_CONFIG_DLL(mtxdm) WINE_CONFIG_DLL(ncrypt) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(ndis.sys) diff --git a/dlls/mtxdm/Makefile.in b/dlls/mtxdm/Makefile.in new file mode 100644 index 0000000..63a99b6 --- /dev/null +++ b/dlls/mtxdm/Makefile.in @@ -0,0 +1,5 @@ +MODULE = mtxdm.dll +IMPORTS = uuid ole32 + +C_SRCS = \ + mtxdm_main.c diff --git a/dlls/mtxdm/mtxdm.spec b/dlls/mtxdm/mtxdm.spec new file mode 100644 index 0000000..4aad62f --- /dev/null +++ b/dlls/mtxdm/mtxdm.spec @@ -0,0 +1 @@ +@ cdecl GetDispenserManager(ptr) diff --git a/dlls/mtxdm/mtxdm_main.c b/dlls/mtxdm/mtxdm_main.c new file mode 100644 index 0000000..9b7e1df --- /dev/null +++ b/dlls/mtxdm/mtxdm_main.c @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "comsvcs.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); + + +HRESULT CDECL GetDispenserManager(IDispenserManager **dispenser) +{ + TRACE("%p\n", dispenser); + + return CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)dispenser); +} diff --git a/include/Makefile.in b/include/Makefile.in index 2384c93..f9cb7b4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -513,6 +513,7 @@ HEADER_SRCS = \ msxml2did.h \ msxml6did.h \ msxmldid.h \ + mtxdm.h \ nb30.h \ ncrypt.h \ ndrtypes.h \ diff --git a/include/mtxdm.h b/include/mtxdm.h new file mode 100644 index 0000000..94098ea --- /dev/null +++ b/include/mtxdm.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __MTXDM_H__ +#define __MTXDM_H__ + +#include "comsvcs.h" + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT CDECL GetDispenserManager(IDispenserManager**); + +#ifdef __cplusplus +} +#endif + + +#endif

1 0

Jacek Caban : mshtml.idl: Added HTMLAnchorElement coclass declaration.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 0636249b0e488377a3c26956a4527366d0d3b012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0636249b0e488377a3c26956a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:45 2017 +0200 mshtml.idl: Added HTMLAnchorElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 4 ++-- include/mshtml.idl | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 75d465f..191677f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLAnchorElement { HTMLElement element; IHTMLAnchorElement IHTMLAnchorElement_iface; nsIDOMHTMLAnchorElement *nsanchor; -} HTMLAnchorElement; +}; static HRESULT navigate_href_new_window(HTMLElement *element, nsAString *href_str, const WCHAR *target) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 74a9eb6..24721eb 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9794,6 +9794,24 @@ methods: } /***************************************************************************** + * HTMLAnchorElement coclass + */ +[ + noncreatable, + uuid(3050f248-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLAnchorElement +{ + [default] dispinterface DispHTMLAnchorElement; + /* [source, default] dispinterface HTMLAnchorEvents; */ + /* [source] dispinterface HTMLAnchorEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLAnchorElement; + /* interface IHTMLAnchorElement2; */ + /* interface IHTMLAnchorElement3; */ +} + +/***************************************************************************** * IHTMLAreaElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLXMLHttpRequest coclass declaration.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: abdec32f68f4a15997f1c879d04a88982fbbe138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdec32f68f4a15997f1c879d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:38 2017 +0200 mshtml.idl: Added HTMLXMLHttpRequest coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 14 ++++++-------- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index ab14c54..30389a4 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -92,20 +92,18 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) return S_OK; } -typedef struct XMLHttpReqEventListener XMLHttpReqEventListener; - typedef struct { + nsIDOMEventListener nsIDOMEventListener_iface; + LONG ref; + HTMLXMLHttpRequest *xhr; +} XMLHttpReqEventListener; + +struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; LONG ref; nsIXMLHttpRequest *nsxhr; XMLHttpReqEventListener *event_listener; -} HTMLXMLHttpRequest; - -struct XMLHttpReqEventListener { - nsIDOMEventListener nsIDOMEventListener_iface; - LONG ref; - HTMLXMLHttpRequest *xhr; }; static void detach_xhr_event_listener(XMLHttpReqEventListener *event_listener) diff --git a/include/mshtml.idl b/include/mshtml.idl index 9a98dc8..74a9eb6 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9134,6 +9134,23 @@ methods: } /***************************************************************************** + * HTMLXMLHttpRequest + */ +[ + noncreatable, + uuid(3051040b-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLXMLHttpRequest +{ + [default] dispinterface DispHTMLXMLHttpRequest; + /* [source, default] dispinterface HTMLXMLHttpRequestEvents; */ + interface IHTMLXMLHttpRequest; + interface IHTMLXMLHttpRequest2; + interface IHTMLDOMConstructor; + interface IEventTarget; +} + +/***************************************************************************** * IHTMLControlElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLImg coclass declaration.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: f40b54483f2a370cbe8c23608531c119fe71aec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40b54483f2a370cbe8c23608… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:27 2017 +0200 mshtml.idl: Added HTMLImg coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlimg.c | 134 +++++++++++++++++++++++++------------------------- include/mshtml.idl | 21 ++++++++ 2 files changed, 88 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f40b54483f2a370cbe8c2…

1 0

Jacek Caban : mshtml.idl: Added HTMLLinkElement coclass declaration.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: ab0e68a95ea65130bc7c098c4ad5b5ce919f0d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0e68a95ea65130bc7c098c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:11 2017 +0200 mshtml.idl: Added HTMLLinkElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllink.c | 4 ++-- include/mshtml.idl | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 19913af..aa44c3d 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -33,12 +33,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLLinkElement { HTMLElement element; IHTMLLinkElement IHTMLLinkElement_iface; nsIDOMHTMLLinkElement *nslink; -} HTMLLinkElement; +}; static inline HTMLLinkElement *impl_from_IHTMLLinkElement(IHTMLLinkElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 75946b1..96799bc 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -7680,6 +7680,26 @@ methods: } /***************************************************************************** + * HTMLLinkElement coclass + */ +[ + noncreatable, + uuid(3050f277-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLLinkElement +{ + [default] dispinterface DispHTMLLinkElement; + /* [source, default] dispinterface HTMLLinkElementEvents; */ + /* [source] dispinterface HTMLLinkElementEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLLinkElement; + interface IHTMLLinkElement2; + interface IHTMLLinkElement3; + interface IHTMLLinkElement4; + /* interface IHTMLLinkElement5; */ +} + +/***************************************************************************** * IHTMLTxtRange interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLGenericElement coclass declaration.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 327a77c1c2856c44654de134ae9bd1fe78cccd7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=327a77c1c2856c44654de134a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:01 2017 +0200 mshtml.idl: Added HTMLGenericElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlgeneric.c | 4 ++-- include/mshtml.idl | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 47f1a0f..d49b5ad 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -32,11 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLGenericElement { HTMLElement element; IHTMLGenericElement IHTMLGenericElement_iface; -} HTMLGenericElement; +}; static inline HTMLGenericElement *impl_from_IHTMLGenericElement(IHTMLGenericElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 97f22a7..75946b1 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -7008,6 +7008,22 @@ methods: } /***************************************************************************** + * HTMLGenericElement coclass + */ +[ + noncreatable, + uuid(3050f4b8-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLGenericElement +{ + [default] dispinterface DispHTMLGenericElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLGenericElement; +} + +/***************************************************************************** * IHTMLStyleSheetRule interface */ [

1 0

Jacek Caban : mshtml.idl: Added helper macros for element coclasses and use it where appropriate.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: d653086102b18b8f7282188a4bedb89a4522bfea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d653086102b18b8f7282188a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:04:53 2017 +0200 mshtml.idl: Added helper macros for element coclasses and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 107 ++++++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 51 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index cbcb44f..97f22a7 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -6912,6 +6912,19 @@ interface IHTMLDatabinding : IDispatch [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] \ BSTR dataFormatAs() +#define WINE_HTMLELEMENT_INTERFACES \ + interface IHTMLElement; \ + interface IHTMLElement2; \ + interface IHTMLElement3; \ + interface IHTMLElement4; \ + interface IHTMLUniqueName; \ + interface IHTMLDOMNode; \ + interface IHTMLDOMNode2; \ + /* interface IHTMLElement5; */ \ + interface IHTMLElement6; \ + interface IHTMLDOMConstructor \ + /* interface IHTMLElement7 */ + #define WINE_HTMLELEMENT_DISPINTERFACE_DECL \ WINE_IHTMLELEMENT_DISPINTERFACE_DECL; \ WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; \ @@ -6923,6 +6936,21 @@ interface IHTMLDatabinding : IDispatch WINE_IHTMLELEMENT6_DISPINTERFACE_DECL; \ WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL +#define WINE_HTMLDATAELEMENT_INTERFACES \ + interface IHTMLElement; \ + interface IHTMLElement2; \ + interface IHTMLElement3; \ + interface IHTMLElement4; \ + interface IHTMLUniqueName; \ + interface IHTMLDOMNode; \ + interface IHTMLDOMNode2; \ + interface IHTMLDatabinding; \ + /* interface IHTMLElement5; */ \ + interface IHTMLElement6; \ + interface IElementSelector; \ + interface IHTMLDOMConstructor \ + /* interface IHTMLElement7 */ + #define WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL \ WINE_IHTMLELEMENT_DISPINTERFACE_DECL; \ WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; \ @@ -8474,15 +8502,12 @@ coclass HTMLFormElement [default] dispinterface DispHTMLFormElement; [source, default] dispinterface HTMLFormElementEvents; [source] dispinterface HTMLFormElementEvents2; - interface IHTMLElement; - interface IHTMLElement2; - interface IHTMLElement3; - interface IHTMLElement4; - interface IHTMLUniqueName; - interface IHTMLDOMNode; - interface IHTMLDOMNode2; - interface IHTMLDOMConstructor; - interface IHTMLFormElement; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLFormElement; + /* interface IHTMLFormElement2; */ + /* interface IHTMLFormElement3; */ + /* interface IHTMLSubmitData; */ + /* interface IHTMLFormElement4; */ } /***************************************************************************** @@ -9394,17 +9419,14 @@ coclass HTMLBody [default] dispinterface DispHTMLBody; [source, default] dispinterface HTMLTextContainerEvents; [source] dispinterface HTMLTextContainerEvents2; - interface IHTMLElement; - interface IHTMLElement2; - interface IHTMLElement3; - interface IHTMLElement4; - interface IHTMLUniqueName; - interface IHTMLDOMNode; - interface IHTMLDOMNode2; - interface IHTMLControlElement; - interface IHTMLTextContainer; - interface IHTMLBodyElement; - interface IHTMLBodyElement2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLTextContainer; + interface IHTMLBodyElement; + interface IHTMLBodyElement2; + /* interface IHTMLBodyElement3; */ + /* interface IHTMLBodyElement4; */ + /* interface IHTMLBodyElement5; */ } /***************************************************************************** @@ -10489,16 +10511,10 @@ coclass HTMLOptionElement [default] dispinterface DispHTMLOptionElement; [source, default] dispinterface HTMLElementEvents; [source] dispinterface HTMLElementEvents2; - interface IHTMLElement; - interface IHTMLElement2; - interface IHTMLElement3; - interface IHTMLElement4; - interface IHTMLUniqueName; - interface IHTMLDOMNode; - interface IHTMLDOMNode2; - interface IHTMLDatabinding; - interface IHTMLOptionElement; - interface IHTMLOptionElement3; + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLOptionElement; + interface IHTMLOptionElement3; + /* interface IHTMLOptionElement4; */ } /***************************************************************************** @@ -16884,15 +16900,10 @@ coclass HTMLCommentElement [default] dispinterface DispHTMLCommentElement; [source, default] dispinterface HTMLElementEvents; [source] dispinterface HTMLElementEvents2; - interface IHTMLElement; - interface IHTMLElement2; - interface IHTMLElement3; - interface IHTMLElement4; - interface IHTMLUniqueName; - interface IHTMLDOMNode; - interface IHTMLDOMNode2; - interface IHTMLCommentElement; - interface IHTMLCommentElement2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLCommentElement; + interface IHTMLCommentElement2; + /* interface IHTMLCommentElement3; */ } /***************************************************************************** @@ -17525,18 +17536,12 @@ coclass HTMLTable [default] dispinterface DispHTMLTable; [source, default] dispinterface HTMLTableEvents; [source] dispinterface HTMLTableEvents2; - interface IHTMLElement; - interface IHTMLElement2; - interface IHTMLElement3; - interface IHTMLElement4; - interface IHTMLUniqueName; - interface IHTMLDOMNode; - interface IHTMLDOMNode2; - interface IHTMLDatabinding; - interface IHTMLControlElement; - interface IHTMLTable; - interface IHTMLTable2; - interface IHTMLTable3; + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLTable; + interface IHTMLTable2; + interface IHTMLTable3; + /* interface IHTMLTable4; */ } [

1 0

Jacek Caban : mshtml: Silence failing QueryInterfaces common for .net applications.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 9141c97d949377c7155f770a7475bca23e1ce911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9141c97d949377c7155f770a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:04:41 2017 +0200 mshtml: Silence failing QueryInterfaces common for .net applications. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 5 +++++ dlls/mshtml/htmldoc.c | 3 --- dlls/mshtml/htmllocation.c | 4 ++++ dlls/mshtml/htmlwindow.c | 4 ++++ dlls/mshtml/main.c | 3 +++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 2013cee..caaf788 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "mscoree.h" #include "wine/debug.h" @@ -1675,6 +1676,10 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) *ppv = NULL; else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) *ppv = NULL; + else if(IsEqualGUID(&IID_IMarshal, riid)) + *ppv = NULL; + else if(IsEqualGUID(&IID_IManagedObject, riid)) + *ppv = NULL; else return FALSE; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8c29b80..4271326 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4572,9 +4572,6 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IPersistPropertyBag, riid)) { TRACE("(%p)->(IID_IPersistPropertyBag %p) returning NULL\n", This, ppv); *ppv = NULL; - }else if(IsEqualGUID(&IID_IMarshal, riid)) { - TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv); - *ppv = NULL; }else if(IsEqualGUID(&IID_IExternalConnection, riid)) { TRACE("(%p)->(IID_IExternalConnection %p) returning NULL\n", This, ppv); *ppv = NULL; diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 6062964..de66ff5 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -87,6 +87,10 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r *ppv = &This->IHTMLLocation_iface; }else if(IsEqualGUID(&IID_IHTMLLocation, riid)) { *ppv = &This->IHTMLLocation_iface; + }else if(IsEqualGUID(&IID_IMarshal, riid)) { + *ppv = NULL; + FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv); + return E_NOINTERFACE; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a5db035..7387e10 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -184,6 +184,10 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii *ppv = &This->ITravelLogClient_iface; }else if(IsEqualGUID(&IID_IObjectIdentity, riid)) { *ppv = &This->IObjectIdentity_iface; + }else if(IsEqualGUID(&IID_IMarshal, riid)) { + *ppv = NULL; + FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv); + return E_NOINTERFACE; }else if(dispex_query_interface(&This->inner_window->event_target.dispex, riid, ppv)) { assert(!*ppv); return E_NOINTERFACE; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index ad6bb2b..262fda6 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -43,6 +43,7 @@ #include "mshtml_private.h" #include "resource.h" #include "pluginhost.h" +#include "mscoree.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -588,6 +589,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLPrivateWindow); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); + X(IID_IManagedObject); + X(IID_IMarshal); X(IID_IMonikerProp); X(IID_IObjectIdentity); X(IID_IObjectSafety);

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017