February 2008 - Wine-Commits

Jacek Caban : mshtml: Update wine_url in nsIURI::SetPath.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 814e07d8e83f97ef5c8b4a9ffc95986c5ea8599d URL: http://source.winehq.org/git/wine.git/?a=commit;h=814e07d8e83f97ef5c8b4a9ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 1 15:31:19 2008 +0100 mshtml: Update wine_url in nsIURI::SetPath. --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/mshtml_private.h | 14 ++++++++++++++ dlls/mshtml/nsio.c | 27 ++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 3b51849..07a32ed 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mshtml.dll IMPORTLIB = libmshtml.$(IMPLIBEXT) -IMPORTS = urlmon ole32 oleaut32 user32 gdi32 advapi32 kernel32 +IMPORTS = urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid EXTRADEFS = -DCOM_NO_WINDOWS_H diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e2abfa4..6eb7f30 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -579,6 +579,20 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, -1); + } + + return ret; +} HINSTANCE get_shdoclc(void); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c900bd9..2e62a44 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1465,14 +1465,31 @@ static nsresult NSAPI nsURI_GetPath(nsIWineURI *iface, nsACString *aPath) static nsresult NSAPI nsURI_SetPath(nsIWineURI *iface, const nsACString *aPath) { nsURI *This = NSURI_THIS(iface); + const char *path; - TRACE("(%p)->(%p)\n", This, aPath); + nsACString_GetData(aPath, &path); + TRACE("(%p)->(%p(%s))\n", This, aPath, debugstr_a(path)); - if(This->uri) - return nsIURI_SetPath(This->uri, aPath); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + if(This->wine_url) { + WCHAR new_url[INTERNET_MAX_URL_LENGTH]; + DWORD size = sizeof(new_url)/sizeof(WCHAR); + LPWSTR pathw; + HRESULT hres; + + pathw = heap_strdupAtoW(path); + hres = UrlCombineW(This->wine_url, pathw, new_url, &size, 0); + heap_free(pathw); + if(SUCCEEDED(hres)) + nsIWineURI_SetWineURL(NSWINEURI(This), new_url); + else + WARN("UrlCombine failed: %08x\n", hres); + } + + if(!This->uri) + return NS_OK; + + return nsIURI_SetPath(This->uri, aPath); } static nsresult NSAPI nsURI_Equals(nsIWineURI *iface, nsIURI *other, PRBool *_retval)

1 0

Bang Jun-young : crypt32: Include wine/port.h for snprintf().
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: dee7722b0768d7e89b17d7c484881d080d3b3fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee7722b0768d7e89b17d7c48… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Fri Feb 1 14:28:58 2008 +0900 crypt32: Include wine/port.h for snprintf(). --- dlls/crypt32/decode.c | 3 +++ dlls/crypt32/encode.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index be7e40f..47b0ba6 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -30,6 +30,9 @@ * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */ +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 6d5d152..f769afc 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -30,6 +30,9 @@ * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */ +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include <stdarg.h> #include <stdio.h>

1 0

Jacek Caban : urlmon: Added more tests.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 684307f43fb57f32b2d8832206d2c024750240d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=684307f43fb57f32b2d883220… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:19:53 2008 +0100 urlmon: Added more tests. --- dlls/urlmon/tests/url.c | 213 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 159 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=684307f43fb57f32b2d88…

1 0

Jacek Caban : itss: Added BINDF_NEEDFILE test.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 9577c4cb747d92fa89776fd82213f01e52a2aed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9577c4cb747d92fa89776fd82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:19:20 2008 +0100 itss: Added BINDF_NEEDFILE test. --- dlls/itss/tests/protocol.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index c2fcf95..ea04437 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -70,6 +70,7 @@ DEFINE_EXPECT(ReportResult); static HRESULT expect_hrResult; static IInternetProtocol *read_protocol = NULL; +static DWORD bindf; static const WCHAR blank_url1[] = {'i','t','s',':', 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; @@ -244,6 +245,7 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB ok(pbindinfo != NULL, "pbindinfo == NULL\n"); ok(pbindinfo->cbSize == sizeof(BINDINFO), "wrong size of pbindinfo: %d\n", pbindinfo->cbSize); + *grfBINDF = bindf; return S_OK; } @@ -610,6 +612,8 @@ static void test_its_protocol(void) test_protocol_url(factory, blank_url5, TRUE); test_protocol_url(factory, blank_url6, TRUE); test_protocol_url(factory, blank_url8, TRUE); + bindf = BINDF_FROMURLMON | BINDF_NEEDFILE; + test_protocol_url(factory, blank_url1, TRUE); } IClassFactory_Release(factory);

1 0

Jacek Caban : urlmon: Added BINDSTATUS_CACHEFILENAMEAVAILABLE support.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 458d27fa46457fd17b71c8de71b432d38e621d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458d27fa46457fd17b71c8de7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:17:18 2008 +0100 urlmon: Added BINDSTATUS_CACHEFILENAMEAVAILABLE support. --- dlls/urlmon/binding.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 230a990..9551b7d 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -48,6 +48,8 @@ typedef struct { DWORD size; BOOL init; HRESULT hres; + + LPWSTR cache_file; } stgmed_buf_t; typedef struct _stgmed_obj_t stgmed_obj_t; @@ -513,6 +515,7 @@ static ULONG WINAPI StgMedUnk_Release(IUnknown *iface) if(!ref) { IInternetProtocol_Release(This->protocol); + heap_free(This->cache_file); heap_free(This); URLMON_UnlockModule(); @@ -538,6 +541,7 @@ static stgmed_buf_t *create_stgmed_buf(IInternetProtocol *protocol) ret->size = 0; ret->init = FALSE; ret->hres = S_OK; + ret->cache_file = NULL; IInternetProtocol_AddRef(protocol); ret->protocol = protocol; @@ -1099,6 +1103,8 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink mime_available(This, szStatusText, FALSE); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: + heap_free(This->stgmed_buf->cache_file); + This->stgmed_buf->cache_file = heap_strdupW(szStatusText); break; case BINDSTATUS_DIRECTBIND: This->report_mime = FALSE; @@ -1134,6 +1140,10 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres sent_begindownloaddata = TRUE; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_BEGINDOWNLOADDATA, This->url); + + if(This->stgmed_buf->cache_file) + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + BINDSTATUS_CACHEFILENAMEAVAILABLE, This->stgmed_buf->cache_file); } if(This->stgmed_buf->hres == S_FALSE || (bscf & BSCF_LASTDATANOTIFICATION)) {

1 0

Jacek Caban : urlmon: Added more protocol tests.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 210854edf2e841af675d541d29f2b90cd2625d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=210854edf2e841af675d541d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:18:49 2008 +0100 urlmon: Added more protocol tests. --- dlls/urlmon/tests/protocol.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index fd92171..e9b1ec1 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -36,17 +36,16 @@ #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define CHECK_EXPECT(func) \ +#define CHECK_EXPECT2(func) \ do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ - expect_ ## func = FALSE; \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0) -#define CHECK_EXPECT2(func) \ +#define CHECK_EXPECT(func) \ do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ - called_ ## func = TRUE; \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ }while(0) #define CHECK_CALLED(func) \ @@ -357,6 +356,8 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL CHECK_CALLED(ReportProgress_SENDINGREQUEST); SET_EXPECT(OnResponse); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + if(bindf & BINDF_NEEDFILE) + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); } SET_EXPECT(ReportData); @@ -368,6 +369,8 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL state = 1; CHECK_CALLED(OnResponse); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + if(bindf & BINDF_NEEDFILE) + CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); } SetEvent(event_complete); @@ -423,8 +426,10 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, if(szStatusText) { if(binding_test) ok(szStatusText == expect_wsz, "unexpected szStatusText\n"); + else if(tested_protocol == FILE_TEST) + ok(!lstrcmpW(szStatusText, file_name), "szStatusText = \"%s\"\n", debugstr_w(szStatusText)); else - ok(!lstrcmpW(szStatusText, file_name), "szStatusText != file_name\n"); + ok(szStatusText != NULL, "szStatusText == NULL\n"); } break; case BINDSTATUS_FINDINGRESOURCE: @@ -1408,6 +1413,8 @@ static void test_file_protocol(void) { test_file_protocol_url(index_url); bindf = BINDF_FROMURLMON; test_file_protocol_url(index_url); + bindf = BINDF_FROMURLMON | BINDF_NEEDFILE; + test_file_protocol_url(index_url); memcpy(buf, wszFile, sizeof(wszFile)); len = sizeof(wszFile)/sizeof(WCHAR)-1; @@ -1639,11 +1646,15 @@ static void test_http_protocol(void) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; test_http_protocol_url(winehq_url, FALSE); + trace("Testing http protocol (to file)...\n"); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NEEDFILE; + test_http_protocol_url(winehq_url, FALSE); + trace("Testing http protocol (post data)...\n"); http_post_test = TRUE; /* Without this flag we get a ReportProgress_CACHEFILENAMEAVAILABLE * notification with BINDVERB_POST */ - bindf |= BINDF_NOWRITECACHE; + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; test_http_protocol_url(posttest_url, TRUE); http_post_test = FALSE; }

1 0

Jacek Caban : urlmon: Correctly handle BINDF_NEEDFILE flag in http protocol .
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: f2aef4cbb9f63ebd3e89dd9f1cafa47e66cbd70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2aef4cbb9f63ebd3e89dd9f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:18:11 2008 +0100 urlmon: Correctly handle BINDF_NEEDFILE flag in http protocol. --- dlls/urlmon/http.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 3056feb..712800d 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -419,6 +419,8 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl if (This->grfBINDF & BINDF_NOWRITECACHE) request_flags |= INTERNET_FLAG_NO_CACHE_WRITE; + if (This->grfBINDF & BINDF_NEEDFILE) + request_flags |= INTERNET_FLAG_NEED_FILE; This->request = HttpOpenRequestW(This->connect, This->bind_info.dwBindVerb < BINDVERB_CUSTOM ? wszBindVerb[This->bind_info.dwBindVerb] : This->bind_info.szCustomVerb, @@ -656,6 +658,21 @@ static HRESULT WINAPI HttpProtocol_Continue(IInternetProtocol *iface, PROTOCOLDA This->content_length = atoiW(content_length); } + if(This->grfBINDF & BINDF_NEEDFILE) { + WCHAR cache_file[MAX_PATH]; + DWORD buflen = sizeof(cache_file); + + if(InternetQueryOptionW(This->request, INTERNET_OPTION_DATAFILE_NAME, + cache_file, &buflen)) + { + IInternetProtocolSink_ReportProgress(This->protocol_sink, + BINDSTATUS_CACHEFILENAMEAVAILABLE, + cache_file); + }else { + FIXME("Could not get cache file\n"); + } + } + This->flags |= FLAG_FIRST_CONTINUE_COMPLETE; }

1 0

Jacek Caban : urlmon: Added support for binding to IID_IUnknown storage ( cache file).
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 2b3c115ad11f2de50be547bb53b8dbff3014674f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3c115ad11f2de50be547bb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:17:48 2008 +0100 urlmon: Added support for binding to IID_IUnknown storage (cache file). --- dlls/urlmon/binding.c | 77 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 72 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 9551b7d..6c5ed61 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -788,6 +788,11 @@ static const stgmed_obj_vtbl stgmed_stream_vtbl = { stgmed_stream_get_result }; +typedef struct { + stgmed_obj_t stgmed_obj; + stgmed_buf_t *buf; +} stgmed_file_obj_t; + static stgmed_obj_t *create_stgmed_stream(stgmed_buf_t *buf) { ProtocolStream *ret = heap_alloc(sizeof(ProtocolStream)); @@ -804,6 +809,61 @@ static stgmed_obj_t *create_stgmed_stream(stgmed_buf_t *buf) return &ret->stgmed_obj; } +static void stgmed_file_release(stgmed_obj_t *obj) +{ + heap_free(obj); +} + +static HRESULT stgmed_file_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) +{ + stgmed_file_obj_t *file_obj = (stgmed_file_obj_t*)obj; + + if(!file_obj->buf->cache_file) { + WARN("cache_file not set\n"); + return INET_E_DATA_NOT_AVAILABLE; + } + + fill_stgmed_buffer(file_obj->buf); + if(file_obj->buf->size == sizeof(file_obj->buf->buf)) { + BYTE buf[1024]; + DWORD read; + HRESULT hres; + + do { + hres = IInternetProtocol_Read(file_obj->buf->protocol, buf, sizeof(buf), &read); + }while(hres == S_OK); + } + + stgmed->tymed = TYMED_FILE; + stgmed->u.lpszFileName = file_obj->buf->cache_file; + stgmed->pUnkForRelease = STGMEDUNK(file_obj->buf); + + return S_OK; +} + +static void *stgmed_file_get_result(stgmed_obj_t *obj) +{ + return NULL; +} + +static const stgmed_obj_vtbl stgmed_file_vtbl = { + stgmed_file_release, + stgmed_file_fill_stgmed, + stgmed_file_get_result +}; + +static stgmed_obj_t *create_stgmed_file(stgmed_buf_t *buf) +{ + stgmed_file_obj_t *ret = heap_alloc(sizeof(*ret)); + + ret->stgmed_obj.vtbl = &stgmed_file_vtbl; + + IUnknown_AddRef(STGMEDUNK(buf)); + ret->buf = buf; + + return &ret->stgmed_obj; +} + #define BINDING_THIS(iface) DEFINE_THIS(Binding, Binding, iface) static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) @@ -1160,6 +1220,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres create_object(This); }else { STGMEDIUM stgmed; + HRESULT hres; if(!(This->state & BINDING_LOCKED)) { HRESULT hres = IInternetProtocol_LockRequest(This->protocol, 0); @@ -1167,8 +1228,14 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres This->state |= BINDING_LOCKED; } + hres = This->stgmed_obj->vtbl->fill_stgmed(This->stgmed_obj, &stgmed); + if(FAILED(hres)) { + stop_binding(This, hres, NULL); + return; + } + + formatetc.tymed = stgmed.tymed; formatetc.cfFormat = This->clipboard_format; - This->stgmed_obj->vtbl->fill_stgmed(This->stgmed_obj, &stgmed); IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &stgmed); @@ -1554,6 +1621,9 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, ret->stgmed_obj = NULL; }else if(IsEqualGUID(&IID_IStream, riid)) { ret->stgmed_obj = create_stgmed_stream(ret->stgmed_buf); + }else if(IsEqualGUID(&IID_IUnknown, riid)) { + ret->bindf |= BINDF_NEEDFILE; + ret->stgmed_obj = create_stgmed_file(ret->stgmed_buf); }else { FIXME("Unsupported riid %s\n", debugstr_guid(riid)); IBinding_Release(BINDING(ret)); @@ -1633,14 +1703,11 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) IInternetProtocol_UnlockRequest(binding->protocol); *ppv = binding->stgmed_obj->vtbl->get_result(binding->stgmed_obj); - hres = S_OK; - }else { - hres = MK_S_ASYNCHRONOUS; } IBinding_Release(BINDING(binding)); - return hres; + return *ppv ? S_OK : MK_S_ASYNCHRONOUS; } HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv)

1 0

Jacek Caban : urlmon: Don't create stgmed_obj for binding to object.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: e9189df9a607c7b901b3e553ea8221b08388c136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9189df9a607c7b901b3e553e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:16:31 2008 +0100 urlmon: Don't create stgmed_obj for binding to object. --- dlls/urlmon/binding.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index b574c96..230a990 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1458,11 +1458,6 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, Binding *ret; HRESULT hres; - if(!to_obj && !IsEqualGUID(&IID_IStream, riid)) { - FIXME("Unsupported riid %s\n", debugstr_guid(riid)); - return E_NOTIMPL; - } - URLMON_LockModule(); ret = heap_alloc_zero(sizeof(Binding)); @@ -1545,7 +1540,15 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, ret->stgmed_buf = create_stgmed_buf(ret->protocol); } - ret->stgmed_obj = create_stgmed_stream(ret->stgmed_buf); + if(to_obj) { + ret->stgmed_obj = NULL; + }else if(IsEqualGUID(&IID_IStream, riid)) { + ret->stgmed_obj = create_stgmed_stream(ret->stgmed_buf); + }else { + FIXME("Unsupported riid %s\n", debugstr_guid(riid)); + IBinding_Release(BINDING(ret)); + return E_NOTIMPL; + } *binding = ret; return S_OK;

1 0

Jacek Caban : urlmon: Abstract ProtocolStream object.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 4985ca0e1c57ddd7c42a80fd3b3e2215fa89ed4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4985ca0e1c57ddd7c42a80fd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:15:53 2008 +0100 urlmon: Abstract ProtocolStream object. --- dlls/urlmon/binding.c | 109 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 75 insertions(+), 34 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 48f537b..b574c96 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -50,15 +50,19 @@ typedef struct { HRESULT hres; } stgmed_buf_t; -#define STGMEDUNK(x) ((IUnknown*) &(x)->lpUnknownVtbl) +typedef struct _stgmed_obj_t stgmed_obj_t; typedef struct { - const IStreamVtbl *lpStreamVtbl; + void (*release)(stgmed_obj_t*); + HRESULT (*fill_stgmed)(stgmed_obj_t*,STGMEDIUM*); + void *(*get_result)(stgmed_obj_t*); +} stgmed_obj_vtbl; - LONG ref; +struct _stgmed_obj_t { + const stgmed_obj_vtbl *vtbl; +}; - stgmed_buf_t *buf; -} ProtocolStream; +#define STGMEDUNK(x) ((IUnknown*) &(x)->lpUnknownVtbl) typedef enum { BEFORE_DOWNLOAD, @@ -83,7 +87,7 @@ struct Binding { IServiceProvider *service_provider; stgmed_buf_t *stgmed_buf; - ProtocolStream *stream; + stgmed_obj_t *stgmed_obj; BINDINFO bindinfo; DWORD bindf; @@ -104,8 +108,6 @@ struct Binding { DWORD apartment_thread; HWND notif_hwnd; - STGMEDIUM stgmed; - task_header_t *task_queue_head, *task_queue_tail; CRITICAL_SECTION section; }; @@ -527,6 +529,33 @@ static const IUnknownVtbl StgMedUnkVtbl = { StgMedUnk_Release }; +static stgmed_buf_t *create_stgmed_buf(IInternetProtocol *protocol) +{ + stgmed_buf_t *ret = heap_alloc(sizeof(*ret)); + + ret->lpUnknownVtbl = &StgMedUnkVtbl; + ret->ref = 1; + ret->size = 0; + ret->init = FALSE; + ret->hres = S_OK; + + IInternetProtocol_AddRef(protocol); + ret->protocol = protocol; + + URLMON_LockModule(); + + return ret; +} + +typedef struct { + stgmed_obj_t stgmed_obj; + const IStreamVtbl *lpStreamVtbl; + + LONG ref; + + stgmed_buf_t *buf; +} ProtocolStream; + #define STREAM_THIS(iface) DEFINE_THIS(ProtocolStream, Stream, iface) static HRESULT WINAPI ProtocolStream_QueryInterface(IStream *iface, @@ -724,30 +753,42 @@ static const IStreamVtbl ProtocolStreamVtbl = { ProtocolStream_Clone }; -#define BINDING_THIS(iface) DEFINE_THIS(Binding, Binding, iface) +static void stgmed_stream_release(stgmed_obj_t *obj) +{ + ProtocolStream *stream = (ProtocolStream*)obj; + IStream_Release(STREAM(stream)); +} -static stgmed_buf_t *create_stgmed_buf(IInternetProtocol *protocol) +static HRESULT stgmed_stream_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) { - stgmed_buf_t *ret = heap_alloc(sizeof(*ret)); + ProtocolStream *stream = (ProtocolStream*)obj; - ret->lpUnknownVtbl = &StgMedUnkVtbl; - ret->ref = 1; - ret->size = 0; - ret->init = FALSE; - ret->hres = S_OK; + stgmed->tymed = TYMED_ISTREAM; + stgmed->u.pstm = STREAM(stream); + stgmed->pUnkForRelease = STGMEDUNK(stream->buf); - IInternetProtocol_AddRef(protocol); - ret->protocol = protocol; + return S_OK; +} - URLMON_LockModule(); +static void *stgmed_stream_get_result(stgmed_obj_t *obj) +{ + ProtocolStream *stream = (ProtocolStream*)obj; - return ret; + IStream_AddRef(STREAM(stream)); + return STREAM(stream); } -static ProtocolStream *create_stream(stgmed_buf_t *buf) +static const stgmed_obj_vtbl stgmed_stream_vtbl = { + stgmed_stream_release, + stgmed_stream_fill_stgmed, + stgmed_stream_get_result +}; + +static stgmed_obj_t *create_stgmed_stream(stgmed_buf_t *buf) { ProtocolStream *ret = heap_alloc(sizeof(ProtocolStream)); + ret->stgmed_obj.vtbl = &stgmed_stream_vtbl; ret->lpStreamVtbl = &ProtocolStreamVtbl; ret->ref = 1; @@ -756,9 +797,11 @@ static ProtocolStream *create_stream(stgmed_buf_t *buf) URLMON_LockModule(); - return ret; + return &ret->stgmed_obj; } +#define BINDING_THIS(iface) DEFINE_THIS(Binding, Binding, iface) + static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) { Binding *This = BINDING_THIS(iface); @@ -821,8 +864,8 @@ static ULONG WINAPI Binding_Release(IBinding *iface) IServiceProvider_Release(This->service_provider); if(This->stgmed_buf) IUnknown_Release(STGMEDUNK(This->stgmed_buf)); - if(This->stream) - IStream_Release(STREAM(This->stream)); + if(This->stgmed_obj) + This->stgmed_obj->vtbl->release(This->stgmed_obj); if(This->obj) IUnknown_Release(This->obj); if(This->bctx) @@ -1106,6 +1149,8 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres if(!(This->state & BINDING_OBJAVAIL)) create_object(This); }else { + STGMEDIUM stgmed; + if(!(This->state & BINDING_LOCKED)) { HRESULT hres = IInternetProtocol_LockRequest(This->protocol, 0); if(SUCCEEDED(hres)) @@ -1113,8 +1158,10 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres } formatetc.cfFormat = This->clipboard_format; + This->stgmed_obj->vtbl->fill_stgmed(This->stgmed_obj, &stgmed); + IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, - &formatetc, &This->stgmed); + &formatetc, &stgmed); if(This->download_state == END_DOWNLOAD) stop_binding(This, S_OK, NULL); @@ -1493,16 +1540,12 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, if(binding_ctx) { ret->stgmed_buf = binding_ctx->stgmed_buf; IUnknown_AddRef(STGMEDUNK(ret->stgmed_buf)); - ret->stream = binding_ctx->stream; - IStream_AddRef(STREAM(binding_ctx->stream)); ret->clipboard_format = binding_ctx->clipboard_format; }else { ret->stgmed_buf = create_stgmed_buf(ret->protocol); - ret->stream = create_stream(ret->stgmed_buf); } - ret->stgmed.tymed = TYMED_ISTREAM; - ret->stgmed.u.pstm = STREAM((ProtocolStream*)ret->stream); - ret->stgmed.pUnkForRelease = (IUnknown*)BINDING(ret); /* NOTE: Windows uses other IUnknown */ + + ret->stgmed_obj = create_stgmed_stream(ret->stgmed_buf); *binding = ret; return S_OK; @@ -1576,9 +1619,7 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) if((binding->state & BINDING_STOPPED) && (binding->state & BINDING_LOCKED)) IInternetProtocol_UnlockRequest(binding->protocol); - *ppv = binding->stgmed.u.pstm; - IStream_AddRef(binding->stgmed.u.pstm); - + *ppv = binding->stgmed_obj->vtbl->get_result(binding->stgmed_obj); hres = S_OK; }else { hres = MK_S_ASYNCHRONOUS;

1 0