mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 02:42:49 -04:00
report total download size properly
This commit is contained in:
parent
f2e3cef83b
commit
f0d19f90a9
@ -18,7 +18,8 @@
|
|||||||
|
|
||||||
|
|
||||||
PPDownloadCallback::PPDownloadCallback( PPDownloadCallbackSync& downloadSync )
|
PPDownloadCallback::PPDownloadCallback( PPDownloadCallbackSync& downloadSync )
|
||||||
: m_downloadSync( downloadSync ), m_dwTotalRead( 0 ), m_ulObjRefCount( 1 )
|
: m_downloadSync( downloadSync ), m_dwTotalRead( 0 ),
|
||||||
|
m_dwTotalInStream( 0 ), m_ulObjRefCount( 1 )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -148,6 +149,7 @@ STDMETHODIMP PPDownloadCallback::OnProgress(ULONG ulProgress,
|
|||||||
ulStatusCode = UF_BINDSTATUS_LAST + 1;
|
ulStatusCode = UF_BINDSTATUS_LAST + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_dwTotalInStream = ulProgressMax;
|
||||||
m_downloadSync.ProgressNotify( ulProgress, ulProgressMax );
|
m_downloadSync.ProgressNotify( ulProgress, ulProgressMax );
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
@ -209,7 +211,7 @@ STDMETHODIMP PPDownloadCallback::OnDataAvailable(DWORD grfBSCF, DWORD dwSize,
|
|||||||
pBytes[dwActuallyRead] = 0;
|
pBytes[dwActuallyRead] = 0;
|
||||||
if (dwActuallyRead>0)
|
if (dwActuallyRead>0)
|
||||||
{
|
{
|
||||||
bool ret = m_downloadSync.DataNotify( dwSize, (const void*)pBytes, dwActuallyRead );
|
bool ret = m_downloadSync.DataNotify( m_dwTotalInStream, (const void*)pBytes, dwActuallyRead );
|
||||||
if (!ret)
|
if (!ret)
|
||||||
{
|
{
|
||||||
hr = E_ABORT;
|
hr = E_ABORT;
|
||||||
|
@ -60,5 +60,6 @@ private:
|
|||||||
PPDownloadCallbackSync& m_downloadSync;
|
PPDownloadCallbackSync& m_downloadSync;
|
||||||
|
|
||||||
DWORD m_dwTotalRead;
|
DWORD m_dwTotalRead;
|
||||||
|
DWORD m_dwTotalInStream;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user