From: Steve Lamerton <steve.lamerton@gmail.com>
Date: Mon, 25 Jul 2011 15:43:18 +0000 (+0000)
Subject: Fix warnings in the MSW IE backend.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0995b9dc18a7ce898c1c1be0e2790b258cab0fee

Fix warnings in the MSW IE backend.

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

diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index c0aa541fb8..935f2c6c12 100644
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -179,9 +179,10 @@ public:
     ULONG STDMETHODCALLTYPE Release();
 
     //IInternetProtocolRoot
-    HRESULT STDMETHODCALLTYPE Abort(HRESULT hrReason, DWORD dwOptions)
+    HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason), 
+                                    DWORD WXUNUSED(dwOptions))
                                    { return E_NOTIMPL; }
-    HRESULT STDMETHODCALLTYPE Continue(PROTOCOLDATA *pProtocolData)
+    HRESULT STDMETHODCALLTYPE Continue(PROTOCOLDATA *WXUNUSED(pProtocolData))
                                        { return S_OK; }
     HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }
     HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, 
@@ -190,13 +191,15 @@ public:
                                     DWORD grfPI, 
                                     HANDLE_PTR dwReserved);
     HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }
-    HRESULT STDMETHODCALLTYPE Terminate(DWORD dwOptions) { return S_OK; }
+    HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; }
 
     //IInternetProtocol
-    HRESULT STDMETHODCALLTYPE LockRequest(DWORD dwOptions) { return S_OK; }
+    HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) 
+                                          { return S_OK; }
     HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead);
-    HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, 
-                                   ULARGE_INTEGER* plibNewPosition) 
+    HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove), 
+                                   DWORD WXUNUSED(dwOrigin), 
+                                   ULARGE_INTEGER* WXUNUSED(plibNewPosition)) 
                                    { return E_FAIL; }
     HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
 };
diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index eae7953283..4905e5de82 100644
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -1019,9 +1019,13 @@ ULONG VirtualProtocol::Release()
 }
 
 HRESULT VirtualProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
-                            IInternetBindInfo *pOIBindInfo, DWORD grfPI, 
-                            HANDLE_PTR dwReserved)
+                               IInternetBindInfo *pOIBindInfo, DWORD grfPI, 
+                               HANDLE_PTR dwReserved)
 {
+    wxUnusedVar(szUrl);
+    wxUnusedVar(pOIBindInfo);
+    wxUnusedVar(grfPI);
+    wxUnusedVar(dwReserved);
     m_protocolSink = pOIProtSink;
     //We have to clean up incoming paths from the webview control as they are
     //not properly escaped, see also the comment in filesys.cpp line 668
@@ -1074,6 +1078,12 @@ HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
         wxDELETE(m_file);
         return INET_E_DOWNLOAD_FAILURE;
     }
+    else
+    {
+        //Dummy return to surpress a compiler warning
+        wxFAIL;
+        return INET_E_DOWNLOAD_FAILURE;
+    }
 }
 
 HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
@@ -1091,8 +1101,8 @@ HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
 
 STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
 {
-     return S_OK;
-
+    wxUnusedVar(fLock);
+    return S_OK;
 }
 
 ULONG ClassFactory::AddRef(void)