mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 19:33:38 +00:00
Implemented CoInternetCombineUrl and CoInternetCompareUrl.
This commit is contained in:
parent
9f1aea2fb8
commit
f0b47e2631
|
@ -5,8 +5,8 @@
|
|||
@ stub BindAsyncMoniker
|
||||
@ stub CoGetClassObjectFromURL
|
||||
@ stub CoInstall
|
||||
@ stub CoInternetCombineUrl
|
||||
@ stub CoInternetCompareUrl
|
||||
@ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long)
|
||||
@ stdcall CoInternetCompareUrl(wstr wstr long)
|
||||
@ stub CoInternetCreateSecurityManager
|
||||
@ stub CoInternetCreateZoneManager
|
||||
@ stub CoInternetGetProtocolFlags
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
#include "winbase.h"
|
||||
#include "winerror.h"
|
||||
#include "wtypes.h"
|
||||
#define NO_SHLWAPI_REG
|
||||
#include "shlwapi.h"
|
||||
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
@ -121,3 +123,22 @@ HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPCSTR pcszUAOut, DWORD *cb
|
|||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT WINAPI CoInternetCombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags,
|
||||
LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved)
|
||||
{
|
||||
HRESULT hres;
|
||||
DWORD size = cchResult;
|
||||
|
||||
TRACE("(%s,%s,0x%08lx,%p,%ld,%p,%ld)\n", debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags,
|
||||
pwzResult, cchResult, pcchResult, dwReserved);
|
||||
hres = UrlCombineW(pwzBaseUrl, pwzRelativeUrl, pwzResult, &size, dwCombineFlags);
|
||||
if(pcchResult) *pcchResult = size;
|
||||
return hres;
|
||||
}
|
||||
|
||||
HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags)
|
||||
{
|
||||
TRACE("(%s,%s,%08lx)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
|
||||
return UrlCompareW(pwzUrl1, pwzUrl2, dwCompareFlags)==0?S_OK:S_FALSE;
|
||||
}
|
||||
|
|
|
@ -1392,6 +1392,11 @@ HRESULT WINAPI CoInternetGetSession(DWORD,/*IInternetSession*/void**,DWORD);
|
|||
HRESULT WINAPI MkParseDisplayNameEx(IBindCtx*,LPCWSTR,ULONG*,IMoniker**);
|
||||
HRESULT WINAPI IsAsyncMoniker(IMoniker* pmk);
|
||||
HRESULT WINAPI CreateAsyncBindCtx(DWORD, IBindStatusCallback*, IEnumFORMATETC*, IBindCtx**);
|
||||
HRESULT WINAPI CoInternetCombineUrl(LPCWSTR,LPCWSTR,DWORD,LPWSTR,DWORD,DWORD*,DWORD);
|
||||
HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);
|
||||
#define OInetCombineUrl CoInternetCombineUrl
|
||||
#define OInetCompareUrl CoInternetCompareUrl
|
||||
#define OInetGetSession CoInternetGetSession
|
||||
#define MKSYS_URLMONIKER 6
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -544,4 +544,11 @@ cpp_quote("HRESULT WINAPI CoInternetGetSession(DWORD,/*IInternetSession*/void**,
|
|||
cpp_quote("HRESULT WINAPI MkParseDisplayNameEx(IBindCtx*,LPCWSTR,ULONG*,IMoniker**);")
|
||||
cpp_quote("HRESULT WINAPI IsAsyncMoniker(IMoniker* pmk);")
|
||||
cpp_quote("HRESULT WINAPI CreateAsyncBindCtx(DWORD, IBindStatusCallback*, IEnumFORMATETC*, IBindCtx**);")
|
||||
cpp_quote("HRESULT WINAPI CoInternetCombineUrl(LPCWSTR,LPCWSTR,DWORD,LPWSTR,DWORD,DWORD*,DWORD);")
|
||||
cpp_quote("HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);");
|
||||
|
||||
cpp_quote("#define OInetCombineUrl CoInternetCombineUrl")
|
||||
cpp_quote("#define OInetCompareUrl CoInternetCompareUrl")
|
||||
cpp_quote("#define OInetGetSession CoInternetGetSession")
|
||||
|
||||
cpp_quote("#define MKSYS_URLMONIKER 6")
|
||||
|
|
Loading…
Reference in a new issue