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

mshtml: Make cookie parameter optional in ConnectionPoint_Advise.

This commit is contained in:
Piotr Caban 2012-02-01 10:41:58 +01:00 committed by Alexandre Julliard
parent 1c1b1c0073
commit 43b38e1420
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/mshtml/conpoint.c
View File

@ -158,7 +158,8 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *
} }
This->sinks[i].unk = sink; This->sinks[i].unk = sink;
*pdwCookie = i+1; if(pdwCookie)
*pdwCookie = i+1;
if(!i && This->data && This->data->on_advise) if(!i && This->data && This->data->on_advise)
This->data->on_advise(This->container->outer, This->data); This->data->on_advise(This->container->outer, This->data);

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

@ -4790,6 +4790,10 @@ static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID ri
if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) {
hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, &cookie); hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, &cookie);
ok(hres == S_OK, "Advise failed: %08x\n", hres); ok(hres == S_OK, "Advise failed: %08x\n", hres);
hres = IConnectionPoint_Unadvise(cp, cookie);
ok(hres == S_OK, "Unadvise failed: %08x\n", hres);
hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, NULL);
ok(hres == S_OK, "Advise failed: %08x\n", hres);
} else if(IsEqualGUID(&IID_IDispatch, riid)) { } else if(IsEqualGUID(&IID_IDispatch, riid)) {
hres = IConnectionPoint_Advise(cp, (IUnknown*)&EventDispatch, &cookie); hres = IConnectionPoint_Advise(cp, (IUnknown*)&EventDispatch, &cookie);
ok(hres == S_OK, "Advise failed: %08x\n", hres); ok(hres == S_OK, "Advise failed: %08x\n", hres);