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

quartz/filesource: Correctly report short reads from IAsyncReader_SyncRead(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Zebediah Figura 2019-02-22 19:27:00 -06:00 committed by Alexandre Julliard
parent e2f37558a7
commit 930e0cdc08
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/quartz/filesource.c
View File

@ -1309,34 +1309,37 @@ static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader * iface, IMed
return hr;
}
static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG llPosition, LONG lLength, BYTE * pBuffer)
static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface,
LONGLONG offset, LONG length, BYTE *buffer)
{
OVERLAPPED ovl;
HRESULT hr = S_OK;
FileAsyncReader *This = impl_from_IAsyncReader(iface);
FileAsyncReader *filter = impl_from_IAsyncReader(iface);
DWORD read_len;
HRESULT hr;
BOOL ret;
TRACE("%p->(%s, %d, %p)\n", This, wine_dbgstr_longlong(llPosition), lLength, pBuffer);
TRACE("filter %p, offset %s, length %d, buffer %p.\n",
filter, wine_dbgstr_longlong(offset), length, buffer);
ZeroMemory(&ovl, sizeof(ovl));
ovl.hEvent = CreateEventW(NULL, 0, 0, NULL);
/* NOTE: llPosition is the actual byte position to start reading from */
ovl.u.s.Offset = (DWORD) llPosition;
ovl.u.s.OffsetHigh = (DWORD) (llPosition >> (sizeof(DWORD) * 8));
ovl.u.s.Offset = (DWORD)offset;
ovl.u.s.OffsetHigh = (DWORD)(offset >> (sizeof(DWORD) * 8));
if (!ReadFile(This->hFile, pBuffer, lLength, NULL, &ovl))
hr = HRESULT_FROM_WIN32(GetLastError());
if (hr == HRESULT_FROM_WIN32(ERROR_IO_PENDING))
hr = S_OK;
if (SUCCEEDED(hr))
ret = ReadFile(filter->hFile, buffer, length, NULL, &ovl);
if (ret || GetLastError() == ERROR_IO_PENDING)
{
DWORD dwBytesRead;
if (!GetOverlappedResult(This->hFile, &ovl, &dwBytesRead, TRUE))
if (GetOverlappedResult(filter->hFile, &ovl, &read_len, TRUE))
hr = (read_len == length) ? S_OK : S_FALSE;
else
hr = HRESULT_FROM_WIN32(GetLastError());
}
else if (GetLastError() == ERROR_HANDLE_EOF)
hr = S_FALSE;
else
hr = HRESULT_FROM_WIN32(GetLastError());
CloseHandle(ovl.hEvent);

2
dlls/quartz/tests/filesource.c
View File

@ -722,7 +722,6 @@ static void test_async_reader(void)
ok(buffer[i] == (10 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i);
hr = IAsyncReader_SyncRead(reader, 590, 20, buffer);
todo_wine
ok(hr == S_FALSE, "Got hr %#x.\n", hr);
for (i = 0; i < 10; i++)
ok(buffer[i] == (590 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i);
@ -731,7 +730,6 @@ todo_wine
memset(buffer, 0xcc, sizeof(buffer));
hr = IAsyncReader_SyncRead(reader, 600, 10, buffer);
todo_wine
ok(hr == S_FALSE, "Got hr %#x.\n", hr);
ok(buffer[0] == 0xcc, "Got wrong byte %02x.\n", buffer[0]);