Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move GetBytesExpectedToReceive() impl to base class

Browse Source
This commit is contained in:
Tobias Taschner
2018-11-02 21:24:10 +01:00
parent 2f4be7e1ae
commit ab544da1d2
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/webrequest_winhttp.h
View File

@@ -81,8 +81,6 @@ public:
wxFileOffset GetBytesReceived() const wxOVERRIDE { return m_bytesReceived; } wxFileOffset GetBytesReceived() const wxOVERRIDE { return m_bytesReceived; }
wxFileOffset GetBytesExpectedToReceive() const wxOVERRIDE { return m_bytesExpectedToReceive; }
void HandleCallback(DWORD dwInternetStatus, LPVOID lpvStatusInformation, void HandleCallback(DWORD dwInternetStatus, LPVOID lpvStatusInformation,
DWORD dwStatusInformationLength); DWORD dwStatusInformationLength);
@@ -96,7 +94,6 @@ private:
wxScopedPtr<wxWebAuthChallengeWinHTTP> m_authChallenge; wxScopedPtr<wxWebAuthChallengeWinHTTP> m_authChallenge;
wxMemoryBuffer m_dataWriteBuffer; wxMemoryBuffer m_dataWriteBuffer;
wxFileOffset m_dataWritten; wxFileOffset m_dataWritten;
wxFileOffset m_bytesExpectedToReceive;
wxFileOffset m_bytesReceived; wxFileOffset m_bytesReceived;
void SendRequest(); void SendRequest();

2
include/wx/webrequest.h
View File

@@ -85,7 +85,7 @@ public:
virtual wxFileOffset GetBytesReceived() const = 0; virtual wxFileOffset GetBytesReceived() const = 0;
virtual wxFileOffset GetBytesExpectedToReceive() const = 0; virtual wxFileOffset GetBytesExpectedToReceive() const;
void SetState(State state, const wxString& failMsg = ""); void SetState(State state, const wxString& failMsg = "");

8
src/common/webrequest.cpp
View File

@@ -102,6 +102,14 @@ void wxWebRequest::SetData(wxSharedPtr<wxInputStream> dataStream, const wxString
SetHeader("Content-Type", contentType); SetHeader("Content-Type", contentType);
} }
wxFileOffset wxWebRequest::GetBytesExpectedToReceive() const
{
if ( GetResponse() )
return GetResponse()->GetContentLength();
else
return -1;
}
void wxWebRequest::SetState(State state, const wxString & failMsg) void wxWebRequest::SetState(State state, const wxString & failMsg)
{ {
// Add a reference while the request is active // Add a reference while the request is active

2
src/msw/webrequest_winhttp.cpp
View File

@@ -148,7 +148,6 @@ wxWebRequestWinHTTP::wxWebRequestWinHTTP(int id, wxWebSessionWinHTTP& session, c
m_connect(NULL), m_connect(NULL),
m_request(NULL), m_request(NULL),
m_dataWritten(0), m_dataWritten(0),
m_bytesExpectedToReceive(0),
m_bytesReceived(0) m_bytesReceived(0)
{ {
m_headers = session.GetHeaders(); m_headers = session.GetHeaders();
@@ -221,7 +220,6 @@ void wxWebRequestWinHTTP::CreateResponse()
m_response.reset(new wxWebResponseWinHTTP(*this)); m_response.reset(new wxWebResponseWinHTTP(*this));
if ( !m_response->Init() ) if ( !m_response->Init() )
return; return;
m_bytesExpectedToReceive = m_response->GetContentLength();
int status = m_response->GetStatus(); int status = m_response->GetStatus();
if ( status == 401 || status == 407) if ( status == 401 || status == 407)
{ {