Jacek Caban : shdocvw: Ignore hwndParent in DoVerb.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Nov 6 05:48:35 CST 2006
Module: wine
Branch: master
Commit: ebbcd53c71433973ccd8abaa3f45ebe88e85ff5b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbcd53c71433973ccd8abaa3f45ebe88e85ff5b
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sun Nov 5 17:39:13 2006 +0100
shdocvw: Ignore hwndParent in DoVerb.
---
dlls/shdocvw/oleobject.c | 13 +++++++------
dlls/shdocvw/tests/webbrowser.c | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c
index a3e1ed6..6ccfaef 100644
--- a/dlls/shdocvw/oleobject.c
+++ b/dlls/shdocvw/oleobject.c
@@ -106,8 +106,9 @@ static void create_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;
if(This->inplace)
@@ -157,7 +158,7 @@ static HRESULT activate_inplace(WebBrows
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;
@@ -166,7 +167,7 @@ static HRESULT activate_ui(WebBrowser *T
if(This->inplace)
return S_OK;
- hres = activate_inplace(This, active_site, parent_hwnd);
+ hres = activate_inplace(This, active_site);
if(FAILED(hres))
return hres;
@@ -347,13 +348,13 @@ static HRESULT WINAPI OleObject_DoVerb(I
{
case OLEIVERB_SHOW:
TRACE("OLEIVERB_SHOW\n");
- return activate_ui(This, pActiveSite, hwndParent);
+ return activate_ui(This, pActiveSite);
case OLEIVERB_UIACTIVATE:
TRACE("OLEIVERB_UIACTIVATE\n");
- return activate_ui(This, pActiveSite, hwndParent);
+ return activate_ui(This, pActiveSite);
case OLEIVERB_INPLACEACTIVATE:
TRACE("OLEIVERB_INPLACEACTIVATE\n");
- return activate_inplace(This, pActiveSite, hwndParent);
+ return activate_inplace(This, pActiveSite);
default:
FIXME("stub for %d\n", iVerb);
break;
diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c
index 9523640..84bc608 100644
--- a/dlls/shdocvw/tests/webbrowser.c
+++ b/dlls/shdocvw/tests/webbrowser.c
@@ -725,7 +725,7 @@ static void test_DoVerb(IUnknown *unk)
SET_EXPECT(SetMenu);
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);
CHECK_CALLED(CanInPlaceActivate);
@@ -741,7 +741,7 @@ static void test_DoVerb(IUnknown *unk)
CHECK_CALLED(SetMenu);
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);
IOleObject_Release(oleobj);
More information about the wine-cvs
mailing list