Module: wine Branch: master Commit: b94dd24eafc524f2946f6ee3aede99f869800749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94dd24eafc524f2946f6ee3ae...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Apr 13 13:26:32 2015 +0200
mshtml: Use debugstr_mshtml_guid in object and embed element implementation.
---
dlls/mshtml/htmlembed.c | 5 ++--- dlls/mshtml/htmlobject.c | 7 ++----- dlls/mshtml/main.c | 2 ++ dlls/mshtml/pluginhost.c | 3 --- dlls/mshtml/pluginhost.h | 2 ++ 5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/dlls/mshtml/htmlembed.c b/dlls/mshtml/htmlembed.c index a06f08e..54070ed 100644 --- a/dlls/mshtml/htmlembed.c +++ b/dlls/mshtml/htmlembed.c @@ -227,14 +227,13 @@ static HRESULT HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLEmbedElement *This = impl_from_HTMLDOMNode(iface);
+ TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IHTMLEmbedElement, riid)) { - TRACE("(%p)->(IID_IHTMLEmbedElement %p)\n", This, ppv); *ppv = &This->IHTMLEmbedElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 2633f48..0e2033e 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -645,21 +645,18 @@ static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
+ TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; }else if(IsEqualGUID(&IID_IHTMLObjectElement, riid)) { - TRACE("(%p)->(IID_IHTMLObjectElement %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; }else if(IsEqualGUID(&IID_IHTMLObjectElement2, riid)) { - TRACE("(%p)->(IID_IHTMLObjectElement2 %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement2_iface; }else if(IsEqualGUID(&IID_HTMLPluginContainer, riid)) { /* Special pseudo-interface returning HTMLPluginContainse struct. */ - TRACE("(%p)->(IID_HTMLPluginContainer %p)\n", This, ppv); *ppv = &This->plugin_container; node_addref(&This->plugin_container.element.node); return S_OK; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8d9f1ac..8938f01e 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -42,6 +42,7 @@ #define INIT_GUID #include "mshtml_private.h" #include "resource.h" +#include "pluginhost.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
@@ -540,6 +541,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(DIID_HTMLDocumentEvents2); X(DIID_HTMLTableEvents); X(DIID_HTMLTextContainerEvents); + X(IID_HTMLPluginContainer); X(IID_IConnectionPoint); X(IID_IConnectionPointContainer); X(IID_ICustomDoc); diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index b6fcf72..7b1133d 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -37,9 +37,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
-const IID IID_HTMLPluginContainer = - {0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}}; - static BOOL check_load_safety(PluginHost *host) { DWORD policy_size, policy; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 0460c3c..5135c33 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -58,6 +58,8 @@ struct HTMLPluginContainer { DWORD props_len; };
+DEFINE_GUID(IID_HTMLPluginContainer, 0xbd7a6050,0xb373,0x4f6f,0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a); + extern const IID IID_HTMLPluginContainer DECLSPEC_HIDDEN;
HRESULT create_plugin_host(HTMLDocumentNode*,HTMLPluginContainer*) DECLSPEC_HIDDEN;