Commit bc718eec authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

winhelp: Cast-qual warnings fix.

parent e181d5d0
...@@ -452,10 +452,12 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off ...@@ -452,10 +452,12 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off
while (ptr < page->lpszTitle + titlesize) while (ptr < page->lpszTitle + titlesize)
{ {
unsigned len = strlen(ptr); unsigned len = strlen(ptr);
char* macro_str;
WINE_TRACE("macro: %s\n", ptr); WINE_TRACE("macro: %s\n", ptr);
macro = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_MACRO) + len + 1); macro = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_MACRO) + len + 1);
macro->lpszMacro = (char*)(macro + 1); macro->lpszMacro = macro_str = (char*)(macro + 1);
memcpy((char*)macro->lpszMacro, ptr, len + 1); memcpy(macro_str, ptr, len + 1);
/* FIXME: shall we really link macro in reverse order ?? /* FIXME: shall we really link macro in reverse order ??
* may produce strange results when played at page opening * may produce strange results when played at page opening
*/ */
...@@ -822,6 +824,7 @@ static HLPFILE_LINK* HLPFILE_AllocLink(int cookie, const char* str, LONG h ...@@ -822,6 +824,7 @@ static HLPFILE_LINK* HLPFILE_AllocLink(int cookie, const char* str, LONG h
BOOL clrChange, unsigned wnd) BOOL clrChange, unsigned wnd)
{ {
HLPFILE_LINK* link; HLPFILE_LINK* link;
char* link_str;
/* FIXME: should build a string table for the attributes.link.lpszPath /* FIXME: should build a string table for the attributes.link.lpszPath
* they are reallocated for each link * they are reallocated for each link
...@@ -830,8 +833,8 @@ static HLPFILE_LINK* HLPFILE_AllocLink(int cookie, const char* str, LONG h ...@@ -830,8 +833,8 @@ static HLPFILE_LINK* HLPFILE_AllocLink(int cookie, const char* str, LONG h
if (!link) return NULL; if (!link) return NULL;
link->cookie = cookie; link->cookie = cookie;
link->lpszString = (char*)link + sizeof(HLPFILE_LINK); link->lpszString = link_str = (char*)link + sizeof(HLPFILE_LINK);
strcpy((char*)link->lpszString, str); strcpy(link_str, str);
link->lHash = hash; link->lHash = hash;
link->bClrChange = clrChange ? 1 : 0; link->bClrChange = clrChange ? 1 : 0;
link->window = wnd; link->window = wnd;
......
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