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

msvfw32: Drawdib doesn't support inverted DIBs.

oldstable
Akihiro Sagawa 2014-05-02 22:14:22 +09:00 committed by Alexandre Julliard
parent 93089217c3
commit 47a3a0528d
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/msvfw32/drawdib.c
View File

@ -246,9 +246,18 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
DWORD dwSize;
/* No compression */
TRACE("Not compressed!\n");
dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD);
whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize);
memcpy(whdd->lpbiOut, lpbi, dwSize);
if (lpbi->biHeight <= 0)
{
/* we don't draw inverted DIBs */
TRACE("detected inverted DIB\n");
ret = FALSE;
}
else
{
dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD);
whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize);
memcpy(whdd->lpbiOut, lpbi, dwSize);
}
}
if (ret)
@ -332,6 +341,8 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc,
{
TRACE("Something changed!\n");
ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0);
if (!ret)
return ret;
}
#undef CHANGED

7
dlls/msvfw32/tests/drawdib.c
View File

@ -98,6 +98,13 @@ static void test_DrawDib_sizeimage(void)
{ WIDTH, HEIGHT, WIDTH * HEIGHT * sizeof(RGBQUAD), "bc943d5ab024b8b0118d0a80aa283055d39942b8" },
/* [1] zero size */
{ WIDTH, HEIGHT, 0, "bc943d5ab024b8b0118d0a80aa283055d39942b8" },
/* error patterns */
{ WIDTH, -HEIGHT, 0, "" },
{ -WIDTH, HEIGHT, 0, "" },
{ -WIDTH, -HEIGHT, 0, "" },
{ 0, 0, 0, "" },
{ 0, HEIGHT, 0, "" },
{ WIDTH, 0, 0, "" },
};
HDC hdc;
DWORD src_dib_size, dst_dib_size;