debugstr_xxx & quotes

Francois Gouget fgouget at free.fr
Thu May 10 22:15:52 CDT 2001



Changelog:

 * controls/listbox.c,
   controls/menu.c,
   dlls/avifil32/avifile.c,
   dlls/comctl32/status.c,
   dlls/comctl32/tab.c,
   dlls/commdlg/filedlg.c,
   dlls/msvcrt/data.c,
   dlls/msvcrt/dir.c,
   dlls/oleaut32/typelib.c,
   dlls/shell32/shellord.c,
   dlls/wineps/font.c,
   files/drive.c,
   graphics/enhmetafiledrv/init.c,
   graphics/win16drv/font.c,
   graphics/x11drv/xfont.c,
   objects/font.c

   Remove unnecessary single quoting of debugstr_xxx strings.

--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                  Dieu dit: "M-x Lumière". Et la lumière fut.
-------------- next part --------------
Index: controls/listbox.c
===================================================================
RCS file: /home/cvs/wine/wine/controls/listbox.c,v
retrieving revision 1.74
diff -u -r1.74 listbox.c
--- controls/listbox.c	2001/04/17 17:57:20	1.74
+++ controls/listbox.c	2001/05/11 01:16:50
@@ -1554,7 +1554,7 @@
         return ret;
     }
 
-    TRACE("[%04x]: added item %d '%s'\n",
+    TRACE("[%04x]: added item %d %s\n",
           wnd->hwndSelf, index, HAS_STRINGS(descr) ? debugstr_w(new_str) : "" );
     return index;
 }
Index: controls/menu.c
===================================================================
RCS file: /home/cvs/wine/wine/controls/menu.c,v
retrieving revision 1.114
diff -u -r1.114 menu.c
--- controls/menu.c	2001/05/09 17:31:31	1.114
+++ controls/menu.c	2001/05/11 01:16:54
@@ -3790,8 +3803,8 @@
 
     if (IS_STRING_ITEM(flags))
     {
-	TRACE("%04x %d %04x %04x '%s'\n",
-                      hMenu, pos, flags, id, str ? debugstr_w(str) : "#NULL#" );
+	TRACE("%04x %d %04x %04x %s\n",
+                      hMenu, pos, flags, id, debugstr_w(str) );
         if (!str) return FALSE;
     }
     else
Index: dlls/avifil32/avifile.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/avifil32/avifile.c,v
retrieving revision 1.20
diff -u -r1.20 avifile.c
--- dlls/avifil32/avifile.c	2001/02/14 23:11:18	1.20
+++ dlls/avifil32/avifile.c	2001/05/11 01:16:54
@@ -174,7 +174,7 @@
 	FIXME("\tfccHandler '%s'\n",fcc);
 	FIXME("\tdwFlags 0x%08lx\n",asi->dwFlags);
 	FIXME("\tdwCaps 0x%08lx\n",asi->dwCaps);
-	FIXME("\tname '%s'\n",debugstr_w(asi->szName));
+	FIXME("\tname %s\n",debugstr_w(asi->szName));
 
 	istream->curframe = 0;
 	*avis = (PAVISTREAM)istream;
@@ -470,7 +470,7 @@
 		return AVIERR_UNSUPPORTED;
 
 	ICGetInfo(as->hic,&(as->icinfo),sizeof(ICINFO));
-	FIXME("Opened compressor: '%s' '%s'\n",debugstr_w(as->icinfo.szName),debugstr_w(as->icinfo.szDescription));
+	FIXME("Opened compressor: %s %s\n",debugstr_w(as->icinfo.szName),debugstr_w(as->icinfo.szDescription));
 	as->iscompressing = TRUE;
 	memcpy(&(as->aco),aco,sizeof(*aco));
 	if (as->icinfo.dwFlags & VIDCF_COMPRESSFRAMES) {
Index: dlls/comctl32/status.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/comctl32/status.c,v
retrieving revision 1.35
diff -u -r1.35 status.c
--- dlls/comctl32/status.c	2001/04/13 22:23:35	1.35
+++ dlls/comctl32/status.c	2001/05/11 01:17:00
@@ -738,7 +738,7 @@
     nPart = ((INT) wParam) & 0x00ff;
     style = ((INT) wParam) & 0xff00;
 
-    TRACE("part %d -> '%s' with style %04x\n", nPart, debugstr_w(text), style);
+    TRACE("part %d -> %s with style %04x\n", nPart, debugstr_w(text), style);
     if ((infoPtr->simple) || (infoPtr->parts==NULL) || (nPart==255))
 	part = &infoPtr->part0;
     else
Index: dlls/comctl32/tab.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/comctl32/tab.c,v
retrieving revision 1.59
diff -u -r1.59 tab.c
--- dlls/comctl32/tab.c	2001/01/25 21:48:01	1.59
+++ dlls/comctl32/tab.c	2001/05/11 01:17:02
@@ -2271,7 +2272,7 @@
   TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd, infoPtr);
   
-  TRACE("[%04x]: added item %d '%s'\n",
+  TRACE("[%04x]: added item %d %s\n",
 	hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
 
   return iItem;
@@ -2340,7 +2341,7 @@
   TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd, infoPtr);
   
-  TRACE("[%04x]: added item %d '%s'\n",
+  TRACE("[%04x]: added item %d %s\n",
 	hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
 
   return iItem;
Index: dlls/commdlg/filedlg.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/commdlg/filedlg.c,v
retrieving revision 1.45
diff -u -r1.45 filedlg.c
--- dlls/commdlg/filedlg.c	2001/05/09 17:31:32	1.45
+++ dlls/commdlg/filedlg.c	2001/05/11 01:17:05
@@ -573,7 +573,7 @@
   SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);    
   lstrcpynW(tmpstr, FILEDLG_GetFileType(ofn->lpstrCustomFilter,
 	     (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
-  TRACE("nFilterIndex = %ld, SetText of edt1 to '%s'\n", 
+  TRACE("nFilterIndex = %ld, SetText of edt1 to %s\n", 
   			ofn->nFilterIndex, debugstr_w(tmpstr));
   SetDlgItemTextW( hWnd, edt1, tmpstr );
   /* get drive list */
@@ -1318,7 +1318,7 @@
         FILEDLG_DestroyPrivate(lfs);
     }
 
-    TRACE("return lpstrFile='%s' !\n", debugstr_w(lpofn->lpstrFile));
+    TRACE("return lpstrFile=%s !\n", debugstr_w(lpofn->lpstrFile));
     return bRet;
 }
 
Index: dlls/msvcrt/data.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/msvcrt/data.c,v
retrieving revision 1.7
diff -u -r1.7 data.c
--- dlls/msvcrt/data.c	2001/04/10 23:25:25	1.7
+++ dlls/msvcrt/data.c	2001/05/11 01:17:10
@@ -154,7 +154,7 @@
      We will free it at the end of processing. */
   cmdline = _strdup(MSVCRT__acmdln);
 
-  TRACE("got '%s', wide = '%s'\n", cmdline, debugstr_w(wcmdline));
+  TRACE("got '%s', wide = %s\n", cmdline, debugstr_w(wcmdline));
 
   version = GetVersion();
   MSVCRT__osver       = version >> 16;
Index: dlls/msvcrt/dir.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/msvcrt/dir.c,v
retrieving revision 1.4
diff -u -r1.4 dir.c
--- dlls/msvcrt/dir.c	2001/04/10 23:25:25	1.4
+++ dlls/msvcrt/dir.c	2001/05/11 01:17:10
@@ -325,7 +325,7 @@
       return NULL; /* buf too small */
     }
 
-    TRACE(":returning '%s'\n", debugstr_w(dir));
+    TRACE(":returning %s\n", debugstr_w(dir));
     if (!buf)
       return _wcsdup(dir); /* allocate */
     strcpyW(buf,dir);
@@ -414,7 +414,7 @@
   WCHAR ch, *ptr, *p;
   WCHAR pathbuff[MAX_PATH],*path=pathbuff;
 
-  TRACE(":splitting path '%s'\n",debugstr_w(path));
+  TRACE(":splitting path %s\n",debugstr_w(path));
   /* FIXME: Should be an strncpyW or something */
   strcpyW(pathbuff, inpath);
 
Index: dlls/oleaut32/typelib.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/oleaut32/typelib.c,v
retrieving revision 1.36
diff -u -r1.36 typelib.c
--- dlls/oleaut32/typelib.c	2001/05/09 17:31:33	1.36
+++ dlls/oleaut32/typelib.c	2001/05/11 01:17:17
@@ -215,7 +215,7 @@
     LPOLESTR szFile, /* [in] Name of file to load from */
     ITypeLib** pptLib) /* [out] Pointer to pointer to loaded type library */
 {
-    FIXME("('%s',%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib);
+    FIXME("(%s,%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib);
 
     if (pptLib!=0)
       *pptLib=0;
Index: dlls/shell32/shellord.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shellord.c,v
retrieving revision 1.77
diff -u -r1.77 shellord.c
--- dlls/shell32/shellord.c	2001/02/23 01:12:26	1.77
+++ dlls/shell32/shellord.c	2001/05/11 01:17:19
@@ -64,7 +64,7 @@
  */
 DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len) 
 {
-	FIXME("('%s',0x%08lx,%p,%ld) stub.\n",
+	FIXME("(%s,0x%08lx,%p,%ld) stub\n",
 	  debugstr_w(src), nField, dst, len);
 	return FALSE;
 }
Index: dlls/wineps/font.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/wineps/font.c,v
retrieving revision 1.9
diff -u -r1.9 font.c
--- dlls/wineps/font.c	2001/04/02 19:14:41	1.9
+++ dlls/wineps/font.c	2001/05/11 01:17:22
@@ -30,7 +30,7 @@
     char FaceName[LF_FACESIZE];
 
 
-    TRACE("FaceName = '%s' Height = %ld Italic = %d Weight = %ld\n",
+    TRACE("FaceName = %s Height = %ld Italic = %d Weight = %ld\n",
 	  debugstr_w(lf->lfFaceName), lf->lfHeight, lf->lfItalic,
 	  lf->lfWeight);
 
Index: files/drive.c
===================================================================
RCS file: /home/cvs/wine/wine/files/drive.c,v
retrieving revision 1.54
diff -u -r1.54 drive.c
--- files/drive.c	2001/04/20 18:36:06	1.54
+++ files/drive.c	2001/05/11 01:17:32
@@ -1206,7 +1206,7 @@
     {
         if ((root[1]) && (root[1] != ':'))
 	{
-	    WARN("invalid root '%s'\n", debugstr_a(root));
+	    WARN("invalid root %s\n", debugstr_a(root));
 	    return DRIVE_NO_ROOT_DIR;
 	}
 	drive = toupper(root[0]) - 'A';
Index: graphics/enhmetafiledrv/init.c
===================================================================
RCS file: /home/cvs/wine/wine/graphics/enhmetafiledrv/init.c,v
retrieving revision 1.21
diff -u -r1.21 init.c
--- graphics/enhmetafiledrv/init.c	2001/03/20 01:55:18	1.21
+++ graphics/enhmetafiledrv/init.c	2001/05/11 01:17:34
@@ -251,7 +251,7 @@
     HFILE hFile;
     DWORD size = 0, length = 0;
 
-    TRACE("'%s'\n", debugstr_w(filename) );
+    TRACE("%s\n", debugstr_w(filename) );
 
     if (!(dc = DC_AllocDC( &EMFDRV_Funcs ))) return 0;
     dc->header.wMagic = ENHMETAFILE_DC_MAGIC;
Index: graphics/win16drv/font.c
===================================================================
RCS file: /home/cvs/wine/wine/graphics/win16drv/font.c,v
retrieving revision 1.19
diff -u -r1.19 font.c
--- graphics/win16drv/font.c	2001/03/16 16:43:14	1.19
+++ graphics/win16drv/font.c	2001/05/11 01:17:34
@@ -80,7 +80,7 @@
 
     dc->hFont = hfont;
 
-    TRACE("WIN16DRV_FONT_SelectObject '%s' h=%ld\n",
+    TRACE("WIN16DRV_FONT_SelectObject %s h=%ld\n",
 	  debugstr_w(font->logfont.lfFaceName), font->logfont.lfHeight);
 
 
Index: graphics/x11drv/xfont.c
===================================================================
RCS file: /home/cvs/wine/wine/graphics/x11drv/xfont.c,v
retrieving revision 1.71
diff -u -r1.71 xfont.c
--- graphics/x11drv/xfont.c	2001/04/16 18:55:02	1.71
+++ graphics/x11drv/xfont.c	2001/05/11 01:17:37
@@ -1201,7 +1201,7 @@
     ptm->tmDefaultChar = pfi->df.dfDefaultChar;
     ptm->tmBreakChar = pfi->df.dfBreakChar;
  
-    TRACE("Calling Enum proc with FaceName '%s' FullName '%s'\n",
+    TRACE("Calling Enum proc with FaceName %s FullName %s\n",
 	  debugstr_w(pLF->elfLogFont.lfFaceName),
 	  debugstr_w(pLF->elfFullName));
 
Index: objects/font.c
===================================================================
RCS file: /home/cvs/wine/wine/objects/font.c,v
retrieving revision 1.42
diff -u -r1.42 font.c
--- objects/font.c	2001/04/23 18:11:58	1.42
+++ objects/font.c	2001/05/11 01:17:42
@@ -453,7 +453,7 @@
 	{
 	    memcpy( &fontPtr->logfont, plf, sizeof(LOGFONTW) );
 
-	    TRACE("(%ld %ld %ld %ld) '%s' %s %s => %04x\n",
+	    TRACE("(%ld %ld %ld %ld) %s %s %s => %04x\n",
                   plf->lfHeight, plf->lfWidth, 
                   plf->lfEscapement, plf->lfOrientation,
                   debugstr_w(plf->lfFaceName),


More information about the wine-patches mailing list