Commit 58f16273 authored by Jean-Christophe Cardot's avatar Jean-Christophe Cardot Committed by Alexandre Julliard

winhlp32: Replace magic numbers by symbols.

parent 64aec5d8
...@@ -1258,13 +1258,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, ...@@ -1258,13 +1258,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
format = buf + 0x15; format = buf + 0x15;
format_end = buf + GET_UINT(buf, 0x10); format_end = buf + GET_UINT(buf, 0x10);
if (buf[0x14] == 0x20 || buf[0x14] == 0x23) if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE)
{ {
fetch_long(&format); fetch_long(&format);
*parlen = fetch_ushort(&format); *parlen = fetch_ushort(&format);
} }
if (buf[0x14] == 0x23) if (buf[0x14] == HLP_TABLE)
{ {
char type; char type;
...@@ -1326,7 +1326,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, ...@@ -1326,7 +1326,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done; if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done;
} }
else nc++; else nc++;
if (buf[0x14] == 0x01) if (buf[0x14] == HLP_DISPLAY30)
format += 6; format += 6;
else else
format += 4; format += 4;
...@@ -1799,12 +1799,12 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, ...@@ -1799,12 +1799,12 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd,
switch (buf[0x14]) switch (buf[0x14])
{ {
case 0x02: case HLP_TOPICHDR:
if (count++) goto done; if (count++) goto done;
break; break;
case 0x01: case HLP_DISPLAY30:
case 0x20: case HLP_DISPLAY:
case 0x23: case HLP_TABLE:
if (!HLPFILE_BrowseParagraph(page, rd, buf, end, &parlen)) return FALSE; if (!HLPFILE_BrowseParagraph(page, rd, buf, end, &parlen)) return FALSE;
if (relative > index * 0x8000 + offs) if (relative > index * 0x8000 + offs)
rd->char_pos_rel = rd->char_pos; rd->char_pos_rel = rd->char_pos;
...@@ -2605,7 +2605,7 @@ static BOOL HLPFILE_SkipParagraph(HLPFILE *hlpfile, const BYTE *buf, const BYTE ...@@ -2605,7 +2605,7 @@ static BOOL HLPFILE_SkipParagraph(HLPFILE *hlpfile, const BYTE *buf, const BYTE
if (buf + 0x19 > end) {WINE_WARN("header too small\n"); return FALSE;}; if (buf + 0x19 > end) {WINE_WARN("header too small\n"); return FALSE;};
tmp = buf + 0x15; tmp = buf + 0x15;
if (buf[0x14] == 0x20 || buf[0x14] == 0x23) if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE)
{ {
fetch_long(&tmp); fetch_long(&tmp);
*len = fetch_ushort(&tmp); *len = fetch_ushort(&tmp);
...@@ -2680,7 +2680,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) ...@@ -2680,7 +2680,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath)
switch (buf[0x14]) switch (buf[0x14])
{ {
case 0x02: case HLP_TOPICHDR: /* Topic Header */
if (hlpfile->version <= 16) if (hlpfile->version <= 16)
topicoffset = ref + index * 12; topicoffset = ref + index * 12;
else else
...@@ -2688,9 +2688,9 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) ...@@ -2688,9 +2688,9 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath)
if (!HLPFILE_AddPage(hlpfile, buf, end, ref, topicoffset)) return FALSE; if (!HLPFILE_AddPage(hlpfile, buf, end, ref, topicoffset)) return FALSE;
break; break;
case 0x01: case HLP_DISPLAY30:
case 0x20: case HLP_DISPLAY:
case 0x23: case HLP_TABLE:
if (!HLPFILE_SkipParagraph(hlpfile, buf, end, &len)) return FALSE; if (!HLPFILE_SkipParagraph(hlpfile, buf, end, &len)) return FALSE;
offs += len; offs += len;
break; break;
......
...@@ -199,3 +199,8 @@ struct RtfData { ...@@ -199,3 +199,8 @@ struct RtfData {
BOOL HLPFILE_BrowsePage(HLPFILE_PAGE*, struct RtfData* rd, BOOL HLPFILE_BrowsePage(HLPFILE_PAGE*, struct RtfData* rd,
unsigned font_scale, unsigned relative); unsigned font_scale, unsigned relative);
#define HLP_DISPLAY30 0x01 /* version 3.0 displayable information */
#define HLP_TOPICHDR 0x02 /* topic header information */
#define HLP_DISPLAY 0x20 /* version 3.1 displayable information */
#define HLP_TABLE 0x23 /* version 3.1 table */
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