wine-commits December 2007

wine-commits@winehq.org

3 participants
824 discussions

Jacek Caban : urlmon: Added "CBinding Context" bind option support.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 91087d6229e36d21a98b68a950704725a3c57f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=91087d6229e36d21a98b68a95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:44:02 2007 +0100 urlmon: Added "CBinding Context" bind option support. --- dlls/urlmon/binding.c | 82 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 61 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 23b11bd..683dfe3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -21,6 +21,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); +static WCHAR cbinding_contextW[] = {'C','B','i','n','d','i','n','g',' ','C','o','n','t','e','x','t',0}; + typedef struct Binding Binding; struct _task_header_t; @@ -661,6 +663,25 @@ static HRESULT WINAPI Binding_GetBindResult(IBinding *iface, CLSID *pclsidProtoc return E_NOTIMPL; } +static Binding *get_bctx_binding(IBindCtx *bctx) +{ + IBinding *binding; + IUnknown *unk; + HRESULT hres; + + hres = IBindCtx_GetObjectParam(bctx, cbinding_contextW, &unk); + if(FAILED(hres)) + return NULL; + + hres = IUnknown_QueryInterface(unk, &IID_IBinding, (void*)&binding); + IUnknown_Release(unk); + if(FAILED(hres)) + return NULL; + + /* FIXME!!! */ + return BINDING_THIS(binding); +} + #undef BINDING_THIS static const IBindingVtbl BindingVtbl = { @@ -1159,7 +1180,7 @@ static BOOL is_urlmon_protocol(LPCWSTR url) return FALSE; } -static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding **binding) +static HRESULT Binding_Create(Binding *binding_ctx, LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding **binding) { Binding *ret; HRESULT hres; @@ -1182,7 +1203,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->apartment_thread = GetCurrentThreadId(); ret->notif_hwnd = get_notif_hwnd(); - ret->report_mime = TRUE; + ret->report_mime = !binding_ctx; ret->download_state = BEFORE_DOWNLOAD; ret->bindinfo.cbSize = sizeof(BINDINFO); @@ -1200,11 +1221,16 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * IBindStatusCallback_QueryInterface(ret->callback, &IID_IServiceProvider, (void**)&ret->service_provider); - hres = create_binding_protocol(url, TRUE, &ret->protocol); - if(FAILED(hres)) { - WARN("Could not get protocol handler\n"); - IBinding_Release(BINDING(ret)); - return hres; + if(binding_ctx) { + ret->protocol = binding_ctx->protocol; + IInternetProtocol_AddRef(ret->protocol); + }else { + hres = create_binding_protocol(url, TRUE, &ret->protocol); + if(FAILED(hres)) { + WARN("Could not get protocol handler\n"); + IBinding_Release(BINDING(ret)); + return hres; + } } hres = IBindStatusCallback_GetBindInfo(ret->callback, &ret->bindf, &ret->bindinfo); @@ -1223,7 +1249,14 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->url = heap_strdupW(url); - ret->stream = create_stream(ret->protocol); + if(binding_ctx) { + ret->stream = binding_ctx->stream; + IStream_AddRef(STREAM(ret->stream)); + ret->clipboard_format = binding_ctx->clipboard_format; + }else { + ret->stream = create_stream(ret->protocol); + } + ret->stgmed.tymed = TYMED_ISTREAM; ret->stgmed.u.pstm = STREAM(ret->stream); ret->stgmed.pUnkForRelease = (IUnknown*)BINDING(ret); /* NOTE: Windows uses other IUnknown */ @@ -1232,13 +1265,13 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * return S_OK; } -static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding **ret) +static HRESULT start_binding(Binding *binding_ctx, LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding **ret) { Binding *binding = NULL; HRESULT hres; MSG msg; - hres = Binding_Create(url, pbc, riid, &binding); + hres = Binding_Create(binding_ctx, url, pbc, riid, &binding); if(FAILED(hres)) return hres; @@ -1250,18 +1283,21 @@ static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding ** return hres; } - hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), - BINDINF(binding), 0, 0); - - TRACE("start ret %08x\n", hres); + if(binding_ctx) { + set_binding_sink(binding->protocol, PROTSINK(binding)); + report_data(binding, 0, 0, 0); + }else { + hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), + BINDINF(binding), 0, 0); - if(FAILED(hres)) { - WARN("Start failed: %08x\n", hres); + TRACE("start ret %08x\n", hres); - stop_binding(binding, hres, NULL); - IBinding_Release(BINDING(binding)); + if(FAILED(hres)) { + stop_binding(binding, hres, NULL); + IBinding_Release(BINDING(binding)); - return hres; + return hres; + } } while(!(binding->bindf & BINDF_ASYNCHRONOUS) && @@ -1279,12 +1315,16 @@ static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding ** HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) { - Binding *binding; + Binding *binding = NULL, *binding_ctx; HRESULT hres; *ppv = NULL; - hres = start_binding(url, pbc, riid, &binding); + binding_ctx = get_bctx_binding(pbc); + + hres = start_binding(binding_ctx, url, pbc, riid, &binding); + if(binding_ctx) + IBinding_Release(BINDING(binding_ctx)); if(FAILED(hres)) return hres;

1 0

Jacek Caban : urlmon: Binding_Create clean up.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: e3c47c88fdc40a7edf52d47535ed6576d7946130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c47c88fdc40a7edf52d4753… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:43:39 2007 +0100 urlmon: Binding_Create clean up. --- dlls/urlmon/binding.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 706daed..23b11bd 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1162,7 +1162,6 @@ static BOOL is_urlmon_protocol(LPCWSTR url) static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding **binding) { Binding *ret; - int len; HRESULT hres; if(!IsEqualGUID(&IID_IStream, riid)) { @@ -1172,7 +1171,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * URLMON_LockModule(); - ret = heap_alloc(sizeof(Binding)); + ret = heap_alloc_zero(sizeof(Binding)); ret->lpBindingVtbl = &BindingVtbl; ret->lpInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; @@ -1181,25 +1180,12 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->ref = 1; - ret->callback = NULL; - ret->protocol = NULL; - ret->service_provider = NULL; - ret->stream = NULL; - ret->mime = NULL; - ret->clipboard_format = 0; - ret->url = NULL; ret->apartment_thread = GetCurrentThreadId(); ret->notif_hwnd = get_notif_hwnd(); ret->report_mime = TRUE; - ret->continue_call = 0; - ret->state = 0; ret->download_state = BEFORE_DOWNLOAD; - ret->task_queue_head = ret->task_queue_tail = NULL; - ret->hres = S_OK; - memset(&ret->bindinfo, 0, sizeof(BINDINFO)); ret->bindinfo.cbSize = sizeof(BINDINFO); - ret->bindf = 0; InitializeCriticalSection(&ret->section); ret->section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": Binding.section"); @@ -1235,9 +1221,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * if(!is_urlmon_protocol(url)) ret->bindf |= BINDF_NEEDFILE; - len = strlenW(url)+1; - ret->url = heap_alloc(len*sizeof(WCHAR)); - memcpy(ret->url, url, len*sizeof(WCHAR)); + ret->url = heap_strdupW(url); ret->stream = create_stream(ret->protocol); ret->stgmed.tymed = TYMED_ISTREAM;

1 0

Jacek Caban : urlmon: Better error handling.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 91938977e9e1ee175c5193cc30ca996ce041016d URL: http://source.winehq.org/git/wine.git/?a=commit;h=91938977e9e1ee175c5193cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:43:26 2007 +0100 urlmon: Better error handling. --- dlls/urlmon/binding.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 8bfc9c1..706daed 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -913,16 +913,23 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa return S_OK; } +typedef struct { + task_header_t header; + + HRESULT hres; + LPWSTR str; +} report_result_task_t; + static void report_result_proc(Binding *binding, task_header_t *t) { + report_result_task_t *task = (report_result_task_t*)t; + IInternetProtocol_Terminate(binding->protocol, 0); - if(binding->state & BINDING_LOCKED) { - IInternetProtocol_UnlockRequest(binding->protocol); - binding->state &= ~BINDING_LOCKED; - } + stop_binding(binding, task->hres, task->str); - heap_free(t); + heap_free(task->str); + heap_free(task); } static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface, @@ -934,9 +941,14 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { IInternetProtocol_Terminate(This->protocol, 0); + stop_binding(This, hrResult, szResult); }else { - task_header_t *task = heap_alloc(sizeof(task_header_t)); - push_task(This, task, report_result_proc); + report_result_task_t *task = heap_alloc(sizeof(report_result_task_t)); + + task->hres = hrResult; + task->str = heap_strdupW(szResult); + + push_task(This, &task->header, report_result_proc); } return S_OK; @@ -1269,7 +1281,7 @@ static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding ** } while(!(binding->bindf & BINDF_ASYNCHRONOUS) && - binding->download_state != END_DOWNLOAD) { + !(binding->state & BINDING_STOPPED)) { MsgWaitForMultipleObjects(0, NULL, FALSE, 5000, QS_POSTMESSAGE); while (PeekMessageW(&msg, binding->notif_hwnd, WM_USER, WM_USER+117, PM_REMOVE|PM_NOYIELD)) { TranslateMessage(&msg); @@ -1292,8 +1304,10 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) if(FAILED(hres)) return hres; - if(binding->stream->init_buf) { - if(binding->state & BINDING_LOCKED) + if(binding->hres != S_OK) { + hres = SUCCEEDED(binding->hres) ? S_OK : binding->hres; + }else if(binding->stream->init_buf) { + if((binding->state & BINDING_STOPPED) && (binding->state & BINDING_LOCKED)) IInternetProtocol_UnlockRequest(binding->protocol); IStream_AddRef(STREAM(binding->stream));

1 0

Jacek Caban : urlmon: Better implementation of bind stopping.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 2f34d0093c3ac679d13eab92761c4cbdd2dcd73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f34d0093c3ac679d13eab927… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:43:11 2007 +0100 urlmon: Better implementation of bind stopping. --- dlls/urlmon/binding.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index ca83537..8bfc9c1 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -52,6 +52,7 @@ typedef enum { } download_state_t; #define BINDING_LOCKED 0x0001 +#define BINDING_STOPPED 0x0002 struct Binding { const IBindingVtbl *lpBindingVtbl; @@ -74,6 +75,7 @@ struct Binding { BOOL report_mime; DWORD continue_call; DWORD state; + HRESULT hres; download_state_t download_state; DWORD apartment_thread; @@ -310,6 +312,21 @@ static void mime_available(Binding *This, LPCWSTR mime, BOOL verify) } } +static void stop_binding(Binding *binding, HRESULT hres, LPCWSTR str) +{ + if(binding->state & BINDING_LOCKED) { + IInternetProtocol_UnlockRequest(binding->protocol); + binding->state &= ~BINDING_LOCKED; + } + + if(!(binding->state & BINDING_STOPPED)) { + binding->state |= BINDING_STOPPED; + + IBindStatusCallback_OnStopBinding(binding->callback, hres, str); + binding->hres = hres; + } +} + #define STREAM_THIS(iface) DEFINE_THIS(ProtocolStream, Stream, iface) static HRESULT WINAPI ProtocolStream_QueryInterface(IStream *iface, @@ -852,9 +869,8 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &This->stgmed); - if(This->download_state == END_DOWNLOAD) { - IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); - } + if(This->download_state == END_DOWNLOAD) + stop_binding(This, S_OK, NULL); } typedef struct { @@ -1167,6 +1183,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->state = 0; ret->download_state = BEFORE_DOWNLOAD; ret->task_queue_head = ret->task_queue_tail = NULL; + ret->hres = S_OK; memset(&ret->bindinfo, 0, sizeof(BINDINFO)); ret->bindinfo.cbSize = sizeof(BINDINFO); @@ -1232,7 +1249,7 @@ static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding ** hres = IBindStatusCallback_OnStartBinding(binding->callback, 0, BINDING(binding)); if(FAILED(hres)) { WARN("OnStartBinding failed: %08x\n", hres); - IBindStatusCallback_OnStopBinding(binding->callback, 0x800c0008, NULL); + stop_binding(binding, 0x800c0008, NULL); IBinding_Release(BINDING(binding)); return hres; } @@ -1245,8 +1262,7 @@ static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding ** if(FAILED(hres)) { WARN("Start failed: %08x\n", hres); - IInternetProtocol_Terminate(binding->protocol, 0); - IBindStatusCallback_OnStopBinding(binding->callback, S_OK, NULL); + stop_binding(binding, hres, NULL); IBinding_Release(BINDING(binding)); return hres;

1 0

Jacek Caban : urlmon: Make start_binding more generic.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: ed1c7f8135c940190b869c47e87112ed0ec44d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1c7f8135c940190b869c47e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:42:17 2007 +0100 urlmon: Make start_binding more generic. --- dlls/urlmon/binding.c | 21 ++++++++++++++++++--- dlls/urlmon/umon.c | 2 +- dlls/urlmon/urlmon_main.h | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 4c2de3c..ca83537 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1219,14 +1219,12 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * return S_OK; } -HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) +static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding **ret) { Binding *binding = NULL; HRESULT hres; MSG msg; - *ppv = NULL; - hres = Binding_Create(url, pbc, riid, &binding); if(FAILED(hres)) return hres; @@ -1242,6 +1240,8 @@ HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), BINDINF(binding), 0, 0); + TRACE("start ret %08x\n", hres); + if(FAILED(hres)) { WARN("Start failed: %08x\n", hres); @@ -1261,6 +1261,21 @@ HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) } } + *ret = binding; + return S_OK; +} + +HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) +{ + Binding *binding; + HRESULT hres; + + *ppv = NULL; + + hres = start_binding(url, pbc, riid, &binding); + if(FAILED(hres)) + return hres; + if(binding->stream->init_buf) { if(binding->state & BINDING_LOCKED) IInternetProtocol_UnlockRequest(binding->protocol); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 7b4a772..51ad270 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -743,7 +743,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); - return start_binding(This->URLName, pbc, riid, ppvObject); + return bind_to_storage(This->URLName, pbc, riid, ppvObject); } /****************************************************************************** diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 0c64124..6508049 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -68,7 +68,7 @@ void UMCloseCacheFileStream(IUMCacheStream *pstr); IInternetProtocolInfo *get_protocol_info(LPCWSTR url); HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret); -HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); +HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol); void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink);

1 0

Jacek Caban : urlmon: Added ibind argument handling in CreateAsyncBindCtx.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 785e98173f918a5f9d3b1f803d0f134b13d1942b URL: http://source.winehq.org/git/wine.git/?a=commit;h=785e98173f918a5f9d3b1f803… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:42:03 2007 +0100 urlmon: Added ibind argument handling in CreateAsyncBindCtx. --- dlls/urlmon/bindctx.c | 17 +++++++++++------ dlls/urlmon/tests/url.c | 23 ++++++++++++++++++++--- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 83c8c39..328254c 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -705,13 +705,13 @@ static HRESULT WINAPI AsyncBindCtx_GetObjectParam(IBindCtx* iface, LPOLESTR pszk return IBindCtx_GetObjectParam(This->bindctx, pszkey, punk); } -static HRESULT WINAPI AsyncBindCtx_RevokeObjectParam(IBindCtx *iface, LPOLESTR ppenum) +static HRESULT WINAPI AsyncBindCtx_RevokeObjectParam(IBindCtx *iface, LPOLESTR pszkey) { AsyncBindCtx *This = BINDCTX_THIS(iface); - TRACE("(%p)->(%p)\n", This, ppenum); + TRACE("(%p)->(%s)\n", This, debugstr_w(pszkey)); - return IBindCtx_RevokeObjectParam(This->bindctx, ppenum); + return IBindCtx_RevokeObjectParam(This->bindctx, pszkey); } static HRESULT WINAPI AsyncBindCtx_EnumObjectParam(IBindCtx *iface, IEnumString **pszkey) @@ -820,9 +820,14 @@ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, if(reserved) WARN("reserved=%d\n", reserved); - hres = CreateBindCtx(0, &bindctx); - if(FAILED(hres)) - return hres; + if(ibind) { + IBindCtx_AddRef(ibind); + bindctx = ibind; + }else { + hres = CreateBindCtx(0, &bindctx); + if(FAILED(hres)) + return hres; + } ret = heap_alloc(sizeof(AsyncBindCtx)); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 9be2de7..0dd9c81 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1191,11 +1191,13 @@ static void test_CreateAsyncBindCtx(void) static void test_CreateAsyncBindCtxEx(void) { - IBindCtx *bctx = NULL, *bctx_arg = NULL; + IBindCtx *bctx = NULL, *bctx2 = NULL, *bctx_arg = NULL; IUnknown *unk; BIND_OPTS bindopts; HRESULT hres; + static WCHAR testW[] = {'t','e','s','t',0}; + hres = CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, NULL, 0); ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed: %08x, expected E_INVALIDARG\n", hres); @@ -1248,8 +1250,23 @@ static void test_CreateAsyncBindCtxEx(void) if(SUCCEEDED(hres)) IUnknown_Release(unk); - if(SUCCEEDED(hres)) - IBindCtx_Release(bctx); + IBindCtx_Release(bctx); + + hres = CreateBindCtx(0, &bctx2); + ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres); + + hres = CreateAsyncBindCtxEx(bctx2, 0, NULL, NULL, &bctx, 0); + ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); + + hres = IBindCtx_RegisterObjectParam(bctx2, testW, (IUnknown*)&Protocol); + ok(hres == S_OK, "RegisterObjectParam failed: %08x\n", hres); + + hres = IBindCtx_GetObjectParam(bctx, testW, &unk); + ok(hres == S_OK, "GetObjectParam failed: %08x\n", hres); + ok(unk == (IUnknown*)&Protocol, "unexpected unk %p\n", unk); + + IBindCtx_Release(bctx); + IBindCtx_Release(bctx2); } static void test_bscholder(IBindStatusCallback *holder)

1 0

Jacek Caban : urlmon.idl: Added missing MONIKERPROPERTY variables.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 2f0f1fefb843e4c7317ff36ab8418b31e7552776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0f1fefb843e4c7317ff36ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:41:44 2007 +0100 urlmon.idl: Added missing MONIKERPROPERTY variables. --- include/urlmon.idl | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index d84f1e7..ab59c40 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -546,8 +546,11 @@ interface IMonikerProp : IUnknown typedef [unique] IMonikerProp *LPMONIKERPROP; typedef enum { - MIMETYPEPROP = 0x00000000, - USE_SRC_URL = 0x00000001 + MIMETYPEPROP = 0, + USE_SRC_URL = 1, + CLASSIDPROP = 2, + TRUSTEDDOWNLOADPROP = 3, + POPUPLEVELPROP = 4 } MONIKERPROPERTY; HRESULT PutProperty(

1 0

Jacek Caban : urlmon: Use BindProtocol in Binding object.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 1ca205525c4e1c57d014773892b8daf6275c778a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca205525c4e1c57d01477389… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:40:26 2007 +0100 urlmon: Use BindProtocol in Binding object. --- dlls/urlmon/binding.c | 31 +++---------------------------- dlls/urlmon/bindprot.c | 34 ++++++++++++++++++++++------------ dlls/urlmon/session.c | 2 +- dlls/urlmon/urlmon_main.h | 2 +- 4 files changed, 27 insertions(+), 42 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 5f5471d..4c2de3c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -790,6 +790,8 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink case BINDSTATUS_SENDINGREQUEST: on_progress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, szStatusText); break; + case BINDSTATUS_PROTOCOLCLASSID: + break; case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: mime_available(This, szStatusText, FALSE); break; @@ -1095,33 +1097,6 @@ static HRESULT get_callback(IBindCtx *pbc, IBindStatusCallback **callback) return SUCCEEDED(hres) ? S_OK : MK_E_SYNTAX; } -static HRESULT get_protocol(Binding *This, LPCWSTR url) -{ - IClassFactory *cf = NULL; - HRESULT hres; - - hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IInternetProtocol, - (void**)&This->protocol); - if(SUCCEEDED(hres)) - return S_OK; - - if(This->service_provider) { - hres = IServiceProvider_QueryService(This->service_provider, &IID_IInternetProtocol, - &IID_IInternetProtocol, (void**)&This->protocol); - if(SUCCEEDED(hres)) - return S_OK; - } - - hres = get_protocol_handler(url, NULL, &cf); - if(FAILED(hres)) - return hres; - - hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&This->protocol); - IClassFactory_Release(cf); - - return hres; -} - static BOOL is_urlmon_protocol(LPCWSTR url) { static const WCHAR wszCdl[] = {'c','d','l'}; @@ -1210,7 +1185,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * IBindStatusCallback_QueryInterface(ret->callback, &IID_IServiceProvider, (void**)&ret->service_provider); - hres = get_protocol(ret, url); + hres = create_binding_protocol(url, TRUE, &ret->protocol); if(FAILED(hres)) { WARN("Could not get protocol handler\n"); IBinding_Release(BINDING(ret)); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index e3a432f..81dfabf 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -38,6 +38,7 @@ typedef struct { LONG priority; BOOL reported_result; + BOOL from_urlmon; } BindProtocol; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) @@ -152,16 +153,23 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl if(FAILED(hres)) return hres; - hres = IClassFactory_CreateInstance(cf, (IUnknown*)BINDINFO(This), - &IID_IUnknown, (void**)&unk); - IClassFactory_Release(cf); - if(FAILED(hres)) - return hres; - - hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&protocol); - IUnknown_Release(unk); - if(FAILED(hres)) - return hres; + if(This->from_urlmon) { + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&protocol); + IClassFactory_Release(cf); + if(FAILED(hres)) + return hres; + }else { + hres = IClassFactory_CreateInstance(cf, (IUnknown*)BINDINFO(This), + &IID_IUnknown, (void**)&unk); + IClassFactory_Release(cf); + if(FAILED(hres)) + return hres; + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&protocol); + IUnknown_Release(unk); + if(FAILED(hres)) + return hres; + } } StringFromCLSID(&clsid, &clsid_str); @@ -488,7 +496,8 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin if(!This->protocol_sink) return S_OK; return IInternetProtocolSink_ReportProgress(This->protocol_sink, - BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); + This->from_urlmon ? BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE : BINDSTATUS_MIMETYPEAVAILABLE, + szStatusText); default: FIXME("unsupported ulStatusCode %u\n", ulStatusCode); } @@ -579,7 +588,7 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { BPServiceProvider_QueryService }; -HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol) +HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol) { BindProtocol *ret = heap_alloc_zero(sizeof(BindProtocol)); @@ -590,6 +599,7 @@ HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol) ret->lpInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; ret->ref = 1; + ret->from_urlmon = from_urlmon; URLMON_LockModule(); diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index a63509c..3571b05 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -306,7 +306,7 @@ static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface, if(pBC || pUnkOuter || ppUnk || dwOption) FIXME("Unsupported arguments\n"); - return create_binding_protocol(szUrl, ppOInetProt); + return create_binding_protocol(szUrl, FALSE, ppOInetProt); } static HRESULT WINAPI InternetSession_SetSessionOption(IInternetSession *iface, diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 70906a1..0c64124 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -70,7 +70,7 @@ HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret); HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); -HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol); +HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol); void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink); static inline void *heap_alloc(size_t len)

1 0

Rob Shearman : rpcrt4: Implement NdrConformantStringMemorySize.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 86a0b1d24e6f83f6f399850301ca75283b6c0d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a0b1d24e6f83f6f39985030… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 29 12:14:30 2007 +0000 rpcrt4: Implement NdrConformantStringMemorySize. --- dlls/rpcrt4/ndr_marshall.c | 57 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index c517ff1..3b6106f 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -790,29 +790,64 @@ void WINAPI NdrConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, ULONG WINAPI NdrConformantStringMemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) { - ULONG rslt = 0; + ULONG bufsize, memsize, esize, i; - FIXME("(pStubMsg == ^%p, pFormat == ^%p)\n", pStubMsg, pFormat); + TRACE("(pStubMsg == ^%p, pFormat == ^%p)\n", pStubMsg, pFormat); - assert(pStubMsg && pFormat); + ReadConformance(pStubMsg, NULL); + ReadVariance(pStubMsg, NULL, pStubMsg->MaxCount); - if (*pFormat == RPC_FC_C_CSTRING) { - rslt = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); /* maxlen */ + if (pFormat[1] != RPC_FC_STRING_SIZED && (pStubMsg->MaxCount != pStubMsg->ActualCount)) + { + ERR("buffer size %d must equal memory size %ld for non-sized conformant strings\n", + pStubMsg->ActualCount, pStubMsg->MaxCount); + RpcRaiseException(RPC_S_INVALID_BOUND); } - else if (*pFormat == RPC_FC_C_WSTRING) { - rslt = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer)*2; /* maxlen */ + if (pStubMsg->Offset) + { + ERR("conformant strings can't have Offset (%d)\n", pStubMsg->Offset); + RpcRaiseException(RPC_S_INVALID_BOUND); } + + if (*pFormat == RPC_FC_C_CSTRING) esize = 1; + else if (*pFormat == RPC_FC_C_WSTRING) esize = 2; else { ERR("Unhandled string type: %#x\n", *pFormat); /* FIXME: raise an exception */ + esize = 0; + } + + memsize = safe_multiply(esize, pStubMsg->MaxCount); + bufsize = safe_multiply(esize, pStubMsg->ActualCount); + + /* strings must always have null terminating bytes */ + if (bufsize < esize) + { + ERR("invalid string length of %d\n", pStubMsg->ActualCount); + RpcRaiseException(RPC_S_INVALID_BOUND); } - if (pFormat[1] != RPC_FC_PAD) { - FIXME("sized string format=%d\n", pFormat[1]); + /* verify the buffer is safe to access */ + if ((pStubMsg->Buffer + bufsize < pStubMsg->Buffer) || + (pStubMsg->Buffer + bufsize > pStubMsg->BufferEnd)) + { + ERR("bufsize 0x%x exceeded buffer end %p of buffer %p\n", bufsize, + pStubMsg->BufferEnd, pStubMsg->Buffer); + RpcRaiseException(RPC_X_BAD_STUB_DATA); } - TRACE(" --> %u\n", rslt); - return rslt; + for (i = bufsize - esize; i < bufsize; i++) + if (pStubMsg->Buffer[i] != 0) + { + ERR("string not null-terminated at byte position %d, data is 0x%x\n", + i, pStubMsg->Buffer[i]); + RpcRaiseException(RPC_S_INVALID_BOUND); + } + + safe_buffer_increment(pStubMsg, bufsize); + pStubMsg->MemorySize += memsize; + + return pStubMsg->MemorySize; } /************************************************************************

1 0

Rob Shearman : rpcrt4: Add some tests for non-conformant strings.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 274dc73ba14a83de2b715e13486556d0b600df40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274dc73ba14a83de2b715e134… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 29 12:17:55 2007 +0000 rpcrt4: Add some tests for non-conformant strings. --- dlls/rpcrt4/tests/ndr_marshall.c | 170 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 170 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d930701..73e33a4 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1245,6 +1245,175 @@ todo_wine { HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); } +static void test_nonconformant_string(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *ptr; + unsigned char *mem, *mem_orig; + unsigned char memsrc[10] = "This is"; + unsigned char memsrc2[10] = "This is a"; + + static const unsigned char fmtstr_nonconf_str[] = + { + 0x26, /* FC_CSTRING */ + 0x5c, /* FC_PAD */ + NdrFcShort( 0xa ), /* 10 */ + }; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr_nonconf_str; + + /* length < size */ + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 0; + + NdrNonConformantStringBufferSize( &StubMsg, + (unsigned char *)memsrc, + fmtstr_nonconf_str ); + ok(StubMsg.BufferLength >= strlen((char *)memsrc) + 1 + 8, "length %d\n", StubMsg.BufferLength); + + /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrNonConformantStringMarshall( &StubMsg, (unsigned char *)memsrc, fmtstr_nonconf_str ); + ok(ptr == NULL, "ret %p\n", ptr); + ok(StubMsg.Buffer - StubMsg.BufferStart == strlen((char *)memsrc) + 1 + 8, "Buffer %p Start %p len %d\n", + StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); + ok(!memcmp(StubMsg.BufferStart + 8, memsrc, strlen((char *)memsrc) + 1), "incorrectly marshaled\n"); + + StubMsg.Buffer = StubMsg.BufferStart; + StubMsg.MemorySize = 0; + mem = NULL; + + /* Client */ + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 1); + todo_wine + ok(mem == mem_orig, "mem alloced\n"); + todo_wine + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + /* Server */ + my_alloc_called = 0; + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem != mem_orig, "mem not alloced\n"); + ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + NdrOleFree(mem); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 1); + todo_wine + ok(mem == mem_orig, "mem alloced\n"); + todo_wine + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + HeapFree(GetProcessHeap(), 0, mem_orig); + HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); + + /* length = size */ + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 0; + + NdrNonConformantStringBufferSize( &StubMsg, + (unsigned char *)memsrc2, + fmtstr_nonconf_str ); + ok(StubMsg.BufferLength >= strlen((char *)memsrc2) + 1 + 8, "length %d\n", StubMsg.BufferLength); + + /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrNonConformantStringMarshall( &StubMsg, (unsigned char *)memsrc2, fmtstr_nonconf_str ); + ok(ptr == NULL, "ret %p\n", ptr); + ok(StubMsg.Buffer - StubMsg.BufferStart == strlen((char *)memsrc2) + 1 + 8, "Buffer %p Start %p len %d\n", + StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); + ok(!memcmp(StubMsg.BufferStart + 8, memsrc2, strlen((char *)memsrc2) + 1), "incorrectly marshaled\n"); + + StubMsg.Buffer = StubMsg.BufferStart; + StubMsg.MemorySize = 0; + mem = NULL; + + /* Client */ + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 1); + todo_wine + ok(mem == mem_orig, "mem alloced\n"); + todo_wine + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + /* Server */ + my_alloc_called = 0; + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem != mem_orig, "mem not alloced\n"); + ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + NdrOleFree(mem); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 1); + todo_wine + ok(mem == mem_orig, "mem alloced\n"); + todo_wine + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + HeapFree(GetProcessHeap(), 0, mem_orig); + HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); +} + START_TEST( ndr_marshall ) { test_ndr_simple_type(); @@ -1255,4 +1424,5 @@ START_TEST( ndr_marshall ) test_ndr_allocate(); test_conformant_array(); test_conformant_string(); + test_nonconformant_string(); }

1 0

← Newer
1
2
3
4
5
6
7
8
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2007