June 2011 - Wine-Commits - list.winehq.org

Jacek Caban : urlmon: Added CoInternetIsFeatureEnabledForUrl stub implementation.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 01653331befa45b05c8c1dfe7130269aa7f76271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01653331befa45b05c8c1dfe7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 15:44:28 2011 +0200 urlmon: Added CoInternetIsFeatureEnabledForUrl stub implementation. --- dlls/urlmon/internet.c | 10 ++++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 2 ++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index c09bace..06a423a 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -693,3 +693,13 @@ HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST FeatureEntry, DWOR TRACE("(%d, %08x)\n", FeatureEntry, dwFlags); return get_internet_feature(FeatureEntry, dwFlags); } + +/*********************************************************************** + * CoInternetIsFeatureEnabledForUrl (URLMON.@) + */ +HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST FeatureEntry, DWORD dwFlags, LPCWSTR szURL, + IInternetSecurityManager *pSecMgr) +{ + FIXME("(%d %08x %s %p)\n", FeatureEntry, dwFlags, debugstr_w(szURL), pSecMgr); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 9765167..3536257 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -21,6 +21,7 @@ @ stdcall CoInternetGetSecurityUrlEx(ptr ptr long long) @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetIsFeatureEnabled(long long) +@ stdcall CoInternetIsFeatureEnabledForUrl(long long wstr ptr) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetParseIUri(ptr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) diff --git a/include/urlmon.idl b/include/urlmon.idl index f282dbb..a8a0a71 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1977,6 +1977,8 @@ cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DW cpp_quote("HRESULT WINAPI CoInternetParseIUri(IUri*,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD_PTR);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST,DWORD,BOOL);") +cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST,DWORD dwFlags);") +cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST,DWORD,LPCWSTR,IInternetSecurityManager*);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR,LPWSTR*,PSUACTION,DWORD);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri*,IUri**,PSUACTION,DWORD_PTR);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);")

1 0

Jacek Caban : mshtml: Use CreateURLMonikerEx2 for creating URL moniker.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: f7b8eccd5f3fc8cf51a4a534b69435337f051ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b8eccd5f3fc8cf51a4a534b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:45:18 2011 +0200 mshtml: Use CreateURLMonikerEx2 for creating URL moniker. --- dlls/mshtml/nsio.c | 56 +++++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b97dbe4..9473754 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -69,6 +69,32 @@ struct nsWineURI { BOOL is_doc_uri; }; +static BOOL ensure_uri(nsWineURI *This) +{ + HRESULT hres; + + if(This->uri) + return TRUE; + + if(This->uri_builder) { + hres = IUriBuilder_CreateUriSimple(This->uri_builder, 0, 0, &This->uri); + if(FAILED(hres)) { + WARN("CreateUriSimple failed: %08x\n", hres); + return FALSE; + } + + return TRUE; + } + + hres = CreateUri(This->wine_url, 0, 0, &This->uri); + if(FAILED(hres)) { + WARN("CreateUri failed: %08x\n", hres); + return FALSE; + } + + return TRUE; +} + static nsresult create_uri(nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -886,7 +912,7 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan IMoniker *mon = NULL; HRESULT hres; - hres = CreateURLMoniker(NULL, This->uri->wine_url, &mon); + hres = CreateURLMonikerEx2(NULL, This->uri->uri, &mon, 0); if(FAILED(hres)) { WARN("CreateURLMoniker failed: %08x\n", hres); return NS_ERROR_UNEXPECTED; @@ -927,6 +953,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url)); + if(!ensure_uri(This->uri)) + return NS_ERROR_FAILURE; + if(This->uri->is_doc_uri) { window = get_channel_window(This); if(window) { @@ -1500,31 +1529,6 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_SetChannelIsForDownload }; -static BOOL ensure_uri(nsWineURI *This) -{ - HRESULT hres; - - if(This->uri) - return TRUE; - - if(This->uri_builder) { - hres = IUriBuilder_CreateUriSimple(This->uri_builder, 0, 0, &This->uri); - if(FAILED(hres)) { - WARN("CreateUriSimple failed: %08x\n", hres); - return FALSE; - } - - return TRUE; - } - - hres = CreateUri(This->wine_url, 0, 0, &This->uri); - if(FAILED(hres)) { - WARN("CreateUri failed: %08x\n", hres); - return FALSE; - } - - return TRUE; -} static void invalidate_uri(nsWineURI *This) {

1 0

Jacek Caban : mshtml: Use IUri instead of wine_url in before_async_open.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 7a0363cd9445285e5e18fe9c7b3e85c1954a40e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0363cd9445285e5e18fe9c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:45:34 2011 +0200 mshtml: Use IUri instead of wine_url in before_async_open. --- dlls/mshtml/nsio.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9473754..b47a643 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -126,7 +126,7 @@ HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret) return S_OK; } -static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url) +static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, BSTR url) { IOleCommandTarget *cmdtrg = NULL; HRESULT hres; @@ -136,13 +136,12 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url) VARIANT varUrl, varRes; V_VT(&varUrl) = VT_BSTR; - V_BSTR(&varUrl) = SysAllocString(url); + V_BSTR(&varUrl) = url; V_VT(&varRes) = VT_BOOL; hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 67, 0, &varUrl, &varRes); IOleCommandTarget_Release(cmdtrg); - SysFreeString(V_BSTR(&varUrl)); if(SUCCEEDED(hres) && !V_BOOL(&varRes)) { TRACE("got VARIANT_FALSE, do not load\n"); @@ -153,11 +152,10 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url) return TRUE; } -static BOOL before_async_open(nsChannel *channel, NSContainer *container) +static nsresult before_async_open(nsChannel *channel, NSContainer *container, BOOL *cancel) { HTMLDocumentObj *doc = container->doc; DWORD hlnf = 0; - BOOL cancel; HRESULT hres; if(!doc) { @@ -169,14 +167,31 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) doc = container_iter->doc; } - if(!doc->client) - return TRUE; + if(!doc->client) { + *cancel = TRUE; + return NS_OK; + } - if(!hlnf && !exec_shldocvw_67(doc, channel->uri->wine_url)) - return FALSE; + if(!hlnf) { + BSTR display_uri; + BOOL b; + + hres = IUri_GetDisplayUri(channel->uri->uri, &display_uri); + if(FAILED(hres)) + return NS_ERROR_FAILURE; - hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, &cancel); - return FAILED(hres) || cancel; + b = !exec_shldocvw_67(doc, display_uri); + SysFreeString(display_uri); + if(b) { + *cancel = FALSE; + return NS_OK; + } + } + + hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, cancel); + if(FAILED(hres)) + *cancel = TRUE; + return NS_OK; } HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, DWORD flags) @@ -948,7 +963,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen { nsChannel *This = impl_from_nsIHttpChannel(iface); HTMLWindow *window = NULL; - BOOL open = TRUE; + BOOL cancel = FALSE; nsresult nsres = NS_OK; TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url)); @@ -967,7 +982,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(This->uri->container->doc) FIXME("nscontainer->doc = %p\n", This->uri->container->doc); - b = before_async_open(This, This->uri->container); + nsres = before_async_open(This, This->uri->container, &b); + if(NS_FAILED(nsres)) + return nsres; if(b) FIXME("Navigation not cancelled\n"); return NS_ERROR_UNEXPECTED; @@ -1003,17 +1020,17 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen This->content_type = heap_strdupWtoA(window->doc_obj->mime); } - open = FALSE; + cancel = TRUE; }else { - open = !before_async_open(This, window->doc_obj->nscontainer); - if(!open) { + nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); + if(NS_SUCCEEDED(nsres) && cancel) { TRACE("canceled\n"); nsres = NS_ERROR_UNEXPECTED; } } } - if(open) + if(!cancel) nsres = async_open(This, window, This->uri->is_doc_uri, aListener, aContext); if(NS_SUCCEEDED(nsres) && This->load_group) {

1 0

Huw Davies : gdi32/tests: Show that Get/SetDIBits ignore the layout mode.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: e2f1bd4f8fef3bcc1bd5f1a405bf8f25dab43d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f1bd4f8fef3bcc1bd5f1a40… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 23 14:30:03 2011 +0100 gdi32/tests: Show that Get/SetDIBits ignore the layout mode. --- dlls/gdi32/tests/bitmap.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ca53fc7..d21d502 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -33,6 +33,7 @@ #include "wine/test.h" static BOOL (WINAPI *pGdiAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); +static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); #define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } @@ -3080,12 +3081,80 @@ static void test_GetDIBits_top_down(int bpp) DeleteObject(bmptb); } +static void test_GetSetDIBits_rtl(void) +{ + HDC hdc, hdc_mem; + HBITMAP bitmap, orig_bitmap; + BITMAPINFO info; + int ret; + DWORD bits_1[8 * 8], bits_2[8 * 8]; + + if(!pSetLayout) + { + win_skip("Don't have SetLayout\n"); + return; + } + + hdc = GetDC( NULL ); + hdc_mem = CreateCompatibleDC( hdc ); + pSetLayout( hdc_mem, LAYOUT_LTR ); + + bitmap = CreateCompatibleBitmap( hdc, 8, 8 ); + orig_bitmap = SelectObject( hdc_mem, bitmap ); + SetPixel( hdc_mem, 0, 0, RGB(0xff, 0, 0) ); + SelectObject( hdc_mem, orig_bitmap ); + + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = 8; + info.bmiHeader.biHeight = 8; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + + /* First show that GetDIBits ignores the layout mode. */ + + ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ok(bits_1[56] == 0xff0000, "got %08x\n", bits_1[56]); /* check we have a red pixel */ + + pSetLayout( hdc_mem, LAYOUT_RTL ); + + ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_2, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + + ok(!memcmp( bits_1, bits_2, sizeof(bits_1) ), "bits differ\n"); + + /* Now to show that SetDIBits also ignores the mode, we perform a SetDIBits + followed by a GetDIBits and show that the bits remain unchanged. */ + + pSetLayout( hdc_mem, LAYOUT_LTR ); + + ret = SetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_2, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ok(!memcmp( bits_1, bits_2, sizeof(bits_1) ), "bits differ\n"); + + pSetLayout( hdc_mem, LAYOUT_RTL ); + + ret = SetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_2, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ok(!memcmp( bits_1, bits_2, sizeof(bits_1) ), "bits differ\n"); + + DeleteObject( bitmap ); + DeleteDC( hdc_mem ); + ReleaseDC( NULL, hdc ); +} + START_TEST(bitmap) { HMODULE hdll; hdll = GetModuleHandle("gdi32.dll"); pGdiAlphaBlend = (void*)GetProcAddress(hdll, "GdiAlphaBlend"); + pSetLayout = (void*)GetProcAddress(hdll, "SetLayout"); test_createdibitmap(); test_dibsections(); @@ -3112,4 +3181,5 @@ START_TEST(bitmap) test_GetDIBits_top_down(16); test_GetDIBits_top_down(24); test_GetDIBits_top_down(32); + test_GetSetDIBits_rtl(); }

1 0

Jacek Caban : urlmon: Use proper IUri in BindToObject implementation.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 8646cd772b6ee06ffab9cd2eb96d8ab909cdf54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8646cd772b6ee06ffab9cd2eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:44:57 2011 +0200 urlmon: Use proper IUri in BindToObject implementation. --- dlls/urlmon/tests/url.c | 5 +++++ dlls/urlmon/umon.c | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 4924154..d752759 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3626,6 +3626,11 @@ static void test_StdURLMoniker(void) ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); ok(!unk, "unk = %p\n", unk); + unk = (void*)0xdeadbeef; + hres = IMoniker_BindToObject(mon, bctx, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); + ok(!unk, "unk = %p\n", unk); + IMoniker_Release(mon); } diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 0e6c764..d3eb44e 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -227,7 +227,6 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM { URLMoniker *This = impl_from_IMoniker(iface); IRunningObjectTable *obj_tbl; - IUri *uri; HRESULT hres; TRACE("(%p)->(%p,%p,%s,%p): stub\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppv); @@ -238,14 +237,12 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM IRunningObjectTable_Release(obj_tbl); } - hres = CreateUri(This->URLName, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); - if(FAILED(hres)) - return hres; - - hres = bind_to_object(iface, uri, pbc, riid, ppv); + if(!This->uri) { + *ppv = NULL; + return MK_E_SYNTAX; + } - IUri_Release(uri); - return hres; + return bind_to_object(&This->IMoniker_iface, This->uri, pbc, riid, ppv); } static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc,

1 0

Jacek Caban : urlmon: Use proper IUri in BindToStorage implementation.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: cca52128bd679dba71b65d6878bd8fbd447c3ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca52128bd679dba71b65d687… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:44:38 2011 +0200 urlmon: Use proper IUri in BindToStorage implementation. --- dlls/urlmon/tests/url.c | 12 ++++++++++++ dlls/urlmon/umon.c | 12 +++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 8766b1d..4924154 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3582,6 +3582,8 @@ static void test_StdURLMoniker(void) { IMoniker *mon, *async_mon; LPOLESTR display_name; + IBindCtx *bctx; + IUnknown *unk; HRESULT hres; hres = CoCreateInstance(&IID_IInternet, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -3614,6 +3616,16 @@ static void test_StdURLMoniker(void) IUriContainer_Release(uri_container); } + SET_EXPECT(QueryInterface_IServiceProvider); + hres = CreateAsyncBindCtx(0, (IBindStatusCallback*)&bsc, NULL, &bctx); + ok(hres == S_OK, "CreateAsyncBindCtx failed: %08x\n\n", hres); + CHECK_CALLED(QueryInterface_IServiceProvider); + + unk = (void*)0xdeadbeef; + hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); + ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); + ok(!unk, "unk = %p\n", unk); + IMoniker_Release(mon); } diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index cff4190..0e6c764 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -252,8 +252,6 @@ static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, void **ppvObject) { URLMoniker *This = impl_from_IMoniker(iface); - IUri *uri; - HRESULT hres; TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); @@ -264,14 +262,10 @@ static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc, if(pmkToLeft) FIXME("Unsupported pmkToLeft\n"); - hres = CreateUri(This->URLName, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); - if(FAILED(hres)) - return hres; - - hres = bind_to_storage(uri, pbc, riid, ppvObject); + if(!This->uri) + return MK_E_SYNTAX; - IUri_Release(uri); - return hres; + return bind_to_storage(This->uri, pbc, riid, ppvObject); } static HRESULT WINAPI URLMoniker_Reduce(IMoniker *iface, IBindCtx *pbc,

1 0

Jacek Caban : urlmon: Added more CreateURLMoniker* tests.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: e6bc4cea2c48e3c4a512afec22848d420c7ef72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6bc4cea2c48e3c4a512afec2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:44:02 2011 +0200 urlmon: Added more CreateURLMoniker* tests. --- dlls/urlmon/tests/uri.c | 200 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 200 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index bc84825..477722f 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -71,6 +71,8 @@ static HRESULT (WINAPI *pCoInternetCombineIUri)(IUri*,IUri*,DWORD,IUri**,DWORD_P static HRESULT (WINAPI *pCoInternetGetSession)(DWORD,IInternetSession**,DWORD); static HRESULT (WINAPI *pCoInternetCombineUrlEx)(IUri*,LPCWSTR,DWORD,IUri**,DWORD_PTR); static HRESULT (WINAPI *pCoInternetParseIUri)(IUri*,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD_PTR); +static HRESULT (WINAPI *pCreateURLMonikerEx)(IMoniker*,LPCWSTR,IMoniker**,DWORD); +static HRESULT (WINAPI *pCreateURLMonikerEx2)(IMoniker*,IUri*,IMoniker**,DWORD); static const WCHAR http_urlW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', '.','o','r','g','/',0}; @@ -10078,6 +10080,199 @@ static void test_CoInternetParseIUri_Pluggable(void) { if(uri) IUri_Release(uri); } +typedef struct { + const char *url; + DWORD uri_flags; + const char *base_url; + DWORD base_uri_flags; + const char *legacy_url; + const char *uniform_url; + const char *no_canon_url; + const char *uri_url; +} create_urlmon_test_t; + +static const create_urlmon_test_t create_urlmon_tests[] = { + { + "http://www.winehq.org",Uri_CREATE_NO_CANONICALIZE, + NULL,0, + "http://www.winehq.org/", + "http://www.winehq.org/", + "http://www.winehq.org", + "http://www.winehq.org" + }, + { + "file://c:\\dir\\file.txt",Uri_CREATE_NO_CANONICALIZE, + NULL,0, + "file://c:\\dir\\file.txt", + "file:///c:/dir/file.txt", + "file:///c:/dir/file.txt", + "file:///c:/dir/file.txt" + }, + { + "file://c:\\dir\\file.txt",Uri_CREATE_FILE_USE_DOS_PATH, + NULL,0, + "file://c:\\dir\\file.txt", + "file:///c:/dir/file.txt", + "file:///c:/dir/file.txt", + "file://c:\\dir\\file.txt" + }, + { + "dat%61",Uri_CREATE_ALLOW_RELATIVE, + "http://www.winehq.org",0, + "http://www.winehq.org/data", + "http://www.winehq.org/data", + "http://www.winehq.org:80/data", + }, + { + "file.txt",Uri_CREATE_ALLOW_RELATIVE, + "file://c:\\dir\\x.txt",Uri_CREATE_NO_CANONICALIZE, + "file://c:\\dir\\file.txt", + "file:///c:/dir/file.txt", + "file:///c:/dir/file.txt", + }, + { + "",Uri_CREATE_ALLOW_RELATIVE, + NULL,0, + "", + "", + "", + "" + }, + { + "test",Uri_CREATE_ALLOW_RELATIVE, + NULL,0, + "test", + "test", + "test", + "test" + }, + { + "c:\\dir\\file.txt",Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + NULL,0, + "file://c:\\dir\\file.txt", + "file:///c:/dir/file.txt", + "file:///c:/dir/file.txt", + "file:///c:/dir/file.txt", + } +}; + +#define test_urlmon_display_name(a,b) _test_urlmon_display_name(__LINE__,a,b) +static void _test_urlmon_display_name(unsigned line, IMoniker *mon, const char *exurl) +{ + WCHAR *display_name; + HRESULT hres; + + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name); + ok_(__FILE__,line)(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_aw(exurl, display_name), "unexpected display name: %s, expected %s\n", + wine_dbgstr_w(display_name), exurl); + + CoTaskMemFree(display_name); +} + +#define test_display_uri(a,b) _test_display_uri(__LINE__,a,b) +static void _test_display_uri(unsigned line, IMoniker *mon, const char *exurl) +{ + IUriContainer *uri_container; + IUri *uri; + BSTR display_uri; + HRESULT hres; + + hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container); + ok(hres == S_OK, "Could not get IUriContainer iface: %08x\n", hres); + + uri = NULL; + hres = IUriContainer_GetIUri(uri_container, &uri); + IUriContainer_Release(uri_container); + ok(hres == S_OK, "GetIUri failed: %08x\n", hres); + ok(uri != NULL, "uri == NULL\n"); + + hres = IUri_GetDisplayUri(uri, &display_uri); + IUri_Release(uri); + ok(hres == S_OK, "GetDisplayUri failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_aw(exurl, display_uri), "unexpected display uri: %s, expected %s\n", + wine_dbgstr_w(display_uri), exurl); + SysFreeString(display_uri); +} + +static void test_CreateURLMoniker(void) +{ + const create_urlmon_test_t *test; + IMoniker *mon, *base_mon; + WCHAR *url, *base_url; + IUri *uri, *base_uri; + HRESULT hres; + + for(test = create_urlmon_tests; test < create_urlmon_tests + sizeof(create_urlmon_tests)/sizeof(*create_urlmon_tests); test++) { + url = a2w(test->url); + base_url = a2w(test->base_url); + + if(base_url) { + hres = pCreateUri(base_url, test->base_uri_flags, 0, &base_uri); + ok(hres == S_OK, "CreateUri failed: %08x\n", hres); + + hres = pCreateURLMonikerEx2(NULL, base_uri, &base_mon, URL_MK_NO_CANONICALIZE); + ok(hres == S_OK, "CreateURLMonikerEx2 failed: %08x\n", hres); + }else { + base_uri = NULL; + base_mon = NULL; + } + + hres = CreateURLMoniker(base_mon, url, &mon); + ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + test_urlmon_display_name(mon, test->legacy_url); + test_display_uri(mon, test->legacy_url); + IMoniker_Release(mon); + + hres = pCreateURLMonikerEx(base_mon, url, &mon, URL_MK_LEGACY); + ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + test_urlmon_display_name(mon, test->legacy_url); + test_display_uri(mon, test->legacy_url); + IMoniker_Release(mon); + + hres = pCreateURLMonikerEx(base_mon, url, &mon, URL_MK_UNIFORM); + ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + test_urlmon_display_name(mon, test->uniform_url); + test_display_uri(mon, test->uniform_url); + IMoniker_Release(mon); + + hres = pCreateURLMonikerEx(base_mon, url, &mon, URL_MK_NO_CANONICALIZE); + ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + test_urlmon_display_name(mon, test->no_canon_url); + test_display_uri(mon, test->no_canon_url); + IMoniker_Release(mon); + + hres = pCreateUri(url, test->uri_flags, 0, &uri); + ok(hres == S_OK, "CreateUri failed: %08x\n", hres); + + hres = pCreateURLMonikerEx2(base_mon, uri, &mon, URL_MK_LEGACY); + ok(hres == S_OK, "CreateURLMonikerEx2 failed: %08x\n", hres); + test_urlmon_display_name(mon, base_url ? test->legacy_url : test->uri_url); + test_display_uri(mon, base_url ? test->legacy_url : test->uri_url); + IMoniker_Release(mon); + + hres = pCreateURLMonikerEx2(base_mon, uri, &mon, URL_MK_UNIFORM); + ok(hres == S_OK, "CreateURLMonikerEx2 failed: %08x\n", hres); + test_urlmon_display_name(mon, base_url ? test->uniform_url : test->uri_url); + test_display_uri(mon, base_url ? test->uniform_url : test->uri_url); + IMoniker_Release(mon); + + hres = pCreateURLMonikerEx2(base_mon, uri, &mon, URL_MK_NO_CANONICALIZE); + ok(hres == S_OK, "CreateURLMonikerEx2 failed: %08x\n", hres); + test_urlmon_display_name(mon, base_url ? test->no_canon_url : test->uri_url); + test_display_uri(mon, base_url ? test->no_canon_url : test->uri_url); + IMoniker_Release(mon); + + IUri_Release(uri); + heap_free(url); + heap_free(base_url); + if(base_uri) + IUri_Release(base_uri); + if(base_mon) + IMoniker_Release(base_mon); + } +} + START_TEST(uri) { HMODULE hurlmon; @@ -10089,6 +10284,8 @@ START_TEST(uri) { pCoInternetCombineIUri = (void*) GetProcAddress(hurlmon, "CoInternetCombineIUri"); pCoInternetCombineUrlEx = (void*) GetProcAddress(hurlmon, "CoInternetCombineUrlEx"); pCoInternetParseIUri = (void*) GetProcAddress(hurlmon, "CoInternetParseIUri"); + pCreateURLMonikerEx = (void*) GetProcAddress(hurlmon, "CreateURLMonikerEx"); + pCreateURLMonikerEx2 = (void*) GetProcAddress(hurlmon, "CreateURLMonikerEx2"); if(!pCreateUri) { win_skip("CreateUri is not present, skipping tests.\n"); @@ -10187,5 +10384,8 @@ START_TEST(uri) { trace("test CoInternetParseIUri pluggable...\n"); test_CoInternetParseIUri_Pluggable(); + trace("test CreateURLMoniker...\n"); + test_CreateURLMoniker(); + unregister_protocols(); }

1 0

Jacek Caban : urlmon: Added support for IUri in IMoniker:: Load implementation.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 649c1793c0b13f00c40602febaa6fc3654c378ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=649c1793c0b13f00c40602feb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:44:17 2011 +0200 urlmon: Added support for IUri in IMoniker::Load implementation. --- dlls/urlmon/umon.c | 48 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index f6e167c..cff4190 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -139,9 +139,12 @@ static HRESULT WINAPI URLMoniker_IsDirty(IMoniker *iface) static HRESULT WINAPI URLMoniker_Load(IMoniker* iface,IStream* pStm) { URLMoniker *This = impl_from_IMoniker(iface); - HRESULT res; + WCHAR *new_uri_str; + IUri *new_uri; + BSTR new_url; ULONG size; ULONG got; + HRESULT hres; TRACE("(%p,%p)\n",This,pStm); @@ -153,22 +156,37 @@ static HRESULT WINAPI URLMoniker_Load(IMoniker* iface,IStream* pStm) * Writes a ULONG containing length of unicode string, followed * by that many unicode characters */ - res = IStream_Read(pStm, &size, sizeof(ULONG), &got); - if(SUCCEEDED(res)) { - if(got == sizeof(ULONG)) { - SysFreeString(This->URLName); - This->URLName = SysAllocStringLen(NULL, size/sizeof(WCHAR)); - if(!This->URLName) - res = E_OUTOFMEMORY; - else { - res = IStream_Read(pStm, This->URLName, size, NULL); - } - } - else - res = E_FAIL; + hres = IStream_Read(pStm, &size, sizeof(ULONG), &got); + if(FAILED(hres)) + return hres; + if(got != sizeof(ULONG)) + return E_FAIL; + + new_uri_str = heap_alloc(size+sizeof(WCHAR)); + if(!new_uri_str) + return E_OUTOFMEMORY; + + hres = IStream_Read(pStm, new_uri_str, size, NULL); + new_uri_str[size/sizeof(WCHAR)] = 0; + if(SUCCEEDED(hres)) + hres = CreateUri(new_uri_str, 0, 0, &new_uri); + heap_free(new_uri_str); + if(FAILED(hres)) + return hres; + + hres = IUri_GetDisplayUri(new_uri, &new_url); + if(FAILED(hres)) { + IUri_Release(new_uri); + return hres; } - return res; + SysFreeString(This->URLName); + if(This->uri) + IUri_Release(This->uri); + + This->uri = new_uri; + This->URLName = new_url; + return S_OK; } static HRESULT WINAPI URLMoniker_Save(IMoniker *iface, IStream* pStm, BOOL fClearDirty)

1 0

Jacek Caban : urlmon: Added CreateURLMonikerEx2 implementation.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: c519159f5da3715be9666cfb12fcc52078f98cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c519159f5da3715be9666cfb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:43:47 2011 +0200 urlmon: Added CreateURLMonikerEx2 implementation. --- dlls/urlmon/umon.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 1 + 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index e65e1d1..f6e167c 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -638,6 +638,58 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker return S_OK; } +/*********************************************************************** + * CreateURLMonikerEx2 (URLMON.@) + */ +HRESULT WINAPI CreateURLMonikerEx2(IMoniker *pmkContext, IUri *pUri, IMoniker **ppmk, DWORD dwFlags) +{ + IUri *context_uri = NULL, *uri; + IUriContainer *uri_container; + URLMoniker *ret; + HRESULT hres; + + TRACE("(%p %p %p %x)\n", pmkContext, pUri, ppmk, dwFlags); + + if (ppmk) + *ppmk = NULL; + + if (!pUri || !ppmk) + return E_INVALIDARG; + + if(dwFlags > sizeof(create_flags_map)/sizeof(*create_flags_map)) { + FIXME("Unsupported flags %x\n", dwFlags); + return E_INVALIDARG; + } + + if(pmkContext) { + hres = IMoniker_QueryInterface(pmkContext, &IID_IUriContainer, (void**)&uri_container); + if(SUCCEEDED(hres)) { + hres = IUriContainer_GetIUri(uri_container, &context_uri); + if(FAILED(hres)) + context_uri = NULL; + IUriContainer_Release(uri_container); + } + } + + if(context_uri) { + hres = CoInternetCombineIUri(context_uri, pUri, combine_flags_map[dwFlags], &uri, 0); + IUri_Release(context_uri); + if(FAILED(hres)) + return hres; + }else { + uri = pUri; + IUri_AddRef(uri); + } + + hres = create_moniker(uri, &ret); + IUri_Release(uri); + if(FAILED(hres)) + return hres; + + *ppmk = &ret->IMoniker_iface; + return S_OK; +} + /********************************************************************** * CreateURLMoniker (URLMON.@) * diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 58b3f33..9765167 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -36,6 +36,7 @@ @ stdcall CreateUriWithFragment(wstr wstr long long ptr) @ stdcall CreateURLMoniker(ptr wstr ptr) @ stdcall CreateURLMonikerEx(ptr wstr ptr long) +@ stdcall CreateURLMonikerEx2(ptr ptr ptr long) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllInstall(long wstr)

1 0

Jacek Caban : urlmon: Properly support dwFlags argument in CreateURLMonikerEx.
by Alexandre Julliard June 24, 2011

June 24, 2011

Module: wine Branch: master Commit: 7cb30ca57d6157c1cca8356bcd7a19d55ff45630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb30ca57d6157c1cca8356bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:43:22 2011 +0200 urlmon: Properly support dwFlags argument in CreateURLMonikerEx. --- dlls/urlmon/umon.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index fbb2287..86c0382 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -555,6 +555,18 @@ HRESULT StdURLMoniker_Construct(IUnknown *outer, void **ppv) return S_OK; } +static const DWORD create_flags_map[3] = { + Uri_CREATE_FILE_USE_DOS_PATH, /* URL_MK_LEGACY */ + 0, /* URL_MK_UNIFORM */ + Uri_CREATE_NO_CANONICALIZE /* URL_MK_NO_CANONICALIZE */ +}; + +static const DWORD combine_flags_map[3] = { + URL_FILE_USE_PATHURL, /* URL_MK_LEGACY */ + 0, /* URL_MK_UNIFORM */ + URL_DONT_SIMPLIFY /* URL_MK_NO_CANONICALIZE */ +}; + /*********************************************************************** * CreateURLMonikerEx (URLMON.@) * @@ -585,8 +597,10 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker if (!szURL || !ppmk) return E_INVALIDARG; - if(dwFlags != URL_MK_LEGACY) + if(dwFlags > sizeof(create_flags_map)/sizeof(*create_flags_map)) { FIXME("Unsupported flags %x\n", dwFlags); + return E_INVALIDARG; + } if(pmkContext) { IUriContainer *uri_container; @@ -601,10 +615,10 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker } if(base_uri) { - hres = CoInternetCombineUrlEx(base_uri, szURL, URL_FILE_USE_PATHURL, &uri, 0); + hres = CoInternetCombineUrlEx(base_uri, szURL, combine_flags_map[dwFlags], &uri, 0); IUri_Release(base_uri); }else { - hres = CreateUri(szURL, Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_ALLOW_RELATIVE|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri); + hres = CreateUri(szURL, Uri_CREATE_ALLOW_RELATIVE|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|create_flags_map[dwFlags], 0, &uri); } if(FAILED(hres)) return hres;

1 0