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

shdocvw: Ignore hwndParent in DoVerb.

Browse Source
This commit is contained in:
Jacek Caban 2006-11-05 17:39:13 +01:00 committed by Alexandre Julliard
parent 30b24fbf7f
commit ebbcd53c71
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/shdocvw/oleobject.c
View File

@ -106,8 +106,9 @@ static void create_shell_embedding_hwnd(WebBrowser *This)
TRACE("parent=%p hwnd=%p\n", parent, This->shell_embedding_hwnd); TRACE("parent=%p hwnd=%p\n", parent, This->shell_embedding_hwnd);
} }
static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site, HWND parent_hwnd) static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site)
{ {
HWND parent_hwnd;
HRESULT hres; HRESULT hres;
if(This->inplace) if(This->inplace)
@ -157,7 +158,7 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site, H
return S_OK; return S_OK;
} }
static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site, HWND parent_hwnd) static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site)
{ {
HRESULT hres; HRESULT hres;
@ -166,7 +167,7 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site, HWND p
if(This->inplace) if(This->inplace)
return S_OK; return S_OK;
hres = activate_inplace(This, active_site, parent_hwnd); hres = activate_inplace(This, active_site);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
@ -347,13 +348,13 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag
{ {
case OLEIVERB_SHOW: case OLEIVERB_SHOW:
TRACE("OLEIVERB_SHOW\n"); TRACE("OLEIVERB_SHOW\n");
return activate_ui(This, pActiveSite, hwndParent); return activate_ui(This, pActiveSite);
case OLEIVERB_UIACTIVATE: case OLEIVERB_UIACTIVATE:
TRACE("OLEIVERB_UIACTIVATE\n"); TRACE("OLEIVERB_UIACTIVATE\n");
return activate_ui(This, pActiveSite, hwndParent); return activate_ui(This, pActiveSite);
case OLEIVERB_INPLACEACTIVATE: case OLEIVERB_INPLACEACTIVATE:
TRACE("OLEIVERB_INPLACEACTIVATE\n"); TRACE("OLEIVERB_INPLACEACTIVATE\n");
return activate_inplace(This, pActiveSite, hwndParent); return activate_inplace(This, pActiveSite);
default: default:
FIXME("stub for %d\n", iVerb); FIXME("stub for %d\n", iVerb);
break; break;

4
dlls/shdocvw/tests/webbrowser.c
View File

@ -725,7 +725,7 @@ static void test_DoVerb(IUnknown *unk)
SET_EXPECT(SetMenu); SET_EXPECT(SetMenu);
hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite,
0, container_hwnd, &rect); 0, (HWND)0xdeadbeef, &rect);
ok(hres == S_OK, "DoVerb failed: %08x\n", hres); ok(hres == S_OK, "DoVerb failed: %08x\n", hres);
CHECK_CALLED(CanInPlaceActivate); CHECK_CALLED(CanInPlaceActivate);
@ -741,7 +741,7 @@ static void test_DoVerb(IUnknown *unk)
CHECK_CALLED(SetMenu); CHECK_CALLED(SetMenu);
hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite,
0, container_hwnd, &rect); 0, (HWND)0xdeadbeef, &rect);
ok(hres == S_OK, "DoVerb failed: %08x\n", hres); ok(hres == S_OK, "DoVerb failed: %08x\n", hres);
IOleObject_Release(oleobj); IOleObject_Release(oleobj);