Fixed format strings.
This commit is contained in:
parent
0ce209c8fc
commit
1b490b42bf
|
@ -425,7 +425,7 @@ REBAR_ForceResize (HWND hwnd)
|
|||
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
|
||||
RECT rc;
|
||||
|
||||
TRACE(" to [%d x %d]!\n",
|
||||
TRACE( " to [%ld x %ld]!\n",
|
||||
infoPtr->calcSize.cx, infoPtr->calcSize.cy);
|
||||
|
||||
infoPtr->bAutoResize = TRUE;
|
||||
|
|
|
@ -314,7 +314,7 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr)
|
|||
TRACE("%s\n", debugstr_w(infoPtr->szTipText));
|
||||
|
||||
TOOLTIPS_CalcTipSize (hwnd, infoPtr, &size);
|
||||
TRACE("size %d - %d\n", size.cx, size.cy);
|
||||
TRACE("size %ld x %ld\n", size.cx, size.cy);
|
||||
|
||||
if (toolPtr->uFlags & TTF_CENTERTIP) {
|
||||
RECT rc;
|
||||
|
@ -437,7 +437,7 @@ TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr)
|
|||
TRACE("%s\n", debugstr_w(infoPtr->szTipText));
|
||||
|
||||
TOOLTIPS_CalcTipSize (hwnd, infoPtr, &size);
|
||||
TRACE("size %d - %d\n", size.cx, size.cy);
|
||||
TRACE("size %ld x %ld\n", size.cx, size.cy);
|
||||
|
||||
if (toolPtr->uFlags & TTF_ABSOLUTE) {
|
||||
rect.left = infoPtr->xTrackPos;
|
||||
|
|
|
@ -1060,7 +1060,8 @@ static HRESULT WINAPI DefaultHandler_SetExtent(
|
|||
DWORD dwDrawAspect,
|
||||
SIZEL* psizel)
|
||||
{
|
||||
TRACE("(%p, %lx, (%d,%d))\n", iface, dwDrawAspect, psizel->cx, psizel->cy);
|
||||
TRACE("(%p, %lx, (%ld x %ld))\n", iface,
|
||||
dwDrawAspect, psizel->cx, psizel->cy);
|
||||
return OLE_E_NOTRUNNING;
|
||||
}
|
||||
|
||||
|
|
|
@ -39,8 +39,7 @@ BOOL WIN16DRV_GetTextExtentPoint( DC *dc, LPCWSTR wstr, INT count,
|
|||
win16drv_SegPtr_TextXForm, NULL, NULL, 0);
|
||||
size->cx = XDSTOLS(dc,LOWORD(dwRet));
|
||||
size->cy = YDSTOLS(dc,HIWORD(dwRet));
|
||||
TRACE("cx=0x%x, cy=0x%x\n",
|
||||
size->cx, size->cy );
|
||||
TRACE("cx=%ld, cy=%ld\n", size->cx, size->cy );
|
||||
HeapFree( GetProcessHeap(), 0, str );
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -910,7 +910,7 @@ BOOL WINAPI GetTextExtentPoint32A( HDC hdc, LPCSTR str, INT count,
|
|||
}
|
||||
}
|
||||
GDI_ReleaseObj( hdc );
|
||||
TRACE("(%08x %s %d %p): returning %d,%d\n",
|
||||
TRACE("(%08x %s %d %p): returning %ld x %ld\n",
|
||||
hdc, debugstr_an (str, count), count, size, size->cx, size->cy );
|
||||
return ret;
|
||||
}
|
||||
|
@ -939,7 +939,7 @@ BOOL WINAPI GetTextExtentPoint32W(
|
|||
ret = dc->funcs->pGetTextExtentPoint( dc, str, count, size );
|
||||
GDI_ReleaseObj( hdc );
|
||||
}
|
||||
TRACE("(%08x %s %d %p): returning %d,%d\n",
|
||||
TRACE("(%08x %s %d %p): returning %ld x %ld\n",
|
||||
hdc, debugstr_wn (str, count), count, size, size->cx, size->cy );
|
||||
return ret;
|
||||
}
|
||||
|
@ -1021,8 +1021,9 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count,
|
|||
*lpnFit = nFit;
|
||||
ret = TRUE;
|
||||
|
||||
TRACE("(%08x %s %d) returning %d %d %d\n",
|
||||
TRACE("(%08x %s %d) returning %d %ld x %ld\n",
|
||||
hdc,debugstr_wn(str,count),maxExt,nFit, size->cx,size->cy);
|
||||
|
||||
done:
|
||||
GDI_ReleaseObj( hdc );
|
||||
return ret;
|
||||
|
|
|
@ -169,7 +169,8 @@ static BOOL DIALOG_GetCharSizeFromDC( HDC hDC, HFONT hFont, SIZE * pSize )
|
|||
Success = TRUE;
|
||||
}
|
||||
/* Use the text metrics */
|
||||
TRACE("Using tm: %ldx%ld (dlg: %dx%d) (%s)\n", tm.tmAveCharWidth, tm.tmHeight, pSize->cx, pSize->cy,
|
||||
TRACE("Using tm: %ldx%ld (dlg: %ld x %ld) (%s)\n",
|
||||
tm.tmAveCharWidth, tm.tmHeight, pSize->cx, pSize->cy,
|
||||
tm.tmPitchAndFamily & TMPF_FIXED_PITCH ? "variable" : "fixed");
|
||||
pSize->cx = tm.tmAveCharWidth;
|
||||
pSize->cy = tm.tmHeight;
|
||||
|
|
Loading…
Reference in New Issue