Nikolay Sivov : comctl32: Change some overly exciting tracing messages.
Alexandre Julliard
julliard at winehq.org
Tue May 30 16:05:13 CDT 2017
Module: wine
Branch: master
Commit: e558858d0fc1b04693cafc18317d9b93d5ac0bd4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e558858d0fc1b04693cafc18317d9b93d5ac0bd4
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun May 28 16:05:25 2017 +0300
comctl32: Change some overly exciting tracing messages.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/animate.c | 8 ++++----
dlls/comctl32/dpa.c | 6 +++---
dlls/comctl32/header.c | 12 ++++++------
dlls/comctl32/toolbar.c | 30 +++++++++++++++---------------
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index 68b2bb6..12c4f65 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -704,7 +704,7 @@ static BOOL ANIMATE_OpenW(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPWSTR lps
if (!lpszName)
{
- TRACE("Closing avi!\n");
+ TRACE("Closing avi.\n");
/* installer of thebat! v1.62 requires FALSE here */
return (infoPtr->hMMio != 0);
}
@@ -718,10 +718,10 @@ static BOOL ANIMATE_OpenW(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPWSTR lps
{
if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName))
{
- TRACE("No AVI resource found!\n");
+ TRACE("No AVI resource found.\n");
if (!ANIMATE_LoadFileW(infoPtr, lpszName))
{
- WARN("No AVI file found!\n");
+ WARN("No AVI file found.\n");
return FALSE;
}
}
@@ -730,7 +730,7 @@ static BOOL ANIMATE_OpenW(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPWSTR lps
{
if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName))
{
- WARN("No AVI resource found!\n");
+ WARN("No AVI resource found.\n");
return FALSE;
}
}
diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c
index b5b7ff8..36b3a42 100644
--- a/dlls/comctl32/dpa.c
+++ b/dlls/comctl32/dpa.c
@@ -287,13 +287,13 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags,
return FALSE;
if (!(dwFlags & DPAM_SORTED)) {
- TRACE("sorting dpa's!\n");
+ TRACE("sorting dpa's.\n");
if (hdpa1->nItemCount > 0)
DPA_Sort (hdpa1, pfnCompare, lParam);
- TRACE ("dpa 1 sorted!\n");
+ TRACE ("dpa 1 sorted.\n");
if (hdpa2->nItemCount > 0)
DPA_Sort (hdpa2, pfnCompare, lParam);
- TRACE ("dpa 2 sorted!\n");
+ TRACE ("dpa 2 sorted.\n");
}
if (hdpa2->nItemCount < 1)
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 705c6c4..fcba262 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -1712,7 +1712,7 @@ HEADER_LButtonDown (HEADER_INFO *infoPtr, INT x, INT y)
HEADER_RefreshItem (infoPtr, nItem);
ReleaseDC (infoPtr->hwndSelf, hdc);
- TRACE("Pressed item %d!\n", nItem);
+ TRACE("Pressed item %d.\n", nItem);
}
else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) {
INT iCurrWidth = infoPtr->items[nItem].cxy;
@@ -1731,7 +1731,7 @@ HEADER_LButtonDown (HEADER_INFO *infoPtr, INT x, INT y)
ReleaseDC (infoPtr->hwndSelf, hdc);
}
- TRACE("Begin tracking item %d!\n", nItem);
+ TRACE("Begin tracking item %d.\n", nItem);
}
}
@@ -1797,14 +1797,14 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y)
HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL);
}
- TRACE("Released item %d!\n", infoPtr->iMoveItem);
+ TRACE("Released item %d.\n", infoPtr->iMoveItem);
infoPtr->bPressed = FALSE;
}
else if (infoPtr->bTracking) {
INT iNewWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
if (iNewWidth < 0)
iNewWidth = 0;
- TRACE("End tracking item %d!\n", infoPtr->iMoveItem);
+ TRACE("End tracking item %d.\n", infoPtr->iMoveItem);
infoPtr->bTracking = FALSE;
HEADER_SendNotifyWithIntFieldT(infoPtr, HDN_ENDTRACKW, infoPtr->iMoveItem, HDI_WIDTH, iNewWidth);
@@ -1934,7 +1934,7 @@ HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam)
ReleaseDC (infoPtr->hwndSelf, hdc);
}
- TRACE("Moving pressed item %d!\n", infoPtr->iMoveItem);
+ TRACE("Moving pressed item %d.\n", infoPtr->iMoveItem);
}
else if (infoPtr->bTracking) {
if (infoPtr->dwStyle & HDS_FULLDRAG) {
@@ -1974,7 +1974,7 @@ HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam)
HEADER_SendNotifyWithIntFieldT(infoPtr, HDN_TRACKW, infoPtr->iMoveItem, HDI_WIDTH, iTrackWidth);
}
- TRACE("Tracking item %d!\n", infoPtr->iMoveItem);
+ TRACE("Tracking item %d.\n", infoPtr->iMoveItem);
}
}
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index d908e41..c57707b 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1293,7 +1293,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize)
SelectObject (hdc, hOldFont);
ReleaseDC (infoPtr->hwndSelf, hdc);
- TRACE("max string size %d x %d!\n", lpSize->cx, lpSize->cy);
+ TRACE("max string size %d x %d\n", lpSize->cx, lpSize->cy);
}
/***********************************************************************
@@ -1808,13 +1808,13 @@ TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt, BOOL *b
if (btnPtr->fsStyle & BTNS_SEP) {
if (PtInRect (&btnPtr->rect, *lpPt)) {
- TRACE(" ON SEPARATOR %d!\n", i);
+ TRACE(" ON SEPARATOR %d\n", i);
return -i;
}
}
else {
if (PtInRect (&btnPtr->rect, *lpPt)) {
- TRACE(" ON BUTTON %d!\n", i);
+ TRACE(" ON BUTTON %d\n", i);
if (button)
*button = TRUE;
return i;
@@ -1822,7 +1822,7 @@ TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt, BOOL *b
}
}
- TRACE(" NOWHERE!\n");
+ TRACE(" NOWHERE\n");
return TOOLBAR_NOWHERE;
}
@@ -2628,7 +2628,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageW (hwnd, wParam, LB_GETITEMDATA, lpdis->itemID, 0);
if (btnInfo == NULL)
{
- FIXME("btnInfo invalid!\n");
+ FIXME("btnInfo invalid\n");
return TRUE;
}
@@ -2837,7 +2837,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp
return -1;
}
- TRACE ("adding %d internal bitmaps!\n", info.nButtons);
+ TRACE ("adding %d internal bitmaps\n", info.nButtons);
/* Windows resize all the buttons to the size of a newly added standard image */
if (lpAddBmp->nID & 1)
@@ -2858,7 +2858,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp
info.nButtons = count;
info.hInst = lpAddBmp->hInst;
info.nID = lpAddBmp->nID;
- TRACE("adding %d bitmaps!\n", info.nButtons);
+ TRACE("adding %d bitmaps\n", info.nButtons);
}
/* check if the bitmap is already loaded and compute iSumButtons */
@@ -2873,7 +2873,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp
if (!infoPtr->cimlDef) {
/* create new default image list */
- TRACE ("creating default image list!\n");
+ TRACE ("creating default image list\n");
himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
ILC_COLOR32 | ILC_MASK, info.nButtons, 2);
@@ -2906,7 +2906,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp
static LRESULT
TOOLBAR_AddButtonsT(TOOLBAR_INFO *infoPtr, INT nAddButtons, const TBBUTTON* lpTbb, BOOL fUnicode)
{
- TRACE("adding %d buttons (unicode=%d)!\n", nAddButtons, fUnicode);
+ TRACE("adding %d buttons (unicode=%d)\n", nAddButtons, fUnicode);
return TOOLBAR_InternalInsertButtonsT(infoPtr, -1, nAddButtons, lpTbb, fUnicode);
}
@@ -3032,7 +3032,7 @@ TOOLBAR_AddStringA (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam)
static LRESULT
TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr)
{
- TRACE("auto sizing, style=%x!\n", infoPtr->dwStyle);
+ TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle);
TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight);
if (!(infoPtr->dwStyle & CCS_NORESIZE))
@@ -3229,7 +3229,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex)
TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[nIndex]);
if (infoPtr->nNumButtons == 1) {
- TRACE(" simple delete!\n");
+ TRACE(" simple delete\n");
free_string( infoPtr->buttons );
Free (infoPtr->buttons);
infoPtr->buttons = NULL;
@@ -3237,7 +3237,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex)
}
else {
TBUTTON_INFO *oldButtons = infoPtr->buttons;
- TRACE("complex delete! [nIndex=%d]\n", nIndex);
+ TRACE("complex delete [nIndex=%d]\n", nIndex);
infoPtr->nNumButtons--;
infoPtr->buttons = Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
@@ -4520,7 +4520,7 @@ TOOLBAR_SetCmdId (TOOLBAR_INFO *infoPtr, INT nIndex, INT nId)
if (infoPtr->hwndToolTip) {
- FIXME("change tool tip!\n");
+ FIXME("change tool tip\n");
}
@@ -5155,7 +5155,7 @@ TOOLBAR_GetStringW (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPWSTR str)
static LRESULT TOOLBAR_SetBoundingSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
SIZE * pSize = (SIZE*)lParam;
- FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub!\n", hwnd, wParam, pSize->cx, pSize->cy);
+ FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub\n", hwnd, wParam, pSize->cx, pSize->cy);
return 0;
}
@@ -6387,7 +6387,7 @@ TOOLBAR_SetRedraw (TOOLBAR_INFO *infoPtr, WPARAM wParam)
static LRESULT
TOOLBAR_Size (TOOLBAR_INFO *infoPtr)
{
- TRACE("sizing toolbar!\n");
+ TRACE("sizing toolbar\n");
if (infoPtr->dwExStyle & TBSTYLE_EX_HIDECLIPPEDBUTTONS)
{
More information about the wine-cvs
mailing list