diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 846a467ac1c..44105bedec3 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -43,7 +43,6 @@
#define NS_ELEMENT_NODE 1
#define NS_DOCUMENT_NODE 9
-typedef struct BindStatusCallback BindStatusCallback;
typedef struct HTMLDOMNode HTMLDOMNode;
typedef struct ConnectionPoint ConnectionPoint;
@@ -84,8 +83,6 @@ typedef struct {
BOOL has_key_path;
BOOL container_locked;
- BindStatusCallback *status_callback;
-
ConnectionPoint *cp_htmldocevents;
ConnectionPoint *cp_htmldocevents2;
@@ -105,7 +102,6 @@ struct NSContainer {
nsIWebBrowser *webbrowser;
nsIWebNavigation *navigation;
nsIBaseWindow *window;
- nsIWebBrowserStream *stream;
nsIWebBrowserFocus *focus;
LONG ref;
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 92ef14a8f53..907b0f58024 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -1194,15 +1194,6 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent)
if(NS_FAILED(nsres))
ERR("Could not get nsIWebBrowserFocus interface: %08lx\n", nsres);
-#if 0
- nsres = nsIWebBrowserStream_QueryInterface(ret->webbrowser, &IID_nsIWebBrowserStream,
- (void**)&ret->stream);
- if(NS_FAILED(nsres))
- ERR("Could not get nsIWebBrowserStream interface: %08lx\n", nsres);
-#else
- ret->stream = NULL;
-#endif
-
if(!nscontainer_class)
register_nscontainer_class();
@@ -1253,11 +1244,6 @@ void NSContainer_Release(NSContainer *This)
nsIWebBrowserFocus_Release(This->focus);
This->focus = NULL;
- if(This->stream) {
- nsIWebBrowserStream_Release(This->stream);
- This->stream = NULL;
- }
-
if(This->hwnd) {
DestroyWindow(This->hwnd);
This->hwnd = NULL;
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 35b70f1af3b..ab4e751edb9 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -819,17 +819,6 @@ interface nsIFile : nsISupports
nsresult GetDirectoryEntries(nsISimpleEnumerator **aDirectoryEntries);
}
-[
- object,
- uuid(86d02f0e-219b-4cfc-9c88-bd98d2cce0b8)
-]
-interface nsIWebBrowserStream : nsISupports
-{
- nsresult OpenStream(nsIURI *aBaseURI, nsACString *aContentType);
- nsresult AppendToStream(PRUint8 *aData, PRUint32 aLen);
- nsresult CloseStream();
-}
-
[
object,
uuid(bddeda3f-9020-4d12-8c70-984ee9f7935e)
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index be12106bb82..a663fe921ac 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -38,220 +38,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
-struct BindStatusCallback {
- const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl;
-
- LONG ref;
-
- HTMLDocument *doc;
- IBinding *binding;
- IStream *stream;
- LPOLESTR url;
-};
-
-#define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface)
-
-static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface,
- REFIID riid, void **ppv)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
-
- *ppv = NULL;
- if(IsEqualGUID(&IID_IUnknown, riid)) {
- TRACE("(%p)->(IID_IUnknown, %p)\n", This, ppv);
- *ppv = STATUSCLB(This);
- }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) {
- TRACE("(%p)->(IID_IBindStatusCallback, %p)\n", This, ppv);
- *ppv = STATUSCLB(This);
- }
-
- if(*ppv) {
- IBindStatusCallback_AddRef(STATUSCLB(This));
- return S_OK;
- }
-
- TRACE("Unsupported riid = %s\n", debugstr_guid(riid));
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
- LONG ref = InterlockedIncrement(&This->ref);
-
- TRACE("(%p) ref = %ld\n", This, ref);
-
- return ref;
-}
-
-static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
- LONG ref = InterlockedDecrement(&This->ref);
-
- TRACE("(%p) ref = %ld\n", This, ref);
-
- if(!ref) {
- if(This->doc->status_callback == This)
- This->doc->status_callback = NULL;
- IHTMLDocument2_Release(HTMLDOC(This->doc));
- if(This->stream)
- IStream_Release(This->stream);
- CoTaskMemFree(This->url);
- HeapFree(GetProcessHeap(), 0, This);
- }
-
- return ref;
-}
-
-static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *iface,
- DWORD dwReserved, IBinding *pbind)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
-
- TRACE("(%p)->(%ld %p)\n", This, dwReserved, pbind);
-
- This->binding = pbind;
- IBinding_AddRef(pbind);
-
- if(This->doc->nscontainer && This->doc->nscontainer->stream) {
- nsACString strTextHtml;
- nsresult nsres;
- nsIURI *uri = get_nsIURI(This->url);
-
- /* FIXME: Set it correctly */
- nsACString_Init(&strTextHtml, "text/html");
-
- nsres = nsIWebBrowserStream_OpenStream(This->doc->nscontainer->stream, uri, &strTextHtml);
- if(NS_FAILED(nsres))
- ERR("OpenStream failed: %08lx\n", nsres);
-
- nsACString_Finish(&strTextHtml);
- nsIURI_Release(uri);
- }
-
- return S_OK;
-}
-
-static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
- FIXME("(%p)->(%p)\n", This, pnPriority);
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
- FIXME("(%p)->(%ld)\n", This, reserved);
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress,
- ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
- TRACE("%p)->(%lu %lu %lu %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
- debugstr_w(szStatusText));
- return S_OK;
-}
-
-static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface,
- HRESULT hresult, LPCWSTR szError)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
-
- TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError));
-
- if(This->doc->nscontainer && This->doc->nscontainer->stream)
- nsIWebBrowserStream_CloseStream(This->doc->nscontainer->stream);
-
- IBinding_Release(This->binding);
- This->binding = NULL;
- return S_OK;
-}
-
-static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface,
- DWORD *grfBINDF, BINDINFO *pbindinfo)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
- DWORD size;
-
- TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo);
-
- *grfBINDF = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA;
- size = pbindinfo->cbSize;
- memset(pbindinfo, 0, size);
- pbindinfo->cbSize = size;
-
- return S_OK;
-}
-
-static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *iface,
- DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
-
- TRACE("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
-
- if(!This->stream) {
- This->stream = pstgmed->u.pstm;
- IStream_AddRef(This->stream);
- }
-
- if(This->doc->nscontainer && This->doc->nscontainer->stream) {
- BYTE buf[1024];
- DWORD size;
- HRESULT hres;
-
- do {
- size = sizeof(buf);
- hres = IStream_Read(This->stream, buf, size, &size);
- nsIWebBrowserStream_AppendToStream(This->doc->nscontainer->stream, buf, size);
- }while(hres == S_OK);
- }
-
- return S_OK;
-}
-
-static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface,
- REFIID riid, IUnknown *punk)
-{
- BindStatusCallback *This = STATUSCLB_THIS(iface);
- FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), punk);
- return E_NOTIMPL;
-}
-
-#undef STATUSCLB_THIS
-
-static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = {
- BindStatusCallback_QueryInterface,
- BindStatusCallback_AddRef,
- BindStatusCallback_Release,
- BindStatusCallback_OnStartBinding,
- BindStatusCallback_GetPriority,
- BindStatusCallback_OnLowResource,
- BindStatusCallback_OnProgress,
- BindStatusCallback_OnStopBinding,
- BindStatusCallback_GetBindInfo,
- BindStatusCallback_OnDataAvailable,
- BindStatusCallback_OnObjectAvailable
-};
-
-static BindStatusCallback *BindStatusCallback_Create(HTMLDocument *doc, LPOLESTR url)
-{
- BindStatusCallback *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(BindStatusCallback));
-
- ret->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl;
- ret->ref = 0;
- ret->url = url;
- ret->doc = doc;
- ret->stream = NULL;
- IHTMLDocument2_AddRef(HTMLDOC(doc));
-
- return ret;
-}
-
/**********************************************************
* IPersistMoniker implementation
*/
@@ -368,9 +154,6 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
IMoniker *pimkName, LPBC pibc, DWORD grfMode)
{
HTMLDocument *This = PERSISTMON_THIS(iface);
- IBindCtx *pbind;
- BindStatusCallback *callback;
- IStream *str = NULL;
LPOLESTR url;
HRESULT hres;
nsresult nsres;
@@ -431,13 +214,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
}
}
- if(This->nscontainer && !This->nscontainer->stream) {
- /*
- * This is a workaround for older Gecko that doesn't support nsIWebBrowserStream.
- * It uses Gecko's LoadURI instead of IMoniker's BindToStorage. Should we improve
- * it (to do so we'd have to use not frozen interfaces)?
- */
-
+ if(This->nscontainer) {
nsIInputStream *post_data_stream = get_post_data_stream(pibc);
This->nscontainer->load_call = TRUE;
@@ -460,29 +237,8 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
if(fFullyAvailable)
FIXME("not supported fFullyAvailable\n");
-
- if(This->status_callback && This->status_callback->binding)
- IBinding_Abort(This->status_callback->binding);
-
- callback = This->status_callback = BindStatusCallback_Create(This, url);
-
- if(pibc) {
- pbind = pibc;
- RegisterBindStatusCallback(pbind, STATUSCLB(callback), NULL, 0);
- }else {
- CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &pbind);
- }
-
- hres = IMoniker_BindToStorage(pimkName, pbind, NULL, &IID_IStream, (void**)&str);
-
- if(!pibc)
- IBindCtx_Release(pbind);
- if(str)
- IStream_Release(str);
- if(FAILED(hres)) {
- WARN("BindToStorage failed: %08lx\n", hres);
- return hres;
- }
+ if(pibc)
+ FIXME("not supported pibc\n");
return S_OK;
}
@@ -727,6 +483,4 @@ void HTMLDocument_Persist_Init(HTMLDocument *This)
This->lpPersistFileVtbl = &PersistFileVtbl;
This->lpMonikerPropVtbl = &MonikerPropVtbl;
This->lpPersistStreamInitVtbl = &PersistStreamInitVtbl;
-
- This->status_callback = NULL;
}