Rework IE virtual file system support to use new syntax. Remove now unused code for resolving links ourselves, we can let the backend resolves them itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/webview_ie.h

@@ -160,7 +160,7 @@ private:
     wxDECLARE_DYNAMIC_CLASS(wxWebViewIE);
 };
 
-class VirtualProtocol : public IInternetProtocol, public IInternetProtocolInfo
+class VirtualProtocol : public IInternetProtocol
 {
 protected:
     ULONG m_refCount;
@@ -204,26 +204,6 @@ public:
                                    ULARGE_INTEGER* WXUNUSED(plibNewPosition)) 
                                    { return E_FAIL; }
     HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
-
-    //IInternetProtocolInfo
-    HRESULT STDMETHODCALLTYPE CombineUrl(LPCWSTR pwzBaseUrl, 
-                                         LPCWSTR pwzRelativeUrl, 
-                                         DWORD dwCombineFlags, 
-                                         LPWSTR pwzResult, DWORD cchResult,
-                                         DWORD *pcchResult, DWORD dwReserved);
-    HRESULT STDMETHODCALLTYPE CompareUrl(LPCWSTR WXUNUSED(pwzUrl1), 
-                                         LPCWSTR WXUNUSED(pwzUrl2),
-                                         DWORD WXUNUSED(dwCompareFlags))
-                                         { return INET_E_DEFAULT_ACTION; }
-    HRESULT STDMETHODCALLTYPE ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction,
-                                       DWORD dwParseFlags, LPWSTR pwzResult,
-                                       DWORD cchResult, DWORD *pcchResult,
-                                       DWORD dwReserved);
-    HRESULT STDMETHODCALLTYPE QueryInfo(LPCWSTR pwzUrl, 
-                                        QUERYOPTION OueryOption, 
-                                        DWORD dwQueryFlags, LPVOID pBuffer,
-                                        DWORD cbBuffer, DWORD *pcbBuf, 
-                                        DWORD dwReserved);
 };
 
 class ClassFactory : public IClassFactory

include/wx/webview.h

@@ -106,7 +106,6 @@ class WXDLLIMPEXP_WEB wxWebHandler
 public:
     virtual wxString GetName() const = 0;
     virtual wxFSFile* GetFile(const wxString &uri) = 0;
-    virtual wxString CombineURIs(const wxString &baseuri, const wxString &newuri) = 0;
 };
 
 extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[];

include/wx/webviewfilehandler.h

@@ -20,7 +20,7 @@ class wxFileSystem;
 #include "wx/webview.h"
 
 //Loads from uris such as file:///C:/example/example.html or archives such as
-//file:///C:/example/example.zip?protocol=zip;path=example.html 
+//file:///C:/example/example.zip;protocol=zip/example.html 
 
 class WXDLLIMPEXP_WEB wxWebFileHandler : public wxWebHandler
 {
@@ -28,7 +28,6 @@ public:
     wxWebFileHandler();
     virtual wxString GetName() const { return m_name; }
     virtual wxFSFile* GetFile(const wxString &uri);
-    virtual wxString CombineURIs(const wxString &baseuri, const wxString &newuri);
 private:
     wxString m_name;
     wxFileSystem* m_fileSystem;