From 3fac812bd9019a98f27aa13f0e84b1ba524845a1 Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Sun, 8 Nov 2009 15:04:59 +0100 Subject: [PATCH] winhlp32: Added support for macros as hotspots' target. --- programs/winhlp32/hlpfile.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index f6c11373a3c..2d685ae493a 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -797,29 +797,35 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, */ str += strlen(str) + 1; /* skip hotspot name */ + hslink = NULL; switch (start[7 + 15 * i + 0]) /* The next two chars always look like 0x04 0x00 ??? * What are they for ? */ { + case 0xC8: + hslink = (HLPFILE_HOTSPOTLINK*) + HLPFILE_AllocLink(rd, hlp_link_macro, str, -1, 0, 0, 1, -1); + break; + case 0xE6: case 0xE7: hslink = (HLPFILE_HOTSPOTLINK*) HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, file->lpszPath, -1, HLPFILE_Hash(str), 0, 1, -1); - if (hslink) - { - hslink->x = GET_USHORT(start, 7 + 15 * i + 3); - hslink->y = GET_USHORT(start, 7 + 15 * i + 5); - hslink->width = GET_USHORT(start, 7 + 15 * i + 7); - hslink->height = GET_USHORT(start, 7 + 15 * i + 9); - /* target = GET_UINT(start, 7 + 15 * i + 11); */ - } break; default: WINE_FIXME("unknown hotsport target 0x%x\n", start[7 + 15 * i + 0]); } + if (hslink) + { + hslink->x = GET_USHORT(start, 7 + 15 * i + 3); + hslink->y = GET_USHORT(start, 7 + 15 * i + 5); + hslink->width = GET_USHORT(start, 7 + 15 * i + 7); + hslink->height = GET_USHORT(start, 7 + 15 * i + 9); + /* target = GET_UINT(start, 7 + 15 * i + 11); */ + } str += strlen(str) + 1; } } -- 2.11.4.GIT