Skip to content

W
wine-cw
Commit 2b855ded authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

Wrote back & history support.

Correctly implemented << and >> buttons. Added support for page level macros.
parent ff3dc347
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 97 deletions
programs/winhelp/hlpfile.c
View file @ 2b855ded
......@@ -86,23 +86,6 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile);
/***********************************************************************
*
* HLPFILE_Contents
*/
HLPFILE_PAGE *HLPFILE_Contents(HLPFILE *hlpfile)
{
if (!hlpfile) return 0;
#if 1
return hlpfile->first_page;
#else
if (hlpfile->contents_start)
return HLPFILE_PageByHash(hlpfile, hlpfile->contents_start);
else
return hlpfile->first_page;
#endif
}
/***********************************************************************
*
* HLPFILE_PageByNumber
*/
HLPFILE_PAGE *HLPFILE_PageByNumber(LPCSTR lpszPath, UINT wNum)
......@@ -119,55 +102,82 @@ HLPFILE_PAGE *HLPFILE_PageByNumber(LPCSTR lpszPath, UINT wNum)
return page;
}
/* FIXME:
* this finds the page containing the offset. The offset can either
* refer to the top of the page (offset == page->offset), or
* to some paragraph inside the page...
* As of today, we only return the page... we should also return
* a paragraph, and then, while opening a new page, compute the
* y-offset of the paragraph to be shown and scroll the window
* accordinly
*/
/******************************************************************
* HLPFILE_PageByOffset
*
*
*/
HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset)
{
HLPFILE_PAGE* page;
HLPFILE_PAGE* found;
if (!hlpfile) return 0;
WINE_TRACE("<%s>[%lx]\n", hlpfile->lpszPath, offset);
if (offset == 0xFFFFFFFF) return NULL;
page = NULL;
for (found = NULL, page = hlpfile->first_page; page; page = page->next)
{
if (page->offset <= offset && (!found || found->offset < page->offset))
found = page;
}
if (!found)
WINE_ERR("Page of offset %lu not found in file %s\n",
offset, hlpfile->lpszPath);
return found;
}
/***********************************************************************
*
* HLPFILE_HlpFilePageByHash
*/
HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash)
{
HLPFILE_PAGE* page;
HLPFILE_PAGE* found;
int i;
WINE_TRACE("path<%s>[%lx]\n", hlpfile->lpszPath, lHash);
if (!hlpfile) return 0;
page = NULL;
WINE_TRACE("<%s>[%lx]\n", hlpfile->lpszPath, lHash);
for (i = 0; i < hlpfile->wContextLen; i++)
{
if (hlpfile->Context[i].lHash != lHash) continue;
/* FIXME:
* this finds the page containing the offset. The offset can either
* refer to the top of the page (offset == page->offset), or
* to some paragraph inside the page...
* As of today, we only return the page... we should also return
* a paragraph, and then, while opening a new page, compute the
* y-offset of the paragraph to be shown and scroll the window
* accordinly
*/
found = NULL;
for (page = hlpfile->first_page; page; page = page->next)
{
if (page->offset <= hlpfile->Context[i].offset)
{
if (!found || found->offset < page->offset)
found = page;
}
}
if (found) return found;
WINE_ERR("Page of offset %lu not found in file %s\n",
hlpfile->Context[i].offset, hlpfile->lpszPath);
return NULL;
if (hlpfile->Context[i].lHash == lHash)
return HLPFILE_PageByOffset(hlpfile, hlpfile->Context[i].offset);
}
WINE_ERR("Page of hash %lx not found in file %s\n", lHash, hlpfile->lpszPath);
return NULL;
}
/***********************************************************************
*
* HLPFILE_Contents
*/
HLPFILE_PAGE* HLPFILE_Contents(HLPFILE *hlpfile)
{
HLPFILE_PAGE* page = NULL;
if (!hlpfile) return NULL;
page = HLPFILE_PageByOffset(hlpfile, hlpfile->contents_start);
if (!page) page = hlpfile->first_page;
return page;
}
/***********************************************************************
*
* HLPFILE_Hash
*/
LONG HLPFILE_Hash(LPCSTR lpszContext)
......@@ -216,7 +226,7 @@ HLPFILE *HLPFILE_ReadHlpFile(LPCSTR lpszPath)
hlpfile->first_macro = NULL;
hlpfile->wContextLen = 0;
hlpfile->Context = NULL;
hlpfile->contents_start = 0;
hlpfile->contents_start = 0xFFFFFFFF;
hlpfile->prev = NULL;
hlpfile->next = first_hlpfile;
hlpfile->wRefCount = 1;
......@@ -338,35 +348,37 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off
HLPFILE_PAGE* page;
BYTE* title;
UINT titlesize;
char* ptr;
HLPFILE_MACRO*macro;
if (buf + 0x31 > end) {WINE_WARN("page1\n"); return FALSE;};
title = buf + GET_UINT(buf, 0x10);
if (title > end) {WINE_WARN("page2\n"); return FALSE;};
titlesize = GET_UINT(buf, 4) + 1;
page = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_PAGE) + titlesize);
titlesize = GET_UINT(buf, 4);
page = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_PAGE) + titlesize + 1);
if (!page) return FALSE;
page->lpszTitle = (char*)page + sizeof(HLPFILE_PAGE);
if (hlpfile->hasPhrases)
{
HLPFILE_Uncompress2(title, end, page->lpszTitle, page->lpszTitle + titlesize - 1);
HLPFILE_Uncompress2(title, end, page->lpszTitle, page->lpszTitle + titlesize);
}
else
{
if (GET_UINT(buf, 0x4) > GET_UINT(buf, 0) - GET_UINT(buf, 0x10))
{
/* need to decompress */
HLPFILE_Uncompress3(page->lpszTitle, page->lpszTitle + titlesize - 1,
HLPFILE_Uncompress3(page->lpszTitle, page->lpszTitle + titlesize,
title, end);
}
else
{
memcpy(page->lpszTitle, title, titlesize - 1);
memcpy(page->lpszTitle, title, titlesize);
}
}
page->lpszTitle[titlesize - 1] = 0;
page->lpszTitle[titlesize] = '\0';
if (hlpfile->first_page)
{
......@@ -385,14 +397,36 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off
page->file = hlpfile;
page->next = NULL;
page->first_paragraph = NULL;
page->first_macro = NULL;
page->wNumber = GET_UINT(buf, 0x21);
page->offset = offset;
WINE_TRACE("Added page[%d]: title='%s' offset=%08x\n",
page->wNumber, page->lpszTitle, page->offset);
page->browse_bwd = GET_UINT(buf, 0x19);
page->browse_fwd = GET_UINT(buf, 0x1D);
WINE_TRACE("Added page[%d]: title='%s' %08lx << %08x >> %08lx\n",
page->wNumber, page->lpszTitle,
page->browse_bwd, page->offset, page->browse_fwd);
memset(&attributes, 0, sizeof(attributes));
/* now load macros */
ptr = page->lpszTitle + strlen(page->lpszTitle) + 1;
while (ptr < page->lpszTitle + titlesize)
{
unsigned len = strlen(ptr);
WINE_TRACE("macro: %s\n", ptr);
macro = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_MACRO) + len + 1);
macro->lpszMacro = (char*)(macro + 1);
memcpy((char*)macro->lpszMacro, ptr, len + 1);
/* FIXME: shall we really link macro in reverse order ??
* may produce strange results when played at page opening
*/
macro->next = page->first_macro;
page->first_macro = macro;
ptr += len + 1;
}
return TRUE;
}
......@@ -1764,34 +1798,35 @@ static void HLPFILE_DeleteParagraph(HLPFILE_PARAGRAPH* paragraph)
/***********************************************************************
*
* DeletePage
* DeleteMacro
*/
static void HLPFILE_DeletePage(HLPFILE_PAGE* page)
static void HLPFILE_DeleteMacro(HLPFILE_MACRO* macro)
{
HLPFILE_PAGE* next;
HLPFILE_MACRO* next;
while (page)
while (macro)
{
next = page->next;
HLPFILE_DeleteParagraph(page->first_paragraph);
HeapFree(GetProcessHeap(), 0, page);
page = next;
next = macro->next;
HeapFree(GetProcessHeap(), 0, macro);
macro = next;
}
}
/***********************************************************************
*
* DeleteMacro
* DeletePage
*/
static void HLPFILE_DeleteMacro(HLPFILE_MACRO* macro)
static void HLPFILE_DeletePage(HLPFILE_PAGE* page)
{
HLPFILE_MACRO* next;
HLPFILE_PAGE* next;
while (macro)
while (page)
{
next = macro->next;
HeapFree(GetProcessHeap(), 0, macro);
macro = next;
next = page->next;
HLPFILE_DeleteParagraph(page->first_paragraph);
HLPFILE_DeleteMacro(page->first_macro);
HeapFree(GetProcessHeap(), 0, page);
page = next;
}
}
......@@ -1836,13 +1871,3 @@ void HLPFILE_FreeHlpFile(HLPFILE* hlpfile)
if (hlpfile->lpszCopyright) HeapFree(GetProcessHeap(), 0, hlpfile->lpszCopyright);
HeapFree(GetProcessHeap(), 0, hlpfile);
}
/***********************************************************************
*
* FreeHlpFilePage
*/
void HLPFILE_FreeHlpFilePage(HLPFILE_PAGE* page)
{
if (!page) return;
HLPFILE_FreeHlpFile(page->file);
}
programs/winhelp/hlpfile.h
View file @ 2b855ded
......@@ -71,15 +71,26 @@ typedef struct tagHlpFileParagraph
struct tagHlpFileParagraph* next;
} HLPFILE_PARAGRAPH;
typedef struct tagHlpFileMacro
{
LPCSTR lpszMacro;
struct tagHlpFileMacro* next;
} HLPFILE_MACRO;
typedef struct tagHlpFilePage
{
LPSTR lpszTitle;
HLPFILE_PARAGRAPH* first_paragraph;
HLPFILE_MACRO* first_macro;
unsigned wNumber;
unsigned offset;
struct tagHlpFilePage* next;
struct tagHlpFilePage* prev;
DWORD browse_bwd;
DWORD browse_fwd;
struct tagHlpFileFile* file;
} HLPFILE_PAGE;
......@@ -89,12 +100,6 @@ typedef struct
unsigned long offset;
} HLPFILE_CONTEXT;
typedef struct tagHlpFileMacro
{
LPCSTR lpszMacro;
struct tagHlpFileMacro* next;
} HLPFILE_MACRO;
typedef struct
{
LOGFONT LogFont;
......@@ -132,9 +137,9 @@ typedef struct tagHlpFileFile
HLPFILE_WINDOWINFO* windows;
} HLPFILE;
HLPFILE *HLPFILE_ReadHlpFile(LPCSTR lpszPath);
HLPFILE_PAGE *HLPFILE_Contents(HLPFILE* hlpfile);
HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG wNum);
HLPFILE* HLPFILE_ReadHlpFile(LPCSTR lpszPath);
HLPFILE_PAGE* HLPFILE_Contents(HLPFILE* hlpfile);
HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash);
HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset);
LONG HLPFILE_Hash(LPCSTR lpszContext);
VOID HLPFILE_FreeHlpFilePage(HLPFILE_PAGE*);
VOID HLPFILE_FreeHlpFile(HLPFILE*);
void HLPFILE_FreeHlpFile(HLPFILE*);
programs/winhelp/macro.c
View file @ 2b855ded
......@@ -222,12 +222,32 @@ void MACRO_AppendItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4)
void MACRO_Back(void)
{
WINE_FIXME("()\n");
WINHELP_WINDOW* win = Globals.active_win;
WINE_TRACE("()\n");
if (win && win->backIndex >= 2)
WINHELP_CreateHelpWindow(win->back[--win->backIndex - 1],
win->info, SW_SHOW);
}
void MACRO_BackFlush(void)
{
WINE_FIXME("()\n");
WINHELP_WINDOW* win = Globals.active_win;
WINE_TRACE("()\n");
if (win)
{
int i;
for (i = 0; i < win->backIndex; i++)
{
HLPFILE_FreeHlpFile(win->back[i]->file);
win->back[i] = NULL;
}
win->backIndex = 0;
}
}
void MACRO_BookmarkDefine(void)
......@@ -599,7 +619,14 @@ void MACRO_HelpOnTop(void)
void MACRO_History(void)
{
WINE_FIXME("()\n");
WINE_TRACE("()\n");
if (Globals.active_win && !Globals.active_win->hHistoryWnd)
{
HWND hWnd = CreateWindow(HISTORY_WIN_CLASS_NAME, "History", WS_OVERLAPPEDWINDOW,
0, 0, 0, 0, 0, 0, Globals.hInstance, Globals.active_win);
ShowWindow(hWnd, SW_NORMAL);
}
}
void MACRO_IfThen(BOOL b, LPCSTR t)
......@@ -717,7 +744,9 @@ void MACRO_Next(void)
HLPFILE_PAGE* page;
WINE_TRACE("()\n");
if ((page = Globals.active_win->page->next) != NULL)
page = Globals.active_win->page;
page = HLPFILE_PageByOffset(page->file, page->browse_fwd);
if (page)
{
page->file->wRefCount++;
WINHELP_CreateHelpWindow(page, Globals.active_win->info, SW_NORMAL);
......@@ -754,7 +783,9 @@ void MACRO_Prev(void)
HLPFILE_PAGE* page;
WINE_TRACE("()\n");
if ((page = Globals.active_win->page->prev) != NULL)
page = Globals.active_win->page;
page = HLPFILE_PageByOffset(page->file, page->browse_bwd);
if (page)
{
page->file->wRefCount++;
WINHELP_CreateHelpWindow(page, Globals.active_win->info, SW_NORMAL);
......
programs/winhelp/string.c
View file @ 2b855ded
......@@ -24,6 +24,7 @@ char MAIN_WIN_CLASS_NAME[] = "MS_WINHELP";
char BUTTON_BOX_WIN_CLASS_NAME[] = "WHButtonBox";
char TEXT_WIN_CLASS_NAME[] = "WHText";
char SHADOW_WIN_CLASS_NAME[] = "WHShadow";
char HISTORY_WIN_CLASS_NAME[] = "WHHistory";
char STRING_BUTTON[] = "BUTTON";
/* Resource names */
......
programs/winhelp/winhelp.h
View file @ 2b855ded
......@@ -95,6 +95,7 @@ typedef struct tagWinHelp
HWND hButtonBoxWnd;
HWND hTextWnd;
HWND hShadowWnd;
HWND hHistoryWnd;
HFONT* fonts;
UINT fonts_len;
......@@ -104,6 +105,12 @@ typedef struct tagWinHelp
HLPFILE_WINDOWINFO* info;
/* FIXME: for now it's a fixed size */
HLPFILE_PAGE* history[40];
unsigned histIndex;
HLPFILE_PAGE* back[40];
unsigned backIndex;
struct tagWinHelp* next;
} WINHELP_WINDOW;
......@@ -131,6 +138,7 @@ extern char MAIN_WIN_CLASS_NAME[];
extern char BUTTON_BOX_WIN_CLASS_NAME[];
extern char TEXT_WIN_CLASS_NAME[];
extern char SHADOW_WIN_CLASS_NAME[];
extern char HISTORY_WIN_CLASS_NAME[];
extern char STRING_BUTTON[];
extern char STRING_MENU_Xx[];
extern char STRING_DIALOG_TEST[];
......
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