mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 13:23:37 +00:00
urlmon.idl: Use HANDLE_PTR in IInternetProtocolRoot::Start declaration.
This commit is contained in:
parent
1b3f6474c8
commit
19067f1256
|
@ -137,7 +137,7 @@ static HRESULT report_result(IInternetProtocolSink *sink, HRESULT hres)
|
|||
|
||||
static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
ITSProtocol *This = PROTOCOL_THIS(iface);
|
||||
BINDINFO bindinfo;
|
||||
|
@ -151,7 +151,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
|||
|
||||
static const WCHAR separator[] = {':',':',0};
|
||||
|
||||
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
pOIBindInfo, grfPI, dwReserved);
|
||||
|
||||
ptr = skip_schema(szUrl);
|
||||
|
|
|
@ -210,7 +210,7 @@ static ULONG WINAPI AboutProtocol_Release(IInternetProtocol *iface)
|
|||
|
||||
static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink* pOIProtSink, IInternetBindInfo* pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
AboutProtocol *This = PROTOCOL_THIS(iface);
|
||||
BINDINFO bindinfo;
|
||||
|
@ -230,7 +230,7 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr
|
|||
* when the url does not have "about:" in the beginning.
|
||||
*/
|
||||
|
||||
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
pOIBindInfo, grfPI, dwReserved);
|
||||
|
||||
memset(&bindinfo, 0, sizeof(bindinfo));
|
||||
|
@ -575,7 +575,7 @@ static ULONG WINAPI ResProtocol_Release(IInternetProtocol *iface)
|
|||
|
||||
static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink* pOIProtSink, IInternetBindInfo* pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
ResProtocol *This = PROTOCOL_THIS(iface);
|
||||
DWORD grfBINDF = 0, len;
|
||||
|
@ -587,7 +587,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
|||
|
||||
static const WCHAR wszRes[] = {'r','e','s',':','/','/'};
|
||||
|
||||
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
pOIBindInfo, grfPI, dwReserved);
|
||||
|
||||
memset(&bindinfo, 0, sizeof(bindinfo));
|
||||
|
|
|
@ -335,7 +335,7 @@ static ULONG WINAPI Protocol_Release(IInternetProtocol *iface)
|
|||
|
||||
static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
BINDINFO bindinfo;
|
||||
DWORD bindf = 0;
|
||||
|
@ -349,7 +349,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
|||
ok(pOIProtSink != NULL, "pOIProtSink == NULL\n");
|
||||
ok(pOIBindInfo != NULL, "pOIBindInfo == NULL\n");
|
||||
ok(!grfPI, "grfPI = %x\n", grfPI);
|
||||
ok(!dwReserved, "dwReserved = %d\n", dwReserved);
|
||||
ok(!dwReserved, "dwReserved = %lx\n", dwReserved);
|
||||
|
||||
memset(&bindinfo, 0, sizeof(bindinfo));
|
||||
bindinfo.cbSize = sizeof(bindinfo);
|
||||
|
|
|
@ -123,7 +123,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface)
|
|||
|
||||
static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
BindProtocol *This = PROTOCOL_THIS(iface);
|
||||
IInternetProtocol *protocol = NULL;
|
||||
|
@ -134,7 +134,7 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
|
|||
LPOLESTR clsid_str;
|
||||
HRESULT hres;
|
||||
|
||||
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
pOIBindInfo, grfPI, dwReserved);
|
||||
|
||||
if(!szUrl || !pOIProtSink || !pOIBindInfo)
|
||||
|
|
|
@ -92,7 +92,7 @@ static ULONG WINAPI FileProtocol_Release(IInternetProtocol *iface)
|
|||
|
||||
static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
FileProtocol *This = PROTOCOL_THIS(iface);
|
||||
BINDINFO bindinfo;
|
||||
|
@ -106,7 +106,7 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
|
|||
|
||||
static const WCHAR wszFile[] = {'f','i','l','e',':'};
|
||||
|
||||
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
pOIBindInfo, grfPI, dwReserved);
|
||||
|
||||
if(!szUrl || strlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR)
|
||||
|
|
|
@ -143,13 +143,13 @@ static ULONG WINAPI FtpProtocol_Release(IInternetProtocol *iface)
|
|||
|
||||
static HRESULT WINAPI FtpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
FtpProtocol *This = PROTOCOL_THIS(iface);
|
||||
|
||||
static const WCHAR ftpW[] = {'f','t','p',':'};
|
||||
|
||||
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
pOIBindInfo, grfPI, dwReserved);
|
||||
|
||||
if(strncmpW(szUrl, ftpW, sizeof(ftpW)/sizeof(WCHAR)))
|
||||
|
|
|
@ -123,11 +123,11 @@ static ULONG WINAPI GopherProtocol_Release(IInternetProtocol *iface)
|
|||
|
||||
static HRESULT WINAPI GopherProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
GopherProtocol *This = PROTOCOL_THIS(iface);
|
||||
|
||||
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
pOIBindInfo, grfPI, dwReserved);
|
||||
|
||||
return protocol_start(&This->base, PROTOCOL(This), szUrl, pOIProtSink, pOIBindInfo);
|
||||
|
|
|
@ -372,14 +372,14 @@ static ULONG WINAPI HttpProtocol_Release(IInternetProtocol *iface)
|
|||
|
||||
static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
HttpProtocol *This = PROTOCOL_THIS(iface);
|
||||
|
||||
static const WCHAR httpW[] = {'h','t','t','p',':'};
|
||||
static const WCHAR httpsW[] = {'h','t','t','p','s',':'};
|
||||
|
||||
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
pOIBindInfo, grfPI, dwReserved);
|
||||
|
||||
if(This->https
|
||||
|
|
|
@ -93,7 +93,7 @@ static HRESULT report_result(IInternetProtocolSink *sink, HRESULT hres, DWORD dw
|
|||
|
||||
static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
MkProtocol *This = PROTOCOL_THIS(iface);
|
||||
IParseDisplayName *pdn;
|
||||
|
@ -108,7 +108,7 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
|||
|
||||
static const WCHAR wszMK[] = {'m','k',':','@'};
|
||||
|
||||
TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
|
||||
pOIBindInfo, grfPI, dwReserved);
|
||||
|
||||
if(strncmpiW(szUrl, wszMK, sizeof(wszMK)/sizeof(WCHAR)))
|
||||
|
|
|
@ -877,7 +877,7 @@ static DWORD WINAPI thread_proc(PVOID arg)
|
|||
|
||||
static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
BINDINFO bindinfo, exp_bindinfo;
|
||||
DWORD cbindf = 0;
|
||||
|
@ -890,7 +890,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
|||
ok(pOIProtSink != &protocol_sink, "unexpected pOIProtSink\n");
|
||||
ok(pOIBindInfo != &bind_info, "unexpected pOIBindInfo\n");
|
||||
ok(!grfPI, "grfPI = %x\n", grfPI);
|
||||
ok(!dwReserved, "dwReserved = %d\n", dwReserved);
|
||||
ok(!dwReserved, "dwReserved = %lx\n", dwReserved);
|
||||
|
||||
memset(&bindinfo, 0, sizeof(bindinfo));
|
||||
bindinfo.cbSize = sizeof(bindinfo);
|
||||
|
|
|
@ -434,7 +434,7 @@ static DWORD WINAPI thread_proc(PVOID arg)
|
|||
|
||||
static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
||||
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI, DWORD dwReserved)
|
||||
DWORD grfPI, HANDLE_PTR dwReserved)
|
||||
{
|
||||
BINDINFO bindinfo;
|
||||
DWORD bindf, bscf = BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION;
|
||||
|
@ -452,7 +452,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
|
|||
ok(pOIProtSink != NULL, "pOIProtSink == NULL\n");
|
||||
ok(pOIBindInfo != NULL, "pOIBindInfo == NULL\n");
|
||||
ok(grfPI == 0, "grfPI=%d, expected 0\n", grfPI);
|
||||
ok(dwReserved == 0, "dwReserved=%d, expected 0\n", dwReserved);
|
||||
ok(dwReserved == 0, "dwReserved=%lx, expected 0\n", dwReserved);
|
||||
|
||||
if(!filedwl_api && binding_hres != S_OK) {
|
||||
SET_EXPECT(OnStopBinding);
|
||||
|
|
|
@ -703,7 +703,7 @@ interface IInternetProtocolRoot : IUnknown
|
|||
[in] IInternetProtocolSink *pOIProtSink,
|
||||
[in] IInternetBindInfo *pOIBindInfo,
|
||||
[in] DWORD grfPI,
|
||||
[in] DWORD dwReserved);
|
||||
[in] HANDLE_PTR dwReserved);
|
||||
|
||||
HRESULT Continue(
|
||||
[in] PROTOCOLDATA *pProtocolData);
|
||||
|
|
Loading…
Reference in a new issue