Skip to content

W
wine-winehq
Commit 857d0e06 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

winhelp: Also store the relative offsets of a page in the history and back information sets.

parent a4480365
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
programs/winhelp/winhelp.c
View file @ 857d0e06
...@@ -485,11 +485,11 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) ...@@ -485,11 +485,11 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win)
} }
static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page) static void WINHELP_RememberPage(WINHELP_WINDOW* win, WINHELP_WNDPAGE* wpage)
{ {
unsigned num; unsigned num;
if (!Globals.history.index || Globals.history.set[0].page != page) if (!Globals.history.index || Globals.history.set[0].page != wpage->page)
{ {
num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]);
/* we're full, remove latest entry */ /* we're full, remove latest entry */
...@@ -500,10 +500,9 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page) ...@@ -500,10 +500,9 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page)
} }
memmove(&Globals.history.set[1], &Globals.history.set[0], memmove(&Globals.history.set[1], &Globals.history.set[0],
Globals.history.index * sizeof(Globals.history.set[0])); Globals.history.index * sizeof(Globals.history.set[0]));
Globals.history.set[0].page = page; Globals.history.set[0] = *wpage;
Globals.history.set[0].wininfo = win->info;
Globals.history.index++; Globals.history.index++;
page->file->wRefCount++; wpage->page->file->wRefCount++;
} }
if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE);
...@@ -516,9 +515,8 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page) ...@@ -516,9 +515,8 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page)
(num - 1) * sizeof(win->back.set[0])); (num - 1) * sizeof(win->back.set[0]));
win->back.index--; win->back.index--;
} }
win->back.set[win->back.index].page = page; win->back.set[win->back.index++] = *wpage;
win->back.set[win->back.index++].wininfo = win->info; wpage->page->file->wRefCount++;
page->file->wRefCount++;
} }
/*********************************************************************** /***********************************************************************
...@@ -592,7 +590,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe ...@@ -592,7 +590,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
if (!bPopup && wpage->page && remember) if (!bPopup && wpage->page && remember)
{ {
WINHELP_RememberPage(win, wpage->page); WINHELP_RememberPage(win, wpage);
} }
if (!bPopup) if (!bPopup)
......
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