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

winhlp32: Use debugstr_a() to trace. 

Signed-off-by: Jean-Christophe Cardot <wine@cardot.net>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jean-Christophe Cardot 2016-04-21 22:03:57 +02:00 committed by Alexandre Julliard
parent 87f081974f
commit 1dba777e69
5 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/winhlp32/callback.c
View File

@ -39,7 +39,7 @@ static HANDLE CALLBACK WHD_Open(LPSTR name, BYTE flags)
{ {
unsigned mode = 0; unsigned mode = 0;
WINE_FIXME("(%s %x)\n", wine_dbgstr_a(name), flags); WINE_FIXME("(%s %x)\n", debugstr_a(name), flags);
switch (flags) switch (flags)
{ {
case 0: mode = GENERIC_READ | GENERIC_WRITE; break; case 0: mode = GENERIC_READ | GENERIC_WRITE; break;
@ -59,7 +59,7 @@ static WORD CALLBACK WHD_Close(HANDLE fs)
static HANDLE CALLBACK WHD_OpenBag(HANDLE fs, LPSTR name, BYTE flags) static HANDLE CALLBACK WHD_OpenBag(HANDLE fs, LPSTR name, BYTE flags)
{ {
WINE_FIXME("(%p %s %x)\n", fs, name, flags); WINE_FIXME("(%p %s %x)\n", fs, debugstr_a(name), flags);
return NULL; return NULL;
} }

56
programs/winhlp32/hlpfile.c
View File

@ -373,7 +373,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ
if (!hlpfile) return 0; if (!hlpfile) return 0;
WINE_TRACE("<%s>[%x]\n", hlpfile->lpszPath, offset); WINE_TRACE("<%s>[%x]\n", debugstr_a(hlpfile->lpszPath), offset);
if (offset == 0xFFFFFFFF) return NULL; if (offset == 0xFFFFFFFF) return NULL;
page = NULL; page = NULL;
@ -388,7 +388,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ
} }
if (!found) if (!found)
WINE_ERR("Page of offset %u not found in file %s\n", WINE_ERR("Page of offset %u not found in file %s\n",
offset, hlpfile->lpszPath); offset, debugstr_a(hlpfile->lpszPath));
return found; return found;
} }
@ -441,7 +441,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative)
if (!hlpfile) return NULL; if (!hlpfile) return NULL;
if (!lHash) return HLPFILE_Contents(hlpfile, relative); if (!lHash) return HLPFILE_Contents(hlpfile, relative);
WINE_TRACE("<%s>[%x]\n", hlpfile->lpszPath, lHash); WINE_TRACE("<%s>[%x]\n", debugstr_a(hlpfile->lpszPath), lHash);
/* For win 3.0 files hash values are really page numbers */ /* For win 3.0 files hash values are really page numbers */
if (hlpfile->version <= 16) if (hlpfile->version <= 16)
@ -453,7 +453,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative)
ptr = HLPFILE_BPTreeSearch(hlpfile->Context, LongToPtr(lHash), comp_PageByHash); ptr = HLPFILE_BPTreeSearch(hlpfile->Context, LongToPtr(lHash), comp_PageByHash);
if (!ptr) if (!ptr)
{ {
WINE_ERR("Page of hash %x not found in file %s\n", lHash, hlpfile->lpszPath); WINE_ERR("Page of hash %x not found in file %s\n", lHash, debugstr_a(hlpfile->lpszPath));
return NULL; return NULL;
} }
@ -470,7 +470,7 @@ HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative)
if (!hlpfile) return 0; if (!hlpfile) return 0;
WINE_TRACE("<%s>[%x]\n", hlpfile->lpszPath, lMap); WINE_TRACE("<%s>[%x]\n", debugstr_a(hlpfile->lpszPath), lMap);
for (i = 0; i < hlpfile->wMapLen; i++) for (i = 0; i < hlpfile->wMapLen; i++)
{ {
@ -478,7 +478,7 @@ HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative)
return HLPFILE_PageByOffset(hlpfile, hlpfile->Map[i].offset, relative); return HLPFILE_PageByOffset(hlpfile, hlpfile->Map[i].offset, relative);
} }
WINE_ERR("Page of Map %x not found in file %s\n", lMap, hlpfile->lpszPath); WINE_ERR("Page of Map %x not found in file %s\n", lMap, debugstr_a(hlpfile->lpszPath));
return NULL; return NULL;
} }
@ -492,7 +492,7 @@ static int comp_FindSubFile(void *p, const void *key,
int leaf, void** next) int leaf, void** next)
{ {
*next = (char *)p+strlen(p)+(leaf?5:3); *next = (char *)p+strlen(p)+(leaf?5:3);
WINE_TRACE("Comparing '%s' with '%s'\n", (char *)p, (const char *)key); WINE_TRACE("Comparing %s with %s\n", debugstr_a((char *)p), debugstr_a((const char *)key));
return strcmp(p, key); return strcmp(p, key);
} }
@ -504,7 +504,7 @@ static BOOL HLPFILE_FindSubFile(HLPFILE* hlpfile, LPCSTR name, BYTE **subbuf, BY
{ {
BYTE *ptr; BYTE *ptr;
WINE_TRACE("looking for file '%s'\n", name); WINE_TRACE("looking for file %s\n", debugstr_a(name));
ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4),
name, comp_FindSubFile); name, comp_FindSubFile);
if (!ptr) if (!ptr)
@ -514,7 +514,7 @@ static BOOL HLPFILE_FindSubFile(HLPFILE* hlpfile, LPCSTR name, BYTE **subbuf, BY
CHAR c = *name++; CHAR c = *name++;
if (c == '|') if (c == '|')
{ {
WINE_TRACE("not found. try '%s'\n", name); WINE_TRACE("not found. try %s\n", debugstr_a(name));
ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4),
name, comp_FindSubFile); name, comp_FindSubFile);
} }
@ -523,18 +523,18 @@ static BOOL HLPFILE_FindSubFile(HLPFILE* hlpfile, LPCSTR name, BYTE **subbuf, BY
*subbuf = hlpfile->file_buffer + GET_UINT(ptr, strlen(name)+1); *subbuf = hlpfile->file_buffer + GET_UINT(ptr, strlen(name)+1);
if (*subbuf >= hlpfile->file_buffer + hlpfile->file_buffer_size) if (*subbuf >= hlpfile->file_buffer + hlpfile->file_buffer_size)
{ {
WINE_ERR("internal file %s does not fit\n", name); WINE_ERR("internal file %s does not fit\n", debugstr_a(name));
return FALSE; return FALSE;
} }
*subend = *subbuf + GET_UINT(*subbuf, 0); *subend = *subbuf + GET_UINT(*subbuf, 0);
if (*subend > hlpfile->file_buffer + hlpfile->file_buffer_size) if (*subend > hlpfile->file_buffer + hlpfile->file_buffer_size)
{ {
WINE_ERR("internal file %s does not fit\n", name); WINE_ERR("internal file %s does not fit\n", debugstr_a(name));
return FALSE; return FALSE;
} }
if (GET_UINT(*subbuf, 0) < GET_UINT(*subbuf, 4) + 9) if (GET_UINT(*subbuf, 0) < GET_UINT(*subbuf, 4) + 9)
{ {
WINE_ERR("invalid size provided for internal file %s\n", name); WINE_ERR("invalid size provided for internal file %s\n", debugstr_a(name));
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -804,7 +804,7 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file,
WINE_TRACE("%02x-%02x%02x {%s,%s}\n", WINE_TRACE("%02x-%02x%02x {%s,%s}\n",
start[7 + 15 * i + 0], start[7 + 15 * i + 1], start[7 + 15 * i + 2], start[7 + 15 * i + 0], start[7 + 15 * i + 1], start[7 + 15 * i + 2],
str, str + strlen(str) + 1); debugstr_a(str), debugstr_a(str + strlen(str) + 1));
/* str points to two null terminated strings: /* str points to two null terminated strings:
* hotspot name, then link name * hotspot name, then link name
*/ */
@ -843,7 +843,7 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file,
if (!strcmp(win + 1, file->windows[wnd].name)) break; if (!strcmp(win + 1, file->windows[wnd].name)) break;
} }
if (wnd == -1) if (wnd == -1)
WINE_WARN("Couldn't find window info for %s\n", win); WINE_WARN("Couldn't find window info for %s\n", debugstr_a(win));
if ((tgt = HeapAlloc(GetProcessHeap(), 0, win - str + 1))) if ((tgt = HeapAlloc(GetProcessHeap(), 0, win - str + 1)))
{ {
memcpy(tgt, str, win - str); memcpy(tgt, str, win - str);
@ -1207,7 +1207,7 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie,
rd->current_link = link; rd->current_link = link;
WINE_TRACE("Link[%d] to %s@%08x:%d\n", WINE_TRACE("Link[%d] to %s@%08x:%d\n",
link->cookie, link->string, link->hash, link->window); link->cookie, debugstr_a(link->string), link->hash, link->window);
return link; return link;
} }
@ -1435,7 +1435,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
while (text < text_end && format < format_end) while (text < text_end && format < format_end)
{ {
WINE_TRACE("Got text: %s (%p/%p - %p/%p)\n", wine_dbgstr_a(text), text, text_end, format, format_end); WINE_TRACE("Got text: %s (%p/%p - %p/%p)\n", debugstr_a(text), text, text_end, format, format_end);
textsize = strlen(text); textsize = strlen(text);
if (textsize) if (textsize)
{ {
@ -1578,7 +1578,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
} }
break; break;
case 0x05: case 0x05:
WINE_FIXME("Got an embedded element %s\n", format + 6); WINE_FIXME("Got an embedded element %s\n", debugstr_a((char *)format + 6));
break; break;
default: default:
WINE_FIXME("Got a type %d picture\n", type); WINE_FIXME("Got a type %d picture\n", type);
@ -1618,7 +1618,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
case 0xC8: case 0xC8:
case 0xCC: case 0xCC:
WINE_TRACE("macro => %s\n", format + 3); WINE_TRACE("macro => %s\n", debugstr_a((char *)format + 3));
HLPFILE_AllocLink(rd, hlp_link_macro, (const char*)format + 3, HLPFILE_AllocLink(rd, hlp_link_macro, (const char*)format + 3,
GET_USHORT(format, 1), 0, !(*format & 4), FALSE, -1); GET_USHORT(format, 1), 0, !(*format & 4), FALSE, -1);
format += 3 + GET_USHORT(format, 1); format += 3 + GET_USHORT(format, 1);
@ -1668,7 +1668,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
if (!strcmp(ptr, page->file->windows[wnd].name)) break; if (!strcmp(ptr, page->file->windows[wnd].name)) break;
} }
if (wnd == -1) if (wnd == -1)
WINE_WARN("Couldn't find window info for %s\n", ptr); WINE_WARN("Couldn't find window info for %s\n", debugstr_a(ptr));
ptr += strlen(ptr) + 1; ptr += strlen(ptr) + 1;
/* fall through */ /* fall through */
case 4: case 4:
@ -1955,7 +1955,7 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile)
X(5, "smallCaps"), X(5, "smallCaps"),
ref[dscr_offset + i * 11 + 1], ref[dscr_offset + i * 11 + 1],
family, family,
hlpfile->fonts[i].LogFont.lfFaceName, idx, debugstr_a(hlpfile->fonts[i].LogFont.lfFaceName), idx,
GET_UINT(ref, dscr_offset + i * 11 + 5) & 0x00FFFFFF); GET_UINT(ref, dscr_offset + i * 11 + 5) & 0x00FFFFFF);
} }
return TRUE; return TRUE;
@ -2051,7 +2051,7 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile)
hlpfile->lpszTitle = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); hlpfile->lpszTitle = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1);
if (!hlpfile->lpszTitle) return FALSE; if (!hlpfile->lpszTitle) return FALSE;
strcpy(hlpfile->lpszTitle, str); strcpy(hlpfile->lpszTitle, str);
WINE_TRACE("Title: %s\n", hlpfile->lpszTitle); WINE_TRACE("Title: %s\n", debugstr_a(hlpfile->lpszTitle));
/* Nothing more to parse */ /* Nothing more to parse */
return TRUE; return TRUE;
} }
@ -2065,7 +2065,7 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile)
hlpfile->lpszTitle = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); hlpfile->lpszTitle = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1);
if (!hlpfile->lpszTitle) return FALSE; if (!hlpfile->lpszTitle) return FALSE;
strcpy(hlpfile->lpszTitle, str); strcpy(hlpfile->lpszTitle, str);
WINE_TRACE("Title: %s\n", hlpfile->lpszTitle); WINE_TRACE("Title: %s\n", debugstr_a(hlpfile->lpszTitle));
break; break;
case 2: case 2:
@ -2073,7 +2073,7 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile)
hlpfile->lpszCopyright = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); hlpfile->lpszCopyright = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1);
if (!hlpfile->lpszCopyright) return FALSE; if (!hlpfile->lpszCopyright) return FALSE;
strcpy(hlpfile->lpszCopyright, str); strcpy(hlpfile->lpszCopyright, str);
WINE_TRACE("Copyright: %s\n", hlpfile->lpszCopyright); WINE_TRACE("Copyright: %s\n", debugstr_a(hlpfile->lpszCopyright));
break; break;
case 3: case 3:
@ -2140,12 +2140,12 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile)
flags & 0x0020 ? 'W' : 'w', flags & 0x0020 ? 'W' : 'w',
flags & 0x0040 ? 'H' : 'h', flags & 0x0040 ? 'H' : 'h',
flags & 0x0080 ? 'S' : 's', flags & 0x0080 ? 'S' : 's',
wi->type, wi->name, wi->caption, wi->origin.x, wi->origin.y, debugstr_a(wi->type), debugstr_a(wi->name), debugstr_a(wi->caption), wi->origin.x, wi->origin.y,
wi->size.cx, wi->size.cy); wi->size.cx, wi->size.cy);
} }
break; break;
case 8: case 8:
WINE_WARN("Citation: '%s'\n", ptr + 4); WINE_WARN("Citation: %s\n", debugstr_a((char *)ptr + 4));
break; break;
case 11: case 11:
hlpfile->charset = ptr[4]; hlpfile->charset = ptr[4];
@ -2604,8 +2604,8 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, const BYTE *buf, const BYTE *end,
page->browse_fwd = hlpfile->TOMap[page->browse_fwd]; page->browse_fwd = hlpfile->TOMap[page->browse_fwd];
} }
WINE_TRACE("Added page[%d]: title='%s' %08x << %08x >> %08x\n", WINE_TRACE("Added page[%d]: title=%s %08x << %08x >> %08x\n",
page->wNumber, page->lpszTitle, page->wNumber, debugstr_a(page->lpszTitle),
page->browse_bwd, page->offset, page->browse_fwd); page->browse_bwd, page->offset, page->browse_fwd);
/* now load macros */ /* now load macros */
@ -2615,7 +2615,7 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, const BYTE *buf, const BYTE *end,
unsigned len = strlen(ptr); unsigned len = strlen(ptr);
char* macro_str; char* macro_str;
WINE_TRACE("macro: %s\n", ptr); WINE_TRACE("macro: %s\n", debugstr_a(ptr));
macro = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_MACRO) + len + 1); macro = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_MACRO) + len + 1);
macro->lpszMacro = macro_str = (char*)(macro + 1); macro->lpszMacro = macro_str = (char*)(macro + 1);
memcpy(macro_str, ptr, len + 1); memcpy(macro_str, ptr, len + 1);

122
programs/winhlp32/macro.c
View File

@ -77,7 +77,7 @@ void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro)
LONG size; LONG size;
LPSTR ptr; LPSTR ptr;
WINE_TRACE("(\"%s\", \"%s\", %s)\n", id, name, macro); WINE_TRACE("(%s, %s, %s)\n", debugstr_a(id), debugstr_a(name), debugstr_a(macro));
size = sizeof(WINHELP_BUTTON) + strlen(id) + strlen(name) + strlen(macro) + 3; size = sizeof(WINHELP_BUTTON) + strlen(id) + strlen(name) + strlen(macro) + 3;
@ -110,17 +110,17 @@ void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro)
static void CALLBACK MACRO_DestroyButton(LPCSTR str) static void CALLBACK MACRO_DestroyButton(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
void CALLBACK MACRO_DisableButton(LPCSTR id) void CALLBACK MACRO_DisableButton(LPCSTR id)
{ {
WINHELP_BUTTON** b; WINHELP_BUTTON** b;
WINE_TRACE("(\"%s\")\n", id); WINE_TRACE("(%s)\n", debugstr_a(id));
b = MACRO_LookupButton(MACRO_CurrentWindow(), id); b = MACRO_LookupButton(MACRO_CurrentWindow(), id);
if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;} if (!*b) {WINE_FIXME("Couldn't find button %s\n", debugstr_a(id)); return;}
EnableWindow((*b)->hWnd, FALSE); EnableWindow((*b)->hWnd, FALSE);
} }
@ -129,10 +129,10 @@ static void CALLBACK MACRO_EnableButton(LPCSTR id)
{ {
WINHELP_BUTTON** b; WINHELP_BUTTON** b;
WINE_TRACE("(\"%s\")\n", id); WINE_TRACE("(%s)\n", debugstr_a(id));
b = MACRO_LookupButton(MACRO_CurrentWindow(), id); b = MACRO_LookupButton(MACRO_CurrentWindow(), id);
if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;} if (!*b) {WINE_FIXME("Couldn't find button %s\n", debugstr_a(id)); return;}
EnableWindow((*b)->hWnd, TRUE); EnableWindow((*b)->hWnd, TRUE);
} }
@ -141,7 +141,7 @@ void CALLBACK MACRO_JumpContents(LPCSTR lpszPath, LPCSTR lpszWindow)
{ {
HLPFILE* hlpfile; HLPFILE* hlpfile;
WINE_TRACE("(\"%s\", \"%s\")\n", lpszPath, lpszWindow); WINE_TRACE("(%s, %s)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow));
if ((hlpfile = WINHELP_LookupHelpFile(lpszPath))) if ((hlpfile = WINHELP_LookupHelpFile(lpszPath)))
WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, 0, WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, 0,
WINHELP_GetWindowInfo(hlpfile, lpszWindow), WINHELP_GetWindowInfo(hlpfile, lpszWindow),
@ -160,12 +160,12 @@ void CALLBACK MACRO_About(void)
static void CALLBACK MACRO_AddAccelerator(LONG u1, LONG u2, LPCSTR str) static void CALLBACK MACRO_AddAccelerator(LONG u1, LONG u2, LPCSTR str)
{ {
WINE_FIXME("(%u, %u, \"%s\")\n", u1, u2, str); WINE_FIXME("(%u, %u, %s)\n", u1, u2, debugstr_a(str));
} }
static void CALLBACK MACRO_ALink(LPCSTR str1, LONG u, LPCSTR str2) static void CALLBACK MACRO_ALink(LPCSTR str1, LONG u, LPCSTR str2)
{ {
WINE_FIXME("(\"%s\", %u, \"%s\")\n", str1, u, str2); WINE_FIXME("(%s, %u, %s)\n", debugstr_a(str1), u, debugstr_a(str2));
} }
void CALLBACK MACRO_Annotate(void) void CALLBACK MACRO_Annotate(void)
@ -175,7 +175,7 @@ void CALLBACK MACRO_Annotate(void)
static void CALLBACK MACRO_AppendItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4) static void CALLBACK MACRO_AppendItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4)
{ {
WINE_FIXME("(\"%s\", \"%s\", \"%s\", \"%s\")\n", str1, str2, str3, str4); WINE_FIXME("(%s, %s, %s, %s)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4));
} }
static void CALLBACK MACRO_Back(void) static void CALLBACK MACRO_Back(void)
@ -231,10 +231,10 @@ static void CALLBACK MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro)
LONG size; LONG size;
LPSTR ptr; LPSTR ptr;
WINE_TRACE("(\"%s\", \"%s\")\n", id, macro); WINE_TRACE("(%s, %s)\n", debugstr_a(id), debugstr_a(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", debugstr_a(id)); return;}
size = sizeof(WINHELP_BUTTON) + strlen(id) + size = sizeof(WINHELP_BUTTON) + strlen(id) +
strlen((*b)->lpszName) + strlen(macro) + 3; strlen((*b)->lpszName) + strlen(macro) + 3;
@ -266,7 +266,7 @@ static void CALLBACK MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro)
static void CALLBACK MACRO_ChangeEnable(LPCSTR id, LPCSTR macro) static void CALLBACK MACRO_ChangeEnable(LPCSTR id, LPCSTR macro)
{ {
WINE_TRACE("(\"%s\", \"%s\")\n", id, macro); WINE_TRACE("(%s, %s)\n", debugstr_a(id), debugstr_a(macro));
MACRO_ChangeButtonBinding(id, macro); MACRO_ChangeButtonBinding(id, macro);
MACRO_EnableButton(id); MACRO_EnableButton(id);
@ -274,12 +274,12 @@ static void CALLBACK MACRO_ChangeEnable(LPCSTR id, LPCSTR macro)
static void CALLBACK MACRO_ChangeItemBinding(LPCSTR str1, LPCSTR str2) static void CALLBACK MACRO_ChangeItemBinding(LPCSTR str1, LPCSTR str2)
{ {
WINE_FIXME("(\"%s\", \"%s\")\n", str1, str2); WINE_FIXME("(%s, %s)\n", debugstr_a(str1), debugstr_a(str2));
} }
static void CALLBACK MACRO_CheckItem(LPCSTR str) static void CALLBACK MACRO_CheckItem(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
static void CALLBACK MACRO_CloseSecondarys(void) static void CALLBACK MACRO_CloseSecondarys(void)
@ -301,7 +301,7 @@ static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow)
WINHELP_WINDOW *win; WINHELP_WINDOW *win;
WINHELP_WINDOW *next; WINHELP_WINDOW *next;
WINE_TRACE("(\"%s\")\n", lpszWindow); WINE_TRACE("(%s)\n", debugstr_a(lpszWindow));
if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main"; if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main";
@ -315,7 +315,7 @@ static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow)
static void CALLBACK MACRO_Compare(LPCSTR str) static void CALLBACK MACRO_Compare(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
static void CALLBACK MACRO_Contents(void) static void CALLBACK MACRO_Contents(void)
@ -330,7 +330,7 @@ static void CALLBACK MACRO_Contents(void)
static void CALLBACK MACRO_ControlPanel(LPCSTR str1, LPCSTR str2, LONG u) static void CALLBACK MACRO_ControlPanel(LPCSTR str1, LPCSTR str2, LONG u)
{ {
WINE_FIXME("(\"%s\", \"%s\", %u)\n", str1, str2, u); WINE_FIXME("(%s, %s, %u)\n", debugstr_a(str1), debugstr_a(str2), u);
} }
void CALLBACK MACRO_CopyDialog(void) void CALLBACK MACRO_CopyDialog(void)
@ -345,22 +345,22 @@ static void CALLBACK MACRO_CopyTopic(void)
static void CALLBACK MACRO_DeleteItem(LPCSTR str) static void CALLBACK MACRO_DeleteItem(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
static void CALLBACK MACRO_DeleteMark(LPCSTR str) static void CALLBACK MACRO_DeleteMark(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
static void CALLBACK MACRO_DisableItem(LPCSTR str) static void CALLBACK MACRO_DisableItem(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
static void CALLBACK MACRO_EnableItem(LPCSTR str) static void CALLBACK MACRO_EnableItem(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
static void CALLBACK MACRO_EndMPrint(void) static void CALLBACK MACRO_EndMPrint(void)
@ -373,7 +373,7 @@ static void CALLBACK MACRO_ExecFile(LPCSTR pgm, LPCSTR args, LONG cmd_show, LPCS
HINSTANCE ret; HINSTANCE ret;
WINE_TRACE("(%s, %s, %u, %s)\n", WINE_TRACE("(%s, %s, %u, %s)\n",
wine_dbgstr_a(pgm), wine_dbgstr_a(args), cmd_show, wine_dbgstr_a(topic)); debugstr_a(pgm), debugstr_a(args), cmd_show, debugstr_a(topic));
ret = ShellExecuteA(Globals.active_win ? Globals.active_win->hMainWnd : NULL, "open", ret = ShellExecuteA(Globals.active_win ? Globals.active_win->hMainWnd : NULL, "open",
pgm, args, ".", cmd_show); pgm, args, ".", cmd_show);
@ -386,7 +386,7 @@ static void CALLBACK MACRO_ExecFile(LPCSTR pgm, LPCSTR args, LONG cmd_show, LPCS
static void CALLBACK MACRO_ExecProgram(LPCSTR str, LONG u) static void CALLBACK MACRO_ExecProgram(LPCSTR str, LONG u)
{ {
WINE_FIXME("(\"%s\", %u)\n", str, u); WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
} }
void CALLBACK MACRO_Exit(void) void CALLBACK MACRO_Exit(void)
@ -399,22 +399,22 @@ void CALLBACK MACRO_Exit(void)
static void CALLBACK MACRO_ExtAbleItem(LPCSTR str, LONG u) static void CALLBACK MACRO_ExtAbleItem(LPCSTR str, LONG u)
{ {
WINE_FIXME("(\"%s\", %u)\n", str, u); WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
} }
static void CALLBACK MACRO_ExtInsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u1, LONG u2) static void CALLBACK MACRO_ExtInsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u1, LONG u2)
{ {
WINE_FIXME("(\"%s\", \"%s\", \"%s\", \"%s\", %u, %u)\n", str1, str2, str3, str4, u1, u2); WINE_FIXME("(%s, %s, %s, %s, %u, %u)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u1, u2);
} }
static void CALLBACK MACRO_ExtInsertMenu(LPCSTR str1, LPCSTR str2, LPCSTR str3, LONG u1, LONG u2) static void CALLBACK MACRO_ExtInsertMenu(LPCSTR str1, LPCSTR str2, LPCSTR str3, LONG u1, LONG u2)
{ {
WINE_FIXME("(\"%s\", \"%s\", \"%s\", %u, %u)\n", str1, str2, str3, u1, u2); WINE_FIXME("(%s, %s, %s, %u, %u)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), u1, u2);
} }
static BOOL CALLBACK MACRO_FileExist(LPCSTR str) static BOOL CALLBACK MACRO_FileExist(LPCSTR str)
{ {
WINE_TRACE("(\"%s\")\n", str); WINE_TRACE("(%s)\n", debugstr_a(str));
return GetFileAttributesA(str) != INVALID_FILE_ATTRIBUTES; return GetFileAttributesA(str) != INVALID_FILE_ATTRIBUTES;
} }
@ -452,7 +452,7 @@ static void CALLBACK MACRO_FocusWindow(LPCSTR lpszWindow)
{ {
WINHELP_WINDOW *win; WINHELP_WINDOW *win;
WINE_TRACE("(\"%s\")\n", lpszWindow); WINE_TRACE("(%s)\n", debugstr_a(lpszWindow));
if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main"; if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main";
@ -463,12 +463,12 @@ static void CALLBACK MACRO_FocusWindow(LPCSTR lpszWindow)
static void CALLBACK MACRO_Generate(LPCSTR str, LONG w, LONG l) static void CALLBACK MACRO_Generate(LPCSTR str, LONG w, LONG l)
{ {
WINE_FIXME("(\"%s\", %x, %x)\n", str, w, l); WINE_FIXME("(%s, %x, %x)\n", debugstr_a(str), w, l);
} }
static void CALLBACK MACRO_GotoMark(LPCSTR str) static void CALLBACK MACRO_GotoMark(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
void CALLBACK MACRO_HelpOn(void) void CALLBACK MACRO_HelpOn(void)
@ -544,12 +544,12 @@ static BOOL CALLBACK MACRO_InitMPrint(void)
static void CALLBACK MACRO_InsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u) static void CALLBACK MACRO_InsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u)
{ {
WINE_FIXME("(\"%s\", \"%s\", \"%s\", \"%s\", %u)\n", str1, str2, str3, str4, u); WINE_FIXME("(%s, %s, %s, %s, %u)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u);
} }
static void CALLBACK MACRO_InsertMenu(LPCSTR str1, LPCSTR str2, LONG u) static void CALLBACK MACRO_InsertMenu(LPCSTR str1, LPCSTR str2, LONG u)
{ {
WINE_FIXME("(\"%s\", \"%s\", %u)\n", str1, str2, u); WINE_FIXME("(%s, %s, %u)\n", debugstr_a(str1), debugstr_a(str2), u);
} }
static BOOL CALLBACK MACRO_IsBook(void) static BOOL CALLBACK MACRO_IsBook(void)
@ -560,13 +560,13 @@ static BOOL CALLBACK MACRO_IsBook(void)
static BOOL CALLBACK MACRO_IsMark(LPCSTR str) static BOOL CALLBACK MACRO_IsMark(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
return FALSE; return FALSE;
} }
static BOOL CALLBACK MACRO_IsNotMark(LPCSTR str) static BOOL CALLBACK MACRO_IsNotMark(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
return TRUE; return TRUE;
} }
@ -574,7 +574,7 @@ void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context
{ {
HLPFILE* hlpfile; HLPFILE* hlpfile;
WINE_TRACE("(\"%s\", \"%s\", %d)\n", lpszPath, lpszWindow, context); WINE_TRACE("(%s, %s, %d)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), context);
if ((hlpfile = WINHELP_LookupHelpFile(lpszPath))) if ((hlpfile = WINHELP_LookupHelpFile(lpszPath)))
/* Some madness: what user calls 'context', hlpfile calls 'map' */ /* Some madness: what user calls 'context', hlpfile calls 'map' */
WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context, WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context,
@ -586,7 +586,7 @@ void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash)
{ {
HLPFILE* hlpfile; HLPFILE* hlpfile;
WINE_TRACE("(\"%s\", \"%s\", %u)\n", lpszPath, lpszWindow, lHash); WINE_TRACE("(%s, %s, %u)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), lHash);
if (!lpszPath || !lpszPath[0]) if (!lpszPath || !lpszPath[0])
hlpfile = MACRO_CurrentWindow()->page->file; hlpfile = MACRO_CurrentWindow()->page->file;
else else
@ -606,7 +606,7 @@ static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id)
{ {
LPSTR ptr; LPSTR ptr;
WINE_TRACE("(\"%s\", \"%s\")\n", lpszPathWindow, topic_id); WINE_TRACE("(%s, %s)\n", debugstr_a(lpszPathWindow), debugstr_a(topic_id));
if ((ptr = strchr(lpszPathWindow, '>')) != NULL) if ((ptr = strchr(lpszPathWindow, '>')) != NULL)
{ {
LPSTR tmp; LPSTR tmp;
@ -634,12 +634,12 @@ static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id)
*/ */
static void CALLBACK MACRO_JumpKeyword(LPCSTR lpszPath, LPCSTR lpszWindow, LPCSTR keyword) static void CALLBACK MACRO_JumpKeyword(LPCSTR lpszPath, LPCSTR lpszWindow, LPCSTR keyword)
{ {
WINE_FIXME("(\"%s\", \"%s\", \"%s\")\n", lpszPath, lpszWindow, keyword); WINE_FIXME("(%s, %s, %s)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), debugstr_a(keyword));
} }
static void CALLBACK MACRO_KLink(LPCSTR str1, LONG u, LPCSTR str2, LPCSTR str3) static void CALLBACK MACRO_KLink(LPCSTR str1, LONG u, LPCSTR str2, LPCSTR str3)
{ {
WINE_FIXME("(\"%s\", %u, \"%s\", \"%s\")\n", str1, u, str2, str3); WINE_FIXME("(%s, %u, %s, %s)\n", debugstr_a(str1), u, debugstr_a(str2), debugstr_a(str3));
} }
static void CALLBACK MACRO_Menu(void) static void CALLBACK MACRO_Menu(void)
@ -654,7 +654,7 @@ static void CALLBACK MACRO_MPrintHash(LONG u)
static void CALLBACK MACRO_MPrintID(LPCSTR str) static void CALLBACK MACRO_MPrintID(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
static void CALLBACK MACRO_Next(void) static void CALLBACK MACRO_Next(void)
@ -679,22 +679,22 @@ static void CALLBACK MACRO_NoShow(void)
void CALLBACK MACRO_PopupContext(LPCSTR str, LONG u) void CALLBACK MACRO_PopupContext(LPCSTR str, LONG u)
{ {
WINE_FIXME("(\"%s\", %u)\n", str, u); WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
} }
static void CALLBACK MACRO_PopupHash(LPCSTR str, LONG u) static void CALLBACK MACRO_PopupHash(LPCSTR str, LONG u)
{ {
WINE_FIXME("(\"%s\", %u)\n", str, u); WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
} }
static void CALLBACK MACRO_PopupId(LPCSTR str1, LPCSTR str2) static void CALLBACK MACRO_PopupId(LPCSTR str1, LPCSTR str2)
{ {
WINE_FIXME("(\"%s\", \"%s\")\n", str1, str2); WINE_FIXME("(%s, %s)\n", debugstr_a(str1), debugstr_a(str2));
} }
static void CALLBACK MACRO_PositionWindow(LONG i1, LONG i2, LONG u1, LONG u2, LONG u3, LPCSTR str) static void CALLBACK MACRO_PositionWindow(LONG i1, LONG i2, LONG u1, LONG u2, LONG u3, LPCSTR str)
{ {
WINE_FIXME("(%i, %i, %u, %u, %u, \"%s\")\n", i1, i2, u1, u2, u3, str); WINE_FIXME("(%i, %i, %u, %u, %u, %s)\n", i1, i2, u1, u2, u3, debugstr_a(str));
} }
static void CALLBACK MACRO_Prev(void) static void CALLBACK MACRO_Prev(void)
@ -754,7 +754,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR
int size; int size;
WINHELP_DLL* dll; WINHELP_DLL* dll;
WINE_TRACE("(\"%s\", \"%s\", \"%s\")\n", dll_name, proc, args); WINE_TRACE("(%s, %s, %s)\n", debugstr_a(dll_name), debugstr_a(proc), debugstr_a(args));
/* FIXME: are the registered DLLs global or linked to the current file ??? /* FIXME: are the registered DLLs global or linked to the current file ???
* We assume globals (as we did for macros, but is this really the case ???) * We assume globals (as we did for macros, but is this really the case ???)
@ -770,14 +770,14 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR
/* FIXME: the library will not be unloaded until exit of program /* FIXME: the library will not be unloaded until exit of program
* We don't send the DW_TERM message * We don't send the DW_TERM message
*/ */
WINE_TRACE("Loading %s\n", dll_name); WINE_TRACE("Loading %s\n", debugstr_a(dll_name));
/* FIXME: should look in the directory where current hlpfile /* FIXME: should look in the directory where current hlpfile
* is loaded from * is loaded from
*/ */
if (hLib == NULL) if (hLib == NULL)
{ {
/* FIXME: internationalisation for error messages */ /* FIXME: internationalisation for error messages */
WINE_FIXME("Cannot find dll %s\n", dll_name); WINE_FIXME("Cannot find dll %s\n", debugstr_a(dll_name));
} }
else if ((dll = HeapAlloc(GetProcessHeap(), 0, sizeof(*dll)))) else if ((dll = HeapAlloc(GetProcessHeap(), 0, sizeof(*dll))))
{ {
@ -787,7 +787,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR
Globals.dlls = dll; Globals.dlls = dll;
dll->handler = (WINHELP_LDLLHandler)GetProcAddress(dll->hLib, "LDLLHandler"); dll->handler = (WINHELP_LDLLHandler)GetProcAddress(dll->hLib, "LDLLHandler");
dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG;
WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); WINE_TRACE("Got class %x for DLL %s\n", dll->class, debugstr_a(dll_name));
if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0);
if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (LONG_PTR)&Callbacks, 0); if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (LONG_PTR)&Callbacks, 0);
} }
@ -796,7 +796,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR
if (dll && !(fn = GetProcAddress(dll->hLib, proc))) if (dll && !(fn = GetProcAddress(dll->hLib, proc)))
{ {
/* FIXME: internationalisation for error messages */ /* FIXME: internationalisation for error messages */
WINE_FIXME("Cannot find proc %s in dll %s\n", dll_name, proc); WINE_FIXME("Cannot find proc %s in dll %s\n", debugstr_a(dll_name), debugstr_a(proc));
} }
size = ++MACRO_NumLoaded * sizeof(struct MacroDesc); size = ++MACRO_NumLoaded * sizeof(struct MacroDesc);
@ -807,7 +807,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR
MACRO_Loaded[MACRO_NumLoaded - 1].isBool = FALSE; MACRO_Loaded[MACRO_NumLoaded - 1].isBool = FALSE;
MACRO_Loaded[MACRO_NumLoaded - 1].arguments = StrDup(args); /* FIXME: never freed */ MACRO_Loaded[MACRO_NumLoaded - 1].arguments = StrDup(args); /* FIXME: never freed */
MACRO_Loaded[MACRO_NumLoaded - 1].fn = fn; MACRO_Loaded[MACRO_NumLoaded - 1].fn = fn;
WINE_TRACE("Added %s(%s) at %p\n", proc, args, fn); WINE_TRACE("Added %s(%s) at %p\n", debugstr_a(proc), debugstr_a(args), fn);
} }
static void CALLBACK MACRO_RemoveAccelerator(LONG u1, LONG u2) static void CALLBACK MACRO_RemoveAccelerator(LONG u1, LONG u2)
@ -822,7 +822,7 @@ static void CALLBACK MACRO_ResetMenu(void)
static void CALLBACK MACRO_SaveMark(LPCSTR str) static void CALLBACK MACRO_SaveMark(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
static void CALLBACK MACRO_Search(void) static void CALLBACK MACRO_Search(void)
@ -832,14 +832,14 @@ static void CALLBACK MACRO_Search(void)
void CALLBACK MACRO_SetContents(LPCSTR str, LONG u) void CALLBACK MACRO_SetContents(LPCSTR str, LONG u)
{ {
WINE_FIXME("(\"%s\", %u)\n", str, u); WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
} }
static void CALLBACK MACRO_SetHelpOnFile(LPCSTR str) static void CALLBACK MACRO_SetHelpOnFile(LPCSTR str)
{ {
HLPFILE_PAGE* page = MACRO_CurrentWindow()->page; HLPFILE_PAGE* page = MACRO_CurrentWindow()->page;
WINE_TRACE("(\"%s\")\n", str); WINE_TRACE("(%s)\n", debugstr_a(str));
HeapFree(GetProcessHeap(), 0, page->file->help_on_file); HeapFree(GetProcessHeap(), 0, page->file->help_on_file);
page->file->help_on_file = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); page->file->help_on_file = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1);
@ -858,12 +858,12 @@ static void CALLBACK MACRO_SetPopupColor(LONG r, LONG g, LONG b)
static void CALLBACK MACRO_ShellExecute(LPCSTR str1, LPCSTR str2, LONG u1, LONG u2, LPCSTR str3, LPCSTR str4) static void CALLBACK MACRO_ShellExecute(LPCSTR str1, LPCSTR str2, LONG u1, LONG u2, LPCSTR str3, LPCSTR str4)
{ {
WINE_FIXME("(\"%s\", \"%s\", %u, %u, \"%s\", \"%s\")\n", str1, str2, u1, u2, str3, str4); WINE_FIXME("(%s, %s, %u, %u, %s, %s)\n", debugstr_a(str1), debugstr_a(str2), u1, u2, debugstr_a(str3), debugstr_a(str4));
} }
static void CALLBACK MACRO_ShortCut(LPCSTR str1, LPCSTR str2, LONG w, LONG l, LPCSTR str) static void CALLBACK MACRO_ShortCut(LPCSTR str1, LPCSTR str2, LONG w, LONG l, LPCSTR str)
{ {
WINE_FIXME("(\"%s\", \"%s\", %x, %x, \"%s\")\n", str1, str2, w, l, str); WINE_FIXME("(%s, %s, %x, %x, %s)\n", debugstr_a(str1), debugstr_a(str2), w, l, debugstr_a(str));
} }
static void CALLBACK MACRO_TCard(LONG u) static void CALLBACK MACRO_TCard(LONG u)
@ -878,24 +878,24 @@ static void CALLBACK MACRO_Test(LONG u)
static BOOL CALLBACK MACRO_TestALink(LPCSTR str) static BOOL CALLBACK MACRO_TestALink(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
return FALSE; return FALSE;
} }
static BOOL CALLBACK MACRO_TestKLink(LPCSTR str) static BOOL CALLBACK MACRO_TestKLink(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
return FALSE; return FALSE;
} }
static void CALLBACK MACRO_UncheckItem(LPCSTR str) static void CALLBACK MACRO_UncheckItem(LPCSTR str)
{ {
WINE_FIXME("(\"%s\")\n", str); WINE_FIXME("(%s)\n", debugstr_a(str));
} }
static void CALLBACK MACRO_UpdateWindow(LPCSTR str1, LPCSTR str2) static void CALLBACK MACRO_UpdateWindow(LPCSTR str1, LPCSTR str2)
{ {
WINE_FIXME("(\"%s\", \"%s\")\n", str1, str2); WINE_FIXME("(%s, %s)\n", debugstr_a(str1), debugstr_a(str2));
} }
@ -1052,7 +1052,7 @@ int MACRO_Lookup(const char* name, struct lexret* lr)
if (!strcmp(name, "qchPath") || !strcmp(name, "qError") || !strcmp(name, "lTopicNo") || if (!strcmp(name, "qchPath") || !strcmp(name, "qError") || !strcmp(name, "lTopicNo") ||
!strcmp(name, "hfs") || !strcmp(name, "coForeground") || !strcmp(name, "coBackground")) !strcmp(name, "hfs") || !strcmp(name, "coForeground") || !strcmp(name, "coBackground"))
{ {
WINE_FIXME("keyword %s not substituted in macro parsing\n", name); WINE_FIXME("keyword %s not substituted in macro parsing\n", debugstr_a(name));
return EMPTY; return EMPTY;
} }

14
programs/winhlp32/macro.lex.l
View File

@ -163,7 +163,7 @@ static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args)
int t; int t;
unsigned int len = 0, idx = 0; unsigned int len = 0, idx = 0;
WINE_TRACE("Checking %s\n", args); WINE_TRACE("Checking %s\n", debugstr_a(args));
if (yylex() != '(') {WINE_WARN("missing (\n");return -1;} if (yylex() != '(') {WINE_WARN("missing (\n");return -1;}
@ -173,7 +173,7 @@ static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args)
for (;;) for (;;)
{ {
t = yylex(); t = yylex();
WINE_TRACE("Got %s <=> %c\n", ts(t), *args); WINE_TRACE("Got %s <=> %c\n", debugstr_a(ts(t)), *args);
switch (*args) switch (*args)
{ {
@ -195,7 +195,7 @@ static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args)
return -1; return -1;
break; break;
default: default:
WINE_WARN("unexpected %s while args is %c\n", ts(t), *args); WINE_WARN("unexpected %s while args is %c\n", debugstr_a(ts(t)), *args);
return -1; return -1;
} }
idx++; idx++;
@ -320,7 +320,7 @@ BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro)
BOOL ret = TRUE; BOOL ret = TRUE;
int t; int t;
WINE_TRACE("%s\n", wine_dbgstr_a(macro)); WINE_TRACE("%s\n", debugstr_a(macro));
prev_lex_data = lex_data; prev_lex_data = lex_data;
lex_data = &curr_lex_data; lex_data = &curr_lex_data;
@ -334,14 +334,14 @@ BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro)
switch (t) switch (t)
{ {
case VOID_FUNCTION: case VOID_FUNCTION:
WINE_TRACE("got type void func(%s)\n", yylval.proto); WINE_TRACE("got type void func(%s)\n", debugstr_a(yylval.proto));
MACRO_CallVoidFunc(yylval.function, yylval.proto); MACRO_CallVoidFunc(yylval.function, yylval.proto);
break; break;
case BOOL_FUNCTION: case BOOL_FUNCTION:
WINE_WARN("got type bool func(%s)\n", yylval.proto); WINE_WARN("got type bool func(%s)\n", debugstr_a(yylval.proto));
break; break;
default: default:
WINE_WARN("got unexpected type %s\n", ts(t)); WINE_WARN("got unexpected type %s\n", debugstr_a(ts(t)));
YY_FLUSH_BUFFER; YY_FLUSH_BUFFER;
ret = FALSE; ret = FALSE;
goto done; goto done;

8
programs/winhlp32/winhelp.c
View File

@ -266,7 +266,7 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name)
if (strcmp(name, "main") != 0) if (strcmp(name, "main") != 0)
{ {
WINE_FIXME("Couldn't find window info for %s\n", name); WINE_FIXME("Couldn't find window info for %s\n", debugstr_a(name));
assert(0); assert(0);
return NULL; return NULL;
} }
@ -368,7 +368,7 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
char* ptr = (wh->ofsFilename) ? (LPSTR)wh + wh->ofsFilename : NULL; char* ptr = (wh->ofsFilename) ? (LPSTR)wh + wh->ofsFilename : NULL;
WINE_TRACE("Got[%u]: cmd=%u data=%08x fn=%s\n", WINE_TRACE("Got[%u]: cmd=%u data=%08x fn=%s\n",
wh->size, wh->command, wh->data, ptr); wh->size, wh->command, wh->data, debugstr_a(ptr));
switch (wh->command) switch (wh->command)
{ {
case HELP_CONTEXT: case HELP_CONTEXT:
@ -1204,7 +1204,7 @@ static void cb_KWBTree(void *p, void **next, void *cookie)
HWND hListWnd = cookie; HWND hListWnd = cookie;
int count; int count;
WINE_TRACE("Adding '%s' to search list\n", (char *)p); WINE_TRACE("Adding %s to search list\n", debugstr_a((char *)p));
SendMessageA(hListWnd, LB_INSERTSTRING, -1, (LPARAM)p); SendMessageA(hListWnd, LB_INSERTSTRING, -1, (LPARAM)p);
count = SendMessageW(hListWnd, LB_GETCOUNT, 0, 0); count = SendMessageW(hListWnd, LB_GETCOUNT, 0, 0);
SendMessageW(hListWnd, LB_SETITEMDATA, count-1, (LPARAM)p); SendMessageW(hListWnd, LB_SETITEMDATA, count-1, (LPARAM)p);
@ -1687,7 +1687,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
break; break;
default: default:
WINE_FIXME("Unsupported cmd line: %s\n", cmdline); WINE_FIXME("Unsupported cmd line: %s\n", debugstr_a(cmdline));
break; break;
} }
} }