Jacek Caban : mshtml: Get rid of no longer needed bind_complete in set_moniker.
Alexandre Julliard
julliard at winehq.org
Thu Nov 12 10:22:12 CST 2009
Module: wine
Branch: master
Commit: 7f6630ee44e9f4bc2185056e9f15deecabe38e8e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6630ee44e9f4bc2185056e9f15deecabe38e8e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 12 14:52:09 2009 +0100
mshtml: Get rid of no longer needed bind_complete in set_moniker.
---
dlls/mshtml/persist.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 805d7f0..f3d23bd 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -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;
LPOLESTR url = NULL;
@@ -268,8 +268,6 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO
IUnknown_Release((IUnknown*)bscallback);
CoTaskMemFree(url);
- if(bind_complete)
- *bind_complete = FALSE;
return S_OK;
}
@@ -357,19 +355,15 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
IMoniker *pimkName, LPBC pibc, DWORD grfMode)
{
HTMLDocument *This = PERSISTMON_THIS(iface);
- BOOL bind_complete = FALSE;
HRESULT hres;
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))
return hres;
- if(!bind_complete)
- return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, pibc);
-
- return S_OK;
+ return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, pibc);
}
static HRESULT WINAPI PersistMoniker_Save(IPersistMoniker *iface, IMoniker *pimkName,
@@ -626,7 +620,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM
return hres;
}
- hres = set_moniker(This, mon, NULL, NULL);
+ hres = set_moniker(This, mon, NULL);
IMoniker_Release(mon);
if(FAILED(hres))
return hres;
More information about the wine-cvs
mailing list