Remove unnecessary single quoting of debugstr_xxx strings.

This commit is contained in:
Francois Gouget 2001-05-11 20:03:40 +00:00 committed by Alexandre Julliard
parent f16d04925c
commit ee285b7ac8
15 changed files with 19 additions and 19 deletions

View File

@ -1554,7 +1554,7 @@ static LRESULT LISTBOX_InsertString( WND *wnd, LB_DESCR *descr, INT index,
return ret; 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) : "" ); wnd->hwndSelf, index, HAS_STRINGS(descr) ? debugstr_w(new_str) : "" );
return index; return index;
} }

View File

@ -174,7 +174,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile*iface,PAVISTREAM*avis,AVI
FIXME("\tfccHandler '%s'\n",fcc); FIXME("\tfccHandler '%s'\n",fcc);
FIXME("\tdwFlags 0x%08lx\n",asi->dwFlags); FIXME("\tdwFlags 0x%08lx\n",asi->dwFlags);
FIXME("\tdwCaps 0x%08lx\n",asi->dwCaps); 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; istream->curframe = 0;
*avis = (PAVISTREAM)istream; *avis = (PAVISTREAM)istream;
@ -470,7 +470,7 @@ HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,PAVISTREAM ppsS
return AVIERR_UNSUPPORTED; return AVIERR_UNSUPPORTED;
ICGetInfo(as->hic,&(as->icinfo),sizeof(ICINFO)); 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; as->iscompressing = TRUE;
memcpy(&(as->aco),aco,sizeof(*aco)); memcpy(&(as->aco),aco,sizeof(*aco));
if (as->icinfo.dwFlags & VIDCF_COMPRESSFRAMES) { if (as->icinfo.dwFlags & VIDCF_COMPRESSFRAMES) {

View File

@ -738,7 +738,7 @@ STATUSBAR_SetTextW (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM
nPart = ((INT) wParam) & 0x00ff; nPart = ((INT) wParam) & 0x00ff;
style = ((INT) wParam) & 0xff00; 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)) if ((infoPtr->simple) || (infoPtr->parts==NULL) || (nPart==255))
part = &infoPtr->part0; part = &infoPtr->part0;
else else

View File

@ -2271,7 +2271,7 @@ TAB_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
TAB_SetItemBounds(hwnd); TAB_SetItemBounds(hwnd);
TAB_InvalidateTabArea(hwnd, infoPtr); 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)); hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
return iItem; return iItem;
@ -2340,7 +2340,7 @@ TAB_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
TAB_SetItemBounds(hwnd); TAB_SetItemBounds(hwnd);
TAB_InvalidateTabArea(hwnd, infoPtr); 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)); hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
return iItem; return iItem;

View File

@ -573,7 +573,7 @@ static LONG FILEDLG_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0); SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);
lstrcpynW(tmpstr, FILEDLG_GetFileType(ofn->lpstrCustomFilter, lstrcpynW(tmpstr, FILEDLG_GetFileType(ofn->lpstrCustomFilter,
(LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE); (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)); ofn->nFilterIndex, debugstr_w(tmpstr));
SetDlgItemTextW( hWnd, edt1, tmpstr ); SetDlgItemTextW( hWnd, edt1, tmpstr );
/* get drive list */ /* get drive list */
@ -1318,7 +1318,7 @@ BOOL WINAPI GetFileName31W(
FILEDLG_DestroyPrivate(lfs); FILEDLG_DestroyPrivate(lfs);
} }
TRACE("return lpstrFile='%s' !\n", debugstr_w(lpofn->lpstrFile)); TRACE("return lpstrFile=%s !\n", debugstr_w(lpofn->lpstrFile));
return bRet; return bRet;
} }

View File

@ -154,7 +154,7 @@ void msvcrt_init_args(void)
We will free it at the end of processing. */ We will free it at the end of processing. */
cmdline = _strdup(MSVCRT__acmdln); 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(); version = GetVersion();
MSVCRT__osver = version >> 16; MSVCRT__osver = version >> 16;

View File

@ -325,7 +325,7 @@ WCHAR* _wgetdcwd(int drive, WCHAR * buf, int size)
return NULL; /* buf too small */ return NULL; /* buf too small */
} }
TRACE(":returning '%s'\n", debugstr_w(dir)); TRACE(":returning %s\n", debugstr_w(dir));
if (!buf) if (!buf)
return _wcsdup(dir); /* allocate */ return _wcsdup(dir); /* allocate */
strcpyW(buf,dir); strcpyW(buf,dir);
@ -414,7 +414,7 @@ void _wsplitpath(const WCHAR *inpath, WCHAR *drv, WCHAR *dir,
WCHAR ch, *ptr, *p; WCHAR ch, *ptr, *p;
WCHAR pathbuff[MAX_PATH],*path=pathbuff; 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 */ /* FIXME: Should be an strncpyW or something */
strcpyW(pathbuff, inpath); strcpyW(pathbuff, inpath);

View File

@ -215,7 +215,7 @@ HRESULT WINAPI LoadTypeLib16(
LPOLESTR szFile, /* [in] Name of file to load from */ LPOLESTR szFile, /* [in] Name of file to load from */
ITypeLib** pptLib) /* [out] Pointer to pointer to loaded type library */ 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) if (pptLib!=0)
*pptLib=0; *pptLib=0;

View File

@ -64,7 +64,7 @@ DWORD WINAPI ParseFieldA(
*/ */
DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len) 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); debugstr_w(src), nField, dst, len);
return FALSE; return FALSE;
} }

View File

@ -30,7 +30,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
char FaceName[LF_FACESIZE]; 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, debugstr_w(lf->lfFaceName), lf->lfHeight, lf->lfItalic,
lf->lfWeight); lf->lfWeight);

View File

@ -1206,7 +1206,7 @@ UINT WINAPI GetDriveTypeA(LPCSTR root) /* [in] String describing drive */
{ {
if ((root[1]) && (root[1] != ':')) 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; return DRIVE_NO_ROOT_DIR;
} }
drive = toupper(root[0]) - 'A'; drive = toupper(root[0]) - 'A';

View File

@ -251,7 +251,7 @@ HDC WINAPI CreateEnhMetaFileW(
HFILE hFile; HFILE hFile;
DWORD size = 0, length = 0; 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; if (!(dc = DC_AllocDC( &EMFDRV_Funcs ))) return 0;
dc->header.wMagic = ENHMETAFILE_DC_MAGIC; dc->header.wMagic = ENHMETAFILE_DC_MAGIC;

View File

@ -80,7 +80,7 @@ HFONT WIN16DRV_FONT_SelectObject( DC * dc, HFONT hfont, FONTOBJ * font)
dc->hFont = hfont; 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); debugstr_w(font->logfont.lfFaceName), font->logfont.lfHeight);

View File

@ -1201,7 +1201,7 @@ static UINT XFONT_GetFontMetric( const fontInfo* pfi,
ptm->tmDefaultChar = pfi->df.dfDefaultChar; ptm->tmDefaultChar = pfi->df.dfDefaultChar;
ptm->tmBreakChar = pfi->df.dfBreakChar; 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->elfLogFont.lfFaceName),
debugstr_w(pLF->elfFullName)); debugstr_w(pLF->elfFullName));

View File

@ -453,7 +453,7 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf )
{ {
memcpy( &fontPtr->logfont, plf, sizeof(LOGFONTW) ); 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->lfHeight, plf->lfWidth,
plf->lfEscapement, plf->lfOrientation, plf->lfEscapement, plf->lfOrientation,
debugstr_w(plf->lfFaceName), debugstr_w(plf->lfFaceName),