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

Aric Stewart : usp10: Correct Pre Base glyph index shifting.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: df16d37b671298dad41e793963d3f4cdb96b68e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df16d37b671298dad41e79396… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 24 10:16:25 2011 -0500 usp10: Correct Pre Base glyph index shifting. --- dlls/usp10/shape.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8152e33..c4f7db5 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2048,20 +2048,20 @@ static void Apply_Indic_PreBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, { INT index, nextIndex; INT count,g_offset; - INT prevCount = *pcGlyphs; count = syllable->base - syllable->start; g_offset = 0; index = find_consonant_halant(&pwChars[syllable->start], 0, count, lexical); - while (index >= 0 && index < (glyph_index->base - glyph_index->start)) + while (index >= 0 && index + g_offset < (glyph_index->base - glyph_index->start)) { + INT prevCount = *pcGlyphs; nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, index+glyph_index->start+g_offset, 1, pcGlyphs, feature); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); + shift_syllable_glyph_indexs(glyph_index, index + glyph_index->start + g_offset, (*pcGlyphs - prevCount)); g_offset += (*pcGlyphs - prevCount); - shift_syllable_glyph_indexs(glyph_index, index + glyph_index->start, g_offset); } index+=2;

1 0

Maarten Lankhorst : quartz: Skip filtergraph tests when filtergraph cannot be created.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: f991daf188247466ffe3353e3843ab0f04947d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f991daf188247466ffe3353e3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jun 24 16:51:11 2011 +0200 quartz: Skip filtergraph tests when filtergraph cannot be created. --- dlls/quartz/tests/filtergraph.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 596d115..7031199 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1872,7 +1872,14 @@ static void test_render_filter_priority(void) START_TEST(filtergraph) { + HRESULT hr; CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, (LPVOID*)&pgraph); + if (FAILED(hr)) { + skip("Creating filtergraph returned %08x, skipping tests\n", hr); + return; + } test_render_run(avifile); test_render_run(mpegfile); test_graph_builder();

1 0

Stefan Dösinger : wined3d: Fix a typo in compare_sig in the arb backend.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 3a3b4828645650d0560c9aa7de3031dcab52463f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a3b4828645650d0560c9aa7d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 23 00:19:11 2011 +0200 wined3d: Fix a typo in compare_sig in the arb backend. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7039841..893455e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3863,7 +3863,7 @@ static int compare_sig(const struct wined3d_shader_signature_element *sig1, cons if(sig1[i].sysval_semantic != sig2[i].sysval_semantic) return sig1[i].sysval_semantic < sig2[i].sysval_semantic ? -1 : 1; if(sig1[i].component_type != sig2[i].component_type) return sig1[i].component_type < sig2[i].component_type ? -1 : 1; if(sig1[i].register_idx != sig2[i].register_idx) return sig1[i].register_idx < sig2[i].register_idx ? -1 : 1; - if(sig1[i].mask != sig2->mask) return sig1[i].mask < sig2[i].mask ? -1 : 1; + if(sig1[i].mask != sig2[i].mask) return sig1[i].mask < sig2[i].mask ? -1 : 1; } return 0; }

1 0

Stefan Dösinger : wined3d: Get rid of the has_signature_idx field in the ARB ps private data.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 1bc01f8f87b88fc4f962b8021b7efd4d0aa84530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc01f8f87b88fc4f962b8021… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 20 23:26:03 2011 +0200 wined3d: Get rid of the has_signature_idx field in the ARB ps private data. --- dlls/wined3d/arb_program_shader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 893455e..e533018 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -285,7 +285,6 @@ struct ps_signature struct arb_pshader_private { struct arb_ps_compiled_shader *gl_shaders; UINT num_gl_shaders, shader_array_size; - BOOL has_signature_idx; DWORD input_signature_idx; DWORD clipplane_emulation; BOOL clamp_consts; @@ -4277,7 +4276,6 @@ static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *sh else shader_data->input_signature_idx = find_input_signature(priv, shader->input_signature); - shader_data->has_signature_idx = TRUE; TRACE("Shader got assigned input signature index %u\n", shader_data->input_signature_idx); if (!device->vs_clipping)

1 0

Mariusz Pluciński : shell32/tests: Add test of IKnownFolder::GetCategory for custom known folder.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: efc1162eb7e9cea29b0e8a29f5bde8e20d804b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc1162eb7e9cea29b0e8a29f… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 23 18:49:48 2011 +0200 shell32/tests: Add test of IKnownFolder::GetCategory for custom known folder. --- dlls/shell32/tests/shellpath.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index bba7858..2240630 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1175,6 +1175,12 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); if(SUCCEEDED(hr)) { + hr = IKnownFolder_GetCategory(folder, &cat); + todo_wine + ok(hr == S_OK, "failed to get folder category: hr=0x%0x\n", hr); + todo_wine + ok(cat == KF_CATEGORY_PERUSER, "invalid category returned: %d, while %d (KF_CATEGORY_PERUSER) expected\n", cat, KF_CATEGORY_PERUSER); + hr = IKnownFolder_GetId(folder, &folderId); ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); ok(IsEqualGUID(&folderId, &newFolderId)==TRUE, "invalid KNOWNFOLDERID returned\n");

1 0

Jacek Caban : urlmon: Properly support dwFlags argument in CreateURLMonikerEx.
by Alexandre Julliard 24 Jun '11

24 Jun '11

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

Jacek Caban : urlmon: Added IUriContainer::GetIUri implementation.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 13a79378b02da3897122e9c7b713a682ff516387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a79378b02da3897122e9c7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:43:33 2011 +0200 urlmon: Added IUriContainer::GetIUri implementation. --- dlls/urlmon/umon.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 86c0382..e65e1d1 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -494,10 +494,16 @@ static HRESULT WINAPI UriContainer_GetIUri(IUriContainer *iface, IUri **ppIUri) { URLMoniker *This = impl_from_IUriContainer(iface); - FIXME("(%p)->(%p)\n", This, ppIUri); + TRACE("(%p)->(%p)\n", This, ppIUri); - *ppIUri = NULL; - return S_FALSE; + if(!This->uri) { + *ppIUri = NULL; + return S_FALSE; + } + + IUri_AddRef(This->uri); + *ppIUri = This->uri; + return S_OK; } static const IUriContainerVtbl UriContainerVtbl = {

1 0

Jacek Caban : urlmon: Added CreateURLMonikerEx2 implementation.
by Alexandre Julliard 24 Jun '11

24 Jun '11

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: Added more CreateURLMoniker* tests.
by Alexandre Julliard 24 Jun '11

24 Jun '11

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 24 Jun '11

24 Jun '11

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