Fixed some debug messages.

diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c
index a64c9c8..30d23f3 100644
--- a/dlls/imagehlp/access.c
+++ b/dlls/imagehlp/access.c
@@ -95,7 +95,7 @@
 PVOID WINAPI ImageDirectoryEntryToData(
   PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
 {
-  FIXME("(%p, %d, %d, %p): stub\n",
+  FIXME("(%p, %d, %hd, %p): stub\n",
     Base, MappedAsImage, DirectoryEntry, Size
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c
index cc203f2..e6e7b67 100644
--- a/dlls/imagehlp/integrity.c
+++ b/dlls/imagehlp/integrity.c
@@ -75,7 +75,7 @@
   HANDLE FileHandle, DWORD DigestLevel,
   DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle)
 {
-  FIXME("(%0x08x, %ld, %p, %p): stub\n",
+  FIXME("(0x%08x, %ld, %p, %p): stub\n",
     FileHandle, DigestLevel, DigestFunction, DigestHandle
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/imagehlp/symbol.c b/dlls/imagehlp/symbol.c
index 71e50b2..00ac33c 100644
--- a/dlls/imagehlp/symbol.c
+++ b/dlls/imagehlp/symbol.c
@@ -44,8 +44,8 @@
   HANDLE hProcess, DWORD BaseOfDll,
   PSYM_ENUMSYMBOLS_CALLBACK EnumSymbolsCallback, PVOID UserContext)
 {
-  FIXME("(0x%08x, %p, %p): stub\n",
-    hProcess, EnumSymbolsCallback, UserContext
+  FIXME("(0x%08x, 0x%08lx, %p, %p): stub\n",
+    hProcess, BaseOfDll, EnumSymbolsCallback, UserContext
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
@@ -204,7 +204,7 @@
  */
 DWORD WINAPI SymSetOptions(DWORD SymOptions)
 {
-  FIXME("(%lx): stub\n", SymOptions);
+  FIXME("(0x%08lx): stub\n", SymOptions);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 }
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 1eb7bcc..3213d69 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -275,7 +275,7 @@
  */
 LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
 {
-	TRACE("(%lx,%s) empty stub!\n", (DWORD)lpbi, lpbi->lpszTitle);
+	TRACE("(%p{lpszTitle=%s})\n", lpbi, debugstr_a(lpbi->lpszTitle));
 
 	return (LPITEMIDLIST) DialogBoxParamA( shell32_hInstance,
 			"SHBRSFORFOLDER_MSGBOX",  lpbi->hwndOwner,
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 1a195fb..485d70a 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -1340,7 +1340,7 @@
  */
 HRESULT WINAPI DoEnvironmentSubstA(LPSTR x, LPSTR y)
 {
-	FIXME("(%p %s, %p %s) stub\n", x, debugstr_a(x), y, debugstr_a(y));
+	FIXME("(%s, %s) stub\n", debugstr_a(x), debugstr_a(y));
 	return 0;
 }
 
@@ -1350,7 +1350,7 @@
  */
 HRESULT WINAPI DoEnvironmentSubstW(LPWSTR x, LPWSTR y)
 {
-	FIXME("(%p %s, %p %s) stub\n", x, debugstr_w(x), y, debugstr_w(y));
+	FIXME("(%s, %s): stub\n", debugstr_w(x), debugstr_w(y));
 	return 0;
 }
 
diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c
index 047c3aa..fa52954 100644
--- a/dlls/tapi32/line.c
+++ b/dlls/tapi32/line.c
@@ -393,7 +393,8 @@
   LPCSTR lpszAppName,
   LPDWORD lpdwNumDevs)
 {
-    FIXME("(...): stub.\n");
+    FIXME("(%p, %04x, %p, %s, %p): stub.\n", lphLineApp, hInstance,
+	  lpfnCallback, debugstr_a(lpszAppName), lpdwNumDevs);
     return 0;
 }
 
@@ -445,8 +446,8 @@
   LPLINEEXTENSIONID lpExtensionID
 )
 {
-    FIXME("(%4x, %ld, %ld, %ld, ...): stub.\n", hLineApp, dwDeviceID, 
-		    dwAPILowVersion, dwAPIHighVersion);
+    FIXME("(%04x, %ld, %ld, %ld, %p, %p): stub.\n", hLineApp, dwDeviceID, 
+	  dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID);
     *lpdwAPIVersion = dwAPIHighVersion;
     return 0;
 }
@@ -612,7 +613,7 @@
  */
 DWORD WINAPI lineSetDevConfig(DWORD dwDeviceID, LPVOID lpDeviceConfig, DWORD dwSize, LPCSTR lpszDeviceClass)
 {
-    FIXME("(%0lx, %p, %08lx, %s): stub.\n", dwDeviceID, lpDeviceConfig, dwSize, lpszDeviceClass);
+    FIXME("(%08lx, %p, %08lx, %s): stub.\n", dwDeviceID, lpDeviceConfig, dwSize, lpszDeviceClass);
     return 0;
 }
 
diff --git a/dlls/tapi32/phone.c b/dlls/tapi32/phone.c
index 36ad68e..b3b1ab3 100644
--- a/dlls/tapi32/phone.c
+++ b/dlls/tapi32/phone.c
@@ -258,7 +258,7 @@
  */
 DWORD WINAPI phoneSetRing(HPHONE hPhone, DWORD dwRingMode, DWORD dwVolume)
 {
-    FIXME("(%04x, %08lx, %08ld): stub.\n", hPhone, dwRingMode, dwVolume);
+    FIXME("(%04x, %08lx, %08lx): stub.\n", hPhone, dwRingMode, dwVolume);
     return 1;
 }
 
@@ -276,7 +276,7 @@
  */
 DWORD WINAPI phoneSetVolume(HPHONE hPhone, DWORD dwHookSwitchDev, DWORD dwVolume)
 {
-    FIXME("(%04x, %08lx, %08ld): stub.\n", hPhone, dwHookSwitchDev, dwVolume);
+    FIXME("(%04x, %08lx, %08lx): stub.\n", hPhone, dwHookSwitchDev, dwVolume);
     return 1;
 }
 
diff --git a/windows/driver.c b/windows/driver.c
index 1bb6aa1..f80ce5c 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -831,7 +831,7 @@
     HDRVR 		hDriver = 0;
     char 		drvName[128];
 
-    TRACE("('%s', '%s', %08lX);\n", lpDriverName, lpSectionName, lParam);
+    TRACE("(%s, %s, 0x%08lx);\n", debugstr_a(lpDriverName), debugstr_a(lpSectionName), lParam);
     
     if (lpSectionName == NULL) {
 	lstrcpynA(drvName, lpDriverName, sizeof(drvName));