Merge r3758 from trunk.

Originally committed to SVN as r3759.
This commit is contained in:
Niels Martin Hansen 2009-11-04 04:27:55 +00:00
parent b4e9cb085d
commit 8970178317
1 changed files with 2 additions and 1 deletions

View File

@ -395,8 +395,9 @@ do_fill_buffer:
DWORD buf1sz, buf2sz; DWORD buf1sz, buf2sz;
void *buf1, *buf2; void *buf1, *buf2;
assert(bytes_needed > 0);
assert(buffer_offset < bufSize); assert(buffer_offset < bufSize);
assert(bytes_needed <= bufSize); assert((DWORD)bytes_needed <= bufSize);
HRESULT res = bfr->Lock(buffer_offset, bytes_needed, &buf1, &buf1sz, &buf2, &buf2sz, 0); HRESULT res = bfr->Lock(buffer_offset, bytes_needed, &buf1, &buf1sz, &buf2, &buf2sz, 0);
switch (res) switch (res)