From 2aed8ce2fd095468492640af98a0be8692536b5b Mon Sep 17 00:00:00 2001 From: Thomas Mullaly Date: Thu, 7 Oct 2010 19:04:21 -0400 Subject: [PATCH] urlmon: Added stub for CoInternetCombineIUri. --- dlls/urlmon/uri.c | 10 ++++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 49368b1f984..99906d20647 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5588,3 +5588,13 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve *ppIUriBuilder = URIBUILDER(ret); return S_OK; } + +/*********************************************************************** + * CoInternetCombineIUri (urlmon.@) + */ +HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD dwCombineFlags, + IUri **ppCombinedUri, DWORD_PTR dwReserved) +{ + FIXME("(%p %p %x %p %x): stub\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 61093850d24..ff1adeaca49 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -12,6 +12,7 @@ @ stub CoInstall @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long) @ stdcall CoInternetCompareUrl(wstr wstr long) +@ stdcall CoInternetCombineIUri(ptr ptr long ptr long) @ stdcall CoInternetCreateSecurityManager(ptr ptr long) @ stdcall CoInternetCreateZoneManager(ptr ptr long) @ stub CoInternetGetProtocolFlags diff --git a/include/urlmon.idl b/include/urlmon.idl index b09eba3c986..e50975d7af3 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1931,6 +1931,7 @@ cpp_quote("HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx*,DWORD,IBindStatusCallba cpp_quote("HRESULT WINAPI CoInternetCreateSecurityManager(IServiceProvider*,IInternetSecurityManager**,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCombineUrl(LPCWSTR,LPCWSTR,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetCombineIUri(IUri*,IUri*,DWORD,IUri**,DWORD_PTR);") cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IInternetZoneManager**, DWORD);") cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") -- 2.11.4.GIT