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

shdocvw: Store DocHost in BindStatusCallback.

Browse Source
This commit is contained in:
Jacek Caban 2008-01-03 16:36:04 +01:00 committed by Alexandre Julliard
parent 4a5339ae5f
commit 3ebdcb847d
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/shdocvw/navigate.c
View File

@ -36,6 +36,8 @@ typedef struct {
LONG ref; LONG ref;
DocHost *doc_host;
HGLOBAL post_data; HGLOBAL post_data;
LPWSTR headers; LPWSTR headers;
ULONG post_data_len; ULONG post_data_len;
@ -135,6 +137,8 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
if(This->doc_host)
IOleClientSite_Release(CLIENTSITE(This->doc_host));
if(This->post_data) if(This->post_data)
GlobalFree(This->post_data); GlobalFree(This->post_data);
heap_free(This->headers); heap_free(This->headers);
@ -181,7 +185,14 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
HRESULT hresult, LPCWSTR szError) HRESULT hresult, LPCWSTR szError)
{ {
BindStatusCallback *This = BINDSC_THIS(iface); BindStatusCallback *This = BINDSC_THIS(iface);
FIXME("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); FIXME("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));
if(This->doc_host) {
IOleClientSite_Release(CLIENTSITE(This->doc_host));
This->doc_host = NULL;
}
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -299,8 +310,8 @@ static const IHttpNegotiateVtbl HttpNegotiateVtbl = {
HttpNegotiate_OnResponse HttpNegotiate_OnResponse
}; };
static IBindStatusCallback *create_callback(DocHost *This, PBYTE post_data, static IBindStatusCallback *create_callback(DocHost *doc_host, PBYTE post_data,
ULONG post_data_len, LPWSTR headers, VARIANT_BOOL *cancel) ULONG post_data_len, LPWSTR headers)
{ {
BindStatusCallback *ret = heap_alloc(sizeof(BindStatusCallback)); BindStatusCallback *ret = heap_alloc(sizeof(BindStatusCallback));
@ -312,6 +323,9 @@ static IBindStatusCallback *create_callback(DocHost *This, PBYTE post_data,
ret->post_data_len = post_data_len; ret->post_data_len = post_data_len;
ret->headers = NULL; ret->headers = NULL;
ret->doc_host = doc_host;
IOleClientSite_AddRef(CLIENTSITE(doc_host));
if(post_data) { if(post_data) {
ret->post_data = GlobalAlloc(0, post_data_len); ret->post_data = GlobalAlloc(0, post_data_len);
memcpy(ret->post_data, post_data, post_data_len); memcpy(ret->post_data, post_data, post_data_len);
@ -496,7 +510,6 @@ static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, U
IBindStatusCallback *callback; IBindStatusCallback *callback;
IMoniker *mon; IMoniker *mon;
IBindCtx *bindctx; IBindCtx *bindctx;
VARIANT_BOOL cancel = VARIANT_FALSE;
HRESULT hres; HRESULT hres;
if(!This->hwnd) if(!This->hwnd)
@ -511,12 +524,14 @@ static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, U
IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); IMoniker_GetDisplayName(mon, NULL, NULL, &This->url);
TRACE("navigating to %s\n", debugstr_w(This->url)); TRACE("navigating to %s\n", debugstr_w(This->url));
callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers, &cancel); callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers);
CreateAsyncBindCtx(0, callback, 0, &bindctx); CreateAsyncBindCtx(0, callback, 0, &bindctx);
IBindStatusCallback_Release(callback);
hres = navigate(This, mon, bindctx); hres = navigate(This, mon, bindctx);
IBindStatusCallback_OnStopBinding(callback, hres, NULL);
IBindStatusCallback_Release(callback);
IBindCtx_Release(bindctx); IBindCtx_Release(bindctx);
IMoniker_Release(mon); IMoniker_Release(mon);