February 2008 - Wine-Commits

Jacek Caban : widl: Ignore ATTR_LOCAL in create_msft_typeinfo.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 2118aeca162c13a88858a1aec57ce15fb5799ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2118aeca162c13a88858a1aec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 01:13:25 2008 +0100 widl: Ignore ATTR_LOCAL in create_msft_typeinfo. --- tools/widl/write_msft.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f5ea2f7..51227bf 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1841,6 +1841,9 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ typeinfo->flags |= 0x10; /* TYPEFLAG_FHIDDEN */ break; + case ATTR_LOCAL: + break; + case ATTR_NONCREATABLE: typeinfo->flags &= ~0x2; /* TYPEFLAG_FCANCREATE */ break;

1 0

Jacek Caban : urlmon: Added comments about missing MIME filters.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 10563d5c8ec1a4e806f5eee2707de8b22caa5ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10563d5c8ec1a4e806f5eee27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:24:47 2008 +0100 urlmon: Added comments about missing MIME filters. --- dlls/urlmon/urlmon_main.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 1661bb6..a20772d 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -604,16 +604,25 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, } mime_filters[] = { {wszTextHtml, text_html_filter}, {wszTextRichtext, text_richtext_filter}, + /* {wszAudioXAiff, audio_xaiff_filter}, */ + /* {wszAudioBasic, audio_basic_filter}, */ {wszAudioWav, audio_wav_filter}, {wszImageGif, image_gif_filter}, {wszImagePjpeg, image_pjpeg_filter}, {wszImageTiff, image_tiff_filter}, {wszImageXPng, image_xpng_filter}, + /* {wszImageXBitmap, image_xbitmap_filter}, */ {wszImageBmp, image_bmp_filter}, + /* {wszImageXJg, image_xjg_filter}, */ + /* {wszImageXEmf, image_xemf_filter}, */ + /* {wszImageXWmf, image_xwmf_filter}, */ {wszVideoAvi, video_avi_filter}, {wszVideoMpeg, video_mpeg_filter}, {wszAppPostscript, application_postscript_filter}, + /* {wszAppBase64, application_base64_filter}, */ + /* {wszAppMacbinhex40, application_macbinhex40_filter}, */ {wszAppPdf, application_pdf_filter}, + /* {wszAppXCompressed, application_xcompressed_filter}, */ {wszAppXZip, application_xzip_filter}, {wszAppXGzip, application_xgzip_filter}, {wszAppJava, application_java_filter},

1 0

Jacek Caban : hlink: Added standard comments.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 7bfab2a48298fe9b544dbb00a41f86c50bd8a0d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfab2a48298fe9b544dbb00a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:22:54 2008 +0100 hlink: Added standard comments. --- dlls/hlink/extserv.c | 3 ++ dlls/hlink/hlink_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 0c12caa..daedf9e 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -209,6 +209,9 @@ static const IHttpNegotiateVtbl HttpNegotiateVtbl = { HttpNegotiate_OnResponse }; +/*********************************************************************** + * HlinkCreateExtensionServices (HLINK.@) + */ HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, HWND phwnd, LPCWSTR pszUsername, LPCWSTR pszPassword, IUnknown *punkOuter, REFIID riid, void** ppv) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index ed8d60f..c8df75c 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -52,12 +52,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +/*********************************************************************** + * DllCanUnloadNow (HLINK.@) + */ HRESULT WINAPI DllCanUnloadNow( void ) { FIXME("\n"); return S_OK; } +/*********************************************************************** + * HlinkCreateFromMoniker (HLINK.@) + */ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, IHlinkSite* pihlsite, DWORD dwSiteData, IUnknown* piunkOuter, REFIID riid, void** ppvObj) @@ -89,6 +95,9 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, return r; } +/*********************************************************************** + * HlinkCreateFromString (HLINK.@) + */ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, IHlinkSite* pihlsite, DWORD dwSiteData, IUnknown* piunkOuter, REFIID riid, void** ppvObj) @@ -151,6 +160,9 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, } +/*********************************************************************** + * HlinkNavigate (HLINK.@) + */ HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj) { HRESULT r = S_OK; @@ -164,6 +176,9 @@ HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void return r; } +/*********************************************************************** + * HlinkNavigate (HLINK.@) + */ HRESULT WINAPI HlinkNavigate(IHlink *phl, IHlinkFrame *phlFrame, DWORD grfHLNF, LPBC pbc, IBindStatusCallback *pbsc, IHlinkBrowseContext *phlbc) @@ -180,6 +195,9 @@ HRESULT WINAPI HlinkNavigate(IHlink *phl, IHlinkFrame *phlFrame, return r; } +/*********************************************************************** + * HlinkOnNavigate (HLINK.@) + */ HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame, IHlinkBrowseContext* phlbc, DWORD grfHLNF, IMoniker *pmkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG* puHLID) @@ -199,6 +217,9 @@ HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame, return r; } +/*********************************************************************** + * HlinkCreateFromData (HLINK.@) + */ HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj, IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter, REFIID riid, void **ppvObj) @@ -209,12 +230,18 @@ HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj, return E_NOTIMPL; } +/*********************************************************************** + * HlinkQueryCreateFromData (HLINK.@) + */ HRESULT WINAPI HlinkQueryCreateFromData(IDataObject* piDataObj) { FIXME("%p\n", piDataObj); return E_NOTIMPL; } +/*********************************************************************** + * HlinkNavigateToStringReference (HLINK.@) + */ HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IHlinkSite *pihlsite, DWORD dwSiteData, IHlinkFrame *pihlframe, DWORD grfHLNF, LPBC pibc, @@ -235,6 +262,9 @@ HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget, return r; } +/*********************************************************************** + * HlinkIsShortcut (HLINK.@) + */ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) { int len; @@ -253,6 +283,9 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) return strcmpiW(pwzFileName+len, url_ext) ? S_FALSE : S_OK; } +/*********************************************************************** + * HlinkGetSpecialReference (HLINK.@) + */ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) { DWORD res, type, size = 100; @@ -308,12 +341,18 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) return S_OK; } +/*********************************************************************** + * HlinkTranslateURL (HLINK.@) + */ HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTranslatedURL) { FIXME("(%s %08x %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL); return E_NOTIMPL; } +/*********************************************************************** + * HlinkUpdateStackItem (HLINK.@) + */ HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *pihlframe, IHlinkBrowseContext *pihlbc, ULONG uHLID, IMoniker *pimkTrgt, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) { @@ -322,6 +361,9 @@ HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *pihlframe, IHlinkBrowseContext return E_NOTIMPL; } +/*********************************************************************** + * HlinkParseDisplayName (HLINK.@) + */ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNoForceAbs, ULONG *pcchEaten, IMoniker **ppimk) { @@ -347,6 +389,9 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo return hres; } +/*********************************************************************** + * HlinkResolveMonikerForData (HLINK.@) + */ HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserved, LPBC pibc, ULONG cFmtetc, FORMATETC *rgFmtetc, IBindStatusCallback *pibsc, LPMONIKER pimkBase) { @@ -380,6 +425,7 @@ HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserve return IMoniker_BindToStorage(pimkReference, pibc, NULL, &IID_IUnknown, &obj); } + static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { @@ -493,6 +539,9 @@ static HRESULT register_clsid(LPCGUID guid) return S_OK; } +/*********************************************************************** + * DllRegisterServer (HLINK.@) + */ HRESULT WINAPI DllRegisterServer(void) { HRESULT r;

1 0

Jacek Caban : hlink: Added HlinkResolveMonikerForData tests.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 5a03ea8914624f70c0517483320e8d8f05f76267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a03ea8914624f70c05174833… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:22:35 2008 +0100 hlink: Added HlinkResolveMonikerForData tests. --- dlls/hlink/tests/hlink.c | 398 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 396 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a03ea8914624f70c0517…

1 0

Jacek Caban : hlink: Added HlinkResolveMonikerForData implementation.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 9d6cf488b60e0ce55a46c1560af6bff8be4dc849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6cf488b60e0ce55a46c1560… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:22:12 2008 +0100 hlink: Added HlinkResolveMonikerForData implementation. --- dlls/hlink/hlink.spec | 2 +- dlls/hlink/hlink_main.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink.spec b/dlls/hlink/hlink.spec index 117327b..0cc761f 100644 --- a/dlls/hlink/hlink.spec +++ b/dlls/hlink/hlink.spec @@ -8,7 +8,7 @@ 10 stdcall HlinkNavigate(ptr ptr long ptr ptr ptr) 11 stdcall HlinkUpdateStackItem(ptr ptr long ptr wstr wstr) 12 stub HlinkOnRenameDocument -14 stub HlinkResolveMonikerForData +14 stdcall HlinkResolveMonikerForData(ptr long ptr long ptr ptr ptr) 15 stub HlinkResolveStringForData 16 stub OleSaveToStreamEx 18 stdcall HlinkParseDisplayName(ptr wstr long ptr ptr) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index b9ce4af..ed8d60f 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -347,6 +347,39 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo return hres; } +HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserved, LPBC pibc, + ULONG cFmtetc, FORMATETC *rgFmtetc, IBindStatusCallback *pibsc, LPMONIKER pimkBase) +{ + LPOLESTR name = NULL; + IBindCtx *bctx; + DWORD mksys = 0; + void *obj = NULL; + HRESULT hres; + + TRACE("(%p %x %p %d %p %p %p)\n", pimkReference, reserved, pibc, cFmtetc, rgFmtetc, pibsc, pimkBase); + + if(cFmtetc || rgFmtetc || pimkBase) + FIXME("Unsupported args\n"); + + hres = RegisterBindStatusCallback(pibc, pibsc, NULL /* FIXME */, 0); + if(FAILED(hres)) + return hres; + + hres = IMoniker_IsSystemMoniker(pimkReference, &mksys); + if(SUCCEEDED(hres) && mksys != MKSYS_URLMONIKER) + WARN("sysmk = %x\n", mksys); + + /* FIXME: What is it for? */ + CreateBindCtx(0, &bctx); + hres = IMoniker_GetDisplayName(pimkReference, bctx, NULL, &name); + IBindCtx_Release(bctx); + if(SUCCEEDED(hres)) { + TRACE("got display name %s\n", debugstr_w(name)); + CoTaskMemFree(name); + } + + return IMoniker_BindToStorage(pimkReference, pibc, NULL, &IID_IUnknown, &obj); +} static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) {

1 0

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

Feb. 4, 2008

Module: wine Branch: master Commit: 2c1591318073dde52d1b9f13c71c25e34d3a350e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1591318073dde52d1b9f13c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:19:02 2008 +0100 urlmon: Added MkParseDisplayNameEx tests. --- dlls/urlmon/tests/misc.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ba36d8a..001ee9c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -258,6 +258,9 @@ static const WCHAR url6[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static const WCHAR url7[] = {'f','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g','/', 'f','i','l','e','.','t','e','s','t',0}; static const WCHAR url8[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; +static const WCHAR url9[] = + {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', + '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', @@ -1271,6 +1274,54 @@ static void test_ObtainUserAgentString(void) HeapFree(GetProcessHeap(), 0, str2); } +static void test_MkParseDisplayNameEx(void) +{ + IMoniker *mon = NULL; + LPWSTR name; + DWORD issys; + ULONG eaten = 0; + IBindCtx *bctx; + HRESULT hres; + + static const WCHAR clsid_nameW[] = {'c','l','s','i','d',':', + '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8', + '-','0','8','0','0','2','B','3','0','3','0','9','D',':',0}; + + CreateBindCtx(0, &bctx); + + hres = MkParseDisplayNameEx(bctx, url9, &eaten, &mon); + ok(hres == S_OK, "MkParseDisplayNameEx failed: %08x\n", hres); + ok(eaten == sizeof(url9)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(mon != NULL, "mon == NULL\n"); + + hres = IMoniker_GetDisplayName(mon, NULL, 0, &name); + ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(!lstrcmpW(name, url9), "wrong display name %s\n", debugstr_w(name)); + CoTaskMemFree(name); + + hres = IMoniker_IsSystemMoniker(mon, &issys); + ok(hres == S_OK, "IsSystemMoniker failed: %08x\n", hres); + ok(issys == MKSYS_URLMONIKER, "issys=%x\n", issys); + + IMoniker_Release(mon); + + hres = MkParseDisplayNameEx(bctx, clsid_nameW, &eaten, &mon); + ok(hres == S_OK, "MkParseDisplayNameEx failed: %08x\n", hres); + ok(eaten == sizeof(clsid_nameW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(mon != NULL, "mon == NULL\n"); + + hres = IMoniker_IsSystemMoniker(mon, &issys); + ok(hres == S_OK, "IsSystemMoniker failed: %08x\n", hres); + ok(issys == MKSYS_CLASSMONIKER, "issys=%x\n", issys); + + IMoniker_Release(mon); + + hres = MkParseDisplayNameEx(bctx, url8, &eaten, &mon); + ok(FAILED(hres), "MkParseDisplayNameEx succeeded: %08x\n", hres); + + IBindCtx_Release(bctx); +} + START_TEST(misc) { OleInitialize(NULL); @@ -1290,6 +1341,7 @@ START_TEST(misc) test_ReleaseBindInfo(); test_UrlMkGetSessionOption(); test_ObtainUserAgentString(); + test_MkParseDisplayNameEx(); OleUninitialize(); }

1 0

Jacek Caban : hlink: Added HlinkParseDisplayName implementation.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 24853242a835675dbf8c349c68fd7c323c1b50f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24853242a835675dbf8c349c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:21:19 2008 +0100 hlink: Added HlinkParseDisplayName implementation. --- dlls/hlink/hlink.spec | 2 +- dlls/hlink/hlink_main.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink.spec b/dlls/hlink/hlink.spec index 7dac4d9..117327b 100644 --- a/dlls/hlink/hlink.spec +++ b/dlls/hlink/hlink.spec @@ -11,7 +11,7 @@ 14 stub HlinkResolveMonikerForData 15 stub HlinkResolveStringForData 16 stub OleSaveToStreamEx -18 stub HlinkParseDisplayName +18 stdcall HlinkParseDisplayName(ptr wstr long ptr ptr) 20 stdcall HlinkQueryCreateFromData(ptr) 21 stub HlinkSetSpecialReference 22 stdcall HlinkGetSpecialReference(long ptr) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 4e32189..b9ce4af 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -322,6 +322,31 @@ HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *pihlframe, IHlinkBrowseContext return E_NOTIMPL; } +HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNoForceAbs, + ULONG *pcchEaten, IMoniker **ppimk) +{ + HRESULT hres; + + TRACE("(%p %s %x %p %p)\n", pibc, debugstr_w(pwzDisplayName), fNoForceAbs, pcchEaten, ppimk); + + if(fNoForceAbs) + FIXME("Unsupported fNoForceAbs\n"); + + hres = MkParseDisplayNameEx(pibc, pwzDisplayName, pcchEaten, ppimk); + if(SUCCEEDED(hres)) + return hres; + + hres = MkParseDisplayName(pibc, pwzDisplayName, pcchEaten, ppimk); + if(SUCCEEDED(hres)) + return hres; + + hres = CreateFileMoniker(pwzDisplayName, ppimk); + if(SUCCEEDED(hres)) + *pcchEaten = strlenW(pwzDisplayName); + + return hres; +} + static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) {

1 0

Jacek Caban : hlink: Added HlinkParseDisplayName tests.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 13c4b62a64ccbf9ed45fbc88996aa9021c1521c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c4b62a64ccbf9ed45fbc889… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:21:47 2008 +0100 hlink: Added HlinkParseDisplayName tests. --- dlls/hlink/tests/hlink.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 271f584..58cd993 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -448,6 +448,69 @@ static void test_HlinkCreateExtensionServices(void) IAuthenticate_Release(authenticate); } +static void test_HlinkParseDisplayName(void) +{ + IMoniker *mon = NULL; + LPWSTR name; + DWORD issys; + ULONG eaten = 0; + IBindCtx *bctx; + HRESULT hres; + + static const WCHAR winehq_urlW[] = + {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', + '/','s','i','t','e','/','a','b','o','u','t',0}; + static const WCHAR invalid_urlW[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; + static const WCHAR clsid_nameW[] = {'c','l','s','i','d',':', + '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8', + '-','0','8','0','0','2','B','3','0','3','0','9','D',':',0}; + + CreateBindCtx(0, &bctx); + + hres = HlinkParseDisplayName(bctx, winehq_urlW, FALSE, &eaten, &mon); + ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); + ok(eaten == sizeof(winehq_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(mon != NULL, "mon == NULL\n"); + + hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); + ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(!lstrcmpW(name, winehq_urlW), "wrong display name %s\n", debugstr_w(name)); + CoTaskMemFree(name); + + hres = IMoniker_IsSystemMoniker(mon, &issys); + ok(hres == S_OK, "IsSystemMoniker failed: %08x\n", hres); + ok(issys == MKSYS_URLMONIKER, "issys=%x\n", issys); + + IMoniker_Release(mon); + + hres = HlinkParseDisplayName(bctx, clsid_nameW, FALSE, &eaten, &mon); + ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); + ok(eaten == sizeof(clsid_nameW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(mon != NULL, "mon == NULL\n"); + + hres = IMoniker_IsSystemMoniker(mon, &issys); + ok(hres == S_OK, "IsSystemMoniker failed: %08x\n", hres); + ok(issys == MKSYS_CLASSMONIKER, "issys=%x\n", issys); + + IMoniker_Release(mon); + + hres = HlinkParseDisplayName(bctx, invalid_urlW, FALSE, &eaten, &mon); + ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); + ok(eaten == sizeof(invalid_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(mon != NULL, "mon == NULL\n"); + + hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); + ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(!lstrcmpW(name, invalid_urlW), "wrong display name %s\n", debugstr_w(name)); + CoTaskMemFree(name); + + hres = IMoniker_IsSystemMoniker(mon, &issys); + ok(hres == S_OK, "IsSystemMoniker failed: %08x\n", hres); + ok(issys == MKSYS_FILEMONIKER, "issys=%x\n", issys); + + IBindCtx_Release(bctx); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -457,6 +520,7 @@ START_TEST(hlink) test_persist(); test_special_reference(); test_HlinkCreateExtensionServices(); + test_HlinkParseDisplayName(); CoUninitialize(); }

1 0

Jacek Caban : hlink: Call AddRef of correct interface in ExtServUnk_QueryInterface.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 485d8362f32505e2749831855fac358efc2b1076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485d8362f32505e2749831855… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:19:22 2008 +0100 hlink: Call AddRef of correct interface in ExtServUnk_QueryInterface. --- dlls/hlink/extserv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index c7a1b77..0c12caa 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -63,7 +63,7 @@ static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, vo } if(*ppv) { - IUnknown_AddRef(EXTSERVUNK(This)); + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; }

1 0

Jacek Caban : urlmon: Added HlinkParseDisplayNameEx implementation.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 60b0539c871c3b3c002e6e2e591fb912fb09d710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b0539c871c3b3c002e6e2e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:18:33 2008 +0100 urlmon: Added HlinkParseDisplayNameEx implementation. --- dlls/urlmon/session.c | 17 +++++++++++++++++ dlls/urlmon/umon.c | 21 +++++++++++++++++++++ dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.h | 1 + 4 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 3571b05..9ce7b66 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -95,9 +95,26 @@ static HRESULT get_protocol_cf(LPCWSTR schema, DWORD schema_len, CLSID *pclsid, if(pclsid) *pclsid = clsid; + if(!ret) + return S_OK; + return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)ret); } +BOOL is_registered_protocol(LPCWSTR url) +{ + DWORD schema_len; + WCHAR schema[64]; + HRESULT hres; + + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), + &schema_len, 0); + if(FAILED(hres)) + return FALSE; + + return get_protocol_cf(schema, schema_len, NULL, NULL) == S_OK; +} + IInternetProtocolInfo *get_protocol_info(LPCWSTR url) { IInternetProtocolInfo *ret = NULL; diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 5981a1c..640f382 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1186,6 +1186,27 @@ HRESULT WINAPI BindAsyncMoniker(IMoniker *pmk, DWORD grfOpt, IBindStatusCallback } /*********************************************************************** + * MkParseDisplayNameEx (URLMON.@) + */ +HRESULT WINAPI MkParseDisplayNameEx(IBindCtx *pbc, LPCWSTR szDisplayName, ULONG *pchEaten, LPMONIKER *ppmk) +{ + TRACE("(%p %s %p %p)\n", pbc, debugstr_w(szDisplayName), pchEaten, ppmk); + + if(is_registered_protocol(szDisplayName)) { + HRESULT hres; + + hres = CreateURLMoniker(NULL, szDisplayName, ppmk); + if(SUCCEEDED(hres)) { + *pchEaten = strlenW(szDisplayName); + return hres; + } + } + + return MkParseDisplayName(pbc, szDisplayName, pchEaten, ppmk); +} + + +/*********************************************************************** * URLDownloadToFileA (URLMON.@) * * Downloads URL szURL to rile szFileName and call lpfnCB callback to diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index fdb94eb..06a56b0 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -53,7 +53,7 @@ @ stub IsLoggingEnabledA @ stub IsLoggingEnabledW @ stdcall IsValidURL(ptr wstr long) -@ stdcall MkParseDisplayNameEx(ptr ptr ptr ptr) ole32.MkParseDisplayName +@ stdcall MkParseDisplayNameEx(ptr wstr ptr ptr) @ stdcall ObtainUserAgentString(long str ptr) @ stub PrivateCoInstall @ stdcall RegisterBindStatusCallback(ptr ptr ptr long) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index d845e6e..87e74f9 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -67,6 +67,7 @@ void UMCloseCacheFileStream(IUMCacheStream *pstr); IInternetProtocolInfo *get_protocol_info(LPCWSTR url); HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret); +BOOL is_registered_protocol(LPCWSTR); HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv);

1 0