winhlp32: Use debugstr_a() to trace.

programs/winhlp32/callback.c

@@ -39,7 +39,7 @@ static HANDLE CALLBACK WHD_Open(LPSTR name, BYTE flags)
 {
     unsigned    mode = 0;
 
-    WINE_FIXME("(%s %x)\n", wine_dbgstr_a(name), flags);
+    WINE_FIXME("(%s %x)\n", debugstr_a(name), flags);
     switch (flags)
     {
     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)
 {
-    WINE_FIXME("(%p %s %x)\n", fs, name, flags);
+    WINE_FIXME("(%p %s %x)\n", fs, debugstr_a(name), flags);
     return NULL;
 }
 

programs/winhlp32/macro.lex.l

@@ -163,7 +163,7 @@ static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args)
     int t;
     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;}
 
@@ -173,7 +173,7 @@ static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args)
         for (;;)
         {
             t = yylex();
-            WINE_TRACE("Got %s <=> %c\n", ts(t), *args);
+            WINE_TRACE("Got %s <=> %c\n", debugstr_a(ts(t)), *args);
 
             switch (*args)
             {
@@ -195,7 +195,7 @@ static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args)
                     return -1;
                 break;
             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;
             }
             idx++;
@@ -320,7 +320,7 @@ BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro)
     BOOL ret = TRUE;
     int t;
 
-    WINE_TRACE("%s\n", wine_dbgstr_a(macro));
+    WINE_TRACE("%s\n", debugstr_a(macro));
 
     prev_lex_data = lex_data;
     lex_data = &curr_lex_data;
@@ -334,14 +334,14 @@ BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro)
         switch (t)
         {
         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);
             break;
         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;
         default:
-            WINE_WARN("got unexpected type %s\n", ts(t));
+            WINE_WARN("got unexpected type %s\n", debugstr_a(ts(t)));
             YY_FLUSH_BUFFER;
             ret = FALSE;
             goto done;

programs/winhlp32/winhelp.c

@@ -266,7 +266,7 @@ HLPFILE_WINDOWINFO*     WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name)
 
     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);
         return NULL;
     }
@@ -368,7 +368,7 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
         char*   ptr = (wh->ofsFilename) ? (LPSTR)wh + wh->ofsFilename : NULL;
 
         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)
         {
         case HELP_CONTEXT:
@@ -1204,7 +1204,7 @@ static void cb_KWBTree(void *p, void **next, void *cookie)
     HWND hListWnd = cookie;
     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);
     count = SendMessageW(hListWnd, LB_GETCOUNT, 0, 0);
     SendMessageW(hListWnd, LB_SETITEMDATA, count-1, (LPARAM)p);
@@ -1687,7 +1687,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
             break;
 
         default:
-            WINE_FIXME("Unsupported cmd line: %s\n", cmdline);
+            WINE_FIXME("Unsupported cmd line: %s\n", debugstr_a(cmdline));
             break;
 	}
     }