February 2008 - Wine-commits

Jacek Caban : urlmon: Abstract ProtocolStream object.
by Alexandre Julliard 04 Feb '08

04 Feb '08

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

Jacek Caban : mshtml: Added more about protocol tests.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: e7885cf221494f26be6a2dbc5fedaa8c1ac26a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7885cf221494f26be6a2dbc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:11:30 2008 +0100 mshtml: Added more about protocol tests. --- dlls/mshtml/tests/protocol.c | 159 ++++++++++++++++++++++------------------- 1 files changed, 85 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7885cf221494f26be6a2…

1 0

Jacek Caban : urlmon: Return better error results.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: bf5487bfc13cc253aa1f7cf3f6e9e7b4a90389a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5487bfc13cc253aa1f7cf3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:10:18 2008 +0100 urlmon: Return better error results. --- dlls/urlmon/binding.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 66b5bdf..1cc8a61 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1283,7 +1283,7 @@ static HRESULT get_callback(IBindCtx *pbc, IBindStatusCallback **callback) IUnknown_Release(unk); } - return SUCCEEDED(hres) ? S_OK : MK_E_SYNTAX; + return SUCCEEDED(hres) ? S_OK : INET_E_DATA_NOT_AVAILABLE; } static BOOL is_urlmon_protocol(LPCWSTR url) @@ -1484,9 +1484,7 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) if(FAILED(hres)) return hres; - if(binding->hres != S_OK) { - hres = SUCCEEDED(binding->hres) ? S_OK : binding->hres; - }else if(binding->stream->init_buf) { + if(binding->hres == S_OK && binding->stream->init_buf) { if((binding->state & BINDING_STOPPED) && (binding->state & BINDING_LOCKED)) IInternetProtocol_UnlockRequest(binding->protocol);

1 0

Rob Shearman : wininet: HTTP_Connect should fail if a NULL or empty hostname is passed in.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 59ab0cf362d764f978ab2c6d291b647e00a7c8ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ab0cf362d764f978ab2c6d2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:47:25 2008 +0000 wininet: HTTP_Connect should fail if a NULL or empty hostname is passed in. Add tests for these circumstances. --- dlls/wininet/http.c | 6 ++++++ dlls/wininet/tests/http.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 16e1ec7..65b86fb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2795,6 +2795,12 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, TRACE("-->\n"); + if (!lpszServerName || !lpszServerName[0]) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lerror; + } + assert( hIC->hdr.htype == WH_HINIT ); lpwhs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WININETHTTPSESSIONW)); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 457a65f..8bb7cca 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -929,9 +929,19 @@ static void InternetOpenRequest_test(void) session = InternetOpenA("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(session != NULL ,"Unable to open Internet session\n"); + connect = InternetConnectA(session, NULL, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0); + ok(connect == NULL, "InternetConnectA should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "InternetConnectA with NULL server named should have failed with ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + + connect = InternetConnectA(session, "", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0); + ok(connect == NULL, "InternetConnectA should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "InternetConnectA with blank server named should have failed with ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + connect = InternetConnectA(session, "winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(connect != NULL, "Unable to connect to http://winehq.org\n"); + ok(connect != NULL, "Unable to connect to http://winehq.org with error %d\n", GetLastError()); request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0); if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED)

1 0

Rob Shearman : rpcrt4: Fix memory leaks in the rpc tests.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 7bc9e425f166a9f7473f1526ff582c1e18ccf6e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc9e425f166a9f7473f1526f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:45:59 2008 +0000 rpcrt4: Fix memory leaks in the rpc tests. --- dlls/rpcrt4/tests/rpc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index e92b057..ec70902 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -112,6 +112,7 @@ static void UuidConversionAndComparison(void) { ok( (UuidFromStringA((unsigned char*)str, &Uuid1) == RPC_S_INVALID_STRING_UUID), "Invalid UUID String\n" ); str[i2] = x; /* change it back so remaining tests are interesting. */ } + RpcStringFree((unsigned char **)&str); } /* Uuid to String to Uuid (wchar) */ @@ -132,6 +133,7 @@ static void UuidConversionAndComparison(void) { ok( (UuidFromStringW(wstr, &Uuid1) == RPC_S_INVALID_STRING_UUID), "Invalid UUID WString\n" ); wstr[i2] = wx; /* change it back so remaining tests are interesting. */ } + RpcStringFreeW(&wstr); } }

1 0

Rob Shearman : comctl32: Get the background colour in ANIMATE_PaintFrame, instead of just in WM_PAINT.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 53c6cdf918e10305f19e74e003fc4d2311ed556f URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c6cdf918e10305f19e74e00… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:47:03 2008 +0000 comctl32: Get the background colour in ANIMATE_PaintFrame, instead of just in WM_PAINT. This fixes the rendering of transparent animations when using a background thread. --- dlls/comctl32/animate.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 8343389..ee668ae 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -317,6 +317,9 @@ static BOOL ANIMATE_PaintFrame(ANIMATE_INFO* infoPtr, HDC hDC) rect.right = nWidth; rect.bottom = nHeight; + infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, + WM_CTLCOLORSTATIC, + (WPARAM)hDC, (LPARAM)infoPtr->hwndSelf); if(!infoPtr->hbrushBG) infoPtr->hbrushBG = GetCurrentObject(hDC, OBJ_BRUSH); @@ -929,11 +932,6 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP return DefWindowProcW(hWnd, uMsg, wParam, lParam); } - if (infoPtr->dwStyle & ACS_TRANSPARENT) - infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, - WM_CTLCOLORSTATIC, - wParam, (LPARAM)infoPtr->hwndSelf); - if (wParam) { EnterCriticalSection(&infoPtr->cs);

1 0

Jacek Caban : urlmon: Added CopyStgMedium implementation.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: fd0d1d0765297a0b614645f55fdf6d1ca12e2603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0d1d0765297a0b614645f55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:09:04 2008 +0100 urlmon: Added CopyStgMedium implementation. --- dlls/urlmon/tests/misc.c | 33 +++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.c | 33 +++++++++++++++++++++++++++++++++ include/urlmon.idl | 1 + 4 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 001ee9c..1ed7614 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -18,6 +18,7 @@ #define COBJMACROS #define CONST_VTABLE +#define NONAMELESSUNION #include <wine/test.h> #include <stdarg.h> @@ -1177,6 +1178,37 @@ static void test_ReleaseBindInfo(void) ok(bi.pUnk == &unk, "bi.pUnk=%p, expected %p\n", bi.pUnk, &unk); } +static void test_CopyStgMedium(void) +{ + STGMEDIUM src, dst; + HRESULT hres; + + memset(&src, 0xf0, sizeof(src)); + memset(&dst, 0xe0, sizeof(dst)); + src.tymed = TYMED_NULL; + src.pUnkForRelease = NULL; + hres = CopyStgMedium(&src, &dst); + ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); + ok(dst.tymed == TYMED_NULL, "tymed=%d\n", dst.tymed); + ok(dst.u.hGlobal == (void*)0xf0f0f0f0, "u=%p\n", dst.u.hGlobal); + ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); + + memset(&dst, 0xe0, sizeof(dst)); + src.tymed = TYMED_ISTREAM; + src.u.pstm = NULL; + src.pUnkForRelease = NULL; + hres = CopyStgMedium(&src, &dst); + ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); + ok(dst.tymed == TYMED_ISTREAM, "tymed=%d\n", dst.tymed); + ok(!dst.u.pstm, "pstm=%p\n", dst.u.pstm); + ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); + + hres = CopyStgMedium(&src, NULL); + ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres); + hres = CopyStgMedium(NULL, &dst); + ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres); +} + static void test_UrlMkGetSessionOption(void) { DWORD encoding, size; @@ -1339,6 +1371,7 @@ START_TEST(misc) test_NameSpace(); test_MimeFilter(); test_ReleaseBindInfo(); + test_CopyStgMedium(); test_UrlMkGetSessionOption(); test_ObtainUserAgentString(); test_MkParseDisplayNameEx(); diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 06a56b0..1fa2f94 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -21,7 +21,7 @@ @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) @ stub CompareSecurityIds @ stub CopyBindInfo -@ stub CopyStgMedium +@ stdcall CopyStgMedium(ptr ptr) @ stdcall CreateAsyncBindCtx(long ptr ptr ptr) @ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) @ stdcall CreateFormatEnumerator(long ptr ptr) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index a20772d..ca52143 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -406,6 +406,39 @@ void WINAPI ReleaseBindInfo(BINDINFO* pbindinfo) pbindinfo->cbSize = size; } +/*********************************************************************** + * CopyStgMedium (URLMON.@) + */ +HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) +{ + TRACE("(%p %p)\n", src, dst); + + if(!src || !dst) + return E_POINTER; + + memcpy(dst, src, sizeof(STGMEDIUM)); + + switch(dst->tymed) { + case TYMED_NULL: + break; + case TYMED_ISTREAM: + if(dst->u.pstm) + IStream_AddRef(dst->u.pstm); + break; + case TYMED_ISTORAGE: + if(dst->u.pstg) + IStorage_AddRef(dst->u.pstg); + break; + default: + FIXME("Unimplemented tymed %d\n", src->tymed); + } + + if(dst->pUnkForRelease) + IUnknown_AddRef(dst->pUnkForRelease); + + return S_OK; +} + static BOOL text_richtext_filter(const BYTE *b, DWORD size) { return size > 5 && !memcmp(b, "{\\rtf", 5); diff --git a/include/urlmon.idl b/include/urlmon.idl index ab59c40..d1da02a 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1279,6 +1279,7 @@ cpp_quote("HRESULT WINAPI ObtainUserAgentString(DWORD,LPSTR,DWORD*);") cpp_quote("HRESULT WINAPI RegisterFormatEnumerator(LPBC,IEnumFORMATETC*,DWORD);") cpp_quote("HRESULT WINAPI RevokeFormatEnumerator(LPBC,IEnumFORMATETC*);") cpp_quote("HRESULT WINAPI RevokeBindStatusCallback(LPBC,IBindStatusCallback*);") +cpp_quote("HRESULT WINAPI CopyStgMedium(const STGMEDIUM*,STGMEDIUM*);") cpp_quote("void WINAPI ReleaseBindInfo(BINDINFO*);") cpp_quote("HRESULT WINAPI UrlMkGetSessionOption(DWORD,LPVOID,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI UrlMkSetSessionOption(DWORD,LPVOID,DWORD,DWORD);")

1 0

Jacek Caban : urlmon: Fixed tests.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 21dbe9d6adda16881a79c6c14fa534058f809723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dbe9d6adda16881a79c6c14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 18:09:32 2008 +0100 urlmon: Fixed tests. --- dlls/urlmon/tests/url.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 91366aa..f27cf8e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1443,8 +1443,6 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva CHECK_EXPECT(Load); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); - trace("LOAD %p\n", pibc); - if(test_protocol == HTTP_TEST) ok(!fFullyAvailable, "fFulyAvailable = %x\n", fFullyAvailable); else @@ -1472,8 +1470,6 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva SET_EXPECT(GetBindInfo); SET_EXPECT(OnStartBinding); - if(test_protocol == FILE_TEST) - SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); SET_EXPECT(OnProgress_BEGINDOWNLOADDATA); if(test_protocol != HTTP_TEST) SET_EXPECT(OnProgress_ENDDOWNLOADDATA); @@ -1487,8 +1483,6 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva CHECK_CALLED(GetBindInfo); CHECK_CALLED(OnStartBinding); - if(test_protocol == FILE_TEST) - todo_wine CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); if(test_protocol != HTTP_TEST) CHECK_CALLED(OnProgress_ENDDOWNLOADDATA); @@ -1972,6 +1966,8 @@ static void test_BindToStorage(int protocol, BOOL emul) SET_EXPECT(UnlockRequest); }else { if(test_protocol == HTTP_TEST) { + SET_EXPECT(QueryInterface_IInternetBindInfo); + SET_EXPECT(QueryService_IInternetBindInfo); SET_EXPECT(QueryInterface_IHttpNegotiate); SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); @@ -2028,6 +2024,8 @@ static void test_BindToStorage(int protocol, BOOL emul) CHECK_CALLED(UnlockRequest); }else { if(test_protocol == HTTP_TEST) { + CLEAR_CALLED(QueryInterface_IInternetBindInfo); + CLEAR_CALLED(QueryService_IInternetBindInfo); CHECK_CALLED(QueryInterface_IHttpNegotiate); CHECK_CALLED(BeginningTransaction); /* QueryInterface_IHttpNegotiate2 and GetRootSecurityId @@ -2195,8 +2193,12 @@ static void test_BindToObject(int protocol, BOOL emul) CHECK_NOT_CALLED(Obj_OnProgress_CONNECTING); } } - if(test_protocol == HTTP_TEST || test_protocol == FILE_TEST) - CHECK_CALLED(Obj_OnProgress_SENDINGREQUEST); + if(test_protocol == HTTP_TEST || test_protocol == FILE_TEST) { + if(urls[test_protocol] == SHORT_RESPONSE_URL) + CLEAR_CALLED(Obj_OnProgress_SENDINGREQUEST); + else + CHECK_CALLED(Obj_OnProgress_SENDINGREQUEST); + } if(test_protocol == HTTP_TEST) CHECK_CALLED(OnResponse); CHECK_CALLED(Obj_OnProgress_MIMETYPEAVAILABLE); @@ -2284,9 +2286,10 @@ static void test_ReportResult(HRESULT exhres) hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); if(SUCCEEDED(exhres)) - ok(hres == S_OK, "BindToStorage failed: %08x\n", hres); + ok(hres == S_OK || hres == MK_S_ASYNCHRONOUS, "BindToStorage failed: %08x\n", hres); else - ok(hres == exhres, "BindToStorage failed: %08x, expected %08x\n", hres, exhres); + ok(hres == exhres || hres == MK_S_ASYNCHRONOUS, + "BindToStorage failed: %08x, expected %08x or MK_S_ASYNCHRONOUS\n", hres, exhres); CHECK_CALLED(GetBindInfo); CHECK_CALLED(QueryInterface_IInternetProtocol); @@ -2315,7 +2318,8 @@ static void test_BindToStorage_fail(void) ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); - ok(hres == MK_E_SYNTAX, "hres=%08x, expected INET_E_SYNTAX\n", hres); + ok(hres == MK_E_SYNTAX || hres == INET_E_DATA_NOT_AVAILABLE, + "hres=%08x, expected INET_E_SYNTAX or INET_E_DATA_NOT_AVAILABLE\n", hres); IBindCtx_Release(bctx);

1 0

Rob Shearman : ole32: Add tests for CreatePointerMoniker.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: c647bb46911b4419cae3695398e0ffad039212cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c647bb46911b4419cae369539… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:44:56 2008 +0000 ole32: Add tests for CreatePointerMoniker. --- dlls/ole32/tests/moniker.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9068f27..2058a59 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1589,6 +1589,114 @@ static void test_generic_composite_moniker(void) IMoniker_Release(moniker); } +static void test_pointer_moniker(void) +{ + HRESULT hr; + IMoniker *moniker; + DWORD moniker_type; + DWORD hash; + IBindCtx *bindctx; + FILETIME filetime; + IMoniker *inverse; + IUnknown *unknown; + IStream *stream; + IROTData *rotdata; + LPOLESTR display_name; + + cLocks = 0; + + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, NULL); + ok(hr == E_INVALIDARG, "CreatePointerMoniker(x, NULL) should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); + todo_wine + ok_ole_success(hr, CreatePointerMoniker); + if (!moniker) return; + + ok_more_than_one_lock(); + + /* Display Name */ + + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); + ok(hr == E_NOTIMPL, "IMoniker_GetDisplayName should have returned E_NOTIMPL instead of 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", hr); + + /* IROTData::GetComparisonData test */ + + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == E_NOINTERFACE, "IMoniker_QueryInterface(IID_IROTData) should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + + /* Saving */ + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + hr = IMoniker_Save(moniker, stream, TRUE); + ok(hr == E_NOTIMPL, "IMoniker_Save should have returned E_NOTIMPL instead of 0x%08x\n", hr); + + IStream_Release(stream); + + /* Hashing */ + hr = IMoniker_Hash(moniker, &hash); + ok_ole_success(hr, IMoniker_Hash); + ok(hash == (DWORD)&Test_ClassFactory, + "Hash value should have been 0x%08x, instead of 0x%08x\n", + (DWORD)&Test_ClassFactory, hash); + + /* IsSystemMoniker test */ + hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); + ok_ole_success(hr, IMoniker_IsSystemMoniker); + ok(moniker_type == MKSYS_POINTERMONIKER, + "dwMkSys != MKSYS_POINTERMONIKER, instead was 0x%08x\n", + moniker_type); + + hr = IMoniker_Inverse(moniker, &inverse); + ok_ole_success(hr, IMoniker_Inverse); + IMoniker_Release(inverse); + + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_OK, "IMoniker_IsRunning should return S_OK, not 0x%08x\n", hr); + + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + ok(hr == E_NOTIMPL, "IMoniker_GetTimeOfLastChange should return E_NOTIMPL, not 0x%08x\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok_ole_success(hr, IMoniker_BindToObject); + IUnknown_Release(unknown); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok_ole_success(hr, IMoniker_BindToStorage); + IUnknown_Release(unknown); + + IMoniker_Release(moniker); + + ok_no_locks(); + + hr = CreatePointerMoniker(NULL, &moniker); + ok_ole_success(hr, CreatePointerMoniker); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToObject should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToStorage should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + IMoniker_Release(moniker); +} + static void test_bind_context(void) { HRESULT hr; @@ -1700,6 +1808,7 @@ START_TEST(moniker) test_item_moniker(); test_anti_moniker(); test_generic_composite_moniker(); + test_pointer_moniker(); /* FIXME: test moniker creation funcs and parsing other moniker formats */

1 0

Rob Shearman : ole32: Add pointer moniker implementation.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: b7f3ee51b1894b956018f0c97a16546bb23a8a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f3ee51b1894b956018f0c97… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:45:10 2008 +0000 ole32: Add pointer moniker implementation. --- dlls/ole32/Makefile.in | 1 + dlls/ole32/moniker.c | 24 -- dlls/ole32/moniker.h | 2 + dlls/ole32/oleproxy.c | 2 + dlls/ole32/pointermoniker.c | 654 +++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/regsvr.c | 3 - dlls/ole32/tests/moniker.c | 1 - 7 files changed, 659 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7f3ee51b1894b956018f…

1 0