Jacek Caban : mshtml: Use inner window' s moniker in PluginHost implementation.

Alexandre Julliard julliard at winehq.org
Tue Aug 14 12:59:52 CDT 2012


Module: wine
Branch: master
Commit: 39182135861ba20d92d8ec0181f76aae4a8c9e66
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=39182135861ba20d92d8ec0181f76aae4a8c9e66

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Aug 14 11:28:50 2012 +0200

mshtml: Use inner window's moniker in PluginHost implementation.

---

 dlls/mshtml/pluginhost.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c
index 07d6e3a..e24131b 100644
--- a/dlls/mshtml/pluginhost.c
+++ b/dlls/mshtml/pluginhost.c
@@ -534,12 +534,12 @@ static HRESULT WINAPI PHClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAss
 
     switch(dwWhichMoniker) {
     case OLEWHICHMK_CONTAINER:
-        if(!This->doc || !This->doc->basedoc.window || !This->doc->basedoc.window->mon) {
+        if(!This->doc || !This->doc->window || !This->doc->window->mon) {
             FIXME("no moniker\n");
             return E_UNEXPECTED;
         }
 
-        *ppmk = This->doc->basedoc.window->mon;
+        *ppmk = This->doc->window->mon;
         IMoniker_AddRef(*ppmk);
         break;
     default:
@@ -1144,12 +1144,12 @@ static HRESULT WINAPI PHBindHost_CreateMoniker(IBindHost *iface, LPOLESTR szName
 
     TRACE("(%p)->(%s %p %p %x)\n", This, debugstr_w(szName), pBC, ppmk, dwReserved);
 
-    if(!This->doc || !This->doc->basedoc.window || !This->doc->basedoc.window->mon) {
+    if(!This->doc || !This->doc->window || !This->doc->window->mon) {
         FIXME("no moniker\n");
         return E_UNEXPECTED;
     }
 
-    return CreateURLMoniker(This->doc->basedoc.window->mon, szName, ppmk);
+    return CreateURLMoniker(This->doc->window->mon, szName, ppmk);
 }
 
 static HRESULT WINAPI PHBindHost_MonikerBindToStorage(IBindHost *iface, IMoniker *pMk, IBindCtx *pBC,




More information about the wine-cvs mailing list