June 2006 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added begining binding code in IPersistMoniker::Load.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: ee8c855f777153c0af27e60c58f933d68b37b90a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee8c855f777153c0af27e60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:41:48 2006 +0200 mshtml: Added begining binding code in IPersistMoniker::Load. --- dlls/mshtml/navigate.c | 25 +++++++++++++++++++++++++ dlls/mshtml/persist.c | 9 ++++++++- 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index dc70726..514f2bd 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -491,3 +491,28 @@ void hlink_frame_navigate(HTMLDocument * IMoniker_Release(mon); } + +HRESULT start_binding(BSCallback *bscallback, IMoniker *mon) +{ + IStream *str = NULL; + IBindCtx *bctx; + HRESULT hres; + + hres = CreateAsyncBindCtx(0, STATUSCLB(bscallback), NULL, &bctx); + if(FAILED(hres)) { + WARN("CreateAsyncBindCtx failed: %08lx\n", hres); + return hres; + } + + hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&str); + IBindCtx_Release(bctx); + if(FAILED(hres)) { + WARN("BindToStorage failed: %08lx\n", hres); + return hres; + } + + if(str) + IStream_Release(str); + + return S_OK; +} diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 55462ad..7127091 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -228,7 +228,12 @@ static HRESULT WINAPI PersistMoniker_Loa if(post_data_stream) nsIInputStream_Release(post_data_stream); + if(!bscallback->nschannel) + ERR("bscallback->nschannel == NULL\n"); + if(NS_SUCCEEDED(nsres)) { + /* FIXME: don't return here (URL Moniker needs to be good enough) */ + IBindStatusCallback_Release(STATUSCLB(bscallback)); CoTaskMemFree(url); return S_OK; @@ -244,10 +249,12 @@ static HRESULT WINAPI PersistMoniker_Loa if(pibc) FIXME("not supported pibc\n"); + hres = start_binding(bscallback, pimkName); + IBindStatusCallback_Release(STATUSCLB(bscallback)); CoTaskMemFree(url); - return S_OK; + return hres; } static HRESULT WINAPI PersistMoniker_Save(IPersistMoniker *iface, IMoniker *pimkName,

1 0

Jacek Caban : mshtml: Added beginning OnDataAvailable implementation.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 93fe34ee6868dd88244aea00c4c01ac42941b51b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93fe34ee6868dd88244aea0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 01:26:00 2006 +0200 mshtml: Added beginning OnDataAvailable implementation. --- dlls/mshtml/mshtml_private.h | 11 +++ dlls/mshtml/navigate.c | 170 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 178 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cd8abe1..725d041 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -131,6 +131,15 @@ typedef struct { nsIURI *original_uri; } nsChannel; +typedef struct { + const nsIInputStreamVtbl *lpInputStreamVtbl; + + LONG ref; + + char buf[1024]; + DWORD buf_size; +} nsProtocolStream; + struct BSCallback { const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; @@ -146,6 +155,8 @@ struct BSCallback { nsChannel *nschannel; nsIStreamListener *nslistener; nsISupports *nscontext; + + nsProtocolStream *nsstream; }; struct HTMLDOMNode { diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 514f2bd..01e5a56 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -19,7 +19,6 @@ #include "config.h" #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -39,6 +38,138 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" +#define NSINSTREAM(x) ((nsIInputStream*) &(x)->lpInputStreamVtbl) + +#define NSINSTREAM_THIS(iface) DEFINE_THIS(nsProtocolStream, InputStream, iface) + +static nsresult NSAPI nsInputStream_QueryInterface(nsIInputStream *iface, nsIIDRef riid, + nsQIResult result) +{ + nsProtocolStream *This = NSINSTREAM_THIS(iface); + + *result = NULL; + + if(IsEqualGUID(&IID_nsISupports, riid)) { + TRACE("(%p)->(IID_nsISupports %p)\n", This, result); + *result = NSINSTREAM(This); + }else if(IsEqualGUID(&IID_nsIInputStream, riid)) { + TRACE("(%p)->(IID_nsIInputStream %p)\n", This, result); + *result = NSINSTREAM(This); + } + + if(*result) { + nsIInputStream_AddRef(NSINSTREAM(This)); + return NS_OK; + } + + WARN("unsupported interface %s\n", debugstr_guid(riid)); + return NS_NOINTERFACE; +} + +static nsrefcnt NSAPI nsInputStream_AddRef(nsIInputStream *iface) +{ + nsProtocolStream *This = NSINSTREAM_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + + +static nsrefcnt NSAPI nsInputStream_Release(nsIInputStream *iface) +{ + nsProtocolStream *This = NSINSTREAM_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static nsresult NSAPI nsInputStream_Close(nsIInputStream *iface) +{ + nsProtocolStream *This = NSINSTREAM_THIS(iface); + FIXME("(%p)\n", This); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, PRUint32 *_retval) +{ + nsProtocolStream *This = NSINSTREAM_THIS(iface); + FIXME("(%p)->(%p)\n", This, _retval); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsInputStream_Read(nsIInputStream *iface, char *aBuf, PRUint32 aCount, + PRUint32 *_retval) +{ + nsProtocolStream *This = NSINSTREAM_THIS(iface); + FIXME("(%p)->(%p %ld %p)\n", This, aBuf, aCount, _retval); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, + nsresult (NSAPI*aWriter)(nsIInputStream*,void*,const char*,PRUint32,PRUint32,PRUint32*), + void *aClousure, PRUint32 aCount, PRUint32 *_retval) +{ + nsProtocolStream *This = NSINSTREAM_THIS(iface); + PRUint32 written = 0; + nsresult nsres; + + FIXME("(%p)->(%p %p %ld %p)\n", This, aWriter, aClousure, aCount, _retval); + + if(!This->buf_size) + return S_OK; + + if(This->buf_size > aCount) + FIXME("buf_size > aCount\n"); + + nsres = aWriter(NSINSTREAM(This), aClousure, This->buf, 0, This->buf_size, &written); + if(NS_FAILED(nsres)) + FIXME("aWritter failed: %08lx\n", nsres); + if(written != This->buf_size) + FIXME("written != buf_size\n"); + + This->buf_size -= written; + + return nsres; +} + +static nsresult NSAPI nsInputStream_IsNonBlocking(nsIInputStream *iface, PRBool *_retval) +{ + nsProtocolStream *This = NSINSTREAM_THIS(iface); + FIXME("(%p)->(%p)\n", This, _retval); + return NS_ERROR_NOT_IMPLEMENTED; +} + +#undef NSINSTREAM_THIS + +static const nsIInputStreamVtbl nsInputStreamVtbl = { + nsInputStream_QueryInterface, + nsInputStream_AddRef, + nsInputStream_Release, + nsInputStream_Close, + nsInputStream_Available, + nsInputStream_Read, + nsInputStream_ReadSegments, + nsInputStream_IsNonBlocking +}; + +static nsProtocolStream *create_nsprotocol_stream(IStream *stream) +{ + nsProtocolStream *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(nsProtocolStream)); + + ret->lpInputStreamVtbl = &nsInputStreamVtbl; + ret->ref = 1; + ret->buf_size = 0; + + return ret; +} + #define STATUSCLB_THIS(iface) DEFINE_THIS(BSCallback, BindStatusCallback, iface) static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, @@ -102,6 +233,8 @@ static ULONG WINAPI BindStatusCallback_R nsIStreamListener_Release(This->nslistener); if(This->nscontext) nsISupports_Release(This->nscontext); + if(This->nsstream) + nsIInputStream_Release(NSINSTREAM(This->nsstream)); HeapFree(GetProcessHeap(), 0, This->headers); HeapFree(GetProcessHeap(), 0, This); } @@ -182,8 +315,38 @@ static HRESULT WINAPI BindStatusCallback DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) { BSCallback *This = STATUSCLB_THIS(iface); - FIXME("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); - return E_NOTIMPL; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + + if(This->nslistener) { + if(!This->nsstream) { + This->nsstream = create_nsprotocol_stream(pstgmed->u.pstm); + + nsres = nsIStreamListener_OnStartRequest(This->nslistener, + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); + if(NS_FAILED(nsres)) + FIXME("OnStartRequest failed: %08lx\n", nsres); + } + + do { + hres = IStream_Read(pstgmed->u.pstm, This->nsstream->buf, sizeof(This->nsstream->buf), + &This->nsstream->buf_size); + if(This->nsstream->buf_size) { + nsres = nsIStreamListener_OnDataAvailable(This->nslistener, + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, + NSINSTREAM(This->nsstream), 0 /* FIXME */, dwSize); + if(NS_FAILED(nsres)) + FIXME("OnDataAvailable failed: %08lx\n", nsres); + + if(This->nsstream->buf_size) + FIXME("buffer is not empty!\n"); + } + }while(hres == S_OK); + } + + return S_OK; } static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, @@ -380,6 +543,7 @@ BSCallback *create_bscallback(HTMLDocume ret->nschannel = NULL; ret->nslistener = NULL; ret->nscontext = NULL; + ret->nsstream = NULL; return ret; }

1 0

Jacek Caban : mshtml: Set binding channel, listener and context in AsyncOpen.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: f1d2e376551476fd79896a698d89526113e58c45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1d2e376551476fd79896a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:40:26 2006 +0200 mshtml: Set binding channel, listener and context in AsyncOpen. --- dlls/mshtml/mshtml_private.h | 29 +++++++++++++++++++++++++++-- dlls/mshtml/navigate.c | 9 +++++++++ dlls/mshtml/nsiface.idl | 22 ++++++++++++++++++++-- dlls/mshtml/nsio.c | 30 +++++++++++------------------- 4 files changed, 67 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7223a7e..cd8abe1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -115,6 +115,22 @@ struct NSContainer { BSCallback *bscallback; /* hack */ }; +typedef struct { + const nsIHttpChannelVtbl *lpHttpChannelVtbl; + const nsIUploadChannelVtbl *lpUploadChannelVtbl; + + LONG ref; + + nsIChannel *channel; + nsIHttpChannel *http_channel; + nsIWineURI *uri; + nsIInputStream *post_data_stream; + nsILoadGroup *load_group; + nsIInterfaceRequestor *notif_callback; + nsLoadFlags load_flags; + nsIURI *original_uri; +} nsChannel; + struct BSCallback { const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; @@ -126,6 +142,10 @@ struct BSCallback { LPWSTR headers; HGLOBAL post_data; ULONG post_data_len; + + nsChannel *nschannel; + nsIStreamListener *nslistener; + nsISupports *nscontext; }; struct HTMLDOMNode { @@ -185,7 +205,6 @@ #define INPLACEWIN(x) ((IOleInPlaceOb #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define CMDTARGET(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define CONTROL(x) ((IOleControl*) &(x)->lpOleControlVtbl) -#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define HLNKTARGET(x) ((IHlinkTarget*) &(x)->lpHlinkTargetVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define PERSTRINIT(x) ((IPersistStreamInit*) &(x)->lpPersistStreamInitVtbl) @@ -199,10 +218,14 @@ #define NSTOOLTIP(x) ((nsITooltipLis #define NSWEAKREF(x) ((nsIWeakReference*) &(x)->lpWeakReferenceVtbl) #define NSSUPWEAKREF(x) ((nsISupportsWeakReference*) &(x)->lpSupportsWeakReferenceVtbl) +#define NSCHANNEL(x) ((nsIChannel*) &(x)->lpHttpChannelVtbl) +#define NSHTTPCHANNEL(x) ((nsIHttpChannel*) &(x)->lpHttpChannelVtbl) +#define NSUPCHANNEL(x) ((nsIUploadChannel*) &(x)->lpUploadChannelVtbl) + #define HTTPNEG(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) +#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl); - #define HTMLELEM(x) ((IHTMLElement*) &(x)->lpHTMLElementVtbl) #define HTMLELEM2(x) ((IHTMLElement2*) &(x)->lpHTMLElement2Vtbl) #define HTMLDOMNODE(x) ((IHTMLDOMNode*) &(x)->lpHTMLDOMNodeVtbl) @@ -253,7 +276,9 @@ PRUint32 nsAString_GetData(const nsAStri void nsAString_Finish(nsAString*); nsIInputStream *create_nsstream(const char*,PRInt32); + BSCallback *create_bscallback(HTMLDocument*,LPCOLESTR); +HRESULT start_binding(BSCallback*,IMoniker*); IHlink *Hlink_Create(void); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3101c92..dc70726 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -96,6 +96,12 @@ static ULONG WINAPI BindStatusCallback_R if(!ref) { if(This->post_data) GlobalFree(This->post_data); + if(This->nschannel) + nsIChannel_Release(NSCHANNEL(This->nschannel)); + if(This->nslistener) + nsIStreamListener_Release(This->nslistener); + if(This->nscontext) + nsISupports_Release(This->nscontext); HeapFree(GetProcessHeap(), 0, This->headers); HeapFree(GetProcessHeap(), 0, This); } @@ -371,6 +377,9 @@ BSCallback *create_bscallback(HTMLDocume ret->post_data = NULL; ret->headers = NULL; ret->post_data_len = 0; + ret->nschannel = NULL; + ret->nslistener = NULL; + ret->nscontext = NULL; return ret; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index ab4e751..0af802e 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -87,9 +87,7 @@ typedef nsISupports nsIWidget; typedef nsISupports nsIProtocolHandler; typedef nsISupports nsIDOMEventTarget; typedef nsISupports nsIDOMAbstractView; -typedef nsISupports nsIStreamListener; typedef nsISupports nsIHttpHeaderVisitor; -typedef nsISupports nsIRequestObserver; typedef nsISupports nsIDOMBarProp; typedef nsISupports nsIDOMWindowCollection; typedef nsISupports nsISelection; @@ -275,6 +273,26 @@ interface nsIRequest : nsISupports [ object, + uuid(fd91e2e0-1481-11d3-9333-00104ba0fd40) +] +interface nsIRequestObserver : nsISupports +{ + nsresult OnStartRequest(nsIRequest *aRequest, nsISupports *aContext); + nsresult OnStopRequest(nsIRequest *aRequest, nsISupports *aContext, nsresult aStatusCode); +} + +[ + object, + uuid(1a637020-1482-11d3-9333-00104ba0fd40) +] +interface nsIStreamListener : nsIRequestObserver +{ + nsresult OnDataAvailable(nsIRequest *aRequest, nsISupports *aContext, + nsIInputStream *aInputStream, PRUint32 aOffset, PRUint32 aCount); +} + +[ + object, uuid(3de0a31c-feaf-400f-9f1e-4ef71f8b20cc) ] interface nsILoadGroup : nsIRequest diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 561a750..76f60ba 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -46,22 +46,6 @@ static const IID NS_IOSERVICE_CID = static nsIIOService *nsio = NULL; typedef struct { - const nsIHttpChannelVtbl *lpHttpChannelVtbl; - const nsIUploadChannelVtbl *lpUploadChannelVtbl; - - LONG ref; - - nsIChannel *channel; - nsIHttpChannel *http_channel; - nsIWineURI *uri; - nsIInputStream *post_data_stream; - nsILoadGroup *load_group; - nsIInterfaceRequestor *notif_callback; - nsLoadFlags load_flags; - nsIURI *original_uri; -} nsChannel; - -typedef struct { const nsIWineURIVtbl *lpWineURIVtbl; LONG ref; @@ -70,9 +54,6 @@ typedef struct { NSContainer *container; } nsURI; -#define NSCHANNEL(x) ((nsIChannel*) &(x)->lpHttpChannelVtbl) -#define NSHTTPCHANNEL(x) ((nsIHttpChannel*) &(x)->lpHttpChannelVtbl) -#define NSUPCHANNEL(x) ((nsIUploadChannel*) &(x)->lpUploadChannelVtbl) #define NSURI(x) ((nsIURI*) &(x)->lpWineURIVtbl) static nsresult create_uri(nsIURI*,NSContainer*,nsIURI**); @@ -590,6 +571,17 @@ static nsresult NSAPI nsChannel_AsyncOpe } if(container->bscallback) { + nsIChannel_AddRef(NSCHANNEL(This)); + container->bscallback->nschannel = This; + + nsIStreamListener_AddRef(aListener); + container->bscallback->nslistener = aListener; + + if(aContext) { + nsISupports_AddRef(aContext); + container->bscallback->nscontext = aContext; + } + nsIWebBrowserChrome_Release(NSWBCHROME(container)); }else { BOOL cont = before_async_open(This, container);

1 0

Jacek Caban : mshtml: Store BSCallback in NSContainer and use it instead of load_call.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: e0157ba201703cec1a098dd40c02462f32a2185e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0157ba201703cec1a098dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:39:39 2006 +0200 mshtml: Store BSCallback in NSContainer and use it instead of load_call. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 13 ++++++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 83bae7f..7223a7e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -112,7 +112,7 @@ struct NSContainer { HWND hwnd; - BOOL load_call; /* hack */ + BSCallback *bscallback; /* hack */ }; struct BSCallback { diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 907b0f5..d12326b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1153,7 +1153,7 @@ NSContainer *NSContainer_Create(HTMLDocu ret->doc = doc; ret->ref = 1; - ret->load_call = FALSE; + ret->bscallback = NULL; if(parent) nsIWebBrowserChrome_AddRef(NSWBCHROME(parent)); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f0344e8..561a750 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -589,7 +589,7 @@ static nsresult NSAPI nsChannel_AsyncOpe return NS_ERROR_UNEXPECTED; } - if(container->load_call) { + if(container->bscallback) { nsIWebBrowserChrome_Release(NSWBCHROME(container)); }else { BOOL cont = before_async_open(This, container); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a663fe9..55462ad 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -154,6 +154,7 @@ static HRESULT WINAPI PersistMoniker_Loa IMoniker *pimkName, LPBC pibc, DWORD grfMode) { HTMLDocument *This = PERSISTMON_THIS(iface); + BSCallback *bscallback; LPOLESTR url; HRESULT hres; nsresult nsres; @@ -214,24 +215,27 @@ static HRESULT WINAPI PersistMoniker_Loa } } + bscallback = create_bscallback(This, url); + if(This->nscontainer) { nsIInputStream *post_data_stream = get_post_data_stream(pibc); - This->nscontainer->load_call = TRUE; + This->nscontainer->bscallback = bscallback; nsres = nsIWebNavigation_LoadURI(This->nscontainer->navigation, url, LOAD_FLAGS_NONE, NULL, post_data_stream, NULL); - This->nscontainer->load_call = FALSE; + This->nscontainer->bscallback = NULL; if(post_data_stream) nsIInputStream_Release(post_data_stream); if(NS_SUCCEEDED(nsres)) { + IBindStatusCallback_Release(STATUSCLB(bscallback)); CoTaskMemFree(url); return S_OK; }else { WARN("LoadURI failed: %08lx\n", nsres); } - } + } /* FIXME: Use grfMode */ @@ -240,6 +244,9 @@ static HRESULT WINAPI PersistMoniker_Loa if(pibc) FIXME("not supported pibc\n"); + IBindStatusCallback_Release(STATUSCLB(bscallback)); + CoTaskMemFree(url); + return S_OK; }

1 0

Jacek Caban : mshtml: Add create_nscallback function to allow using BSCallback out of navigate.c .
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 813e82f253d5d9dc424c050d56c561c04371a0d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=813e82f253d5d9dc424c050… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:37:58 2006 +0200 mshtml: Add create_nscallback function to allow using BSCallback out of navigate.c. --- dlls/mshtml/mshtml_private.h | 19 +++++++++++++++++ dlls/mshtml/navigate.c | 48 +++++++++++++----------------------------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 44105be..83bae7f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -45,6 +45,7 @@ #define NS_DOCUMENT_NODE 9 typedef struct HTMLDOMNode HTMLDOMNode; typedef struct ConnectionPoint ConnectionPoint; +typedef struct BSCallback BSCallback; typedef struct { const IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; @@ -114,6 +115,19 @@ struct NSContainer { BOOL load_call; /* hack */ }; +struct BSCallback { + const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; + const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; + const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; + + LONG ref; + + LPWSTR headers; + HGLOBAL post_data; + ULONG post_data_len; +}; + struct HTMLDOMNode { const IHTMLDOMNodeVtbl *lpHTMLDOMNodeVtbl; @@ -185,6 +199,10 @@ #define NSTOOLTIP(x) ((nsITooltipLis #define NSWEAKREF(x) ((nsIWeakReference*) &(x)->lpWeakReferenceVtbl) #define NSSUPWEAKREF(x) ((nsISupportsWeakReference*) &(x)->lpSupportsWeakReferenceVtbl) +#define HTTPNEG(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) +#define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl); + + #define HTMLELEM(x) ((IHTMLElement*) &(x)->lpHTMLElementVtbl) #define HTMLELEM2(x) ((IHTMLElement2*) &(x)->lpHTMLElement2Vtbl) #define HTMLDOMNODE(x) ((IHTMLDOMNode*) &(x)->lpHTMLDOMNodeVtbl) @@ -235,6 +253,7 @@ PRUint32 nsAString_GetData(const nsAStri void nsAString_Finish(nsAString*); nsIInputStream *create_nsstream(const char*,PRInt32); +BSCallback *create_bscallback(HTMLDocument*,LPCOLESTR); IHlink *Hlink_Create(void); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1535f58..3101c92 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -41,22 +41,6 @@ #define CONTENT_LENGTH "Content-Length" #define STATUSCLB_THIS(iface) DEFINE_THIS(BSCallback, BindStatusCallback, iface) -typedef struct { - const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; - const IServiceProviderVtbl *lpServiceProviderVtbl; - const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; - const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; - - LONG ref; - - LPWSTR headers; - HGLOBAL post_data; - ULONG post_data_len; -} BSCallback; - -#define HTTPNEG(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) -#define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl); - static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { @@ -375,8 +359,7 @@ static const IServiceProviderVtbl Servic BSCServiceProvider_QueryService }; -static IBindStatusCallback *BSCallback_Create(HTMLDocument *doc, LPCOLESTR url, - HGLOBAL post_data, ULONG post_data_len, LPWSTR headers) +BSCallback *create_bscallback(HTMLDocument *doc, LPCOLESTR url) { BSCallback *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(BSCallback)); @@ -385,11 +368,11 @@ static IBindStatusCallback *BSCallback_C ret->lpHttpNegotiate2Vtbl = &HttpNegotiate2Vtbl; ret->lpInternetBindInfoVtbl = &InternetBindInfoVtbl; ret->ref = 1; - ret->post_data = post_data; - ret->headers = headers; - ret->post_data_len = post_data_len; + ret->post_data = NULL; + ret->headers = NULL; + ret->post_data_len = 0; - return STATUSCLB(ret); + return ret; } static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_ret, @@ -466,22 +449,21 @@ static void parse_post_data(nsIInputStre void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, LPCWSTR uri, nsIInputStream *post_data_stream, DWORD hlnf) { - IBindStatusCallback *callback; + BSCallback *callback; IBindCtx *bindctx; IMoniker *mon; IHlink *hlink; - PRUint32 post_data_len = 0; - HGLOBAL post_data = NULL; - LPWSTR headers = NULL; + + callback = create_bscallback(doc, uri); if(post_data_stream) { - parse_post_data(post_data_stream, &headers, &post_data, &post_data_len); - TRACE("headers = %s post_data = %s\n", debugstr_w(headers), - debugstr_an(post_data, post_data_len)); + parse_post_data(post_data_stream, &callback->headers, &callback->post_data, + &callback->post_data_len); + TRACE("headers = %s post_data = %s\n", debugstr_w(callback->headers), + debugstr_an(callback->post_data, callback->post_data_len)); } - callback = BSCallback_Create(doc, uri, post_data, post_data_len, headers); - CreateAsyncBindCtx(0, callback, NULL, &bindctx); + CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); hlink = Hlink_Create(); @@ -493,10 +475,10 @@ void hlink_frame_navigate(HTMLDocument * IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ } - IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, callback, hlink); + IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); IBindCtx_Release(bindctx); - IBindStatusCallback_Release(callback); + IBindStatusCallback_Release(STATUSCLB(callback)); IMoniker_Release(mon); }

1 0

Jacek Caban : mshtml: Get rid of (currently disabled anyway) nsIWebBrowserStream.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 08ae32e43ac79b8336038f24e19d7acfa5c27e30 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08ae32e43ac79b8336038f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:33:48 2006 +0200 mshtml: Get rid of (currently disabled anyway) nsIWebBrowserStream. We have to handle it in another way. --- dlls/mshtml/mshtml_private.h | 4 - dlls/mshtml/nsembed.c | 14 -- dlls/mshtml/nsiface.idl | 11 -- dlls/mshtml/persist.c | 252 +----------------------------------------- 4 files changed, 3 insertions(+), 278 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=08ae32e43ac79b83360…

1 0

Jacek Caban : mshtml: Move some code from before_async_open to AsyncOpen.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: beb5366e6f34487ac1e794239394f2f22db17f11 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=beb5366e6f34487ac1e7942… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:35:17 2006 +0200 mshtml: Move some code from before_async_open to AsyncOpen. --- dlls/mshtml/nsio.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 756e1f7..f0344e8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -143,40 +143,24 @@ static BOOL handle_uri(NSContainer *cont return TRUE; } -static BOOL before_async_open(nsChannel *This) +static BOOL before_async_open(nsChannel *channel, NSContainer *container) { nsACString uri_str; - NSContainer *container; const char *uria; LPWSTR uri; DWORD len; BOOL ret; - if(!(This->load_flags & LOAD_INITIAL_DOCUMENT_URI)) - return TRUE; - - nsIWineURI_GetNSContainer(This->uri, &container); - if(!container) { - WARN("container = NULL\n"); - return TRUE; - } - - if(container->load_call) { - nsIWebBrowserChrome_Release(NSWBCHROME(container)); - return TRUE; - } - nsACString_Init(&uri_str, NULL); - nsIWineURI_GetSpec(This->uri, &uri_str); + nsIWineURI_GetSpec(channel->uri, &uri_str); nsACString_GetData(&uri_str, &uria, NULL); len = MultiByteToWideChar(CP_ACP, 0, uria, -1, NULL, 0); uri = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, uria, -1, uri, len); nsACString_Finish(&uri_str); - ret = handle_uri(container, This, uri); + ret = handle_uri(container, channel, uri); - nsIWebBrowserChrome_Release(NSWBCHROME(container)); HeapFree(GetProcessHeap(), 0, uri); return ret; @@ -596,9 +580,26 @@ static nsresult NSAPI nsChannel_AsyncOpe TRACE("(%p)->(%p %p)\n", This, aListener, aContext); - if(!before_async_open(This)) { - TRACE("canceled\n"); - return NS_ERROR_UNEXPECTED; + if(This->load_flags & LOAD_INITIAL_DOCUMENT_URI) { + NSContainer *container; + + nsIWineURI_GetNSContainer(This->uri, &container); + if(!container) { + ERR("container = NULL\n"); + return NS_ERROR_UNEXPECTED; + } + + if(container->load_call) { + nsIWebBrowserChrome_Release(NSWBCHROME(container)); + }else { + BOOL cont = before_async_open(This, container); + nsIWebBrowserChrome_Release(NSWBCHROME(container)); + + if(!cont) { + TRACE("canceled\n"); + return NS_ERROR_UNEXPECTED; + } + } } if(!This->channel) {

1 0

Kai Blin : secur32: Don't fail on SECURITY_NETWORK_DREP, ntlm_auth handles this just fine.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: be4d1fea4d30f187a46b5449caff835864c39305 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be4d1fea4d30f187a46b544… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Jun 3 08:14:17 2006 +0000 secur32: Don't fail on SECURITY_NETWORK_DREP, ntlm_auth handles this just fine. --- dlls/secur32/ntlm.c | 8 ++------ dlls/secur32/tests/main.c | 25 ++++++++++++++----------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 0caf504..3554f67 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -435,8 +435,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In /* Done with the flags */ if(TargetDataRep == SECURITY_NETWORK_DREP){ - FIXME("Don't know how to do SECURITY_NETWORK_DREP\n"); - return SEC_E_UNSUPPORTED_FUNCTION; + TRACE("Setting SECURITY_NETWORK_DREP\n"); } buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(char) * NTLM_MAX_BUF); @@ -714,10 +713,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac } /* Done with the flags */ if(TargetDataRep == SECURITY_NETWORK_DREP){ - FIXME("Don't know how to do SECURITY_NETWORK_DREP\n"); - HeapFree(GetProcessHeap(), 0, buffer); - HeapFree(GetProcessHeap(), 0, bin); - return SEC_E_UNSUPPORTED_FUNCTION; + TRACE("Using SECURITY_NETWORK_DREP\n"); } diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index 67c5332..a673b73 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -289,7 +289,7 @@ void cleanupBuffers(SspiData *sspi_data) /**********************************************************************/ -SECURITY_STATUS runClient(SspiData *sspi_data, BOOL first) +SECURITY_STATUS runClient(SspiData *sspi_data, BOOL first, ULONG data_rep) { SECURITY_STATUS ret; ULONG req_attr = ISC_REQ_CONNECTION | ISC_REQ_CONFIDENTIALITY; @@ -323,7 +323,7 @@ SECURITY_STATUS runClient(SspiData *sspi /* pass NULL as an output buffer */ ret = pInitializeSecurityContextA(sspi_data->cred, NULL, NULL, req_attr, - 0, SECURITY_NATIVE_DREP, NULL, 0, sspi_data->ctxt, NULL, + 0, data_rep, NULL, 0, sspi_data->ctxt, NULL, &ctxt_attr, &ttl); ok(ret == SEC_E_BUFFER_TOO_SMALL, "expected SEC_E_BUFFER_TOO_SMALL, got %s\n", getSecError(ret)); @@ -333,7 +333,7 @@ SECURITY_STATUS runClient(SspiData *sspi out_buf->pBuffers[0].pvBuffer = NULL; ret = pInitializeSecurityContextA(sspi_data->cred, NULL, NULL, req_attr, - 0, SECURITY_NATIVE_DREP, NULL, 0, sspi_data->ctxt, out_buf, + 0, data_rep, NULL, 0, sspi_data->ctxt, out_buf, &ctxt_attr, &ttl); ok(ret == SEC_E_INTERNAL_ERROR, "expected SEC_E_INTERNAL_ERROR, got %s\n", getSecError(ret)); @@ -344,7 +344,7 @@ SECURITY_STATUS runClient(SspiData *sspi out_buf->pBuffers[0].cbBuffer = 0; ret = pInitializeSecurityContextA(sspi_data->cred, NULL, NULL, req_attr, - 0, SECURITY_NATIVE_DREP, NULL, 0, sspi_data->ctxt, out_buf, + 0, data_rep, NULL, 0, sspi_data->ctxt, out_buf, &ctxt_attr, &ttl); ok(ret == SEC_E_BUFFER_TOO_SMALL, "expected SEC_E_BUFFER_TOO_SMALL, got %s\n", getSecError(ret)); @@ -356,7 +356,7 @@ SECURITY_STATUS runClient(SspiData *sspi out_buf->pBuffers[0].cbBuffer = sspi_data->max_token; ret = pInitializeSecurityContextA(sspi_data->cred, first?NULL:sspi_data->ctxt, NULL, req_attr, - 0, SECURITY_NATIVE_DREP, first?NULL:in_buf, 0, sspi_data->ctxt, out_buf, + 0, data_rep, first?NULL:in_buf, 0, sspi_data->ctxt, out_buf, &ctxt_attr, &ttl); if(ret == SEC_I_COMPLETE_AND_CONTINUE || ret == SEC_I_COMPLETE_NEEDED) @@ -376,7 +376,7 @@ SECURITY_STATUS runClient(SspiData *sspi /**********************************************************************/ -SECURITY_STATUS runServer(SspiData *sspi_data, BOOL first) +SECURITY_STATUS runServer(SspiData *sspi_data, BOOL first, ULONG data_rep) { SECURITY_STATUS ret; ULONG ctxt_attr; @@ -385,7 +385,7 @@ SECURITY_STATUS runServer(SspiData *sspi trace("Running the server the %s time\n", first?"first":"second"); ret = pAcceptSecurityContext(sspi_data->cred, first?NULL:sspi_data->ctxt, - sspi_data->in_buf, 0, SECURITY_NATIVE_DREP, sspi_data->ctxt, + sspi_data->in_buf, 0, data_rep, sspi_data->ctxt, sspi_data->out_buf, &ctxt_attr, &ttl); if(ret == SEC_I_COMPLETE_AND_CONTINUE || ret == SEC_I_COMPLETE_NEEDED) @@ -545,7 +545,7 @@ static void testQuerySecurityPackageInfo getSecError(sec_status) ); } -void testAuth(SEC_CHAR* sec_pkg_name) +void testAuth(SEC_CHAR* sec_pkg_name, ULONG data_rep) { SECURITY_STATUS client_stat = SEC_I_CONTINUE_NEEDED; SECURITY_STATUS server_stat = SEC_I_CONTINUE_NEEDED; @@ -592,7 +592,7 @@ void testAuth(SEC_CHAR* sec_pkg_name) while(client_stat == SEC_I_CONTINUE_NEEDED && server_stat == SEC_I_CONTINUE_NEEDED) { - client_stat = runClient(&client, first); + client_stat = runClient(&client, first, data_rep); ok(client_stat == SEC_E_OK || client_stat == SEC_I_CONTINUE_NEEDED, "Running the client returned %s, more tests will fail.\n", @@ -600,7 +600,7 @@ void testAuth(SEC_CHAR* sec_pkg_name) communicate(&client, &server); - server_stat = runServer(&server, first); + server_stat = runServer(&server, first, data_rep); ok(server_stat == SEC_E_OK || server_stat == SEC_I_CONTINUE_NEEDED || server_stat == SEC_E_LOGON_DENIED, @@ -650,7 +650,10 @@ START_TEST(main) { testQuerySecurityPackageInfo(); if(pInitSecurityInterfaceA) - testAuth("NTLM"); + { + testAuth("NTLM", SECURITY_NATIVE_DREP); + testAuth("NTLM", SECURITY_NETWORK_DREP); + } } } if(secdll)

1 0

Jacek Caban : urlmon: Added OnResponse implementation.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 67b51130f58e22935e3ad2b4d9196c6ea1a15d50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67b51130f58e22935e3ad2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:24:56 2006 +0200 urlmon: Added OnResponse implementation. --- dlls/urlmon/binding.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 20a95f1..dd67e9c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -353,9 +353,12 @@ static HRESULT WINAPI HttpNegotiate_OnRe LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPWSTR *pszAdditionalRequestHeaders) { - FIXME("(%ld %s %s %p)\n", dwResponseCode, debugstr_w(szResponseHeaders), + TRACE("(%ld %s %s %p)\n", dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); - return E_NOTIMPL; + + if(pszAdditionalRequestHeaders) + *pszAdditionalRequestHeaders = NULL; + return S_OK; } static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface,

1 0

Jacek Caban : urlmon: Use task queue to handle OnDataAvailable call.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: e4211f4358e22bf29e62552b7c7a71085fbc21ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4211f4358e22bf29e62552… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 3 00:26:48 2006 +0200 urlmon: Use task queue to handle OnDataAvailable call. --- dlls/urlmon/binding.c | 75 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 50 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index dd67e9c..52e7de3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -38,7 +38,8 @@ typedef struct Binding Binding; enum task_enum { TASK_ON_PROGRESS, - TASK_SWITCH + TASK_SWITCH, + TASK_DATA_AVAILABLE }; typedef struct { @@ -55,6 +56,7 @@ typedef struct _task_t { union { on_progress_data on_progress; PROTOCOLDATA *protocol_data; + DWORD bscf; } data; } task_t; @@ -140,6 +142,46 @@ static task_t *pop_task(Binding *binding return ret; } +static void fill_stream_buffer(ProtocolStream *This) +{ + DWORD read = 0; + HRESULT hres; + + if(sizeof(This->buf) == This->buf_size) + return; + + hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, + sizeof(This->buf)-This->buf_size, &read); + if(SUCCEEDED(hres)) { + This->buf_size += read; + This->init_buf = TRUE; + } +} + +static void on_data_available(Binding *binding, DWORD bscf) +{ + FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM}; + + if(GetCurrentThreadId() != binding->apartment_thread) + FIXME("called from worked hread\n"); + + if(binding->continue_call) { + task_t *task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_t)); + task->task = TASK_DATA_AVAILABLE; + task->data.bscf = bscf; + + push_task(binding, task); + + return; + } + + fill_stream_buffer(binding->stream); + + IBindStatusCallback_OnDataAvailable(binding->callback, bscf, binding->stream->buf_size, + &formatetc, &binding->stgmed); +} + + static void do_task(Binding *binding, task_t *task) { switch(task->task) { @@ -158,6 +200,10 @@ static void do_task(Binding *binding, ta binding->continue_call++; IInternetProtocol_Continue(binding->protocol, task->data.protocol_data); binding->continue_call--; + + break; + case TASK_DATA_AVAILABLE: + on_data_available(binding, task->data.bscf); } } @@ -595,19 +641,6 @@ static ProtocolStream *create_stream(IIn return ret; } -static void fill_stream_buffer(ProtocolStream *This) -{ - DWORD read = 0; - HRESULT hres; - - hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, - sizeof(This->buf)-This->buf_size, &read); - if(SUCCEEDED(hres)) { - This->buf_size += read; - This->init_buf = TRUE; - } -} - static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) { Binding *This = BINDING_THIS(iface); @@ -819,17 +852,16 @@ static HRESULT WINAPI InternetProtocolSi DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { Binding *This = PROTSINK_THIS(iface); - FORMATETC formatetc; TRACE("(%p)->(%ld %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax); - fill_stream_buffer(This->stream); - if(!This->verified_mime) { LPWSTR mime; This->verified_mime = TRUE; + fill_stream_buffer(This->stream); + /* FIXME: Always call FindMediaFromData (its implementation is not yet ready for this). */ if(This->mime) mime = This->mime; @@ -850,14 +882,7 @@ static HRESULT WINAPI InternetProtocolSi if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) IInternetProtocol_LockRequest(This->protocol, 0); - formatetc.cfFormat = 0; /* FIXME */ - formatetc.ptd = NULL; - formatetc.dwAspect = 1; - formatetc.lindex = -1; - formatetc.tymed = TYMED_ISTREAM; - - IBindStatusCallback_OnDataAvailable(This->callback, grfBSCF, This->stream->buf_size, - &formatetc, &This->stgmed); + on_data_available(This, grfBSCF); if(grfBSCF & BSCF_LASTDATANOTIFICATION) IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL);

1 0