From ab544da1d25ec24e0865b1a60a47f4030c4b4156 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Fri, 2 Nov 2018 21:24:10 +0100
Subject: [PATCH] Move GetBytesExpectedToReceive() impl to base class

---
 include/wx/msw/webrequest_winhttp.h | 3 ---
 include/wx/webrequest.h             | 2 +-
 src/common/webrequest.cpp           | 8 ++++++++
 src/msw/webrequest_winhttp.cpp      | 2 --
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/wx/msw/webrequest_winhttp.h b/include/wx/msw/webrequest_winhttp.h
index 99c736e01b..edd4e66ffd 100644
--- a/include/wx/msw/webrequest_winhttp.h
+++ b/include/wx/msw/webrequest_winhttp.h
@@ -81,8 +81,6 @@ public:
 
     wxFileOffset GetBytesReceived() const wxOVERRIDE { return m_bytesReceived; }
 
-    wxFileOffset GetBytesExpectedToReceive() const wxOVERRIDE { return m_bytesExpectedToReceive; }
-
     void HandleCallback(DWORD dwInternetStatus, LPVOID lpvStatusInformation,
         DWORD dwStatusInformationLength);
 
@@ -96,7 +94,6 @@ private:
     wxScopedPtr<wxWebAuthChallengeWinHTTP> m_authChallenge;
     wxMemoryBuffer m_dataWriteBuffer;
     wxFileOffset m_dataWritten;
-    wxFileOffset m_bytesExpectedToReceive;
     wxFileOffset m_bytesReceived;
 
     void SendRequest();
diff --git a/include/wx/webrequest.h b/include/wx/webrequest.h
index 75106322ea..7f40cb9acf 100644
--- a/include/wx/webrequest.h
+++ b/include/wx/webrequest.h
@@ -85,7 +85,7 @@ public:
 
     virtual wxFileOffset GetBytesReceived() const = 0;
 
-    virtual wxFileOffset GetBytesExpectedToReceive() const = 0;
+    virtual wxFileOffset GetBytesExpectedToReceive() const;
 
     void SetState(State state, const wxString& failMsg = "");
 
diff --git a/src/common/webrequest.cpp b/src/common/webrequest.cpp
index bdcca3649a..200e00080f 100644
--- a/src/common/webrequest.cpp
+++ b/src/common/webrequest.cpp
@@ -102,6 +102,14 @@ void wxWebRequest::SetData(wxSharedPtr<wxInputStream> dataStream, const wxString
     SetHeader("Content-Type", contentType);
 }
 
+wxFileOffset wxWebRequest::GetBytesExpectedToReceive() const
+{
+    if ( GetResponse() )
+        return GetResponse()->GetContentLength();
+    else
+        return -1;
+}
+
 void wxWebRequest::SetState(State state, const wxString & failMsg)
 {
     // Add a reference while the request is active
diff --git a/src/msw/webrequest_winhttp.cpp b/src/msw/webrequest_winhttp.cpp
index f92c81c33f..f7cca43d60 100644
--- a/src/msw/webrequest_winhttp.cpp
+++ b/src/msw/webrequest_winhttp.cpp
@@ -148,7 +148,6 @@ wxWebRequestWinHTTP::wxWebRequestWinHTTP(int id, wxWebSessionWinHTTP& session, c
     m_connect(NULL),
     m_request(NULL),
     m_dataWritten(0),
-    m_bytesExpectedToReceive(0),
     m_bytesReceived(0)
 {
     m_headers = session.GetHeaders();
@@ -221,7 +220,6 @@ void wxWebRequestWinHTTP::CreateResponse()
         m_response.reset(new wxWebResponseWinHTTP(*this));
         if ( !m_response->Init() )
             return;
-        m_bytesExpectedToReceive = m_response->GetContentLength();
         int status = m_response->GetStatus();
         if ( status == 401 || status == 407)
         {