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

mshtml: Get rid of no longer needed bind_complete in set_moniker.

Browse Source
This commit is contained in:
Jacek Caban 2009-11-12 14:52:09 +01:00 committed by Alexandre Julliard
parent aa714ca169
commit 7f6630ee44
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/mshtml/persist.c
View File

@ -152,7 +152,7 @@ static void set_downloading_proc(task_t *_task)
} }
} }
static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL *bind_complete) static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc)
{ {
nsChannelBSC *bscallback; nsChannelBSC *bscallback;
LPOLESTR url = NULL; LPOLESTR url = NULL;
@ -268,8 +268,6 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO
IUnknown_Release((IUnknown*)bscallback); IUnknown_Release((IUnknown*)bscallback);
CoTaskMemFree(url); CoTaskMemFree(url);
if(bind_complete)
*bind_complete = FALSE;
return S_OK; return S_OK;
} }
@ -357,19 +355,15 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
IMoniker *pimkName, LPBC pibc, DWORD grfMode) IMoniker *pimkName, LPBC pibc, DWORD grfMode)
{ {
HTMLDocument *This = PERSISTMON_THIS(iface); HTMLDocument *This = PERSISTMON_THIS(iface);
BOOL bind_complete = FALSE;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode);
hres = set_moniker(This, pimkName, pibc, &bind_complete); hres = set_moniker(This, pimkName, pibc);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
if(!bind_complete) return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, pibc);
return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, pibc);
return S_OK;
} }
static HRESULT WINAPI PersistMoniker_Save(IPersistMoniker *iface, IMoniker *pimkName, static HRESULT WINAPI PersistMoniker_Save(IPersistMoniker *iface, IMoniker *pimkName,
@ -626,7 +620,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM
return hres; return hres;
} }
hres = set_moniker(This, mon, NULL, NULL); hres = set_moniker(This, mon, NULL);
IMoniker_Release(mon); IMoniker_Release(mon);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;