ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhlp32: Replace magic numbers by symbols. 

Signed-off-by: Jean-Christophe Cardot <wine@cardot.net>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jean-Christophe Cardot 2016-04-10 22:06:07 +02:00 committed by Alexandre Julliard
parent 64aec5d8db
commit 58f16273c3
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
programs/winhlp32/hlpfile.c
View File

@ -1258,13 +1258,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
format = buf + 0x15;
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);
*parlen = fetch_ushort(&format);
}
if (buf[0x14] == 0x23)
if (buf[0x14] == HLP_TABLE)
{
char type;
@ -1326,7 +1326,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done;
}
else nc++;
if (buf[0x14] == 0x01)
if (buf[0x14] == HLP_DISPLAY30)
format += 6;
else
format += 4;
@ -1799,12 +1799,12 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd,
switch (buf[0x14])
{
case 0x02:
case HLP_TOPICHDR:
if (count++) goto done;
break;
case 0x01:
case 0x20:
case 0x23:
case HLP_DISPLAY30:
case HLP_DISPLAY:
case HLP_TABLE:
if (!HLPFILE_BrowseParagraph(page, rd, buf, end, &parlen)) return FALSE;
if (relative > index * 0x8000 + offs)
rd->char_pos_rel = rd->char_pos;
@ -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;};
tmp = buf + 0x15;
if (buf[0x14] == 0x20 || buf[0x14] == 0x23)
if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE)
{
fetch_long(&tmp);
*len = fetch_ushort(&tmp);
@ -2680,7 +2680,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath)
switch (buf[0x14])
{
case 0x02:
case HLP_TOPICHDR: /* Topic Header */
if (hlpfile->version <= 16)
topicoffset = ref + index * 12;
else
@ -2688,9 +2688,9 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath)
if (!HLPFILE_AddPage(hlpfile, buf, end, ref, topicoffset)) return FALSE;
break;
case 0x01:
case 0x20:
case 0x23:
case HLP_DISPLAY30:
case HLP_DISPLAY:
case HLP_TABLE:
if (!HLPFILE_SkipParagraph(hlpfile, buf, end, &len)) return FALSE;
offs += len;
break;

5
programs/winhlp32/hlpfile.h
View File

@ -199,3 +199,8 @@ struct RtfData {
BOOL HLPFILE_BrowsePage(HLPFILE_PAGE*, struct RtfData* rd,
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 */