Skip to content

W
wine-cw
Commit e862e7d8 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

winhelp: Fix the loading of a row in a table (especially, for multiple…

winhelp: Fix the loading of a row in a table (especially, for multiple paragraphs in a single cell).
parent e0032f0c
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
programs/winhelp/hlpfile.c
View file @ e862e7d8
...@@ -882,6 +882,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) ...@@ -882,6 +882,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end)
long size, blocksize, datalen; long size, blocksize, datalen;
unsigned short bits; unsigned short bits;
unsigned nc, ncol = 1; unsigned nc, ncol = 1;
BOOL in_table = FALSE;
for (paragraphptr = &page->first_paragraph; *paragraphptr; for (paragraphptr = &page->first_paragraph; *paragraphptr;
paragraphptr = &(*paragraphptr)->next) /* Nothing */; paragraphptr = &(*paragraphptr)->next) /* Nothing */;
...@@ -925,6 +926,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) ...@@ -925,6 +926,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end)
{ {
char type; char type;
in_table = TRUE;
ncol = *format++; ncol = *format++;
WINE_TRACE("#cols %u\n", ncol); WINE_TRACE("#cols %u\n", ncol);
...@@ -934,15 +936,17 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) ...@@ -934,15 +936,17 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end)
format += ncol * 4; 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); WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc);
if (buf[0x14] == 0x23) if (in_table)
{
nc = GET_SHORT(format, 0);
if (nc == -1) break;
format += 5; format += 5;
if (buf[0x14] == 0x01) }
format += 6; else nc++;
else format += 4;
format += 4;
bits = GET_USHORT(format, 0); format += 2; bits = GET_USHORT(format, 0); format += 2;
if (bits & 0x0001) fetch_long(&format); if (bits & 0x0001) fetch_long(&format);
if (bits & 0x0002) fetch_short(&format); if (bits & 0x0002) fetch_short(&format);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment