Commit 0dcf2a45 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

Beginning of true BindToStorage implementation.

parent 80560929
...@@ -8,6 +8,7 @@ IMPORTS = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll ...@@ -8,6 +8,7 @@ IMPORTS = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
EXTRALIBS = -luuid EXTRALIBS = -luuid
C_SRCS = \ C_SRCS = \
binding.c \
file.c \ file.c \
format.c \ format.c \
ftp.c \ ftp.c \
......
...@@ -198,7 +198,7 @@ static HRESULT Binding_MoreCacheData(Binding *This, char *buf, DWORD dwBytes) ...@@ -198,7 +198,7 @@ static HRESULT Binding_MoreCacheData(Binding *This, char *buf, DWORD dwBytes)
(This->total_read == written) ? (This->total_read == written) ?
BINDSTATUS_BEGINDOWNLOADDATA : BINDSTATUS_BEGINDOWNLOADDATA :
BINDSTATUS_DOWNLOADINGDATA, BINDSTATUS_DOWNLOADINGDATA,
NULL); This->URLName);
if (!hr) if (!hr)
{ {
STGMEDIUM stg; STGMEDIUM stg;
...@@ -244,7 +244,8 @@ static void Binding_FinishedDownload(Binding *This, HRESULT hr) ...@@ -244,7 +244,8 @@ static void Binding_FinishedDownload(Binding *This, HRESULT hr)
stg.u.pstm = (IStream *)This->pstrCache; stg.u.pstm = (IStream *)This->pstrCache;
stg.pUnkForRelease = NULL; stg.pUnkForRelease = NULL;
IBindStatusCallback_OnProgress(This->pbscb, This->total_read, This->expected_size, BINDSTATUS_ENDDOWNLOADDATA, NULL); IBindStatusCallback_OnProgress(This->pbscb, This->total_read, This->expected_size,
BINDSTATUS_ENDDOWNLOADDATA, This->URLName);
IBindStatusCallback_OnDataAvailable(This->pbscb, BSCF_LASTDATANOTIFICATION, This->total_read, &fmt, &stg); IBindStatusCallback_OnDataAvailable(This->pbscb, BSCF_LASTDATANOTIFICATION, This->total_read, &fmt, &stg);
if (hr) if (hr)
{ {
...@@ -883,9 +884,9 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, ...@@ -883,9 +884,9 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface,
|| url.nScheme == INTERNET_SCHEME_FILE) || url.nScheme == INTERNET_SCHEME_FILE)
return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject); return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject);
FIXME("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject);
return E_NOTIMPL; return start_binding(This->URLName, pbc, riid, ppvObject);
} }
/****************************************************************************** /******************************************************************************
......
...@@ -56,4 +56,6 @@ void UMCloseCacheFileStream(IUMCacheStream *pstr); ...@@ -56,4 +56,6 @@ void UMCloseCacheFileStream(IUMCacheStream *pstr);
HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret); HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret);
HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv);
#endif /* __WINE_URLMON_MAIN_H */ #endif /* __WINE_URLMON_MAIN_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment