winhlp32: Ensure win->page is not NULL when selecting Help on Help.

b4f2c552 · Owen Rudge · Alexandre Julliard · 5e289b91 · b4f2c552
Commit b4f2c552 authored Jul 22, 2009 by Owen Rudge Committed by Alexandre Julliard Jul 22, 2009
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

macro.c programs/winhlp32/macro.c +5 -2

No files found.
--- a/programs/winhlp32/macro.c
+++ b/programs/winhlp32/macro.c
@@ -446,10 +446,13 @@ static void CALLBACK MACRO_GotoMark(LPCSTR str)

 void CALLBACK MACRO_HelpOn(void)
 {
-    LPCSTR      file;
+    WINHELP_WINDOW *win = MACRO_CurrentWindow();
+    LPCSTR      file = NULL;

    WINE_TRACE("()\n");
-    file = MACRO_CurrentWindow()->page->file->help_on_file;
+    if (win && win->page && win->page->file)
+        file = win->page->file->help_on_file;
+
    if (!file)
        file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp";