system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 17:53:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

winhlp32: Better protect macros against not finding a help file.

Browse source
This commit is contained in:
Eric Pouech 2011-07-31 08:53:34 +02:00 committed by Alexandre Julliard
parent 862cc73fb4
commit d3fd3d73be
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
programs/winhlp32/macro.c
View file

@ -575,11 +575,11 @@ void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context
HLPFILE* hlpfile; HLPFILE* hlpfile;
WINE_TRACE("(\"%s\", \"%s\", %d)\n", lpszPath, lpszWindow, context); WINE_TRACE("(\"%s\", \"%s\", %d)\n", lpszPath, lpszWindow, context);
hlpfile = WINHELP_LookupHelpFile(lpszPath); if ((hlpfile = WINHELP_LookupHelpFile(lpszPath)))
/* Some madness: what user calls 'context', hlpfile calls 'map' */ /* Some madness: what user calls 'context', hlpfile calls 'map' */
WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context, WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context,
WINHELP_GetWindowInfo(hlpfile, lpszWindow), WINHELP_GetWindowInfo(hlpfile, lpszWindow),
SW_NORMAL); SW_NORMAL);
} }
void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash)
@ -591,9 +591,10 @@ void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash)
hlpfile = MACRO_CurrentWindow()->page->file; hlpfile = MACRO_CurrentWindow()->page->file;
else else
hlpfile = WINHELP_LookupHelpFile(lpszPath); hlpfile = WINHELP_LookupHelpFile(lpszPath);
WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash, if (hlpfile)
WINHELP_GetWindowInfo(hlpfile, lpszWindow), WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash,
SW_NORMAL); WINHELP_GetWindowInfo(hlpfile, lpszWindow),
SW_NORMAL);
} }
static void CALLBACK MACRO_JumpHelpOn(void) static void CALLBACK MACRO_JumpHelpOn(void)