Don't put single quotes around '%s' when using the debugstr_*() functions.

dlls/comctl32/ipaddress.c

@@ -378,7 +378,7 @@ static BOOL IPADDRESS_ConstrainField (IPADDRESS_INFO *infoPtr, int currentfield)
     if (newValue == curValue) return FALSE;
 
     wsprintfW (field, fmt, newValue);
-    TRACE("  field='%s'\n", debugstr_w(field));
+    TRACE("  field=%s\n", debugstr_w(field));
     return SetWindowTextW (part->EditHwnd, field);
 }
 

dlls/comctl32/propsheet.c

@@ -360,7 +360,7 @@ static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
   psInfo->isModeless = dwFlags & PSH_MODELESS;
 
   memcpy(&psInfo->ppshheader,lppsh,dwSize);
-  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
+  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t%s\nnPages\t\t%d\npfnCallback\t%p\n",
       lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
 
   PROPSHEET_UnImplementedFlags(lppsh->dwFlags);
@@ -2156,7 +2156,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText)
   PropSheetInfo*	psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr);
   WCHAR			szTitle[256];
 
-  TRACE("'%s' (style %08x)\n", debugstr_w(lpszText), dwStyle);
+  TRACE("%s (style %08x)\n", debugstr_w(lpszText), dwStyle);
   if (HIWORD(lpszText) == 0) {
     if (!LoadStringW(psInfo->ppshheader.hInstance,
                      LOWORD(lpszText), szTitle, sizeof(szTitle)-sizeof(WCHAR)))
@@ -2216,7 +2216,7 @@ static void PROPSHEET_SetFinishTextW(HWND hwndDlg, LPCWSTR lpszText)
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr);
   HWND hwndButton = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
 
-  TRACE("'%s'\n", debugstr_w(lpszText));
+  TRACE("%s\n", debugstr_w(lpszText));
   /* Set text, show and enable the Finish button */
   SetWindowTextW(hwndButton, lpszText);
   ShowWindow(hwndButton, SW_SHOW);

dlls/comdlg32/filedlg.c

@@ -3984,7 +3984,7 @@ short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf)
 	if(i == -1)
 		i++;
 
-	TRACE("---> '%s'\n", debugstr_w(&lpFile[i]));
+	TRACE("---> %s\n", debugstr_w(&lpFile[i]));
 
 	len = strlenW(lpFile+i)+1;
 	if(cbBuf < len)

dlls/dmloader/loaderstream.c

@@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Read (LPSTREAM iface,
     if (pcbRead == NULL) pcbRead = &cbRead;
     if (!ReadFile (This->hFile, pv, cb, pcbRead, NULL) || *pcbRead != cb) return E_FAIL;
 	
-	TRACE_(dmfileraw)(": data (size = 0x%08X): '%s'\n", *pcbRead, debugstr_an(pv, *pcbRead));
+	TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", *pcbRead, debugstr_an(pv, *pcbRead));
     return S_OK;
 }
 
@@ -201,7 +201,7 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Write (LPSTREAM iface
     if (pcbWritten == NULL) pcbWritten = &cbWrite;
     if (!WriteFile (This->hFile, pv, cb, pcbWritten, NULL) || *pcbWritten != cb) return E_FAIL;
 	
-	TRACE_(dmfileraw)(": data (size = 0x%08X): '%s'\n", *pcbWritten, debugstr_an(pv, *pcbWritten));
+	TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", *pcbWritten, debugstr_an(pv, *pcbWritten));
     return S_OK;
 }
 
@@ -392,7 +392,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Read (LPSTREAM if
 	/* FIXME: error checking would be nice */
 	if (pcbRead) *pcbRead = cb;
 	
-	TRACE_(dmfileraw)(": data (size = 0x%08X): '%s'\n", cb, debugstr_an(pv, cb));
+	TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", cb, debugstr_an(pv, cb));
     return S_OK;
 }
 

dlls/gdi32/mfdrv/init.c

@@ -241,7 +241,7 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename )
     METAFILEDRV_PDEVICE *physDev;
     HANDLE hFile;
 
-    TRACE("'%s'\n", debugstr_w(filename) );
+    TRACE("%s\n", debugstr_w(filename) );
 
     if (!(dc = MFDRV_AllocMetaFile())) return 0;
     physDev = (METAFILEDRV_PDEVICE *)dc->physDev;

dlls/gdi32/palette.c

@@ -983,7 +983,7 @@ BOOL WINAPI GetLogColorSpaceW(HCOLORSPACE hColorSpace, LPLOGCOLORSPACEW lpBuffer
  */
 BOOL WINAPI SetICMProfileA(HDC hDC, LPSTR lpszFilename)
 {
-    FIXME("hDC %p filename '%s': stub!\n", hDC, debugstr_a(lpszFilename));
+    FIXME("hDC %p filename %s: stub!\n", hDC, debugstr_a(lpszFilename));
     return TRUE; /* success */
 }
 
@@ -993,7 +993,7 @@ BOOL WINAPI SetICMProfileA(HDC hDC, LPSTR lpszFilename)
  */
 BOOL WINAPI SetICMProfileW(HDC hDC, LPWSTR lpszFilename)
 {
-    FIXME("hDC %p filename '%s': stub!\n", hDC, debugstr_w(lpszFilename));
+    FIXME("hDC %p filename %s: stub!\n", hDC, debugstr_w(lpszFilename));
     return TRUE; /* success */
 }
 

dlls/kernel32/lcformat.c

@@ -140,7 +140,7 @@ static WCHAR* NLS_GetLocaleString(LCID lcid, DWORD dwFlags)
   TRACE( #type ": %d (%08x)\n", (DWORD)num, (DWORD)num)
 
 #define GET_LOCALE_STRING(str, type) str = NLS_GetLocaleString(lcid, type|dwFlags); \
-  TRACE( #type ": '%s'\n", debugstr_w(str))
+  TRACE( #type ": %s\n", debugstr_w(str))
 
 /**************************************************************************
  * NLS_GetFormats <internal>
@@ -656,7 +656,7 @@ NLS_GetDateTimeFormatW_InvalidFlags:
   }
   cchWritten++; /* Include terminating NUL */
 
-  TRACE("returning length=%d, ouput='%s'\n", cchWritten, debugstr_w(lpStr));
+  TRACE("returning length=%d, ouput=%s\n", cchWritten, debugstr_w(lpStr));
   return cchWritten;
 
 NLS_GetDateTimeFormatW_Overrun:

dlls/msacm32/driver.c

@@ -589,7 +589,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
 
     /* FIXME: Create a WINE_ACMDRIVER32 */
     *phad = (HACMDRIVER)pad;
-    TRACE("'%s' => %p\n", debugstr_w(padid->pszDriverAlias), pad);
+    TRACE("%s => %p\n", debugstr_w(padid->pszDriverAlias), pad);
 
     return MMSYSERR_NOERROR;
  gotError:

dlls/msi/action.c

@@ -4276,7 +4276,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
     service = OpenServiceW(scm, name, SERVICE_START);
     if (!service)
     {
-        ERR("Failed to open service '%s'\n", debugstr_w(name));
+        ERR("Failed to open service %s\n", debugstr_w(name));
         goto done;
     }
 
@@ -4284,7 +4284,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
 
     if (!StartServiceW(service, numargs, vector))
     {
-        ERR("Failed to start service '%s'\n", debugstr_w(name));
+        ERR("Failed to start service %s\n", debugstr_w(name));
         goto done;
     }
 

dlls/msvcrt/dir.c

@@ -768,7 +768,7 @@ MSVCRT_wchar_t * CDECL _wfullpath(MSVCRT_wchar_t * absPath, const MSVCRT_wchar_t
     return NULL;
   }
 
-  TRACE(":resolving relative path '%s'\n",debugstr_w(relPath));
+  TRACE(":resolving relative path %s\n",debugstr_w(relPath));
 
   rc = GetFullPathNameW(relPath,size,buffer,&lastpart);
 

dlls/msvcrt/file.c

@@ -2752,7 +2752,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf)
     }
     *buf = '\0';
 
-    TRACE("got '%s'\n", debugstr_w(ws));
+    TRACE("got %s\n", debugstr_w(ws));
     return ws;
 }
 

dlls/msvfw32/mciwnd.c

@@ -244,7 +244,7 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi)
         strcatW(buffer, r_braceW);
     }
 
-    TRACE("=> '%s'\n", debugstr_w(buffer));
+    TRACE("=> %s\n", debugstr_w(buffer));
     SetWindowTextW(mwi->hWnd, buffer);
 }
 

dlls/secur32/ntlm.c

@@ -520,7 +520,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW(
 
         if(lstrlenA(want_flags) > 2)
         {
-            TRACE("Want flags are '%s'\n", debugstr_a(want_flags));
+            TRACE("Want flags are %s\n", debugstr_a(want_flags));
             lstrcpynA(buffer, want_flags, max_len-1);
             if((ret = run_helper(helper, buffer, max_len, &buffer_len)) 
                     != SEC_E_OK)

dlls/shell32/shellpath.c

@@ -1734,12 +1734,12 @@ HRESULT WINAPI SHGetFolderPathW(
     ret = SHCreateDirectoryExW(hwndOwner, szBuildPath, NULL);
     if (ret && ret != ERROR_ALREADY_EXISTS)
     {
-        ERR("Failed to create directory '%s'.\n", debugstr_w(szBuildPath));
+        ERR("Failed to create directory %s.\n", debugstr_w(szBuildPath));
         hr = E_FAIL;
         goto end;
     }
 
-    TRACE("Created missing system directory '%s'\n", debugstr_w(szBuildPath));
+    TRACE("Created missing system directory %s\n", debugstr_w(szBuildPath));
 end:
     TRACE("returning 0x%08x (final path is %s)\n", hr, debugstr_w(szBuildPath));
     return hr;

dlls/shlwapi/ordinal.c

@@ -3091,7 +3091,7 @@ BOOL WINAPI SHGetIniStringW(LPSTR str1, LPSTR str2, LPSTR pStr, DWORD some_len,
  */
 BOOL WINAPI SHSetIniStringW(LPWSTR str1, LPVOID x, LPWSTR str2, LPWSTR str3)
 {
-    FIXME("('%s', %p, '%s', '%s'), stub.\n", debugstr_w(str1), x, debugstr_w(str2), debugstr_w(str3));
+    FIXME("(%s, %p, %s, %s), stub.\n", debugstr_w(str1), x, debugstr_w(str2), debugstr_w(str3));
     return TRUE;
 }
 

dlls/user32/dialog.c

@@ -1668,7 +1668,7 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPWSTR str, INT len,
     BOOL ret;
     HWND listbox = GetDlgItem( hwnd, id );
 
-    TRACE("%p '%s' %d\n", hwnd, unicode ? debugstr_w(str) : debugstr_a((LPSTR)str), id );
+    TRACE("%p %s %d\n", hwnd, unicode ? debugstr_w(str) : debugstr_a((LPSTR)str), id );
     if (!listbox) return FALSE;
 
     item = SendMessageW(listbox, combo ? CB_GETCURSEL : LB_GETCURSEL, 0, 0 );
@@ -1704,7 +1704,7 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPWSTR str, INT len,
     }
     else lstrcpynW( str, ptr, len );
     HeapFree( GetProcessHeap(), 0, buffer );
-    TRACE("Returning %d '%s'\n", ret, unicode ? debugstr_w(str) : debugstr_a((LPSTR)str) );
+    TRACE("Returning %d %s\n", ret, unicode ? debugstr_w(str) : debugstr_a((LPSTR)str) );
     return ret;
 }
 

dlls/user32/edit.c

@@ -3206,7 +3206,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac
 	if (strl) {
 		/* there is an insertion */
 		tl = strlenW(es->text);
-		TRACE("inserting stuff (tl %d, strl %d, selstart %d ('%s'), text '%s')\n", tl, strl, s, debugstr_w(es->text + s), debugstr_w(es->text));
+		TRACE("inserting stuff (tl %d, strl %d, selstart %d (%s), text %s)\n", tl, strl, s, debugstr_w(es->text + s), debugstr_w(es->text));
 		for (p = es->text + tl ; p >= es->text + s ; p--)
 			p[strl] = p[0];
 		for (i = 0 , p = es->text + s ; i < strl ; i++)

dlls/wineps.drv/ps.c

@@ -314,7 +314,7 @@ INT PSDRV_WriteHeader( PSDRV_PDEVICE *physDev, LPCSTR title )
     int win_duplex;
     int llx, lly, urx, ury;
 
-    TRACE("'%s'\n", debugstr_a(title));
+    TRACE("%s\n", debugstr_a(title));
 
     escaped_title = escape_title(title);
     buf = HeapAlloc( PSDRV_Heap, 0, sizeof(psheader) +

dlls/wininet/http.c

@@ -980,7 +980,7 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC,
 
     if( !lpwhr->lpszPath )
         lpwhr->lpszPath = szNul;
-    TRACE("server='%s' path='%s'\n",
+    TRACE("server=%s path=%s\n",
           debugstr_w(lpwhs->lpszHostName), debugstr_w(lpwhr->lpszPath));
     /* for constant 15 see above */
     len = strlenW(lpwhs->lpszHostName) + strlenW(lpwhr->lpszPath) + 15;
@@ -1524,7 +1524,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev
         *lpdwBufferLength = len - sizeof(WCHAR);
         bSuccess = TRUE;
 
-	TRACE(" returning string : '%s'\n", debugstr_w(lpBuffer));
+	TRACE(" returning string : %s\n", debugstr_w(lpBuffer));
     }
     return bSuccess;
 }

dlls/winmm/playsound.c

@@ -133,7 +133,7 @@ static HMMIO	get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName)
     hmmio = mmioOpenW(str, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
     if (hmmio) return hmmio;
  none:
-    WARN("can't find SystemSound='%s' !\n", debugstr_w(lpszName));
+    WARN("can't find SystemSound=%s !\n", debugstr_w(lpszName));
     return 0;
 }
 
@@ -263,7 +263,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
 
     s.hEvent = 0;
 
-    TRACE("SoundName='%s' !\n", debugstr_w(wps->pszSound));
+    TRACE("SoundName=%s !\n", debugstr_w(wps->pszSound));
 
     /* if resource, grab it */
     if ((wps->fdwSound & SND_RESOURCE) == SND_RESOURCE) {
@@ -408,7 +408,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
     waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR));
 
 errCleanUp:
-    TRACE("Done playing='%s' => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko");
+    TRACE("Done playing=%s => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko");
     CloseHandle(s.hEvent);
     HeapFree(GetProcessHeap(), 0, waveHdr);
     HeapFree(GetProcessHeap(), 0, lpWaveFormat);

programs/winemenubuilder/winemenubuilder.c

@@ -916,7 +916,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bAgain )
 
     if( !GetLinkLocation( link, &csidl, &link_name ) )
     {
-        WINE_WARN("Unknown link location '%s'. Ignoring.\n",wine_dbgstr_w(link));
+        WINE_WARN("Unknown link location %s. Ignoring.\n",wine_dbgstr_w(link));
         return TRUE;
     }
     if (!in_desktop_dir(csidl) && !in_startmenu(csidl))

programs/winhelp/hlpfile.c

@@ -941,7 +941,7 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne
 
         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", wine_dbgstr_a(text), text, text_end, format, format_end);
             textsize = strlen(text) + 1;
             if (textsize > 1)
             {