ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Jacek Caban 2012-08-14 11:28:50 +02:00 committed by Alexandre Julliard
parent 1a25ed2637
commit 3918213586
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/mshtml/pluginhost.c
View File

@ -534,12 +534,12 @@ static HRESULT WINAPI PHClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAss
switch(dwWhichMoniker) { switch(dwWhichMoniker) {
case OLEWHICHMK_CONTAINER: 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"); FIXME("no moniker\n");
return E_UNEXPECTED; return E_UNEXPECTED;
} }
*ppmk = This->doc->basedoc.window->mon; *ppmk = This->doc->window->mon;
IMoniker_AddRef(*ppmk); IMoniker_AddRef(*ppmk);
break; break;
default: 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); 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"); FIXME("no moniker\n");
return E_UNEXPECTED; 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, static HRESULT WINAPI PHBindHost_MonikerBindToStorage(IBindHost *iface, IMoniker *pMk, IBindCtx *pBC,