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

mshtml: Added OnFrameWindowActivate implementation.

This commit is contained in:
Jacek Caban 2006-07-08 16:11:25 +02:00 committed by Alexandre Julliard
parent 0542e835bb
commit 081d50d297
2 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/mshtml/olewnd.c
View File

@ -91,11 +91,17 @@ static HRESULT WINAPI OleInPlaceActiveObject_TranslateAccelerator(IOleInPlaceAct
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI OleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface, BOOL fActivate) static HRESULT WINAPI OleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface,
BOOL fActivate)
{ {
HTMLDocument *This = ACTOBJ_THIS(iface); HTMLDocument *This = ACTOBJ_THIS(iface);
FIXME("(%p)->(%x)\n", This, fActivate);
return E_NOTIMPL; TRACE("(%p)->(%x)\n", This, fActivate);
if(This->hostui)
IDocHostUIHandler_OnFrameWindowActivate(This->hostui, fActivate);
return S_OK;
} }
static HRESULT WINAPI OleInPlaceActiveObject_OnDocWindowActivate(IOleInPlaceActiveObject *iface, BOOL fActivate) static HRESULT WINAPI OleInPlaceActiveObject_OnDocWindowActivate(IOleInPlaceActiveObject *iface, BOOL fActivate)

56
dlls/mshtml/tests/htmldoc.c
View File

@ -101,6 +101,7 @@ DEFINE_EXPECT(Invoke_AMBIENT_PALETTE);
DEFINE_EXPECT(GetDropTarget); DEFINE_EXPECT(GetDropTarget);
DEFINE_EXPECT(UpdateUI); DEFINE_EXPECT(UpdateUI);
DEFINE_EXPECT(Navigate); DEFINE_EXPECT(Navigate);
DEFINE_EXPECT(OnFrameWindowActivate);
static BOOL expect_LockContainer_fLock; static BOOL expect_LockContainer_fLock;
static BOOL expect_SetActiveObject_active; static BOOL expect_SetActiveObject_active;
@ -832,10 +833,12 @@ static HRESULT WINAPI DocHostUIHandler_OnDocWindowActivate(IDocHostUIHandler2 *i
return E_NOTIMPL; return E_NOTIMPL;
} }
static BOOL expect_OnFrameWindowActivate_fActivate;
static HRESULT WINAPI DocHostUIHandler_OnFrameWindowActivate(IDocHostUIHandler2 *iface, BOOL fActivate) static HRESULT WINAPI DocHostUIHandler_OnFrameWindowActivate(IDocHostUIHandler2 *iface, BOOL fActivate)
{ {
ok(0, "unexpected call\n"); CHECK_EXPECT2(OnFrameWindowActivate);
return E_NOTIMPL; ok(fActivate == expect_OnFrameWindowActivate_fActivate, "fActivate=%x\n", fActivate);
return S_OK;
} }
static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface, LPCRECT prcBorder, static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface, LPCRECT prcBorder,
@ -1808,6 +1811,50 @@ static void test_Close(IUnknown *unk, BOOL set_client)
IOleObject_Release(oleobj); IOleObject_Release(oleobj);
} }
static void test_OnFrameWindowActivate(IUnknown *unk)
{
IOleInPlaceActiveObject *inplaceact;
HRESULT hres;
hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&inplaceact);
ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceActiveObject) failed: %08lx\n", hres);
if(FAILED(hres))
return;
if(set_clientsite) {
expect_OnFrameWindowActivate_fActivate = TRUE;
SET_EXPECT(OnFrameWindowActivate);
hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE);
ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres);
CHECK_CALLED(OnFrameWindowActivate);
SET_EXPECT(OnFrameWindowActivate);
hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE);
ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres);
CHECK_CALLED(OnFrameWindowActivate);
expect_OnFrameWindowActivate_fActivate = FALSE;
SET_EXPECT(OnFrameWindowActivate);
hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, FALSE);
ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres);
CHECK_CALLED(OnFrameWindowActivate);
expect_OnFrameWindowActivate_fActivate = TRUE;
SET_EXPECT(OnFrameWindowActivate);
hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE);
ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres);
CHECK_CALLED(OnFrameWindowActivate);
}else {
hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, FALSE);
ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres);
hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE);
ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres);
}
IOleInPlaceActiveObject_Release(inplaceact);
}
static void test_InPlaceDeactivate(IUnknown *unk, BOOL expect_call) static void test_InPlaceDeactivate(IUnknown *unk, BOOL expect_call)
{ {
IOleInPlaceObjectWindowless *windowlessobj = NULL; IOleInPlaceObjectWindowless *windowlessobj = NULL;
@ -1851,12 +1898,17 @@ static HRESULT test_Activate(IUnknown *unk, DWORD flags)
ok(hres == S_OK, "GetUserClassID failed: %08lx\n", hres); ok(hres == S_OK, "GetUserClassID failed: %08lx\n", hres);
ok(IsEqualGUID(&guid, &CLSID_HTMLDocument), "guid != CLSID_HTMLDocument\n"); ok(IsEqualGUID(&guid, &CLSID_HTMLDocument), "guid != CLSID_HTMLDocument\n");
test_OnFrameWindowActivate(unk);
test_ClientSite(oleobj, flags); test_ClientSite(oleobj, flags);
test_InPlaceDeactivate(unk, FALSE); test_InPlaceDeactivate(unk, FALSE);
hres = test_DoVerb(oleobj); hres = test_DoVerb(oleobj);
IOleObject_Release(oleobj); IOleObject_Release(oleobj);
test_OnFrameWindowActivate(unk);
return hres; return hres;
} }