ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stub MACRO_JumpContext to at least bring up the help file.

Browse Source
This commit is contained in:
Jon Griffiths 2004-09-27 20:07:03 +00:00 committed by Alexandre Julliard
parent ac5e454e2f
commit cea5e75f56
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
programs/winhelp/macro.c
View File

@ -155,7 +155,7 @@ static int MACRO_DoLookUp(struct MacroDesc* start, const char* name, struct lexr
{ {
lr->proto = md->arguments; lr->proto = md->arguments;
if (md->isBool) if (md->isBool)
{ {
lr->bool_function = (BOOL (*)())md->fn; lr->bool_function = (BOOL (*)())md->fn;
return BOOL_FUNCTION; return BOOL_FUNCTION;
} }
@ -172,7 +172,7 @@ static int MACRO_DoLookUp(struct MacroDesc* start, const char* name, struct lexr
int MACRO_Lookup(const char* name, struct lexret* lr) int MACRO_Lookup(const char* name, struct lexret* lr)
{ {
int ret; int ret;
if ((ret = MACRO_DoLookUp(MACRO_Builtins, name, lr, -1)) != EMPTY) if ((ret = MACRO_DoLookUp(MACRO_Builtins, name, lr, -1)) != EMPTY)
return ret; return ret;
if (MACRO_Loaded && (ret = MACRO_DoLookUp(MACRO_Loaded, name, lr, MACRO_NumLoaded)) != EMPTY) if (MACRO_Loaded && (ret = MACRO_DoLookUp(MACRO_Loaded, name, lr, MACRO_NumLoaded)) != EMPTY)
@ -281,7 +281,7 @@ void MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro)
b = MACRO_LookupButton(win, id); b = MACRO_LookupButton(win, id);
if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;} if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;}
size = sizeof(WINHELP_BUTTON) + lstrlen(id) + size = sizeof(WINHELP_BUTTON) + lstrlen(id) +
lstrlen((*b)->lpszName) + lstrlen(macro) + 3; lstrlen((*b)->lpszName) + lstrlen(macro) + 3;
button = HeapAlloc(GetProcessHeap(), 0, size); button = HeapAlloc(GetProcessHeap(), 0, size);
@ -558,7 +558,7 @@ void MACRO_FileOpen(void)
{ {
HLPFILE* hlpfile = WINHELP_LookupHelpFile(szPath); HLPFILE* hlpfile = WINHELP_LookupHelpFile(szPath);
WINHELP_CreateHelpWindowByHash(hlpfile, 0, WINHELP_CreateHelpWindowByHash(hlpfile, 0,
WINHELP_GetWindowInfo(hlpfile, "main"), SW_SHOWNORMAL); WINHELP_GetWindowInfo(hlpfile, "main"), SW_SHOWNORMAL);
} }
} }
@ -679,14 +679,15 @@ void MACRO_JumpContents(LPCSTR lpszPath, LPCSTR lpszWindow)
WINE_TRACE("(\"%s\", \"%s\")\n", lpszPath, lpszWindow); WINE_TRACE("(\"%s\", \"%s\")\n", lpszPath, lpszWindow);
hlpfile = WINHELP_LookupHelpFile(lpszPath); hlpfile = WINHELP_LookupHelpFile(lpszPath);
WINHELP_CreateHelpWindowByHash(hlpfile, 0, WINHELP_CreateHelpWindowByHash(hlpfile, 0,
WINHELP_GetWindowInfo(hlpfile, lpszWindow), WINHELP_GetWindowInfo(hlpfile, lpszWindow),
SW_NORMAL); SW_NORMAL);
} }
void MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context) void MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context)
{ {
WINE_FIXME("(\"%s\", \"%s\", %lu)\n", lpszPath, lpszWindow, context); WINE_FIXME("(\"%s\", \"%s\", %ld)semi-stub\n", lpszPath, lpszWindow, context);
return MACRO_JumpContents(lpszPath, lpszWindow);
} }
void MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) void MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash)
@ -695,7 +696,7 @@ void MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash)
WINE_TRACE("(\"%s\", \"%s\", %lu)\n", lpszPath, lpszWindow, lHash); WINE_TRACE("(\"%s\", \"%s\", %lu)\n", lpszPath, lpszWindow, lHash);
hlpfile = WINHELP_LookupHelpFile(lpszPath); hlpfile = WINHELP_LookupHelpFile(lpszPath);
WINHELP_CreateHelpWindowByHash(hlpfile, lHash, WINHELP_CreateHelpWindowByHash(hlpfile, lHash,
WINHELP_GetWindowInfo(hlpfile, lpszWindow), WINHELP_GetWindowInfo(hlpfile, lpszWindow),
SW_NORMAL); SW_NORMAL);
} }