system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-18 10:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

winhelp: Fix the loading of a row in a table (especially, for multiple paragraphs in a single cell).

Browse source
This commit is contained in:
Eric Pouech 2008-04-22 22:00:08 +02:00 committed by Alexandre Julliard
parent e0032f0ceb
commit e862e7d84c
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
programs/winhelp/hlpfile.c
View file

@ -882,6 +882,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end)
long size, blocksize, datalen;
unsigned short bits;
unsigned nc, ncol = 1;
BOOL in_table = FALSE;
for (paragraphptr = &page->first_paragraph; *paragraphptr;
paragraphptr = &(*paragraphptr)->next) /* Nothing */;
@ -925,6 +926,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end)
{
char type;
in_table = TRUE;
ncol = *format++;
WINE_TRACE("#cols %u\n", ncol);
@ -934,15 +936,17 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end)
format += ncol * 4;
}
for (nc = 0; nc < ncol; nc++)
for (nc = 0; nc < ncol; /**/)
{
WINE_TRACE("looking for format at offset %lu for column %d\n", (SIZE_T)(format - (buf + 0x15)), nc);
if (buf[0x14] == 0x23)
WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc);
if (in_table)
{
nc = GET_SHORT(format, 0);
if (nc == -1) break;
format += 5;
if (buf[0x14] == 0x01)
format += 6;
else
format += 4;
}
else nc++;
format += 4;
bits = GET_USHORT(format, 0); format += 2;
if (bits & 0x0001) fetch_long(&format);
if (bits & 0x0002) fetch_short(&format);