diff --git a/include/wx/msw/private/webview_ie.h b/include/wx/msw/private/webview_ie.h index 4d94911aaa..091167f17b 100644 --- a/include/wx/msw/private/webview_ie.h +++ b/include/wx/msw/private/webview_ie.h @@ -122,7 +122,7 @@ public: DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) wxOVERRIDE; HRESULT STDMETHODCALLTYPE ParseUrl( - LPCWSTR pwzUrl, PARSEACTION ParseAction, + LPCWSTR pwzUrl, wxPARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) wxOVERRIDE; @@ -131,7 +131,7 @@ public: LPCWSTR pwzUrl2, DWORD dwCompareFlags) wxOVERRIDE; HRESULT STDMETHODCALLTYPE QueryInfo( - LPCWSTR pwzUrl, QUERYOPTION OueryOption, + LPCWSTR pwzUrl, wxQUERYOPTION OueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD *pcbBuf, DWORD dwReserved) wxOVERRIDE; diff --git a/include/wx/msw/private/webview_missing.h b/include/wx/msw/private/webview_missing.h index e3f70c3300..6d3196c10f 100644 --- a/include/wx/msw/private/webview_missing.h +++ b/include/wx/msw/private/webview_missing.h @@ -27,6 +27,10 @@ struct IHTMLDocument2; #define REFRESH_COMPLETELY 3 #endif +#ifndef INET_E_DEFAULT_ACTION +#define INET_E_DEFAULT_ACTION ((HRESULT)0x800C0011L) +#endif + typedef enum __wxMIDL_IBindStatusCallback_0006 { wxBSCF_FIRSTDATANOTIFICATION = 0x1, @@ -136,11 +140,26 @@ public: DWORD dwReserved) = 0; }; +// This interface uses a couple of enums which are not defined in old MinGW +// SDK headers, but we don't have any reliable way to test if they're actually +// defined, so define our own enums, containing just the values we need: this +// compiles everywhere and is ABI-compatible with the real enums. +enum wxPARSEACTION +{ + wxPARSE_SECURITY_URL = 3, + wxPARSE_SECURITY_DOMAIN = 17 +}; + +enum wxQUERYOPTION +{ + // We don't actually need any values in this one. +}; + class wxIInternetProtocolInfo : public IUnknown { public: virtual HRESULT STDMETHODCALLTYPE ParseUrl(LPCWSTR pwzUrl, - PARSEACTION ParseAction, + wxPARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, @@ -160,7 +179,7 @@ public: DWORD dwCompareFlags) = 0; virtual HRESULT STDMETHODCALLTYPE QueryInfo(LPCWSTR pwzUrl, - QUERYOPTION OueryOption, + wxQUERYOPTION OueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index 6b7aba1922..839acc92f3 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -1762,7 +1762,7 @@ HRESULT STDMETHODCALLTYPE VirtualProtocol::CombineUrl( } HRESULT STDMETHODCALLTYPE VirtualProtocol::ParseUrl( - LPCWSTR pwzUrl, PARSEACTION ParseAction, + LPCWSTR pwzUrl, wxPARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) @@ -1777,8 +1777,8 @@ HRESULT STDMETHODCALLTYPE VirtualProtocol::ParseUrl( switch (ParseAction) { - case PARSE_SECURITY_URL: - case PARSE_SECURITY_DOMAIN: + case wxPARSE_SECURITY_URL: + case wxPARSE_SECURITY_DOMAIN: { LPWSTR Result = L"http://localhost"; size_t Len = wcslen(Result); @@ -1806,7 +1806,7 @@ HRESULT STDMETHODCALLTYPE VirtualProtocol::CompareUrl( } HRESULT STDMETHODCALLTYPE VirtualProtocol::QueryInfo( - LPCWSTR pwzUrl, QUERYOPTION OueryOption, + LPCWSTR pwzUrl, wxQUERYOPTION OueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD *pcbBuf, DWORD dwReserved)