marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Fix CopyTo to work correctly with LARGE_INTEGERs.

oldstable
Huw Davies 2008-03-06 12:05:52 +00:00 committed by Alexandre Julliard
parent a555658ba1
commit 0aedac346a
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/ole32/hglobalstream.c
View File

@ -467,24 +467,16 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo(
TRACE("(%p, %p, %d, %p, %p)\n", iface, pstm, TRACE("(%p, %p, %d, %p, %p)\n", iface, pstm,
cb.u.LowPart, pcbRead, pcbWritten); cb.u.LowPart, pcbRead, pcbWritten);
/*
* Sanity check
*/
if ( pstm == 0 ) if ( pstm == 0 )
return STG_E_INVALIDPOINTER; return STG_E_INVALIDPOINTER;
totalBytesRead.u.LowPart = totalBytesRead.u.HighPart = 0; totalBytesRead.QuadPart = 0;
totalBytesWritten.u.LowPart = totalBytesWritten.u.HighPart = 0; totalBytesWritten.QuadPart = 0;
/* while ( cb.QuadPart > 0 )
* use stack to store data temporarly
* there is surely more performant way of doing it, for now this basic
* implementation will do the job
*/
while ( cb.u.LowPart > 0 )
{ {
if ( cb.u.LowPart >= 128 ) if ( cb.QuadPart >= sizeof(tmpBuffer) )
copySize = 128; copySize = sizeof(tmpBuffer);
else else
copySize = cb.u.LowPart; copySize = cb.u.LowPart;
@ -492,7 +484,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo(
if (FAILED(hr)) if (FAILED(hr))
break; break;
totalBytesRead.u.LowPart += bytesRead; totalBytesRead.QuadPart += bytesRead;
if (bytesRead) if (bytesRead)
{ {
@ -500,29 +492,18 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo(
if (FAILED(hr)) if (FAILED(hr))
break; break;
totalBytesWritten.u.LowPart += bytesWritten; totalBytesWritten.QuadPart += bytesWritten;
} }
if (bytesRead!=copySize) if (bytesRead!=copySize)
cb.u.LowPart = 0; cb.QuadPart = 0;
else else
cb.u.LowPart -= bytesRead; cb.QuadPart -= bytesRead;
} }
/* if (pcbRead) pcbRead->QuadPart = totalBytesRead.QuadPart;
* Update number of bytes read and written if (pcbWritten) pcbWritten->QuadPart = totalBytesWritten.QuadPart;
*/
if (pcbRead)
{
pcbRead->u.LowPart = totalBytesRead.u.LowPart;
pcbRead->u.HighPart = totalBytesRead.u.HighPart;
}
if (pcbWritten)
{
pcbWritten->u.LowPart = totalBytesWritten.u.LowPart;
pcbWritten->u.HighPart = totalBytesWritten.u.HighPart;
}
return hr; return hr;
} }