Converted to the new debug interface, using script written by Patrik
Stridvall.
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index 7fb5c72..32a3a2e 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -17,7 +17,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "animate.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(animate)
@@ -109,38 +109,38 @@
ANIMATE_Free (infoPtr);
if (!lParam) {
- TRACE (animate, "closing avi!\n");
+ TRACE("closing avi!\n");
return TRUE;
}
if (HIWORD(lParam)) {
- FIXME (animate, "(\"%s\") empty stub!\n", (LPSTR)lParam);
+ FIXME("(\"%s\") empty stub!\n", (LPSTR)lParam);
if (ANIMATE_LoadResA (infoPtr, hInstance, (LPSTR)lParam)) {
- FIXME (animate, "AVI resource found!\n");
+ FIXME("AVI resource found!\n");
}
else {
- FIXME (animate, "No AVI resource found!\n");
+ FIXME("No AVI resource found!\n");
if (ANIMATE_LoadFileA (infoPtr, (LPSTR)lParam)) {
- FIXME (animate, "AVI file found!\n");
+ FIXME("AVI file found!\n");
}
else {
- FIXME (animate, "No AVI file found!\n");
+ FIXME("No AVI file found!\n");
return FALSE;
}
}
}
else {
- FIXME (animate, "(%u) empty stub!\n", (WORD)LOWORD(lParam));
+ FIXME("(%u) empty stub!\n", (WORD)LOWORD(lParam));
if (ANIMATE_LoadResA (infoPtr, hInstance,
MAKEINTRESOURCEA((INT)lParam))) {
- FIXME (animate, "AVI resource found!\n");
+ FIXME("AVI resource found!\n");
}
else {
- FIXME (animate, "No AVI resource found!\n");
+ FIXME("No AVI resource found!\n");
return FALSE;
}
}
@@ -170,13 +170,13 @@
if (nRepeat == -1) {
- FIXME (animate, "(loop from=%d to=%d) empty stub!\n",
+ FIXME("(loop from=%d to=%d) empty stub!\n",
nFrom, nTo);
}
else {
- FIXME (animate, "(repeat=%d from=%d to=%d) empty stub!\n",
+ FIXME("(repeat=%d from=%d to=%d) empty stub!\n",
nRepeat, nFrom, nTo);
}
@@ -210,7 +210,7 @@
/* allocate memory for info structure */
infoPtr = (ANIMATE_INFO *)COMCTL32_Alloc (sizeof(ANIMATE_INFO));
if (!infoPtr) {
- ERR (animate, "could not allocate info memory!\n");
+ ERR("could not allocate info memory!\n");
return 0;
}
@@ -296,7 +296,7 @@
default:
if (uMsg >= WM_USER)
- ERR (animate, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index ba71c09..4c0021b 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -19,7 +19,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "comboex.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(comboex)
@@ -36,7 +36,7 @@
{
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
- TRACE (comboex, "\n");
+ TRACE("\n");
return (LRESULT)infoPtr->hwndCombo;
}
@@ -50,7 +50,7 @@
if ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN)
return 0;
- TRACE (comboex, "-- 0x%x\n", GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT));
+ TRACE("-- 0x%x\n", GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT));
return (LRESULT)GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT);
}
@@ -70,7 +70,7 @@
{
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
- TRACE (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
+ TRACE("(0x%08x 0x%08lx)\n", wParam, lParam);
return (LRESULT)infoPtr->himl;
}
@@ -83,7 +83,7 @@
{
/* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd); */
- FIXME (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
+ FIXME("(0x%08x 0x%08lx)\n", wParam, lParam);
return -1;
}
@@ -96,7 +96,7 @@
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
DWORD dwTemp;
- TRACE (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
+ TRACE("(0x%08x 0x%08lx)\n", wParam, lParam);
dwTemp = infoPtr->dwExtStyle;
@@ -118,7 +118,7 @@
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
HIMAGELIST himlTemp;
- TRACE (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
+ TRACE("(0x%08x 0x%08lx)\n", wParam, lParam);
himlTemp = infoPtr->himl;
infoPtr->himl = (HIMAGELIST)lParam;
@@ -132,7 +132,7 @@
{
/* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd); */
- FIXME (comboex, "(%p): stub\n", (LPVOID)lParam);
+ FIXME("(%p): stub\n", (LPVOID)lParam);
return TRUE;
}
@@ -146,7 +146,7 @@
{
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
- FIXME (comboex, "(0x%x 0x%x 0x%lx): stub\n", uMsg, wParam, lParam);
+ FIXME("(0x%x 0x%x 0x%lx): stub\n", uMsg, wParam, lParam);
if (infoPtr->hwndCombo)
return SendMessageA (infoPtr->hwndCombo, uMsg, wParam, lParam);
@@ -164,7 +164,7 @@
/* allocate memory for info structure */
infoPtr = (COMBOEX_INFO *)COMCTL32_Alloc (sizeof(COMBOEX_INFO));
if (infoPtr == NULL) {
- ERR (comboex, "could not allocate info memory!\n");
+ ERR("could not allocate info memory!\n");
return 0;
}
@@ -298,7 +298,7 @@
default:
if (uMsg >= WM_USER)
- ERR (comboex, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index 2536020..45ac8c8 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -20,7 +20,7 @@
#include "winbase.h"
#include "commctrl.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(commctrl)
@@ -59,7 +59,7 @@
/* LPVOID *pWork1, *pWork2; */
INT nCount1, nCount2;
- TRACE (commctrl, "(%p %p %08lx %p %p %08lx): stub!\n",
+ TRACE("(%p %p %08lx %p %p %08lx): stub!\n",
hdpa1, hdpa2, dwFlags, pfnCompare, pfnParam5, lParam);
if (IsBadWritePtr (hdpa1, sizeof(DPA)))
@@ -75,7 +75,7 @@
return FALSE;
if (dwFlags & DPAM_SORT) {
- TRACE (commctrl, "sorting dpa's!\n");
+ TRACE("sorting dpa's!\n");
DPA_Sort (hdpa1, pfnCompare, lParam);
DPA_Sort (hdpa2, pfnCompare, lParam);
}
@@ -87,8 +87,8 @@
nCount2 = hdpa2->nItemCount - 1;
- FIXME (commctrl, "nCount1=%d nCount2=%d\n", nCount1, nCount2);
- FIXME (commctrl, "semi stub!\n");
+ FIXME("nCount1=%d nCount2=%d\n", nCount1, nCount2);
+ FIXME("semi stub!\n");
#if 0
do {
@@ -132,11 +132,11 @@
{
LPVOID lpPtr;
- TRACE (commctrl, "(0x%lx)\n", dwSize);
+ TRACE("(0x%lx)\n", dwSize);
lpPtr = HeapAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, dwSize);
- TRACE (commctrl, "-- ret=%p\n", lpPtr);
+ TRACE("-- ret=%p\n", lpPtr);
return lpPtr;
}
@@ -166,14 +166,14 @@
{
LPVOID lpDest;
- TRACE (commctrl, "(%p 0x%08lx)\n", lpSrc, dwSize);
+ TRACE("(%p 0x%08lx)\n", lpSrc, dwSize);
if (lpSrc)
lpDest = HeapReAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, lpSrc, dwSize);
else
lpDest = HeapAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, dwSize);
- TRACE (commctrl, "-- ret=%p\n", lpDest);
+ TRACE("-- ret=%p\n", lpDest);
return lpDest;
}
@@ -195,7 +195,7 @@
BOOL WINAPI
COMCTL32_Free (LPVOID lpMem)
{
- TRACE (commctrl, "(%p)\n", lpMem);
+ TRACE("(%p)\n", lpMem);
return HeapFree (COMCTL32_hHeap, 0, lpMem);
}
@@ -218,7 +218,7 @@
DWORD WINAPI
COMCTL32_GetSize (LPVOID lpMem)
{
- TRACE (commctrl, "(%p)\n", lpMem);
+ TRACE("(%p)\n", lpMem);
return HeapSize (COMCTL32_hHeap, 0, lpMem);
}
@@ -276,7 +276,7 @@
DWORD WINAPI
FreeMRUListA (HMRU hmru)
{
- FIXME (commctrl, "(%p) empty stub!\n", hmru);
+ FIXME("(%p) empty stub!\n", hmru);
#if 0
if (!(hmru->dwParam1 & 1001)) {
@@ -299,7 +299,7 @@
AddMRUData (DWORD dwParam1, DWORD dwParam2, DWORD dwParam3)
{
- FIXME (commctrl, "(%lx %lx %lx) empty stub!\n",
+ FIXME("(%lx %lx %lx) empty stub!\n",
dwParam1, dwParam2, dwParam3);
return 0;
@@ -310,7 +310,7 @@
FindMRUData (DWORD dwParam1, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4)
{
- FIXME (commctrl, "(%lx %lx %lx %lx) empty stub!\n",
+ FIXME("(%lx %lx %lx %lx) empty stub!\n",
dwParam1, dwParam2, dwParam3, dwParam4);
return TRUE;
@@ -332,10 +332,10 @@
/* internal variables */
LPVOID ptr;
- FIXME (commctrl, "(%p) empty stub!\n", lpmi);
+ FIXME("(%p) empty stub!\n", lpmi);
if (lpmi) {
- FIXME (commctrl, "(%lx %lx %lx %lx \"%s\" %lx)\n",
+ FIXME("(%lx %lx %lx %lx \"%s\" %lx)\n",
lpmi->dwParam1, lpmi->dwParam2, lpmi->dwParam3,
(DWORD)lpmi->hkeyMain, lpmi->lpszSubKey, lpmi->dwParam6);
}
@@ -343,7 +343,7 @@
/* dummy pointer creation */
ptr = COMCTL32_Alloc (32);
- FIXME (commctrl, "-- ret = %p\n", ptr);
+ FIXME("-- ret = %p\n", ptr);
return ptr;
}
@@ -367,7 +367,7 @@
{
INT len;
- TRACE (commctrl, "(%p %p %d)\n", lpSrc, lpDest, nMaxLen);
+ TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen);
if (!lpDest && lpSrc)
return lstrlenA (lpSrc);
@@ -404,7 +404,7 @@
BOOL WINAPI
Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc)
{
- TRACE (commctrl, "(%p %p)\n", lppDest, lpSrc);
+ TRACE("(%p %p)\n", lppDest, lpSrc);
if (lpSrc) {
LPSTR ptr = COMCTL32_ReAlloc (*lppDest, lstrlenA (lpSrc) + 1);
@@ -440,7 +440,7 @@
{
INT len;
- TRACE (commctrl, "(%p %p %d)\n", lpSrc, lpDest, nMaxLen);
+ TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen);
if (!lpDest && lpSrc)
return lstrlenW (lpSrc);
@@ -477,7 +477,7 @@
BOOL WINAPI
Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc)
{
- TRACE (commctrl, "(%p %p)\n", lppDest, lpSrc);
+ TRACE("(%p %p)\n", lppDest, lpSrc);
if (lpSrc) {
INT len = lstrlenW (lpSrc) + 1;
@@ -521,7 +521,7 @@
{
HDSA hdsa;
- TRACE (commctrl, "(size=%d grow=%d)\n", nSize, nGrow);
+ TRACE("(size=%d grow=%d)\n", nSize, nGrow);
hdsa = (HDSA)COMCTL32_Alloc (sizeof(DSA));
if (hdsa)
@@ -551,7 +551,7 @@
BOOL WINAPI
DSA_Destroy (const HDSA hdsa)
{
- TRACE (commctrl, "(%p)\n", hdsa);
+ TRACE("(%p)\n", hdsa);
if (!hdsa)
return FALSE;
@@ -581,7 +581,7 @@
{
LPVOID pSrc;
- TRACE (commctrl, "(%p %d %p)\n", hdsa, nIndex, pDest);
+ TRACE("(%p %d %p)\n", hdsa, nIndex, pDest);
if (!hdsa)
return FALSE;
@@ -614,7 +614,7 @@
{
LPVOID pSrc;
- TRACE (commctrl, "(%p %d)\n", hdsa, nIndex);
+ TRACE("(%p %d)\n", hdsa, nIndex);
if (!hdsa)
return NULL;
@@ -623,7 +623,7 @@
pSrc = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
- TRACE (commctrl, "-- ret=%p\n", pSrc);
+ TRACE("-- ret=%p\n", pSrc);
return pSrc;
}
@@ -650,7 +650,7 @@
INT nSize, nNewItems;
LPVOID pDest, lpTemp;
- TRACE (commctrl, "(%p %d %p)\n", hdsa, nIndex, pSrc);
+ TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
if ((!hdsa) || nIndex < 0)
return FALSE;
@@ -679,7 +679,7 @@
/* put the new entry in */
pDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
- TRACE (commctrl, "-- move dest=%p src=%p size=%d\n",
+ TRACE("-- move dest=%p src=%p size=%d\n",
pDest, pSrc, hdsa->nItemSize);
memmove (pDest, pSrc, hdsa->nItemSize);
@@ -707,7 +707,7 @@
LPVOID lpTemp, lpDest;
LPDWORD p;
- TRACE(commctrl, "(%p %d %p)\n", hdsa, nIndex, pSrc);
+ TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
if ((!hdsa) || nIndex < 0)
return -1;
@@ -715,9 +715,9 @@
for (i = 0; i < hdsa->nItemSize; i += 4) {
p = *(DWORD**)((char *) pSrc + i);
if (IsBadStringPtrA ((char*)p, 256))
- TRACE (commctrl, "-- %d=%p\n", i, (DWORD*)p);
+ TRACE("-- %d=%p\n", i, (DWORD*)p);
else
- TRACE (commctrl, "-- %d=%p [%s]\n", i, p, debugstr_a((char*)p));
+ TRACE("-- %d=%p [%s]\n", i, p, debugstr_a((char*)p));
}
/* when nIndex > nItemCount then append */
@@ -742,7 +742,7 @@
lpTemp = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
lpDest = (char *) lpTemp + hdsa->nItemSize;
nSize = (hdsa->nItemCount - nIndex) * hdsa->nItemSize;
- TRACE (commctrl, "-- move dest=%p src=%p size=%d\n",
+ TRACE("-- move dest=%p src=%p size=%d\n",
lpDest, lpTemp, nSize);
memmove (lpDest, lpTemp, nSize);
}
@@ -750,7 +750,7 @@
/* ok, we can put the new Item in */
hdsa->nItemCount++;
lpDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
- TRACE (commctrl, "-- move dest=%p src=%p size=%d\n",
+ TRACE("-- move dest=%p src=%p size=%d\n",
lpDest, pSrc, hdsa->nItemSize);
memmove (lpDest, pSrc, hdsa->nItemSize);
@@ -776,7 +776,7 @@
LPVOID lpDest,lpSrc;
INT nSize;
- TRACE (commctrl, "(%p %d)\n", hdsa, nIndex);
+ TRACE("(%p %d)\n", hdsa, nIndex);
if (!hdsa)
return -1;
@@ -788,7 +788,7 @@
lpDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
lpSrc = (char *) lpDest + hdsa->nItemSize;
nSize = hdsa->nItemSize * (hdsa->nItemCount - nIndex - 1);
- TRACE (commctrl, "-- move dest=%p src=%p size=%d\n",
+ TRACE("-- move dest=%p src=%p size=%d\n",
lpDest, lpSrc, nSize);
memmove (lpDest, lpSrc, nSize);
}
@@ -827,7 +827,7 @@
BOOL WINAPI
DSA_DeleteAllItems (const HDSA hdsa)
{
- TRACE (commctrl, "(%p)\n", hdsa);
+ TRACE("(%p)\n", hdsa);
if (!hdsa)
return FALSE;
@@ -863,7 +863,7 @@
{
HDPA hdpa;
- TRACE (commctrl, "(%d)\n", nGrow);
+ TRACE("(%d)\n", nGrow);
hdpa = (HDPA)COMCTL32_Alloc (sizeof(DPA));
if (hdpa) {
@@ -874,7 +874,7 @@
(LPVOID*)COMCTL32_Alloc (hdpa->nMaxCount * sizeof(LPVOID));
}
- TRACE (commctrl, "-- %p\n", hdpa);
+ TRACE("-- %p\n", hdpa);
return hdpa;
}
@@ -894,7 +894,7 @@
BOOL WINAPI
DPA_Destroy (const HDPA hdpa)
{
- TRACE (commctrl, "(%p)\n", hdpa);
+ TRACE("(%p)\n", hdpa);
if (!hdpa)
return FALSE;
@@ -923,7 +923,7 @@
BOOL WINAPI
DPA_Grow (const HDPA hdpa, INT nGrow)
{
- TRACE (commctrl, "(%p %d)\n", hdpa, nGrow);
+ TRACE("(%p %d)\n", hdpa, nGrow);
if (!hdpa)
return FALSE;
@@ -963,7 +963,7 @@
if (!hdpa)
return NULL;
- TRACE (commctrl, "(%p %p)\n", hdpa, hdpaNew);
+ TRACE("(%p %p)\n", hdpa, hdpaNew);
if (!hdpaNew) {
/* create a new DPA */
@@ -1017,7 +1017,7 @@
LPVOID WINAPI
DPA_GetPtr (const HDPA hdpa, INT i)
{
- TRACE (commctrl, "(%p %d)\n", hdpa, i);
+ TRACE("(%p %d)\n", hdpa, i);
if (!hdpa)
return NULL;
@@ -1026,7 +1026,7 @@
if ((i < 0) || (i >= hdpa->nItemCount))
return NULL;
- TRACE (commctrl, "-- %p\n", hdpa->ptrs[i]);
+ TRACE("-- %p\n", hdpa->ptrs[i]);
return hdpa->ptrs[i];
}
@@ -1084,7 +1084,7 @@
INT nNewItems, nSize, nIndex = 0;
LPVOID *lpTemp, *lpDest;
- TRACE (commctrl, "(%p %d %p)\n", hdpa, i, p);
+ TRACE("(%p %d %p)\n", hdpa, i, p);
if ((!hdpa) || (i < 0))
return -1;
@@ -1100,7 +1100,7 @@
}
else {
if (hdpa->nItemCount >= hdpa->nMaxCount) {
- TRACE (commctrl, "-- resizing\n");
+ TRACE("-- resizing\n");
nNewItems = hdpa->nMaxCount + hdpa->nGrow;
nSize = nNewItems * sizeof(LPVOID);
@@ -1114,14 +1114,14 @@
if (i >= hdpa->nItemCount) {
nIndex = hdpa->nItemCount;
- TRACE (commctrl, "-- appending at %d\n", nIndex);
+ TRACE("-- appending at %d\n", nIndex);
}
else {
- TRACE (commctrl, "-- inserting at %d\n", i);
+ TRACE("-- inserting at %d\n", i);
lpTemp = hdpa->ptrs + i;
lpDest = lpTemp + 1;
nSize = (hdpa->nItemCount - i) * sizeof(LPVOID);
- TRACE (commctrl, "-- move dest=%p src=%p size=%x\n",
+ TRACE("-- move dest=%p src=%p size=%x\n",
lpDest, lpTemp, nSize);
memmove (lpDest, lpTemp, nSize);
nIndex = i;
@@ -1156,7 +1156,7 @@
{
LPVOID *lpTemp;
- TRACE (commctrl, "(%p %d %p)\n", hdpa, i, p);
+ TRACE("(%p %d %p)\n", hdpa, i, p);
if ((!hdpa) || i < 0)
return FALSE;
@@ -1210,7 +1210,7 @@
LPVOID *lpDest, *lpSrc, lpTemp = NULL;
INT nSize;
- TRACE (commctrl, "(%p %d)\n", hdpa, i);
+ TRACE("(%p %d)\n", hdpa, i);
if ((!hdpa) || i < 0 || i >= hdpa->nItemCount)
return NULL;
@@ -1222,7 +1222,7 @@
lpDest = hdpa->ptrs + i;
lpSrc = lpDest + 1;
nSize = (hdpa->nItemCount - i - 1) * sizeof(LPVOID);
- TRACE (commctrl,"-- move dest=%p src=%p size=%x\n",
+ TRACE("-- move dest=%p src=%p size=%x\n",
lpDest, lpSrc, nSize);
memmove (lpDest, lpSrc, nSize);
}
@@ -1262,7 +1262,7 @@
BOOL WINAPI
DPA_DeleteAllPtrs (const HDPA hdpa)
{
- TRACE (commctrl, "(%p)\n", hdpa);
+ TRACE("(%p)\n", hdpa);
if (!hdpa)
return FALSE;
@@ -1302,7 +1302,7 @@
LPVOID t, v;
INT i, j;
- TRACE (commctrl, "l=%i r=%i\n", l, r);
+ TRACE("l=%i r=%i\n", l, r);
i = l;
j = r;
@@ -1343,7 +1343,7 @@
if (!hdpa || !pfnCompare)
return FALSE;
- TRACE (commctrl, "(%p %p 0x%lx)\n", hdpa, pfnCompare, lParam);
+ TRACE("(%p %p 0x%lx)\n", hdpa, pfnCompare, lParam);
if ((hdpa->nItemCount > 1) && (hdpa->ptrs))
DPA_QuickSort (hdpa->ptrs, 0, hdpa->nItemCount - 1,
@@ -1383,7 +1383,7 @@
if (!hdpa || !pfnCompare || !pFind)
return -1;
- TRACE (commctrl, "(%p %p %d %p 0x%08lx 0x%08x)\n",
+ TRACE("(%p %p %d %p 0x%08lx 0x%08x)\n",
hdpa, pFind, nStart, pfnCompare, lParam, uOptions);
if (uOptions & DPAS_SORTED) {
@@ -1391,7 +1391,7 @@
INT l, r, x, n;
LPVOID *lpPtr;
- TRACE (commctrl, "binary search\n");
+ TRACE("binary search\n");
l = (nStart == -1) ? 0 : nStart;
r = hdpa->nItemCount - 1;
@@ -1404,18 +1404,18 @@
else
l = x + 1;
if (n == 0) {
- TRACE (commctrl, "-- ret=%d\n", n);
+ TRACE("-- ret=%d\n", n);
return n;
}
}
if (uOptions & DPAS_INSERTBEFORE) {
- TRACE (commctrl, "-- ret=%d\n", r);
+ TRACE("-- ret=%d\n", r);
return r;
}
if (uOptions & DPAS_INSERTAFTER) {
- TRACE (commctrl, "-- ret=%d\n", l);
+ TRACE("-- ret=%d\n", l);
return l;
}
}
@@ -1424,19 +1424,19 @@
LPVOID *lpPtr;
INT nIndex;
- TRACE (commctrl, "linear search\n");
+ TRACE("linear search\n");
nIndex = (nStart == -1)? 0 : nStart;
lpPtr = hdpa->ptrs;
for (; nIndex < hdpa->nItemCount; nIndex++) {
if ((pfnCompare)(pFind, lpPtr[nIndex], lParam) == 0) {
- TRACE (commctrl, "-- ret=%d\n", nIndex);
+ TRACE("-- ret=%d\n", nIndex);
return nIndex;
}
}
}
- TRACE (commctrl, "-- not found: ret=-1\n");
+ TRACE("-- not found: ret=-1\n");
return -1;
}
@@ -1460,7 +1460,7 @@
{
HDPA hdpa;
- TRACE (commctrl, "(%d 0x%x)\n", nGrow, hHeap);
+ TRACE("(%d 0x%x)\n", nGrow, hHeap);
if (hHeap)
hdpa = (HDPA)HeapAlloc (hHeap, HEAP_ZERO_MEMORY, sizeof(DPA));
@@ -1476,7 +1476,7 @@
hdpa->nMaxCount * sizeof(LPVOID));
}
- TRACE (commctrl, "-- %p\n", hdpa);
+ TRACE("-- %p\n", hdpa);
return hdpa;
}
@@ -1508,7 +1508,7 @@
LPNMHDR lpNmh = NULL;
UINT idFrom = 0;
- TRACE (commctrl, "(0x%04x 0x%04x %d %p 0x%08lx)\n",
+ TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
lpNotify->hwndFrom, lpNotify->hwndTo, uCode, lpHdr,
lpNotify->dwParam5);
@@ -1560,7 +1560,7 @@
{
NOTIFYDATA notify;
- TRACE (commctrl, "(0x%04x 0x%04x %d %p)\n",
+ TRACE("(0x%04x 0x%04x %d %p)\n",
hwndFrom, hwndTo, uCode, lpHdr);
notify.hwndFrom = hwndFrom;
@@ -1594,7 +1594,7 @@
NOTIFYDATA notify;
HWND hwndNotify;
- TRACE (commctrl, "(0x%04x 0x%04x %d %p 0x%08lx)\n",
+ TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
hwndFrom, hwndTo, uCode, lpHdr, dwParam5);
hwndNotify = hwndTo;
@@ -1690,7 +1690,7 @@
{
INT i;
- TRACE (commctrl, "(%p %p %08lx)\n", hdpa, enumProc, lParam);
+ TRACE("(%p %p %08lx)\n", hdpa, enumProc, lParam);
if (!hdpa)
return;
@@ -1724,7 +1724,7 @@
BOOL WINAPI
DPA_DestroyCallback (const HDPA hdpa, DPAENUMPROC enumProc, LPARAM lParam)
{
- TRACE (commctrl, "(%p %p %08lx)\n", hdpa, enumProc, lParam);
+ TRACE("(%p %p %08lx)\n", hdpa, enumProc, lParam);
DPA_EnumCallback (hdpa, enumProc, lParam);
@@ -1751,7 +1751,7 @@
{
INT i;
- TRACE (commctrl, "(%p %p %08lx)\n", hdsa, enumProc, lParam);
+ TRACE("(%p %p %08lx)\n", hdsa, enumProc, lParam);
if (!hdsa)
return;
@@ -1786,7 +1786,7 @@
BOOL WINAPI
DSA_DestroyCallback (const HDSA hdsa, DSAENUMPROC enumProc, LPARAM lParam)
{
- TRACE (commctrl, "(%p %p %08lx)\n", hdsa, enumProc, lParam);
+ TRACE("(%p %p %08lx)\n", hdsa, enumProc, lParam);
DSA_EnumCallback (hdsa, enumProc, lParam);
@@ -1884,7 +1884,7 @@
DWORD WINAPI DPA_LoadStream(HDPA *hDpa, DWORD pfnDpaLoadCallback, DWORD param3, DWORD param4)
{
- FIXME(commctrl, "(%p %lx %lx %lx): partial stub!\n", hDpa, pfnDpaLoadCallback, param3, param4);
+ FIXME("(%p %lx %lx %lx): partial stub!\n", hDpa, pfnDpaLoadCallback, param3, param4);
*hDpa = DPA_Create(8);
@@ -1899,7 +1899,7 @@
DWORD WINAPI DPA_SaveStream(DWORD param1, DWORD param2, DWORD param3, DWORD param4)
{
- FIXME(commctrl, "(%lx %lx %lx %lx): stub!\n", param1, param2, param3, param4);
+ FIXME("(%lx %lx %lx %lx): stub!\n", param1, param2, param3, param4);
return(0);
}
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 6f530c6..f2526c2 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -29,7 +29,7 @@
#include "trackbar.h"
#include "treeview.h"
#include "updown.h"
-#include "debug.h"
+#include "debugtools.h"
#include "winerror.h"
DEFAULT_DEBUG_CHANNEL(commctrl)
@@ -57,7 +57,7 @@
BOOL WINAPI
COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- TRACE (commctrl, "%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+ TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
@@ -68,11 +68,11 @@
/* create private heap */
COMCTL32_hHeap = HeapCreate (0, 0x10000, 0);
- TRACE (commctrl, "Heap created: 0x%x\n", COMCTL32_hHeap);
+ TRACE("Heap created: 0x%x\n", COMCTL32_hHeap);
/* add global subclassing atom (used by 'tooltip' and 'updown') */
COMCTL32_aSubclass = (LPSTR)(DWORD)GlobalAddAtomA ("CC32SubclassInfo");
- TRACE (commctrl, "Subclassing atom added: %p\n",
+ TRACE("Subclassing atom added: %p\n",
COMCTL32_aSubclass);
/* register all Win95 common control classes */
@@ -120,13 +120,13 @@
/* delete global subclassing atom */
GlobalDeleteAtom (LOWORD(COMCTL32_aSubclass));
- TRACE (commctrl, "Subclassing atom deleted: %p\n",
+ TRACE("Subclassing atom deleted: %p\n",
COMCTL32_aSubclass);
COMCTL32_aSubclass = (LPSTR)NULL;
/* destroy private heap */
HeapDestroy (COMCTL32_hHeap);
- TRACE (commctrl, "Heap destroyed: 0x%x\n", COMCTL32_hHeap);
+ TRACE("Heap destroyed: 0x%x\n", COMCTL32_hHeap);
COMCTL32_hHeap = (HANDLE)NULL;
}
break;
@@ -174,12 +174,12 @@
switch (uMsg) {
case WM_MENUSELECT:
- TRACE (commctrl, "WM_MENUSELECT wParam=0x%X lParam=0x%lX\n",
+ TRACE("WM_MENUSELECT wParam=0x%X lParam=0x%lX\n",
wParam, lParam);
if ((HIWORD(wParam) == 0xFFFF) && (lParam == 0)) {
/* menu was closed */
- TRACE (commctrl, "menu was closed!\n");
+ TRACE("menu was closed!\n");
SendMessageA (hwndStatus, SB_SIMPLE, FALSE, 0);
}
else {
@@ -188,7 +188,7 @@
uMenuID = (UINT)*(lpwIDs+1);
else
uMenuID = (UINT)LOWORD(wParam);
- TRACE (commctrl, "uMenuID = %u\n", uMenuID);
+ TRACE("uMenuID = %u\n", uMenuID);
if (uMenuID) {
CHAR szText[256];
@@ -204,7 +204,7 @@
break;
default:
- FIXME (commctrl, "Invalid Message 0x%x!\n", uMsg);
+ FIXME("Invalid Message 0x%x!\n", uMsg);
break;
}
}
@@ -245,7 +245,7 @@
{
LPINT lpMenuId;
- TRACE (commctrl, "%x, %x, %p\n", hwnd, uFlags, lpInfo);
+ TRACE("%x, %x, %p\n", hwnd, uFlags, lpInfo);
if (lpInfo == NULL)
return FALSE;
@@ -307,7 +307,7 @@
INT *lpRun;
HWND hwndCtrl;
- TRACE (commctrl, "(0x%08lx 0x%08lx 0x%08lx)\n",
+ TRACE("(0x%08lx 0x%08lx 0x%08lx)\n",
(DWORD)hwnd, (DWORD)lpRect, (DWORD)lpInfo);
GetClientRect (hwnd, lpRect);
@@ -320,7 +320,7 @@
lpRun++;
hwndCtrl = GetDlgItem (hwnd, *lpRun);
if (GetWindowLongA (hwndCtrl, GWL_STYLE) & WS_VISIBLE) {
- TRACE (commctrl, "control id 0x%x\n", *lpRun);
+ TRACE("control id 0x%x\n", *lpRun);
GetWindowRect (hwndCtrl, &rcCtrl);
MapWindowPoints ((HWND)0, hwnd, (LPPOINT)&rcCtrl, 2);
SubtractRect (lpRect, lpRect, &rcCtrl);
@@ -539,7 +539,7 @@
if (lpInitCtrls->dwSize != sizeof(INITCOMMONCONTROLSEX))
return FALSE;
- TRACE(commctrl,"(0x%08lx)\n", lpInitCtrls->dwICC);
+ TRACE("(0x%08lx)\n", lpInitCtrls->dwICC);
for (cCount = 0; cCount < 32; cCount++) {
dwMask = 1 << cCount;
@@ -585,7 +585,7 @@
break;
default:
- FIXME (commctrl, "Unknown class! dwICC=0x%lX\n", dwMask);
+ FIXME("Unknown class! dwICC=0x%lX\n", dwMask);
break;
}
}
@@ -819,7 +819,7 @@
COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi)
{
if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) {
- WARN (commctrl, "wrong DLLVERSIONINFO size from app");
+ WARN("wrong DLLVERSIONINFO size from app");
return E_INVALIDARG;
}
@@ -828,7 +828,7 @@
pdvi->dwBuildNumber = 3110;
pdvi->dwPlatformID = 1;
- TRACE (commctrl, "%lu.%lu.%lu.%lu\n",
+ TRACE("%lu.%lu.%lu.%lu\n",
pdvi->dwMajorVersion, pdvi->dwMinorVersion,
pdvi->dwBuildNumber, pdvi->dwPlatformID);
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 94d6be4..84da338 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -17,7 +17,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "datetime.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(datetime)
@@ -37,7 +37,7 @@
/* allocate memory for info structure */
infoPtr = (DATETIME_INFO *)COMCTL32_Alloc (sizeof(DATETIME_INFO));
if (infoPtr == NULL) {
- ERR (datetime, "could not allocate info memory!\n");
+ ERR("could not allocate info memory!\n");
return 0;
}
@@ -73,47 +73,47 @@
{
case DTM_GETSYSTEMTIME:
- FIXME (datetime, "Unimplemented msg DTM_GETSYSTEMTIME\n");
+ FIXME("Unimplemented msg DTM_GETSYSTEMTIME\n");
return GDT_VALID;
case DTM_SETSYSTEMTIME:
- FIXME (datetime, "Unimplemented msg DTM_SETSYSTEMTIME\n");
+ FIXME("Unimplemented msg DTM_SETSYSTEMTIME\n");
return 1;
case DTM_GETRANGE:
- FIXME (datetime, "Unimplemented msg DTM_GETRANGE\n");
+ FIXME("Unimplemented msg DTM_GETRANGE\n");
return 0;
case DTM_SETRANGE:
- FIXME (datetime, "Unimplemented msg DTM_SETRANGE\n");
+ FIXME("Unimplemented msg DTM_SETRANGE\n");
return 1;
case DTM_SETFORMATA:
- FIXME (datetime, "Unimplemented msg DTM_SETFORMAT32A\n");
+ FIXME("Unimplemented msg DTM_SETFORMAT32A\n");
return 1;
case DTM_SETFORMATW:
- FIXME (datetime, "Unimplemented msg DTM_SETFORMAT32W\n");
+ FIXME("Unimplemented msg DTM_SETFORMAT32W\n");
return 1;
case DTM_SETMCCOLOR:
- FIXME (datetime, "Unimplemented msg DTM_SETMCCOLOR\n");
+ FIXME("Unimplemented msg DTM_SETMCCOLOR\n");
return 0;
case DTM_GETMCCOLOR:
- FIXME (datetime, "Unimplemented msg DTM_GETMCCOLOR\n");
+ FIXME("Unimplemented msg DTM_GETMCCOLOR\n");
return 0;
case DTM_GETMONTHCAL:
- FIXME (datetime, "Unimplemented msg DTM_GETMONTHCAL\n");
+ FIXME("Unimplemented msg DTM_GETMONTHCAL\n");
return 0;
case DTM_SETMCFONT:
- FIXME (datetime, "Unimplemented msg DTM_SETMCFONT\n");
+ FIXME("Unimplemented msg DTM_SETMCFONT\n");
return 0;
case DTM_GETMCFONT:
- FIXME (datetime, "Unimplemented msg DTM_GETMCFONT\n");
+ FIXME("Unimplemented msg DTM_GETMCFONT\n");
return 0;
case WM_CREATE:
@@ -124,7 +124,7 @@
default:
if (uMsg >= WM_USER)
- ERR (datetime, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c
index 43fe498..d3958f9 100644
--- a/dlls/comctl32/draglist.c
+++ b/dlls/comctl32/draglist.c
@@ -13,14 +13,14 @@
*/
#include "commctrl.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(commctrl)
BOOL WINAPI MakeDragList (HWND hwndLB)
{
- FIXME (commctrl, "(0x%x)\n", hwndLB);
+ FIXME("(0x%x)\n", hwndLB);
return FALSE;
@@ -29,7 +29,7 @@
VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem)
{
- FIXME (commctrl, "(0x%x 0x%x %d)\n", hwndParent, hwndLB, nItem);
+ FIXME("(0x%x 0x%x %d)\n", hwndParent, hwndLB, nItem);
}
@@ -37,7 +37,7 @@
INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll)
{
- FIXME (commctrl, "(0x%x %ld x %ld %s)\n",
+ FIXME("(0x%x %ld x %ld %s)\n",
hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 23b4182..97bd3e9 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -24,7 +24,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "header.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(header)
@@ -309,7 +309,7 @@
if (infoPtr->uNumItem == 0) {
*pFlags |= HHT_NOWHERE;
*pItem = 1;
- TRACE (header, "NOWHERE\n");
+ TRACE("NOWHERE\n");
return;
}
else {
@@ -325,7 +325,7 @@
if (width <= 2 * DIVIDER_WIDTH) {
*pFlags |= HHT_ONHEADER;
*pItem = iCount;
- TRACE (header, "ON HEADER %d\n", iCount);
+ TRACE("ON HEADER %d\n", iCount);
return;
}
if (iCount > 0) {
@@ -335,13 +335,13 @@
if (bNoWidth) {
*pFlags |= HHT_ONDIVOPEN;
*pItem = iCount - 1;
- TRACE (header, "ON DIVOPEN %d\n", *pItem);
+ TRACE("ON DIVOPEN %d\n", *pItem);
return;
}
else {
*pFlags |= HHT_ONDIVIDER;
*pItem = iCount - 1;
- TRACE (header, "ON DIVIDER %d\n", *pItem);
+ TRACE("ON DIVIDER %d\n", *pItem);
return;
}
}
@@ -351,13 +351,13 @@
if (PtInRect (&rcTest, *lpPt)) {
*pFlags |= HHT_ONDIVIDER;
*pItem = iCount;
- TRACE (header, "ON DIVIDER %d\n", *pItem);
+ TRACE("ON DIVIDER %d\n", *pItem);
return;
}
*pFlags |= HHT_ONHEADER;
*pItem = iCount;
- TRACE (header, "ON HEADER %d\n", iCount);
+ TRACE("ON HEADER %d\n", iCount);
return;
}
}
@@ -370,45 +370,45 @@
if (bNoWidth) {
*pFlags |= HHT_ONDIVOPEN;
*pItem = infoPtr->uNumItem - 1;
- TRACE (header, "ON DIVOPEN %d\n", *pItem);
+ TRACE("ON DIVOPEN %d\n", *pItem);
return;
}
else {
*pFlags |= HHT_ONDIVIDER;
*pItem = infoPtr->uNumItem-1;
- TRACE (header, "ON DIVIDER %d\n", *pItem);
+ TRACE("ON DIVIDER %d\n", *pItem);
return;
}
}
*pFlags |= HHT_NOWHERE;
*pItem = 1;
- TRACE (header, "NOWHERE\n");
+ TRACE("NOWHERE\n");
return;
}
}
else {
if (lpPt->x < rect.left) {
- TRACE (header, "TO LEFT\n");
+ TRACE("TO LEFT\n");
*pFlags |= HHT_TOLEFT;
}
else if (lpPt->x > rect.right) {
- TRACE (header, "TO LEFT\n");
+ TRACE("TO LEFT\n");
*pFlags |= HHT_TORIGHT;
}
if (lpPt->y < rect.top) {
- TRACE (header, "ABOVE\n");
+ TRACE("ABOVE\n");
*pFlags |= HHT_ABOVE;
}
else if (lpPt->y > rect.bottom) {
- TRACE (header, "BELOW\n");
+ TRACE("BELOW\n");
*pFlags |= HHT_BELOW;
}
}
*pItem = 1;
- TRACE (header, "flags=0x%X\n", *pFlags);
+ TRACE("flags=0x%X\n", *pFlags);
return;
}
@@ -495,7 +495,7 @@
static LRESULT
HEADER_CreateDragImage (HWND hwnd, WPARAM wParam)
{
- FIXME (header, "empty stub!\n");
+ FIXME("empty stub!\n");
return 0;
}
@@ -507,13 +507,13 @@
INT iItem = (INT)wParam;
HDC hdc;
- TRACE(header, "[iItem=%d]\n", iItem);
+ TRACE("[iItem=%d]\n", iItem);
if ((iItem < 0) || (iItem >= (INT)infoPtr->uNumItem))
return FALSE;
if (infoPtr->uNumItem == 1) {
- TRACE(header, "Simple delete!\n");
+ TRACE("Simple delete!\n");
if (infoPtr->items[0].pszText)
COMCTL32_Free (infoPtr->items[0].pszText);
COMCTL32_Free (infoPtr->items);
@@ -522,7 +522,7 @@
}
else {
HEADER_ITEM *oldItems = infoPtr->items;
- TRACE(header, "Complex delete! [iItem=%d]\n", iItem);
+ TRACE("Complex delete! [iItem=%d]\n", iItem);
if (infoPtr->items[iItem].pszText)
COMCTL32_Free (infoPtr->items[iItem].pszText);
@@ -576,7 +576,7 @@
if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
return FALSE;
- TRACE (header, "[nItem=%d]\n", nItem);
+ TRACE("[nItem=%d]\n", nItem);
if (phdi->mask == 0)
return TRUE;
@@ -624,7 +624,7 @@
if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
return FALSE;
- TRACE (header, "[nItem=%d]\n", nItem);
+ TRACE("[nItem=%d]\n", nItem);
if (phdi->mask == 0)
return TRUE;
@@ -905,7 +905,7 @@
lpLayout->pwpos->cy = infoPtr->nHeight;
lpLayout->pwpos->flags = SWP_NOZORDER;
- TRACE (header, "Layout x=%d y=%d cx=%d cy=%d\n",
+ TRACE("Layout x=%d y=%d cx=%d cy=%d\n",
lpLayout->pwpos->x, lpLayout->pwpos->y,
lpLayout->pwpos->cx, lpLayout->pwpos->cy);
@@ -950,7 +950,7 @@
if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
return FALSE;
- TRACE (header, "[nItem=%d]\n", nItem);
+ TRACE("[nItem=%d]\n", nItem);
if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, nItem))
return FALSE;
@@ -1015,7 +1015,7 @@
if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
return FALSE;
- TRACE (header, "[nItem=%d]\n", nItem);
+ TRACE("[nItem=%d]\n", nItem);
if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, nItem))
return FALSE;
@@ -1198,7 +1198,7 @@
HEADER_RefreshItem (hwnd, hdc, nItem);
ReleaseDC (hwnd, hdc);
- TRACE (header, "Pressed item %d!\n", nItem);
+ TRACE("Pressed item %d!\n", nItem);
}
else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) {
if (!(HEADER_SendHeaderNotify (hwnd, HDN_BEGINTRACKA, nItem))) {
@@ -1216,7 +1216,7 @@
ReleaseDC (hwnd, hdc);
}
- TRACE (header, "Begin tracking item %d!\n", nItem);
+ TRACE("Begin tracking item %d!\n", nItem);
}
}
@@ -1247,11 +1247,11 @@
HEADER_SendClickNotify (hwnd, HDN_ITEMCLICKA, infoPtr->iMoveItem);
}
- TRACE (header, "Released item %d!\n", infoPtr->iMoveItem);
+ TRACE("Released item %d!\n", infoPtr->iMoveItem);
infoPtr->bPressed = FALSE;
}
else if (infoPtr->bTracking) {
- TRACE (header, "End tracking item %d!\n", infoPtr->iMoveItem);
+ TRACE("End tracking item %d!\n", infoPtr->iMoveItem);
infoPtr->bTracking = FALSE;
HEADER_SendHeaderNotify (hwnd, HDN_ENDTRACKA, infoPtr->iMoveItem);
@@ -1321,7 +1321,7 @@
HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem);
ReleaseDC (hwnd, hdc);
- TRACE (header, "Moving pressed item %d!\n", infoPtr->iMoveItem);
+ TRACE("Moving pressed item %d!\n", infoPtr->iMoveItem);
}
else if (infoPtr->bTracking) {
if (dwStyle & HDS_FULLDRAG) {
@@ -1353,12 +1353,12 @@
}
HEADER_SendHeaderNotify (hwnd, HDN_TRACKA, infoPtr->iMoveItem);
- TRACE (header, "Tracking item %d!\n", infoPtr->iMoveItem);
+ TRACE("Tracking item %d!\n", infoPtr->iMoveItem);
}
}
if ((dwStyle & HDS_BUTTONS) && (dwStyle & HDS_HOTTRACK)) {
- FIXME (header, "hot track support!\n");
+ FIXME("hot track support!\n");
}
return 0;
@@ -1394,7 +1394,7 @@
UINT flags;
INT nItem;
- TRACE (header, "code=0x%X id=0x%X\n", LOWORD(lParam), HIWORD(lParam));
+ TRACE("code=0x%X id=0x%X\n", LOWORD(lParam), HIWORD(lParam));
GetCursorPos (&pt);
ScreenToClient (hwnd, &pt);
@@ -1542,7 +1542,7 @@
default:
if (msg >= WM_USER)
- ERR (header, "unknown msg %04x wp=%04x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%04x lp=%08lx\n",
msg, wParam, lParam );
return DefWindowProcA (hwnd, msg, wParam, lParam);
}
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
index 8c79291..ecc6ab0 100644
--- a/dlls/comctl32/hotkey.c
+++ b/dlls/comctl32/hotkey.c
@@ -16,7 +16,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "hotkey.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(hotkey)
@@ -117,11 +117,11 @@
case VK_SHIFT:
case VK_CONTROL:
case VK_MENU:
- FIXME (hotkey, "modifier key pressed!\n");
+ FIXME("modifier key pressed!\n");
break;
default:
- FIXME (hotkey, " %d\n", wParam);
+ FIXME(" %d\n", wParam);
break;
}
@@ -134,7 +134,7 @@
{
/* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd); */
- FIXME (hotkey, " %d\n", wParam);
+ FIXME(" %d\n", wParam);
return 0;
}
@@ -217,7 +217,7 @@
if (LOWORD(lParam)) {
- FIXME (hotkey, "force redraw!\n");
+ FIXME("force redraw!\n");
}
@@ -242,11 +242,11 @@
case VK_SHIFT:
case VK_CONTROL:
case VK_MENU:
- FIXME (hotkey, "modifier key pressed!\n");
+ FIXME("modifier key pressed!\n");
break;
default:
- FIXME (hotkey, " %d\n", wParam);
+ FIXME(" %d\n", wParam);
break;
}
@@ -259,7 +259,7 @@
{
/* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd); */
- FIXME (hotkey, " %d\n", wParam);
+ FIXME(" %d\n", wParam);
return 0;
}
@@ -321,7 +321,7 @@
default:
if (uMsg >= WM_USER)
- ERR (hotkey, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 9fca3c3..810c615 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -34,7 +34,7 @@
#include "wine/obj_storage.h"
#include "imagelist.h"
#include "commctrl.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(imagelist)
@@ -82,7 +82,7 @@
HBITMAP hbmNewBitmap;
INT nNewWidth, nNewCount;
- TRACE(imagelist, "Create expanded bitmaps!\n");
+ TRACE("Create expanded bitmaps!\n");
nNewCount = himl->cCurImage + nImageCount + himl->cGrow;
nNewWidth = nNewCount * himl->cx;
@@ -93,7 +93,7 @@
hbmNewBitmap =
CreateBitmap (nNewWidth, himl->cy, 1, himl->uBitsPixel, NULL);
if (hbmNewBitmap == 0)
- ERR (imagelist, "creating new image bitmap!\n");
+ ERR("creating new image bitmap!\n");
SelectObject (hdcImageList, himl->hbmImage);
SelectObject (hdcBitmap, hbmNewBitmap);
@@ -108,7 +108,7 @@
CreateBitmap (nNewWidth, himl->cy, 1, 1, NULL);
if (hbmNewBitmap == 0)
- ERR (imagelist, "creating new mask bitmap!");
+ ERR("creating new mask bitmap!");
SelectObject (hdcImageList, himl->hbmMask);
SelectObject (hdcBitmap, hbmNewBitmap);
@@ -309,7 +309,7 @@
{
HDC hdcSrc, hdcDst;
- FIXME(imagelist, "partially implemented!\n");
+ FIXME("partially implemented!\n");
if (himlTrack == NULL)
return FALSE;
@@ -321,7 +321,7 @@
ImageList_Create (himlTrack->cx, himlTrack->cy,
himlTrack->flags, 1, 1);
if (himlInternalDrag == NULL) {
- ERR(imagelist, "Error creating drag image list!\n");
+ ERR("Error creating drag image list!\n");
return FALSE;
}
@@ -381,7 +381,7 @@
{
HDC hdcSrc, hdcDst;
- TRACE(imagelist, "iDst=%d iSrc=%d\n", iDst, iSrc);
+ TRACE("iDst=%d iSrc=%d\n", iDst, iSrc);
if ((himlSrc == NULL) || (himlDst == NULL))
return FALSE;
@@ -509,7 +509,7 @@
static WORD aBitBlend50[] =
{0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA};
- TRACE (imagelist, "(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow);
+ TRACE("(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow);
himl = (HIMAGELIST)COMCTL32_Alloc (sizeof(struct _IMAGELIST));
if (!himl)
@@ -533,13 +533,13 @@
himl->uBitsPixel = (UINT)GetDeviceCaps (hdc, BITSPIXEL);
DeleteDC (hdc);
- TRACE(imagelist, "Image: %d Bits per Pixel\n", himl->uBitsPixel);
+ TRACE("Image: %d Bits per Pixel\n", himl->uBitsPixel);
himl->hbmImage =
CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
1, himl->uBitsPixel, NULL);
if (himl->hbmImage == 0) {
- ERR(imagelist, "Error creating image bitmap!\n");
+ ERR("Error creating image bitmap!\n");
return NULL;
}
@@ -547,7 +547,7 @@
himl->hbmMask = CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
1, 1, NULL);
if (himl->hbmMask == 0) {
- ERR(imagelist, "Error creating mask bitmap!\n");
+ ERR("Error creating mask bitmap!\n");
if (himl->hbmImage)
DeleteObject (himl->hbmImage);
return NULL;
@@ -732,8 +732,8 @@
{
HDC hdcDrag;
- FIXME (imagelist, "semi-stub!\n");
- TRACE (imagelist, "bShow=0x%X!\n", bShow);
+ FIXME("semi-stub!\n");
+ TRACE("bShow=0x%X!\n", bShow);
hdcDrag = GetDCEx (hwndInternalDrag, 0,
DCX_WINDOW | DCX_CACHE | DCX_LOCKWINDOWUPDATE);
@@ -1069,7 +1069,7 @@
HDC hdcSrc, hdcDst;
if (himlSrc == NULL) {
- ERR (imagelist, "Invalid image list handle!\n");
+ ERR("Invalid image list handle!\n");
return NULL;
}
@@ -1120,7 +1120,7 @@
BOOL WINAPI
ImageList_EndDrag (void)
{
- FIXME (imagelist, "semi-stub!\n");
+ FIXME("semi-stub!\n");
if (himlInternalDrag)
{
@@ -1180,7 +1180,7 @@
HIMAGELIST WINAPI
ImageList_GetDragImage (POINT *ppt, POINT *pptHotspot)
{
- FIXME (imagelist, "semi-stub!\n");
+ FIXME("semi-stub!\n");
if (himlInternalDrag)
return (himlInternalDrag);
@@ -1409,7 +1409,7 @@
handle = LoadImageA (hi, lpbmp, uType, 0, 0, uFlags);
if (!handle) {
- ERR (imagelist, "Error loading image!\n");
+ ERR("Error loading image!\n");
return NULL;
}
@@ -1473,7 +1473,7 @@
handle = LoadImageW (hi, lpbmp, uType, 0, 0, uFlags);
if (!handle) {
- ERR (imagelist, "Error loading image!\n");
+ ERR("Error loading image!\n");
return NULL;
}
@@ -1539,12 +1539,12 @@
/* check indices */
if ((i1 < 0) || (i1 >= himl1->cCurImage)) {
- ERR (imagelist, "Index 1 out of range! %d\n", i1);
+ ERR("Index 1 out of range! %d\n", i1);
return NULL;
}
if ((i2 < 0) || (i2 >= himl2->cCurImage)) {
- ERR (imagelist, "Index 2 out of range! %d\n", i2);
+ ERR("Index 2 out of range! %d\n", i2);
return NULL;
}
@@ -1646,7 +1646,7 @@
HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm)
{
- FIXME (imagelist, "empty stub!\n");
+ FIXME("empty stub!\n");
return NULL;
@@ -1673,18 +1673,18 @@
INT cxNew, nCount;
if ((i < -1) || (i >= himl->cCurImage)) {
- ERR (imagelist, "index out of range! %d\n", i);
+ ERR("index out of range! %d\n", i);
return FALSE;
}
if (himl->cCurImage == 0) {
- ERR (imagelist, "image list is already empty!\n");
+ ERR("image list is already empty!\n");
return FALSE;
}
if (i == -1) {
/* remove all */
- TRACE (imagelist, "remove all!\n");
+ TRACE("remove all!\n");
himl->cMaxImage = himl->cInitial + himl->cGrow;
himl->cCurImage = 0;
@@ -1705,14 +1705,14 @@
}
else {
/* delete one image */
- TRACE (imagelist, "Remove single image! %d\n", i);
+ TRACE("Remove single image! %d\n", i);
/* create new bitmap(s) */
cxNew = (himl->cCurImage + himl->cGrow - 1) * himl->cx;
- TRACE(imagelist, " - Number of images: %d / %d (Old/New)\n",
+ TRACE(" - Number of images: %d / %d (Old/New)\n",
himl->cCurImage, himl->cCurImage - 1);
- TRACE(imagelist, " - Max. number of images: %d / %d (Old/New)\n",
+ TRACE(" - Max. number of images: %d / %d (Old/New)\n",
himl->cMaxImage, himl->cCurImage + himl->cGrow - 1);
hbmNewImage =
@@ -1728,7 +1728,7 @@
/* copy all images and masks prior to the "removed" image */
if (i > 0) {
- TRACE (imagelist, "Pre image copy: Copy %d images\n", i);
+ TRACE("Pre image copy: Copy %d images\n", i);
SelectObject (hdcSrc, himl->hbmImage);
SelectObject (hdcDst, hbmNewImage);
@@ -1745,7 +1745,7 @@
/* copy all images and masks behind the removed image */
if (i < himl->cCurImage - 1) {
- TRACE (imagelist, "Post image copy!\n");
+ TRACE("Post image copy!\n");
SelectObject (hdcSrc, himl->hbmImage);
SelectObject (hdcDst, hbmNewImage);
BitBlt (hdcDst, i * himl->cx, 0, (himl->cCurImage - i - 1) * himl->cx,
@@ -1803,12 +1803,12 @@
BITMAP bmp;
if (himl == NULL) {
- ERR (imagelist, "Invalid image list handle!\n");
+ ERR("Invalid image list handle!\n");
return FALSE;
}
if ((i >= himl->cCurImage) || (i < 0)) {
- ERR (imagelist, "Invalid image index!\n");
+ ERR("Invalid image index!\n");
return FALSE;
}
@@ -1864,7 +1864,7 @@
ICONINFO ii;
BITMAP bmp;
- TRACE (imagelist, "(0x%lx 0x%x 0x%x)\n", (DWORD)himl, i, hIcon);
+ TRACE("(0x%lx 0x%x 0x%x)\n", (DWORD)himl, i, hIcon);
if (himl == NULL)
return -1;
@@ -1873,9 +1873,9 @@
GetIconInfo (hIcon, &ii);
if (ii.hbmMask == 0)
- ERR (imagelist, "no mask!\n");
+ ERR("no mask!\n");
if (ii.hbmColor == 0)
- ERR (imagelist, "no color!\n");
+ ERR("no color!\n");
GetObjectA (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
if (i == -1) {
@@ -1889,14 +1889,14 @@
nIndex = i;
hdcImageList = CreateCompatibleDC (0);
- TRACE (imagelist, "hdcImageList=0x%x!\n", hdcImageList);
+ TRACE("hdcImageList=0x%x!\n", hdcImageList);
if (hdcImageList == 0)
- ERR (imagelist, "invalid hdcImageList!\n");
+ ERR("invalid hdcImageList!\n");
hdcImage = CreateCompatibleDC (0);
- TRACE (imagelist, "hdcImage=0x%x!\n", hdcImage);
+ TRACE("hdcImage=0x%x!\n", hdcImage);
if (hdcImage == 0)
- ERR (imagelist, "invalid hdcImage!\n");
+ ERR("invalid hdcImage!\n");
hbmOldDst = SelectObject (hdcImageList, himl->hbmImage);
SetTextColor( hdcImageList, RGB(0,0,0));
@@ -1981,12 +1981,12 @@
{
HIMAGELIST himlTemp;
- FIXME (imagelist, "semi-stub!\n");
+ FIXME("semi-stub!\n");
if (himlInternalDrag == NULL)
return FALSE;
- TRACE (imagelist, " dxH=%d dyH=%d nX=%d nY=%d\n",
+ TRACE(" dxH=%d dyH=%d nX=%d nY=%d\n",
dxHotspot, dyHotspot, nInternalDragHotspotX, nInternalDragHotspotY);
himlTemp = ImageList_Merge (himlInternalDrag, 0, himlDrag, iDrag,
@@ -2024,7 +2024,7 @@
BOOL WINAPI
ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter)
{
- FIXME (imagelist, "(%p 0x%x 0x%lx):empty stub!\n",
+ FIXME("(%p 0x%x 0x%lx):empty stub!\n",
himl, i, dwFilter);
return FALSE;
@@ -2135,7 +2135,7 @@
himl->hbmImage = hbmNewBitmap;
}
else
- ERR (imagelist, "Could not create new image bitmap !\n");
+ ERR("Could not create new image bitmap !\n");
if (himl->hbmMask)
{
@@ -2160,7 +2160,7 @@
himl->hbmMask = hbmNewBitmap;
}
else
- ERR (imagelist, "Could not create new mask bitmap!\n");
+ ERR("Could not create new mask bitmap!\n");
}
DeleteDC (hdcImageList);
@@ -2232,7 +2232,7 @@
if (!himl)
return FALSE;
- FIXME (imagelist, "empty stub!\n");
+ FIXME("empty stub!\n");
return FALSE;
}
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index b481ff1..9042b74 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -27,7 +27,7 @@
#include "commctrl.h"
#include "ipaddress.h"
#include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ipaddress)
@@ -112,7 +112,7 @@
(HANDLE)lpipsi);
/* infoPtr->lpipsi= lpipsi; */
} else
- WARN (ipaddress,"IP-create called twice\n");
+ WARN("IP-create called twice\n");
for (i=0; i<=3; i++) {
infoPtr->LowerLimit[i]=0;
@@ -159,7 +159,7 @@
{
HDC hdc;
- TRACE (ipaddress,"\n");
+ TRACE("\n");
hdc = GetDC (hwnd);
IPADDRESS_Refresh (hwnd, hdc);
ReleaseDC (hwnd, hdc);
@@ -191,7 +191,7 @@
{
HDC hdc;
- TRACE (ipaddress,"\n");
+ TRACE("\n");
hdc = GetDC (hwnd);
IPADDRESS_Refresh (hwnd, hdc);
@@ -205,7 +205,7 @@
IPADDRESS_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
/* IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd); */
- TRACE (ipaddress,"\n");
+ TRACE("\n");
return 0;
}
@@ -214,7 +214,7 @@
IPADDRESS_SendNotify (HWND hwnd, UINT command)
{
- TRACE (ipaddress, "%x\n",command);
+ TRACE("%x\n",command);
return (BOOL)SendMessageA (GetParent (hwnd), WM_COMMAND,
MAKEWPARAM (GetWindowLongA (hwnd, GWL_ID),command), (LPARAM)hwnd);
}
@@ -225,7 +225,7 @@
{
NMIPADDRESS nmip;
- TRACE (ipaddress, "%x %x\n",field,newValue);
+ TRACE("%x %x\n",field,newValue);
nmip.hdr.hwndFrom = hwnd;
nmip.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
nmip.hdr.code = IPN_FIELDCHANGED;
@@ -249,7 +249,7 @@
LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
GetPropA ((HWND)hwnd,IP_SUBCLASS_PROP);
- TRACE (ipaddress,"\n");
+ TRACE("\n");
buf[0]=0;
for (i=0; i<=3; i++)
@@ -270,7 +270,7 @@
LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
GetPropA ((HWND)hwnd, IP_SUBCLASS_PROP);
- TRACE (ipaddress,"\n");
+ TRACE("\n");
for (i=0; i<=3; i++) {
GetWindowTextA (lpipsi->hwndIP[i],buf,5);
@@ -291,7 +291,7 @@
LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
GetPropA ((HWND)hwnd, IP_SUBCLASS_PROP);
- TRACE (ipaddress,"\n");
+ TRACE("\n");
valid=0;
ip_addr=0;
@@ -322,7 +322,7 @@
IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd);
INT index;
- TRACE (ipaddress,"\n");
+ TRACE("\n");
index=(INT) wParam;
if ((index<0) || (index>3)) return 0;
@@ -342,7 +342,7 @@
int i,ip_address,value;
char buf[20];
- TRACE (ipaddress,"\n");
+ TRACE("\n");
ip_address=(DWORD) lParam;
for (i=3; i>=0; i--) {
@@ -375,7 +375,7 @@
INT index;
index=(INT) wParam;
- TRACE (ipaddress," %d\n", index);
+ TRACE(" %d\n", index);
if ((index<0) || (index>3)) return 0;
SetFocus (lpipsi->hwndIP[index]);
@@ -387,7 +387,7 @@
static LRESULT
IPADDRESS_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE (ipaddress, "\n");
+ TRACE("\n");
SetFocus (hwnd);
IPADDRESS_SendNotify (hwnd, EN_SETFOCUS);
@@ -414,7 +414,7 @@
char field[20];
IPADDRESS_INFO *infoPtr=lpipsi->infoPtr;
- TRACE (ipaddress,"\n");
+ TRACE("\n");
GetWindowTextA (lpipsi->hwndIP[currentfield],field,4);
if (field[0]) {
field[3]=0;
@@ -545,7 +545,7 @@
default:
if (uMsg >= WM_USER)
- ERR (ipaddress, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 3452f74..4232501 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -44,7 +44,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "listview.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(listview)
@@ -313,42 +313,42 @@
{
if ((LVS_TYPEMASK & lStyle) == LVS_EDITLABELS)
{
- FIXME( listview, " LVS_EDITLABELS\n");
+ FIXME(" LVS_EDITLABELS\n");
}
if ((LVS_TYPEMASK & lStyle) == LVS_NOLABELWRAP)
{
- FIXME( listview, " LVS_NOLABELWRAP\n");
+ FIXME(" LVS_NOLABELWRAP\n");
}
if ((LVS_TYPEMASK & lStyle) == LVS_NOSCROLL)
{
- FIXME( listview, " LVS_NOSCROLL\n");
+ FIXME(" LVS_NOSCROLL\n");
}
if ((LVS_TYPEMASK & lStyle) == LVS_NOSORTHEADER)
{
- FIXME( listview, " LVS_NOSORTHEADER\n");
+ FIXME(" LVS_NOSORTHEADER\n");
}
if ((LVS_TYPEMASK & lStyle) == LVS_OWNERDRAWFIXED)
{
- FIXME( listview, " LVS_OWNERDRAWFIXED\n");
+ FIXME(" LVS_OWNERDRAWFIXED\n");
}
if ((LVS_TYPEMASK & lStyle) == LVS_SHAREIMAGELISTS)
{
- FIXME( listview, " LVS_SHAREIMAGELISTS\n");
+ FIXME(" LVS_SHAREIMAGELISTS\n");
}
if ((LVS_TYPEMASK & lStyle) == LVS_SORTASCENDING)
{
- FIXME( listview, " LVS_SORTASCENDING\n");
+ FIXME(" LVS_SORTASCENDING\n");
}
if ((LVS_TYPEMASK & lStyle) == LVS_SORTDESCENDING)
{
- FIXME( listview, " LVS_SORTDESCENDING\n");
+ FIXME(" LVS_SORTDESCENDING\n");
}
}
@@ -483,7 +483,7 @@
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
BOOL bResult = FALSE;
- TRACE(listview, "(hwnd=%x, left=%d, top=%d, right=%d, bottom=%d)\n", hwnd,
+ TRACE("(hwnd=%x, left=%d, top=%d, right=%d, bottom=%d)\n", hwnd,
lprcView->left, lprcView->top, lprcView->right, lprcView->bottom);
if (lprcView != NULL)
@@ -516,7 +516,7 @@
BOOL bResult = FALSE;
POINT ptOrigin;
- TRACE(listview, "(hwnd=%x, lprcView=%p)\n", hwnd, lprcView);
+ TRACE("(hwnd=%x, lprcView=%p)\n", hwnd, lprcView);
if (lprcView != NULL)
{
@@ -529,7 +529,7 @@
lprcView->bottom = infoPtr->rcView.bottom + ptOrigin.y;
}
- TRACE(listview, "(left=%d, top=%d, right=%d, bottom=%d)\n",
+ TRACE("(left=%d, top=%d, right=%d, bottom=%d)\n",
lprcView->left, lprcView->top, lprcView->right, lprcView->bottom);
}
@@ -590,7 +590,7 @@
INT nLabelWidth;
INT i;
- TRACE(listview, "(hwnd=%x)\n", hwnd);
+ TRACE("(hwnd=%x)\n", hwnd);
if (uView == LVS_ICON)
{
@@ -1683,7 +1683,7 @@
CHAR szDispText[DISP_TEXT_SIZE];
LVITEMA lvItem;
- TRACE(listview, "(hwnd=%x, hdc=%x, nItem=%d, nSubItem=%d\n", hwnd, hdc,
+ TRACE("(hwnd=%x, hdc=%x, nItem=%d, nSubItem=%d\n", hwnd, hdc,
nItem, nSubItem);
/* get information needed for drawing the item */
@@ -1727,7 +1727,7 @@
DWORD dwBkColor;
DWORD dwTextColor;
- TRACE(listview, "(hwnd=%x, hdc=%x, nItem=%d\n", hwnd, hdc, nItem);
+ TRACE("(hwnd=%x, hdc=%x, nItem=%d\n", hwnd, hdc, nItem);
/* get information needed for drawing the item */
ZeroMemory(&lvItem, sizeof(LVITEMA));
@@ -1842,7 +1842,7 @@
TEXTMETRICA tm;
LVITEMA lvItem;
- TRACE(listview, "(hwnd=%x, hdc=%x, nItem=%d, left=%d, top=%d, right=%d, \
+ TRACE("(hwnd=%x, hdc=%x, nItem=%d, left=%d, top=%d, right=%d, \
bottom=%d)\n", hwnd, hdc, nItem, rcItem.left, rcItem.top, rcItem.right,
rcItem.bottom);
@@ -2361,7 +2361,7 @@
INT j;
HDPA hdpaSubItems;
- TRACE(listview, "(hwnd=%x,)\n", hwnd);
+ TRACE("(hwnd=%x,)\n", hwnd);
if (GETITEMCOUNT(infoPtr) > 0)
{
@@ -2513,7 +2513,7 @@
LISTVIEW_SUBITEM *lpSubItem;
INT i;
- TRACE(listview, "(hwnd=%x,nItem=%d)\n", hwnd, nItem);
+ TRACE("(hwnd=%x,nItem=%d)\n", hwnd, nItem);
if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)))
{
@@ -3237,7 +3237,7 @@
LISTVIEW_ITEM *lpItem;
HDPA hdpaSubItems;
- TRACE(listview, "(hwnd=%x, lpLVItem=%p)\n", hwnd, lpLVItem);
+ TRACE("(hwnd=%x, lpLVItem=%p)\n", hwnd, lpLVItem);
if (lpLVItem != NULL)
{
@@ -3455,7 +3455,7 @@
INT nCountPerColumn;
INT nRow;
- TRACE(listview, "(hwnd=%x,nItem=%d,lpptPosition=%p)\n", hwnd, nItem,
+ TRACE("(hwnd=%x,nItem=%d,lpptPosition=%p)\n", hwnd, nItem,
lpptPosition);
if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) &&
@@ -3538,7 +3538,7 @@
INT nLabelWidth;
TEXTMETRICA tm;
- TRACE(listview, "(hwnd=%x, nItem=%d, lprc=%p)\n", hwnd, nItem, lprc);
+ TRACE("(hwnd=%x, nItem=%d, lprc=%p)\n", hwnd, nItem, lprc);
if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) && (lprc != NULL))
{
@@ -3824,7 +3824,7 @@
INT nLabelWidth = 0;
LVITEMA lvItem;
- TRACE(listview, "(hwnd=%x, nItem=%d)\n", hwnd, nItem);
+ TRACE("(hwnd=%x, nItem=%d)\n", hwnd, nItem);
ZeroMemory(&lvItem, sizeof(LVITEMA));
lvItem.mask = LVIF_TEXT;
@@ -4106,7 +4106,7 @@
INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
BOOL bResult = FALSE;
- TRACE(listview, "(hwnd=%x, lpptOrigin=%p)\n", hwnd, lpptOrigin);
+ TRACE("(hwnd=%x, lpptOrigin=%p)\n", hwnd, lpptOrigin);
if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
{
@@ -4267,7 +4267,7 @@
RECT rcItem;
INT i;
- TRACE(listview,"(hwnd=%x, x=%ld, y=%ld)\n", hwnd, lpHitTestInfo->pt.x,
+ TRACE("(hwnd=%x, x=%ld, y=%ld)\n", hwnd, lpHitTestInfo->pt.x,
lpHitTestInfo->pt.y);
for (i = 0; i < GETITEMCOUNT(infoPtr); i++)
@@ -4378,7 +4378,7 @@
HDITEMA hdi;
INT nNewColumn = -1;
- TRACE(listview,"(hwnd=%x, nColumn=%d, lpColumn=%p)\n",hwnd, nColumn,
+ TRACE("(hwnd=%x, nColumn=%d, lpColumn=%p)\n",hwnd, nColumn,
lpColumn);
if (lpColumn != NULL)
@@ -4492,7 +4492,7 @@
HDPA hdpaSubItems;
LISTVIEW_ITEM *lpItem = NULL;
- TRACE(listview, "(hwnd=%x,lpLVItem=%p)\n", hwnd, lpLVItem);
+ TRACE("(hwnd=%x,lpLVItem=%p)\n", hwnd, lpLVItem);
if (lpLVItem != NULL)
{
@@ -4892,7 +4892,7 @@
*/
static VOID LISTVIEW_SetItemCount(HWND hwnd, INT nItemCount)
{
- FIXME (listview, "empty stub!\n");
+ FIXME("empty stub!\n");
}
/***
@@ -4918,7 +4918,7 @@
HDPA hdpaSubItems;
BOOL bResult = FALSE;
- TRACE(listview, "(hwnd=%x,nItem=%d,X=%d,Y=%d)\n", hwnd, nItem, nPosX, nPosY);
+ TRACE("(hwnd=%x,nItem=%d,X=%d,Y=%d)\n", hwnd, nItem, nPosX, nPosY);
if ((nItem >= 0) || (nItem < GETITEMCOUNT(infoPtr)))
{
@@ -5081,7 +5081,7 @@
*/
static LRESULT LISTVIEW_SortItems(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- FIXME (listview, "empty stub!\n");
+ FIXME("empty stub!\n");
return TRUE;
}
@@ -5152,7 +5152,7 @@
(WPARAM)hwnd, (LPARAM)NF_QUERY);
if (infoPtr->notifyFormat != NFR_ANSI)
{
- FIXME (listview, "ANSI notify format is NOT used\n");
+ FIXME("ANSI notify format is NOT used\n");
}
/* initialize color information */
@@ -5640,7 +5640,7 @@
LONG nCtrlId = GetWindowLongA(hwnd, GWL_ID);
NMHDR nmh;
- TRACE(listview, "(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
+ TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
/* send NM_DBLCLK notification */
nmh.hwndFrom = hwnd;
@@ -5679,7 +5679,7 @@
NMHDR nmh;
INT nItem;
- TRACE(listview, "(hwnd=%x, key=%hu, X=%hu, Y=%hu)\n", hwnd, wKey, wPosX,
+ TRACE("(hwnd=%x, key=%hu, X=%hu, Y=%hu)\n", hwnd, wKey, wPosX,
wPosY);
/* send NM_RELEASEDCAPTURE notification */
@@ -5761,7 +5761,7 @@
{
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
- TRACE(listview, "(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
+ TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
if (infoPtr->bLButtonDown != FALSE)
{
@@ -5797,20 +5797,20 @@
{
LISTVIEW_INFO *infoPtr;
- TRACE(listview, "(hwnd=%x,wParam=%x,lParam=%lx)\n", hwnd, wParam, lParam);
+ TRACE("(hwnd=%x,wParam=%x,lParam=%lx)\n", hwnd, wParam, lParam);
/* allocate memory for info structure */
infoPtr = (LISTVIEW_INFO *)COMCTL32_Alloc(sizeof(LISTVIEW_INFO));
SetWindowLongA(hwnd, 0, (LONG)infoPtr);
if (infoPtr == NULL)
{
- ERR(listview, "could not allocate info memory!\n");
+ ERR("could not allocate info memory!\n");
return 0;
}
if ((LISTVIEW_INFO *)GetWindowLongA(hwnd, 0) != infoPtr)
{
- ERR(listview, "pointer assignment error!\n");
+ ERR("pointer assignment error!\n");
return 0;
}
@@ -5831,7 +5831,7 @@
{
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
- TRACE(listview, "(hwnd=%x)\n", hwnd);
+ TRACE("(hwnd=%x)\n", hwnd);
/* delete all items */
LISTVIEW_DeleteAllItems(hwnd);
@@ -5904,7 +5904,7 @@
(WPARAM)hwnd, (LPARAM)NF_QUERY);
if (infoPtr->notifyFormat == NFR_UNICODE)
{
- FIXME (listview, "NO support for unicode structures");
+ FIXME("NO support for unicode structures");
}
}
@@ -5926,7 +5926,7 @@
{
PAINTSTRUCT ps;
- TRACE(listview, "(hwnd=%x,hdc=%x)\n", hwnd, hdc);
+ TRACE("(hwnd=%x,hdc=%x)\n", hwnd, hdc);
if (hdc == 0)
{
@@ -5961,7 +5961,7 @@
INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
NMHDR nmh;
- TRACE(listview, "(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
+ TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
/* send NM_RELEASEDCAPTURE notification */
nmh.hwndFrom = hwnd;
@@ -5998,7 +5998,7 @@
NMHDR nmh;
INT nItem;
- TRACE(listview, "(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
+ TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
/* send NM_RELEASEDCAPTURE notification */
nmh.hwndFrom = hwnd;
@@ -6054,7 +6054,7 @@
INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
NMHDR nmh;
- TRACE(listview, "(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
+ TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
if (infoPtr->bRButtonDown != FALSE)
{
@@ -6118,7 +6118,7 @@
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
- TRACE(listview, "(hwnd=%x,hfont=%x,redraw=%hu)\n", hwnd, hFont, fRedraw);
+ TRACE("(hwnd=%x,hfont=%x,redraw=%hu)\n", hwnd, hFont, fRedraw);
if (hFont == 0)
{
@@ -6165,7 +6165,7 @@
LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
UINT uView = lStyle & LVS_TYPEMASK;
- TRACE(listview, "(hwnd=%x, width=%d, height=%d)\n",hwnd, Width, Height);
+ TRACE("(hwnd=%x, width=%d, height=%d)\n",hwnd, Width, Height);
LISTVIEW_UpdateSize(hwnd);
@@ -6258,7 +6258,7 @@
UINT uOldView = lpss->styleOld & LVS_TYPEMASK;
RECT rcList = infoPtr->rcList;
- TRACE(listview, "(hwnd=%x, styletype=%x, stylestruct=%p)\n",
+ TRACE("(hwnd=%x, styletype=%x, stylestruct=%p)\n",
hwnd, wStyleType, lpss);
if (wStyleType == GWL_STYLE)
@@ -6664,7 +6664,7 @@
default:
if (uMsg >= WM_USER)
{
- ERR(listview, "unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam,
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam,
lParam);
}
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index ce7aea5..83a226f 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -17,7 +17,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "monthcal.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(monthcal)
@@ -81,7 +81,7 @@
default:
if (uMsg >= WM_USER)
- ERR (monthcal, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c
index ae1eea0..4bfa5f6 100644
--- a/dlls/comctl32/nativefont.c
+++ b/dlls/comctl32/nativefont.c
@@ -16,7 +16,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "nativefont.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(nativefont)
@@ -72,7 +72,7 @@
return NATIVEFONT_Destroy (hwnd, wParam, lParam);
default:
- ERR (nativefont, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index 8024ee7..e7b3915 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -16,7 +16,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "pager.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(pager)
@@ -67,7 +67,7 @@
{
/* PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); */
- FIXME (pager, "empty stub!\n");
+ FIXME("empty stub!\n");
return PGF_INVISIBLE;
}
@@ -104,7 +104,7 @@
infoPtr->nChildSize = (dwStyle & PGS_HORZ) ? nmpgcs.iWidth : nmpgcs.iHeight;
- FIXME (pager, "Child size %d\n", infoPtr->nChildSize);
+ FIXME("Child size %d\n", infoPtr->nChildSize);
}
@@ -149,7 +149,7 @@
infoPtr->nButtonSize = (INT)lParam;
- FIXME (pager, "size=%d\n", infoPtr->nButtonSize);
+ FIXME("size=%d\n", infoPtr->nButtonSize);
/* FIXME: redraw */
@@ -164,7 +164,7 @@
infoPtr->hwndChild = IsWindow ((HWND)lParam) ? (HWND)lParam : 0;
- FIXME (pager, "hwnd=%x\n", infoPtr->hwndChild);
+ FIXME("hwnd=%x\n", infoPtr->hwndChild);
/* FIXME: redraw */
if (infoPtr->hwndChild) {
@@ -184,7 +184,7 @@
infoPtr->nPos = (INT)lParam;
- FIXME (pager, "pos=%d\n", infoPtr->nPos);
+ FIXME("pos=%d\n", infoPtr->nPos);
/* FIXME: redraw */
SetWindowPos (infoPtr->hwndChild, HWND_TOP,
@@ -251,7 +251,7 @@
{
/* PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); */
- TRACE (pager, "stub!\n");
+ TRACE("stub!\n");
return 0;
}
@@ -349,7 +349,7 @@
default:
if (uMsg >= WM_USER)
- ERR (pager, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index ee797f1..2ef35de 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -9,7 +9,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "progress.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(progress)
@@ -20,7 +20,7 @@
/* Work constants */
-#define UNKNOWN_PARAM(msg, wParam, lParam) WARN(progress, \
+#define UNKNOWN_PARAM(msg, wParam, lParam) WARN(\
"Unknown parameter(s) for message " #msg \
"(%04x): wp=%04x lp=%08lx\n", msg, wParam, lParam);
@@ -40,7 +40,7 @@
RECT rect;
DWORD dwStyle;
- TRACE(progress, "refresh pos=%d min=%d, max=%d\n",
+ TRACE("refresh pos=%d min=%d, max=%d\n",
infoPtr->CurVal, infoPtr->MinVal, infoPtr->MaxVal);
/* get the required bar brush */
@@ -223,11 +223,11 @@
infoPtr->ColorBar=CLR_DEFAULT;
infoPtr->ColorBk=CLR_DEFAULT;
infoPtr->hFont=(HANDLE)NULL;
- TRACE(progress, "Progress Ctrl creation, hwnd=%04x\n", hwnd);
+ TRACE("Progress Ctrl creation, hwnd=%04x\n", hwnd);
break;
case WM_DESTROY:
- TRACE (progress, "Progress Ctrl destruction, hwnd=%04x\n", hwnd);
+ TRACE("Progress Ctrl destruction, hwnd=%04x\n", hwnd);
COMCTL32_Free (infoPtr);
break;
@@ -341,7 +341,7 @@
default:
if (message >= WM_USER)
- ERR(progress, "unknown msg %04x wp=%04x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%04x lp=%08lx\n",
message, wParam, lParam );
return DefWindowProcA( hwnd, message, wParam, lParam );
}
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index ab31345..ceb20d9 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -16,7 +16,7 @@
#include "prsht.h"
#include "winnls.h"
#include "comctl32.h"
-#include "debug.h"
+#include "debugtools.h"
/******************************************************************************
@@ -144,7 +144,7 @@
if (dwFlags & PSH_USEPSTARTPAGE)
{
- TRACE(propsheet, "PSH_USEPSTARTPAGE is on");
+ TRACE("PSH_USEPSTARTPAGE is on");
psInfo->active_page = 0;
}
else
@@ -268,7 +268,7 @@
/* Extract the caption */
psInfo->proppage[index].pszText = (LPCWSTR)p;
- TRACE(propsheet, "Tab %d %s\n",index,debugstr_w((LPCWSTR)p));
+ TRACE("Tab %d %s\n",index,debugstr_w((LPCWSTR)p));
p += lstrlenW((LPCWSTR)p) + 1;
return TRUE;
@@ -326,7 +326,7 @@
* Original tab size.
*/
GetClientRect(hwndTabCtrl, &rcOrigTab);
- TRACE(propsheet, "orig tab %d %d %d %d\n", rcOrigTab.left, rcOrigTab.top,
+ TRACE("orig tab %d %d %d %d\n", rcOrigTab.left, rcOrigTab.top,
rcOrigTab.right, rcOrigTab.bottom);
/*
@@ -338,7 +338,7 @@
rcPage.bottom = psInfo->height;
MapDialogRect(hwndDlg, &rcPage);
- TRACE(propsheet, "biggest page %d %d %d %d\n", rcPage.left, rcPage.top,
+ TRACE("biggest page %d %d %d %d\n", rcPage.left, rcPage.top,
rcPage.right, rcPage.bottom);
if (rcPage.right > rcOrigTab.right)
@@ -392,7 +392,7 @@
GetClientRect(hwndTabCtrl, &rc);
- TRACE(propsheet, "tab client rc %d %d %d %d\n",
+ TRACE("tab client rc %d %d %d %d\n",
rc.left, rc.top, rc.right, rc.bottom);
rc.right += ((padding.x * 2) + tabOffsetX);
@@ -576,7 +576,7 @@
PADDING_INFO padding = PROPSHEET_GetPaddingInfo(hwndParent);
HWND hwndTabCtrl = GetDlgItem(hwndParent, IDC_TABCONTROL);
- TRACE(propsheet, "index %d\n", index);
+ TRACE("index %d\n", index);
if (ppshpage->dwFlags & PSP_DLGINDIRECT)
pTemplate = (DLGTEMPLATE*)ppshpage->u1.pResource;
@@ -821,25 +821,25 @@
SendMessageA(hwndDlg, WM_COMMAND, IDC_APPLY_BUTTON, 0);
break;
case PSBTN_BACK:
- FIXME(propsheet, "Wizard mode not implemented.\n");
+ FIXME("Wizard mode not implemented.\n");
break;
case PSBTN_CANCEL:
SendMessageA(hwndDlg, WM_COMMAND, IDCANCEL, 0);
break;
case PSBTN_FINISH:
- FIXME(propsheet, "Wizard mode not implemented.\n");
+ FIXME("Wizard mode not implemented.\n");
break;
case PSBTN_HELP:
SendMessageA(hwndDlg, WM_COMMAND, IDHELP, 0);
break;
case PSBTN_NEXT:
- FIXME(propsheet, "Wizard mode not implemented.\n");
+ FIXME("Wizard mode not implemented.\n");
break;
case PSBTN_OK:
SendMessageA(hwndDlg, WM_COMMAND, IDOK, 0);
break;
default:
- FIXME(propsheet, "Invalid button index %d\n", buttonID);
+ FIXME("Invalid button index %d\n", buttonID);
}
}
@@ -868,7 +868,7 @@
return FALSE;
if (hpage != NULL)
- FIXME(propsheet, "Implement HPROPSHEETPAGE!\n");
+ FIXME("Implement HPROPSHEETPAGE!\n");
else
hwndPage = psInfo->proppage[index].hwndPage;
@@ -1034,12 +1034,12 @@
if (index == -1)
{
- TRACE(propsheet, "Could not find page to remove!\n");
+ TRACE("Could not find page to remove!\n");
return FALSE;
}
}
- TRACE(propsheet, "total pages %d removing page %d active page %d\n",
+ TRACE("total pages %d removing page %d active page %d\n",
psInfo->nPages, index, psInfo->active_page);
/*
* Check if we're removing the active page.
@@ -1061,7 +1061,7 @@
}
else
{
- TRACE(propsheet, "Removing the only page, close the dialog!\n");
+ TRACE("Removing the only page, close the dialog!\n");
if (psInfo->isModeless)
psInfo->active_page = -1;
@@ -1166,7 +1166,7 @@
*/
INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW propertySheetHeader)
{
- FIXME(propsheet, "(%p): stub\n", propertySheetHeader);
+ FIXME("(%p): stub\n", propertySheetHeader);
return -1;
}
@@ -1189,7 +1189,7 @@
*/
HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage)
{
- FIXME(propsheet, "(%p): stub\n", lpPropSheetPage);
+ FIXME("(%p): stub\n", lpPropSheetPage);
return 0;
}
@@ -1429,7 +1429,7 @@
case PSM_ISDIALOGMESSAGE:
{
- FIXME (propsheet, "Unimplemented msg PSM_ISDIALOGMESSAGE\n");
+ FIXME("Unimplemented msg PSM_ISDIALOGMESSAGE\n");
return 0;
}
@@ -1438,19 +1438,19 @@
return TRUE;
case PSM_SETTITLEW:
- FIXME (propsheet, "Unimplemented msg PSM_SETTITLE32W\n");
+ FIXME("Unimplemented msg PSM_SETTITLE32W\n");
return 0;
case PSM_SETWIZBUTTONS:
- FIXME (propsheet, "Unimplemented msg PSM_SETWIZBUTTONS\n");
+ FIXME("Unimplemented msg PSM_SETWIZBUTTONS\n");
return 0;
case PSM_SETCURSELID:
- FIXME (propsheet, "Unimplemented msg PSM_SETCURSELID\n");
+ FIXME("Unimplemented msg PSM_SETCURSELID\n");
return 0;
case PSM_SETFINISHTEXTA:
- FIXME (propsheet, "Unimplemented msg PSM_SETFINISHTEXT32A\n");
+ FIXME("Unimplemented msg PSM_SETFINISHTEXT32A\n");
return 0;
case PSM_SETFINISHTEXTW:
- FIXME (propsheet, "Unimplemented msg PSM_SETFINISHTEXT32W\n");
+ FIXME("Unimplemented msg PSM_SETFINISHTEXT32W\n");
return 0;
default:
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 3692b80..1bcfac1 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -24,7 +24,7 @@
#include "wingdi.h"
#include "commctrl.h"
#include "rebar.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(rebar)
@@ -371,7 +371,7 @@
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
RECT rc;
- TRACE (rebar, " to [%d x %d]!\n",
+ TRACE(" to [%d x %d]!\n",
infoPtr->calcSize.cx, infoPtr->calcSize.cy);
infoPtr->bAutoResize = TRUE;
@@ -405,7 +405,7 @@
if (lpBand->fStyle & RBBS_HIDDEN)
continue;
if (lpBand->hwndChild) {
- TRACE (rebar, "hwndChild = %x\n", lpBand->hwndChild);
+ TRACE("hwndChild = %x\n", lpBand->hwndChild);
GetClassNameA (lpBand->hwndChild, szClassName, 40);
if (!lstrcmpA (szClassName, "ComboBox")) {
@@ -463,7 +463,7 @@
*pFlags = RBHT_NOWHERE;
if (pBand)
*pBand = -1;
- TRACE (rebar, "NOWHERE\n");
+ TRACE("NOWHERE\n");
return;
}
else {
@@ -475,27 +475,27 @@
*pBand = iCount;
if (PtInRect (&lpBand->rcGripper, *lpPt)) {
*pFlags = RBHT_GRABBER;
- TRACE (rebar, "ON GRABBER %d\n", iCount);
+ TRACE("ON GRABBER %d\n", iCount);
return;
}
else if (PtInRect (&lpBand->rcCapImage, *lpPt)) {
*pFlags = RBHT_CAPTION;
- TRACE (rebar, "ON CAPTION %d\n", iCount);
+ TRACE("ON CAPTION %d\n", iCount);
return;
}
else if (PtInRect (&lpBand->rcCapText, *lpPt)) {
*pFlags = RBHT_CAPTION;
- TRACE (rebar, "ON CAPTION %d\n", iCount);
+ TRACE("ON CAPTION %d\n", iCount);
return;
}
else if (PtInRect (&lpBand->rcChild, *lpPt)) {
*pFlags = RBHT_CLIENT;
- TRACE (rebar, "ON CLIENT %d\n", iCount);
+ TRACE("ON CLIENT %d\n", iCount);
return;
}
else {
*pFlags = RBHT_NOWHERE;
- TRACE (rebar, "NOWHERE %d\n", iCount);
+ TRACE("NOWHERE %d\n", iCount);
return;
}
}
@@ -505,7 +505,7 @@
if (pBand)
*pBand = -1;
- TRACE (rebar, "NOWHERE\n");
+ TRACE("NOWHERE\n");
return;
}
}
@@ -513,11 +513,11 @@
*pFlags = RBHT_NOWHERE;
if (pBand)
*pBand = -1;
- TRACE (rebar, "NOWHERE\n");
+ TRACE("NOWHERE\n");
return;
}
- TRACE (rebar, "flags=0x%X\n", *pFlags);
+ TRACE("flags=0x%X\n", *pFlags);
return;
}
@@ -535,17 +535,17 @@
if (uBand >= infoPtr->uNumBands)
return FALSE;
- TRACE (rebar, "deleting band %u!\n", uBand);
+ TRACE("deleting band %u!\n", uBand);
if (infoPtr->uNumBands == 1) {
- TRACE (rebar, " simple delete!\n");
+ TRACE(" simple delete!\n");
COMCTL32_Free (infoPtr->bands);
infoPtr->bands = NULL;
infoPtr->uNumBands = 0;
}
else {
REBAR_BAND *oldBands = infoPtr->bands;
- TRACE(rebar, "complex delete! [uBand=%u]\n", uBand);
+ TRACE("complex delete! [uBand=%u]\n", uBand);
infoPtr->uNumBands--;
infoPtr->bands = COMCTL32_Alloc (sizeof (REBAR_BAND) * infoPtr->uNumBands);
@@ -603,7 +603,7 @@
{
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
- TRACE (rebar, "band count %u!\n", infoPtr->uNumBands);
+ TRACE("band count %u!\n", infoPtr->uNumBands);
return infoPtr->uNumBands;
}
@@ -623,7 +623,7 @@
if ((UINT)wParam >= infoPtr->uNumBands)
return FALSE;
- TRACE (rebar, "index %u\n", (UINT)wParam);
+ TRACE("index %u\n", (UINT)wParam);
/* copy band information */
lpBand = &infoPtr->bands[(UINT)wParam];
@@ -694,7 +694,7 @@
if ((UINT)wParam >= infoPtr->uNumBands)
return FALSE;
- TRACE (rebar, "index %u\n", (UINT)wParam);
+ TRACE("index %u\n", (UINT)wParam);
/* copy band information */
lpBand = &infoPtr->bands[(UINT)wParam];
@@ -764,7 +764,7 @@
nHeight += (2 * GetSystemMetrics(SM_CYEDGE));
- FIXME (rebar, "height = %d\n", nHeight);
+ FIXME("height = %d\n", nHeight);
return nHeight;
}
@@ -782,7 +782,7 @@
if (lpInfo->cbSize < sizeof (REBARINFO))
return FALSE;
- TRACE (rebar, "getting bar info!\n");
+ TRACE("getting bar info!\n");
if (infoPtr->himl) {
lpInfo->himl = infoPtr->himl;
@@ -798,7 +798,7 @@
{
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
- TRACE (rebar, "background color 0x%06lx!\n", infoPtr->clrBk);
+ TRACE("background color 0x%06lx!\n", infoPtr->clrBk);
return infoPtr->clrBk;
}
@@ -811,7 +811,7 @@
static LRESULT
REBAR_GetPalette (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- FIXME (rebar, "empty stub!\n");
+ FIXME("empty stub!\n");
return 0;
}
@@ -830,7 +830,7 @@
if (!lprc)
return FALSE;
- TRACE (rebar, "band %d\n", iBand);
+ TRACE("band %d\n", iBand);
lpBand = &infoPtr->bands[iBand];
CopyRect (lprc, &lpBand->rcBand);
@@ -850,7 +850,7 @@
{
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
- FIXME (rebar, "%u : semi stub!\n", infoPtr->uNumBands);
+ FIXME("%u : semi stub!\n", infoPtr->uNumBands);
return infoPtr->uNumBands;
}
@@ -861,7 +861,7 @@
{
/* REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd); */
- FIXME (rebar, "-- height = 20: semi stub!\n");
+ FIXME("-- height = 20: semi stub!\n");
return 20;
}
@@ -872,7 +872,7 @@
{
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
- TRACE (rebar, "text color 0x%06lx!\n", infoPtr->clrText);
+ TRACE("text color 0x%06lx!\n", infoPtr->clrText);
return infoPtr->clrText;
}
@@ -921,16 +921,16 @@
if (infoPtr->uNumBands < 1)
return -1;
- TRACE (rebar, "id %u\n", (UINT)wParam);
+ TRACE("id %u\n", (UINT)wParam);
for (i = 0; i < infoPtr->uNumBands; i++) {
if (infoPtr->bands[i].wID == (UINT)wParam) {
- TRACE (rebar, "band %u found!\n", i);
+ TRACE("band %u found!\n", i);
return i;
}
}
- TRACE (rebar, "no band found!\n");
+ TRACE("no band found!\n");
return -1;
}
@@ -950,7 +950,7 @@
if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
return FALSE;
- TRACE (rebar, "insert band at %u!\n", uIndex);
+ TRACE("insert band at %u!\n", uIndex);
if (infoPtr->uNumBands == 0) {
infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
@@ -980,7 +980,7 @@
infoPtr->uNumBands++;
- TRACE (rebar, "index %u!\n", uIndex);
+ TRACE("index %u!\n", uIndex);
/* initialize band (infoPtr->bands[uIndex])*/
lpBand = &infoPtr->bands[uIndex];
@@ -1011,7 +1011,7 @@
lpBand->iImage = -1;
if (lprbbi->fMask & RBBIM_CHILD) {
- TRACE (rebar, "hwndChild = %x\n", lprbbi->hwndChild);
+ TRACE("hwndChild = %x\n", lprbbi->hwndChild);
lpBand->hwndChild = lprbbi->hwndChild;
lpBand->hwndPrevParent =
SetParent (lpBand->hwndChild, hwnd);
@@ -1079,7 +1079,7 @@
if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
return FALSE;
- TRACE (rebar, "insert band at %u!\n", uIndex);
+ TRACE("insert band at %u!\n", uIndex);
if (infoPtr->uNumBands == 0) {
infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
@@ -1109,7 +1109,7 @@
infoPtr->uNumBands++;
- TRACE (rebar, "index %u!\n", uIndex);
+ TRACE("index %u!\n", uIndex);
/* initialize band (infoPtr->bands[uIndex])*/
lpBand = &infoPtr->bands[uIndex];
@@ -1140,7 +1140,7 @@
lpBand->iImage = -1;
if (lprbbi->fMask & RBBIM_CHILD) {
- TRACE (rebar, "hwndChild = %x\n", lprbbi->hwndChild);
+ TRACE("hwndChild = %x\n", lprbbi->hwndChild);
lpBand->hwndChild = lprbbi->hwndChild;
lpBand->hwndPrevParent =
SetParent (lpBand->hwndChild, hwnd);
@@ -1198,7 +1198,7 @@
{
/* REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd); */
- FIXME (rebar, "(uBand = %u fIdeal = %s)\n",
+ FIXME("(uBand = %u fIdeal = %s)\n",
(UINT)wParam, lParam ? "TRUE" : "FALSE");
@@ -1211,7 +1211,7 @@
{
/* REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd); */
- FIXME (rebar, "(uBand = %u)\n", (UINT)wParam);
+ FIXME("(uBand = %u)\n", (UINT)wParam);
return 0;
@@ -1223,7 +1223,7 @@
{
/* REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd); */
- FIXME (rebar, "(iFrom = %u iTof = %u)\n",
+ FIXME("(iFrom = %u iTof = %u)\n",
(UINT)wParam, (UINT)lParam);
@@ -1245,7 +1245,7 @@
if ((UINT)wParam >= infoPtr->uNumBands)
return FALSE;
- TRACE (rebar, "index %u\n", (UINT)wParam);
+ TRACE("index %u\n", (UINT)wParam);
/* set band information */
lpBand = &infoPtr->bands[(UINT)wParam];
@@ -1280,7 +1280,7 @@
SetParent (lpBand->hwndChild, hwnd);
}
else {
- TRACE (rebar, "child: 0x%x prev parent: 0x%x\n",
+ TRACE("child: 0x%x prev parent: 0x%x\n",
lpBand->hwndChild, lpBand->hwndPrevParent);
lpBand->hwndChild = 0;
lpBand->hwndPrevParent = 0;
@@ -1338,7 +1338,7 @@
if ((UINT)wParam >= infoPtr->uNumBands)
return FALSE;
- TRACE (rebar, "index %u\n", (UINT)wParam);
+ TRACE("index %u\n", (UINT)wParam);
/* set band information */
lpBand = &infoPtr->bands[(UINT)wParam];
@@ -1373,7 +1373,7 @@
SetParent (lpBand->hwndChild, hwnd);
}
else {
- TRACE (rebar, "child: 0x%x prev parent: 0x%x\n",
+ TRACE("child: 0x%x prev parent: 0x%x\n",
lpBand->hwndChild, lpBand->hwndPrevParent);
lpBand->hwndChild = 0;
lpBand->hwndPrevParent = 0;
@@ -1429,7 +1429,7 @@
if (lpInfo->cbSize < sizeof (REBARINFO))
return FALSE;
- TRACE (rebar, "setting bar info!\n");
+ TRACE("setting bar info!\n");
if (lpInfo->fMask & RBIM_IMAGELIST) {
infoPtr->himl = lpInfo->himl;
@@ -1456,7 +1456,7 @@
clrTemp = infoPtr->clrBk;
infoPtr->clrBk = (COLORREF)lParam;
- TRACE (rebar, "background color 0x%06lx!\n", infoPtr->clrBk);
+ TRACE("background color 0x%06lx!\n", infoPtr->clrBk);
return clrTemp;
}
@@ -1487,7 +1487,7 @@
clrTemp = infoPtr->clrText;
infoPtr->clrText = (COLORREF)lParam;
- TRACE (rebar, "text color 0x%06lx!\n", infoPtr->clrText);
+ TRACE("text color 0x%06lx!\n", infoPtr->clrText);
return clrTemp;
}
@@ -1518,13 +1518,13 @@
lpBand = &infoPtr->bands[(INT)wParam];
if ((BOOL)lParam) {
- TRACE (rebar, "show band %d\n", (INT)wParam);
+ TRACE("show band %d\n", (INT)wParam);
lpBand->fStyle = lpBand->fStyle & ~RBBS_HIDDEN;
if (IsWindow (lpBand->hwndChild))
ShowWindow (lpBand->hwndChild, SW_SHOW);
}
else {
- TRACE (rebar, "hide band %d\n", (INT)wParam);
+ TRACE("hide band %d\n", (INT)wParam);
lpBand->fStyle = lpBand->fStyle | RBBS_HIDDEN;
if (IsWindow (lpBand->hwndChild))
ShowWindow (lpBand->hwndChild, SW_SHOW);
@@ -1547,8 +1547,8 @@
if (lpRect == NULL)
return FALSE;
- FIXME (rebar, "layout change not implemented!\n");
- FIXME (rebar, "[%d %d %d %d]\n",
+ FIXME("layout change not implemented!\n");
+ FIXME("[%d %d %d %d]\n",
lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
#if 0
@@ -1588,13 +1588,13 @@
infoPtr->bUnicode = IsWindowUnicode (hwnd);
if (GetWindowLongA (hwnd, GWL_STYLE) & RBS_AUTOSIZE)
- FIXME (rebar, "style RBS_AUTOSIZE set!\n");
+ FIXME("style RBS_AUTOSIZE set!\n");
#if 0
SendMessageA (hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY);
#endif
- TRACE (rebar, "created!\n");
+ TRACE("created!\n");
return 0;
}
@@ -1641,7 +1641,7 @@
/* free rebar info data */
COMCTL32_Free (infoPtr);
- TRACE (rebar, "destroyed!\n");
+ TRACE("destroyed!\n");
return 0;
}
@@ -1729,7 +1729,7 @@
POINT pt;
UINT flags;
- TRACE (rebar, "code=0x%X id=0x%X\n", LOWORD(lParam), HIWORD(lParam));
+ TRACE("code=0x%X id=0x%X\n", LOWORD(lParam), HIWORD(lParam));
GetCursorPos (&pt);
ScreenToClient (hwnd, &pt);
@@ -1796,7 +1796,7 @@
return 0;
}
- TRACE (rebar, "sizing rebar!\n");
+ TRACE("sizing rebar!\n");
/* get parent rectangle */
GetClientRect (GetParent (hwnd), &rcParent);
@@ -2000,7 +2000,7 @@
default:
if (uMsg >= WM_USER)
- ERR (rebar, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index 31b3c22..2dadddf 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -8,7 +8,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "status.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(statusbar)
@@ -599,7 +599,7 @@
ti.cbSize = sizeof(TTTOOLINFOA);
ti.hwnd = hwnd;
for (i = nTipCount; i < self->numParts; i++) {
- TRACE (statusbar, "add tool %d\n", i);
+ TRACE("add tool %d\n", i);
ti.uId = i;
SendMessageA (self->hwndToolTip, TTM_ADDTOOLA,
0, (LPARAM)&ti);
@@ -611,7 +611,7 @@
for (i = nTipCount - 1; i >= self->numParts; i--) {
- FIXME (statusbar, "delete tool %d\n", i);
+ FIXME("delete tool %d\n", i);
}
}
@@ -716,7 +716,7 @@
{
STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (hwnd);
- TRACE (statusbar, "part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
+ TRACE("part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
if (infoPtr->hwndToolTip) {
TTTOOLINFOA ti;
ti.cbSize = sizeof(TTTOOLINFOA);
@@ -737,7 +737,7 @@
{
STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (hwnd);
- TRACE (statusbar, "part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
+ TRACE("part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
if (infoPtr->hwndToolTip) {
TTTOOLINFOW ti;
ti.cbSize = sizeof(TTTOOLINFOW);
@@ -759,7 +759,7 @@
STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (hwnd);
BOOL bTemp = infoPtr->bUnicode;
- TRACE (statusbar, "(0x%x)\n", (BOOL)wParam);
+ TRACE("(0x%x)\n", (BOOL)wParam);
infoPtr->bUnicode = (BOOL)wParam;
return bTemp;
@@ -1229,7 +1229,7 @@
default:
if (msg >= WM_USER)
- ERR (statusbar, "unknown msg %04x wp=%04x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%04x lp=%08lx\n",
msg, wParam, lParam);
return DefWindowProcA (hwnd, msg, wParam, lParam);
}
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index fa0ce78..82cb4dd 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -16,7 +16,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "tab.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(tab)
@@ -129,7 +129,7 @@
infoPtr->uFocus=iItem;
if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS) {
- FIXME (tab,"Should set input focus\n");
+ FIXME("Should set input focus\n");
} else {
if (infoPtr->iSelected != iItem) {
if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)!=TRUE) {
@@ -398,7 +398,7 @@
newItem=TAB_InternalHitTest (hwnd, infoPtr,pt,&dummy);
- TRACE(tab, "On Tab, item %d\n", newItem);
+ TRACE("On Tab, item %d\n", newItem);
if ( (newItem!=-1) &&
(infoPtr->iSelected != newItem) )
@@ -714,8 +714,8 @@
size.cx + 2*HORIZONTAL_ITEM_PADDING;
}
- TRACE(tab, "TextSize: %i\n ", size.cx);
- TRACE(tab, "Rect: T %i, L %i, B %i, R %i\n",
+ TRACE("TextSize: %i\n ", size.cx);
+ TRACE("Rect: T %i, L %i, B %i, R %i\n",
infoPtr->items[curItem].rect.top,
infoPtr->items[curItem].rect.left,
infoPtr->items[curItem].rect.bottom,
@@ -1245,7 +1245,7 @@
RECT rect;
GetClientRect (hwnd, &rect);
- TRACE(tab, "Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
+ TRACE("Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
rect.top, rect.left, rect.bottom, rect.right);
pti = (TCITEMA *)lParam;
@@ -1297,7 +1297,7 @@
TAB_InvalidateTabArea(hwnd, infoPtr);
- TRACE(tab, "[%04x]: added item %d '%s'\n",
+ TRACE("[%04x]: added item %d '%s'\n",
hwnd, iItem, infoPtr->items[iItem].pszText);
TAB_SetItemBounds(hwnd);
@@ -1331,7 +1331,7 @@
iItem=(INT) wParam;
tabItem=(LPTCITEMA ) lParam;
- TRACE (tab,"%d %p\n",iItem, tabItem);
+ TRACE("%d %p\n",iItem, tabItem);
if ((iItem<0) || (iItem>infoPtr->uNumItem)) return FALSE;
wineItem=& infoPtr->items[iItem];
@@ -1343,7 +1343,7 @@
wineItem->lParam=tabItem->lParam;
if (tabItem->mask & TCIF_RTLREADING)
- FIXME (tab,"TCIF_RTLREADING\n");
+ FIXME("TCIF_RTLREADING\n");
if (tabItem->mask & TCIF_STATE)
wineItem->dwState=tabItem->dwState;
@@ -1377,7 +1377,7 @@
iItem=(INT) wParam;
tabItem=(LPTCITEMA) lParam;
- TRACE (tab,"\n");
+ TRACE("\n");
if ((iItem<0) || (iItem>infoPtr->uNumItem)) return FALSE;
wineItem=& infoPtr->items[iItem];
@@ -1389,7 +1389,7 @@
tabItem->lParam=wineItem->lParam;
if (tabItem->mask & TCIF_RTLREADING)
- FIXME (tab, "TCIF_RTLREADING\n");
+ FIXME("TCIF_RTLREADING\n");
if (tabItem->mask & TCIF_STATE)
tabItem->dwState=wineItem->dwState;
@@ -1461,7 +1461,7 @@
{
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- TRACE (tab,"\n");
+ TRACE("\n");
return (LRESULT)infoPtr->hFont;
}
@@ -1471,7 +1471,7 @@
{
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- TRACE (tab,"%x %lx\n",wParam, lParam);
+ TRACE("%x %lx\n",wParam, lParam);
infoPtr->hFont = (HFONT)wParam;
@@ -1488,7 +1488,7 @@
{
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- TRACE (tab,"\n");
+ TRACE("\n");
return (LRESULT)infoPtr->himl;
}
@@ -1498,7 +1498,7 @@
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
HIMAGELIST himlPrev;
- TRACE (tab,"\n");
+ TRACE("\n");
himlPrev = infoPtr->himl;
infoPtr->himl= (HIMAGELIST)lParam;
return (LRESULT)himlPrev;
@@ -1571,7 +1571,7 @@
infoPtr->hwndUpDown = 0;
infoPtr->leftmostVisible = 0;
- TRACE(tab, "Created tab control, hwnd [%04x]\n", hwnd);
+ TRACE("Created tab control, hwnd [%04x]\n", hwnd);
if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_TOOLTIPS) {
/* Create tooltip control */
infoPtr->hwndToolTip =
@@ -1666,14 +1666,14 @@
return TAB_GetItemA (hwnd, wParam, lParam);
case TCM_GETITEMW:
- FIXME (tab, "Unimplemented msg TCM_GETITEMW\n");
+ FIXME("Unimplemented msg TCM_GETITEMW\n");
return 0;
case TCM_SETITEMA:
return TAB_SetItemA (hwnd, wParam, lParam);
case TCM_SETITEMW:
- FIXME (tab, "Unimplemented msg TCM_SETITEMW\n");
+ FIXME("Unimplemented msg TCM_SETITEMW\n");
return 0;
case TCM_DELETEITEM:
@@ -1698,11 +1698,11 @@
return TAB_InsertItem (hwnd, wParam, lParam);
case TCM_INSERTITEMW:
- FIXME (tab, "Unimplemented msg TCM_INSERTITEM32W\n");
+ FIXME("Unimplemented msg TCM_INSERTITEM32W\n");
return 0;
case TCM_SETITEMEXTRA:
- FIXME (tab, "Unimplemented msg TCM_SETITEMEXTRA\n");
+ FIXME("Unimplemented msg TCM_SETITEMEXTRA\n");
return 0;
case TCM_ADJUSTRECT:
@@ -1712,27 +1712,27 @@
return TAB_SetItemSize (hwnd, wParam, lParam);
case TCM_REMOVEIMAGE:
- FIXME (tab, "Unimplemented msg TCM_REMOVEIMAGE\n");
+ FIXME("Unimplemented msg TCM_REMOVEIMAGE\n");
return 0;
case TCM_SETPADDING:
- FIXME (tab, "Unimplemented msg TCM_SETPADDING\n");
+ FIXME("Unimplemented msg TCM_SETPADDING\n");
return 0;
case TCM_GETROWCOUNT:
- FIXME (tab, "Unimplemented msg TCM_GETROWCOUNT\n");
+ FIXME("Unimplemented msg TCM_GETROWCOUNT\n");
return 0;
case TCM_GETUNICODEFORMAT:
- FIXME (tab, "Unimplemented msg TCM_GETUNICODEFORMAT\n");
+ FIXME("Unimplemented msg TCM_GETUNICODEFORMAT\n");
return 0;
case TCM_SETUNICODEFORMAT:
- FIXME (tab, "Unimplemented msg TCM_SETUNICODEFORMAT\n");
+ FIXME("Unimplemented msg TCM_SETUNICODEFORMAT\n");
return 0;
case TCM_HIGHLIGHTITEM:
- FIXME (tab, "Unimplemented msg TCM_HIGHLIGHTITEM\n");
+ FIXME("Unimplemented msg TCM_HIGHLIGHTITEM\n");
return 0;
case TCM_GETTOOLTIPS:
@@ -1748,19 +1748,19 @@
return TAB_SetCurFocus (hwnd, wParam);
case TCM_SETMINTTABWIDTH:
- FIXME (tab, "Unimplemented msg TCM_SETMINTTABWIDTH\n");
+ FIXME("Unimplemented msg TCM_SETMINTTABWIDTH\n");
return 0;
case TCM_DESELECTALL:
- FIXME (tab, "Unimplemented msg TCM_DESELECTALL\n");
+ FIXME("Unimplemented msg TCM_DESELECTALL\n");
return 0;
case TCM_GETEXTENDEDSTYLE:
- FIXME (tab, "Unimplemented msg TCM_GETEXTENDEDSTYLE\n");
+ FIXME("Unimplemented msg TCM_GETEXTENDEDSTYLE\n");
return 0;
case TCM_SETEXTENDEDSTYLE:
- FIXME (tab, "Unimplemented msg TCM_SETEXTENDEDSTYLE\n");
+ FIXME("Unimplemented msg TCM_SETEXTENDEDSTYLE\n");
return 0;
case WM_GETFONT:
@@ -1814,7 +1814,7 @@
default:
if (uMsg >= WM_USER)
- ERR (tab, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index af5593c..bf8779e 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -34,7 +34,7 @@
#include "cache.h"
#include "comctl32.h"
#include "toolbar.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(toolbar)
@@ -321,7 +321,7 @@
SelectObject (hdc, hOldFont);
ReleaseDC (0, hdc);
- TRACE (toolbar, "string size %d x %d!\n", lpSize->cx, lpSize->cy);
+ TRACE("string size %d x %d!\n", lpSize->cx, lpSize->cy);
}
/***********************************************************************
@@ -601,7 +601,7 @@
nSepRows * SEPARATOR_WIDTH * 2 / 3 +
nSepRows * (infoPtr->nBitmapHeight + 1) +
BOTTOM_BORDER;
- TRACE (toolbar, "toolbar height %d\n", infoPtr->nHeight);
+ TRACE("toolbar height %d\n", infoPtr->nHeight);
}
@@ -619,19 +619,19 @@
if (btnPtr->fsStyle & TBSTYLE_SEP) {
if (PtInRect (&btnPtr->rect, *lpPt)) {
- TRACE (toolbar, " ON SEPARATOR %d!\n", i);
+ TRACE(" ON SEPARATOR %d!\n", i);
return -i;
}
}
else {
if (PtInRect (&btnPtr->rect, *lpPt)) {
- TRACE (toolbar, " ON BUTTON %d!\n", i);
+ TRACE(" ON BUTTON %d!\n", i);
return i;
}
}
}
- TRACE (toolbar, " NOWHERE!\n");
+ TRACE(" NOWHERE!\n");
return -1;
}
@@ -645,11 +645,11 @@
btnPtr = infoPtr->buttons;
for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
if (btnPtr->idCommand == idCommand) {
- TRACE (toolbar, "command=%d index=%d\n", idCommand, i);
+ TRACE("command=%d index=%d\n", idCommand, i);
return i;
}
}
- TRACE (toolbar, "no index found for command=%d\n", idCommand);
+ TRACE("no index found for command=%d\n", idCommand);
return -1;
}
@@ -794,7 +794,7 @@
COLORREF oldText = 0;
COLORREF oldBk = 0;
- FIXME(toolbar, "action: %x itemState: %x\n",
+ FIXME("action: %x itemState: %x\n",
lpdis->itemAction, lpdis->itemState);
if (lpdis->itemState & ODS_FOCUS)
@@ -876,12 +876,12 @@
if ((!lpAddBmp) || ((INT)wParam <= 0))
return -1;
- TRACE (toolbar, "adding %d bitmaps!\n", wParam);
+ TRACE("adding %d bitmaps!\n", wParam);
if (!(infoPtr->himlStd)) {
/* create new standard image list */
- TRACE (toolbar, "creating standard image list!\n");
+ TRACE("creating standard image list!\n");
/* Windows resize all the buttons to the size of a newly added STandard Image*/
@@ -922,7 +922,7 @@
else if (lpAddBmp->hInst == HINST_COMMCTRL) {
/* add internal bitmaps */
- FIXME (toolbar, "internal bitmaps not supported!\n");
+ FIXME("internal bitmaps not supported!\n");
/* TODO: Resize all the buttons when a new standard image is added */
/* Hack to "add" some reserved images within the image list
@@ -952,7 +952,7 @@
LPTBBUTTON lpTbb = (LPTBBUTTON)lParam;
INT nOldButtons, nNewButtons, nAddButtons, nCount;
- TRACE (toolbar, "adding %d buttons!\n", wParam);
+ TRACE("adding %d buttons!\n", wParam);
nAddButtons = (UINT)wParam;
nOldButtons = infoPtr->nNumButtons;
@@ -1019,12 +1019,12 @@
if ((wParam) && (HIWORD(lParam) == 0)) {
char szString[256];
INT len;
- TRACE (toolbar, "adding string from resource!\n");
+ TRACE("adding string from resource!\n");
len = LoadStringA ((HINSTANCE)wParam, (UINT)lParam,
szString, 256);
- TRACE (toolbar, "len=%d \"%s\"\n", len, szString);
+ TRACE("len=%d \"%s\"\n", len, szString);
nIndex = infoPtr->nNumStrings;
if (infoPtr->nNumStrings == 0) {
infoPtr->strings =
@@ -1050,11 +1050,11 @@
if (p == NULL)
return -1;
- TRACE (toolbar, "adding string(s) from array!\n");
+ TRACE("adding string(s) from array!\n");
nIndex = infoPtr->nNumStrings;
while (*p) {
len = lstrlenA (p);
- TRACE (toolbar, "len=%d \"%s\"\n", len, p);
+ TRACE("len=%d \"%s\"\n", len, p);
if (infoPtr->nNumStrings == 0) {
infoPtr->strings =
@@ -1091,12 +1091,12 @@
if ((wParam) && (HIWORD(lParam) == 0)) {
WCHAR szString[256];
INT len;
- TRACE (toolbar, "adding string from resource!\n");
+ TRACE("adding string from resource!\n");
len = LoadStringW ((HINSTANCE)wParam, (UINT)lParam,
szString, 256);
- TRACE (toolbar, "len=%d \"%s\"\n", len, debugstr_w(szString));
+ TRACE("len=%d \"%s\"\n", len, debugstr_w(szString));
nIndex = infoPtr->nNumStrings;
if (infoPtr->nNumStrings == 0) {
infoPtr->strings =
@@ -1122,11 +1122,11 @@
if (p == NULL)
return -1;
- TRACE (toolbar, "adding string(s) from array!\n");
+ TRACE("adding string(s) from array!\n");
nIndex = infoPtr->nNumStrings;
while (*p) {
len = lstrlenW (p);
- TRACE (toolbar, "len=%d \"%s\"\n", len, debugstr_w(p));
+ TRACE("len=%d \"%s\"\n", len, debugstr_w(p));
if (infoPtr->nNumStrings == 0) {
infoPtr->strings =
@@ -1165,7 +1165,7 @@
INT cx, cy;
UINT uPosFlags = 0;
- TRACE (toolbar, "resize forced!\n");
+ TRACE("resize forced!\n");
parent = GetParent (hwnd);
GetClientRect(parent, &parent_rect);
@@ -1212,8 +1212,8 @@
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
if (infoPtr == NULL) {
- ERR (toolbar, "(0x%x, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
- ERR (toolbar, "infoPtr == NULL!\n");
+ ERR("(0x%x, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
+ ERR("infoPtr == NULL!\n");
return 0;
}
@@ -1362,14 +1362,14 @@
}
if (infoPtr->nNumButtons == 1) {
- TRACE (toolbar, " simple delete!\n");
+ TRACE(" simple delete!\n");
COMCTL32_Free (infoPtr->buttons);
infoPtr->buttons = NULL;
infoPtr->nNumButtons = 0;
}
else {
TBUTTON_INFO *oldButtons = infoPtr->buttons;
- TRACE(toolbar, "complex delete! [nIndex=%d]\n", nIndex);
+ TRACE("complex delete! [nIndex=%d]\n", nIndex);
infoPtr->nNumButtons--;
infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
@@ -1542,7 +1542,7 @@
nStringIndex = infoPtr->buttons[nIndex].iString;
- TRACE (toolbar, "index=%d stringIndex=%d\n", nIndex, nStringIndex);
+ TRACE("index=%d stringIndex=%d\n", nIndex, nStringIndex);
if ((nStringIndex < 0) || (nStringIndex >= infoPtr->nNumStrings))
return -1;
@@ -1654,7 +1654,7 @@
lpSize->cx = infoPtr->rcBound.right - infoPtr->rcBound.left;
lpSize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
- TRACE (toolbar, "maximum size %d x %d\n",
+ TRACE("maximum size %d x %d\n",
infoPtr->rcBound.right - infoPtr->rcBound.left,
infoPtr->rcBound.bottom - infoPtr->rcBound.top);
@@ -1761,7 +1761,7 @@
{
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
- TRACE (toolbar, "%s hwnd=0x%x stub!\n",
+ TRACE("%s hwnd=0x%x stub!\n",
infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
return infoPtr->bUnicode;
@@ -1839,10 +1839,10 @@
if (nIndex < 0)
return FALSE;
- TRACE (toolbar, "inserting button index=%d\n", nIndex);
+ TRACE("inserting button index=%d\n", nIndex);
if (nIndex > infoPtr->nNumButtons) {
nIndex = infoPtr->nNumButtons;
- TRACE (toolbar, "adjust index=%d\n", nIndex);
+ TRACE("adjust index=%d\n", nIndex);
}
oldButtons = infoPtr->buttons;
@@ -2026,7 +2026,7 @@
if ((BOOL)wParam) {
/* save toolbar information */
- FIXME (toolbar, "save to \"%s\" \"%s\"\n",
+ FIXME("save to \"%s\" \"%s\"\n",
lpSave->pszSubKey, lpSave->pszValueName);
@@ -2034,7 +2034,7 @@
else {
/* restore toolbar information */
- FIXME (toolbar, "restore from \"%s\" \"%s\"\n",
+ FIXME("restore from \"%s\" \"%s\"\n",
lpSave->pszSubKey, lpSave->pszValueName);
@@ -2159,7 +2159,7 @@
if (infoPtr->hwndToolTip) {
- FIXME (toolbar, "change tool tip!\n");
+ FIXME("change tool tip!\n");
}
@@ -2325,7 +2325,7 @@
if (LOWORD(wParam) > 1) {
- FIXME (toolbar, "multiple rows not supported!\n");
+ FIXME("multiple rows not supported!\n");
}
@@ -2391,7 +2391,7 @@
if (infoPtr->hwndToolTip) {
- FIXME (toolbar, "change tool tip!\n");
+ FIXME("change tool tip!\n");
}
@@ -2417,7 +2417,7 @@
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
BOOL bTemp;
- TRACE (toolbar, "%s hwnd=0x%04x stub!\n",
+ TRACE("%s hwnd=0x%04x stub!\n",
((BOOL)wParam) ? "TRUE" : "FALSE", hwnd);
bTemp = infoPtr->bUnicode;
@@ -2819,7 +2819,7 @@
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
LPNMHDR lpnmh = (LPNMHDR)lParam;
- TRACE (toolbar, "passing WM_NOTIFY!\n");
+ TRACE("passing WM_NOTIFY!\n");
if ((infoPtr->hwndToolTip) && (lpnmh->hwndFrom == infoPtr->hwndToolTip)) {
SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, wParam, lParam);
@@ -2828,13 +2828,13 @@
if (lpnmh->code == TTN_GETDISPINFOA) {
LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
- FIXME (toolbar, "retrieving ASCII string\n");
+ FIXME("retrieving ASCII string\n");
}
else if (lpnmh->code == TTN_GETDISPINFOW) {
LPNMTTDISPINFOW lpdi = (LPNMTTDISPINFOW)lParam;
- FIXME (toolbar, "retrieving UNICODE string\n");
+ FIXME("retrieving UNICODE string\n");
}
#endif
@@ -2883,7 +2883,7 @@
* SIZE_MAXIMIZED, SIZE_MAXSHOW, SIZE_MINIMIZED
*/
- TRACE (toolbar, "sizing toolbar!\n");
+ TRACE("sizing toolbar!\n");
if (flags == SIZE_RESTORED) {
/* width and height don't apply */
@@ -3238,7 +3238,7 @@
default:
if (uMsg >= WM_USER)
- ERR (toolbar, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index 812dd0b..6b6fcd6 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -19,7 +19,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "tooltips.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(tooltips)
@@ -85,7 +85,7 @@
if ((toolPtr->hinst) && (HIWORD((UINT)toolPtr->lpszText) == 0)) {
/* load a resource */
- TRACE (tooltips, "load res string %x %x\n",
+ TRACE("load res string %x %x\n",
toolPtr->hinst, (int)toolPtr->lpszText);
LoadStringW (toolPtr->hinst, (UINT)toolPtr->lpszText,
infoPtr->szTipText, INFOTIPSIZE);
@@ -103,7 +103,7 @@
ttnmdi.uFlags = toolPtr->uFlags;
ttnmdi.lParam = toolPtr->lParam;
- TRACE (tooltips, "hdr.idFrom = %x\n", ttnmdi.hdr.idFrom);
+ TRACE("hdr.idFrom = %x\n", ttnmdi.hdr.idFrom);
SendMessageA (toolPtr->hwnd, WM_NOTIFY,
(WPARAM)toolPtr->uId, (LPARAM)&ttnmdi);
@@ -138,7 +138,7 @@
}
}
else {
- ERR (tooltips, "recursive text callback!\n");
+ ERR("recursive text callback!\n");
infoPtr->szTipText[0] = '\0';
}
}
@@ -152,7 +152,7 @@
infoPtr->szTipText[0] = L'\0';
}
- TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
+ TRACE("\"%s\"\n", debugstr_w(infoPtr->szTipText));
}
@@ -170,7 +170,7 @@
}
if (GetWindowLongA (hwnd, GWL_STYLE) & TTS_NOPREFIX)
uFlags |= DT_NOPREFIX;
- TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
+ TRACE("\"%s\"\n", debugstr_w(infoPtr->szTipText));
hdc = GetDC (hwnd);
hOldFont = SelectObject (hdc, infoPtr->hFont);
@@ -195,13 +195,13 @@
NMHDR hdr;
if (infoPtr->nTool == -1) {
- TRACE (tooltips, "invalid tool (-1)!\n");
+ TRACE("invalid tool (-1)!\n");
return;
}
infoPtr->nCurrentTool = infoPtr->nTool;
- TRACE (tooltips, "Show tooltip pre %d!\n", infoPtr->nTool);
+ TRACE("Show tooltip pre %d!\n", infoPtr->nTool);
TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nCurrentTool);
@@ -210,7 +210,7 @@
return;
}
- TRACE (tooltips, "Show tooltip %d!\n", infoPtr->nCurrentTool);
+ TRACE("Show tooltip %d!\n", infoPtr->nCurrentTool);
toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
hdr.hwndFrom = hwnd;
@@ -219,10 +219,10 @@
SendMessageA (toolPtr->hwnd, WM_NOTIFY,
(WPARAM)toolPtr->uId, (LPARAM)&hdr);
- TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
+ TRACE("\"%s\"\n", debugstr_w(infoPtr->szTipText));
TOOLTIPS_CalcTipSize (hwnd, infoPtr, &size);
- TRACE (tooltips, "size %d - %d\n", size.cx, size.cy);
+ TRACE("size %d - %d\n", size.cx, size.cy);
if (toolPtr->uFlags & TTF_CENTERTIP) {
RECT rc;
@@ -243,7 +243,7 @@
/* FIXME: check position */
- TRACE (tooltips, "pos %d - %d\n", rect.left, rect.top);
+ TRACE("pos %d - %d\n", rect.left, rect.top);
rect.right = rect.left + size.cx;
rect.bottom = rect.top + size.cy;
@@ -274,7 +274,7 @@
return;
toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
- TRACE (tooltips, "Hide tooltip %d!\n", infoPtr->nCurrentTool);
+ TRACE("Hide tooltip %d!\n", infoPtr->nCurrentTool);
KillTimer (hwnd, ID_TIMERPOP);
hdr.hwndFrom = hwnd;
@@ -300,11 +300,11 @@
NMHDR hdr;
if (infoPtr->nTrackTool == -1) {
- TRACE (tooltips, "invalid tracking tool (-1)!\n");
+ TRACE("invalid tracking tool (-1)!\n");
return;
}
- TRACE (tooltips, "show tracking tooltip pre %d!\n", infoPtr->nTrackTool);
+ TRACE("show tracking tooltip pre %d!\n", infoPtr->nTrackTool);
TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nTrackTool);
@@ -313,7 +313,7 @@
return;
}
- TRACE (tooltips, "show tracking tooltip %d!\n", infoPtr->nTrackTool);
+ TRACE("show tracking tooltip %d!\n", infoPtr->nTrackTool);
toolPtr = &infoPtr->tools[infoPtr->nTrackTool];
hdr.hwndFrom = hwnd;
@@ -322,10 +322,10 @@
SendMessageA (toolPtr->hwnd, WM_NOTIFY,
(WPARAM)toolPtr->uId, (LPARAM)&hdr);
- TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
+ TRACE("\"%s\"\n", debugstr_w(infoPtr->szTipText));
TOOLTIPS_CalcTipSize (hwnd, infoPtr, &size);
- TRACE (tooltips, "size %d - %d\n", size.cx, size.cy);
+ TRACE("size %d - %d\n", size.cx, size.cy);
if (toolPtr->uFlags & TTF_ABSOLUTE) {
rect.left = infoPtr->xTrackPos;
@@ -360,7 +360,7 @@
rect.left = rcTool.right;
}
- TRACE (tooltips, "pos %d - %d\n", rect.left, rect.top);
+ TRACE("pos %d - %d\n", rect.left, rect.top);
rect.right = rect.left + size.cx;
rect.bottom = rect.top + size.cy;
@@ -388,7 +388,7 @@
return;
toolPtr = &infoPtr->tools[infoPtr->nTrackTool];
- TRACE (tooltips, "hide tracking tooltip %d!\n", infoPtr->nTrackTool);
+ TRACE("hide tracking tooltip %d!\n", infoPtr->nTrackTool);
hdr.hwndFrom = hwnd;
hdr.idFrom = toolPtr->uId;
@@ -536,7 +536,7 @@
return -1;
}
- TRACE (tooltips, "tool %d\n", nTool);
+ TRACE("tool %d\n", nTool);
return nTool;
}
@@ -550,7 +550,7 @@
infoPtr->bActive = (BOOL)wParam;
if (infoPtr->bActive)
- TRACE (tooltips, "activate!\n");
+ TRACE("activate!\n");
if (!(infoPtr->bActive) && (infoPtr->nCurrentTool != -1))
TOOLTIPS_Hide (hwnd, infoPtr);
@@ -571,7 +571,7 @@
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
return FALSE;
- TRACE (tooltips, "add tool (%x) %x %d%s!\n",
+ TRACE("add tool (%x) %x %d%s!\n",
hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
(lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
@@ -599,17 +599,17 @@
toolPtr->hinst = lpToolInfo->hinst;
if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
- TRACE (tooltips, "add string id %x!\n", (int)lpToolInfo->lpszText);
+ TRACE("add string id %x!\n", (int)lpToolInfo->lpszText);
toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
}
else if (lpToolInfo->lpszText) {
if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA) {
- TRACE (tooltips, "add CALLBACK!\n");
+ TRACE("add CALLBACK!\n");
toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
}
else {
INT len = lstrlenA (lpToolInfo->lpszText);
- TRACE (tooltips, "add text \"%s\"!\n", lpToolInfo->lpszText);
+ TRACE("add text \"%s\"!\n", lpToolInfo->lpszText);
toolPtr->lpszText = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
}
@@ -635,7 +635,7 @@
(HANDLE)lpttsi);
}
else
- WARN (tooltips, "A window tool must only be listed once!\n");
+ WARN("A window tool must only be listed once!\n");
}
else {
LPTT_SUBCLASS_INFO lpttsi =
@@ -653,7 +653,7 @@
else
lpttsi->uRefCount++;
}
- TRACE (tooltips, "subclassing installed!\n");
+ TRACE("subclassing installed!\n");
}
return TRUE;
@@ -672,7 +672,7 @@
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
return FALSE;
- TRACE (tooltips, "add tool (%x) %x %d%s!\n",
+ TRACE("add tool (%x) %x %d%s!\n",
hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
(lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
@@ -700,17 +700,17 @@
toolPtr->hinst = lpToolInfo->hinst;
if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
- TRACE (tooltips, "add string id %x!\n", (int)lpToolInfo->lpszText);
+ TRACE("add string id %x!\n", (int)lpToolInfo->lpszText);
toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
}
else if (lpToolInfo->lpszText) {
if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW) {
- TRACE (tooltips, "add CALLBACK!\n");
+ TRACE("add CALLBACK!\n");
toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
}
else {
INT len = lstrlenW (lpToolInfo->lpszText);
- TRACE (tooltips, "add text \"%s\"!\n",
+ TRACE("add text \"%s\"!\n",
debugstr_w(lpToolInfo->lpszText));
toolPtr->lpszText = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
@@ -737,7 +737,7 @@
(HANDLE)lpttsi);
}
else
- WARN (tooltips, "A window tool must only be listed once!\n");
+ WARN("A window tool must only be listed once!\n");
}
else {
LPTT_SUBCLASS_INFO lpttsi =
@@ -755,7 +755,7 @@
else
lpttsi->uRefCount++;
}
- TRACE (tooltips, "subclassing installed!\n");
+ TRACE("subclassing installed!\n");
}
return TRUE;
@@ -780,7 +780,7 @@
nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
if (nTool == -1) return 0;
- TRACE (tooltips, "tool %d\n", nTool);
+ TRACE("tool %d\n", nTool);
/* delete text string */
toolPtr = &infoPtr->tools[nTool];
@@ -801,7 +801,7 @@
COMCTL32_Free (&lpttsi);
}
else
- ERR (tooltips, "Invalid data handle!\n");
+ ERR("Invalid data handle!\n");
}
else {
LPTT_SUBCLASS_INFO lpttsi =
@@ -817,7 +817,7 @@
lpttsi->uRefCount--;
}
else
- ERR (tooltips, "Invalid data handle!\n");
+ ERR("Invalid data handle!\n");
}
}
@@ -866,7 +866,7 @@
nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
if (nTool == -1) return 0;
- TRACE (tooltips, "tool %d\n", nTool);
+ TRACE("tool %d\n", nTool);
/* delete text string */
toolPtr = &infoPtr->tools[nTool];
@@ -887,7 +887,7 @@
COMCTL32_Free (&lpttsi);
}
else
- ERR (tooltips, "Invalid data handle!\n");
+ ERR("Invalid data handle!\n");
}
else {
LPTT_SUBCLASS_INFO lpttsi =
@@ -903,7 +903,7 @@
lpttsi->uRefCount--;
}
else
- ERR (tooltips, "Invalid data handle!\n");
+ ERR("Invalid data handle!\n");
}
}
@@ -949,7 +949,7 @@
if (uIndex >= infoPtr->uNumTools)
return FALSE;
- TRACE (tooltips, "index=%u\n", uIndex);
+ TRACE("index=%u\n", uIndex);
toolPtr = &infoPtr->tools[uIndex];
@@ -984,7 +984,7 @@
if (uIndex >= infoPtr->uNumTools)
return FALSE;
- TRACE (tooltips, "index=%u\n", uIndex);
+ TRACE("index=%u\n", uIndex);
toolPtr = &infoPtr->tools[uIndex];
@@ -1212,7 +1212,7 @@
if (nTool == -1)
return FALSE;
- TRACE (tooltips, "tool %d\n", nTool);
+ TRACE("tool %d\n", nTool);
toolPtr = &infoPtr->tools[nTool];
@@ -1249,7 +1249,7 @@
if (nTool == -1)
return FALSE;
- TRACE (tooltips, "tool %d\n", nTool);
+ TRACE("tool %d\n", nTool);
toolPtr = &infoPtr->tools[nTool];
@@ -1282,7 +1282,7 @@
if (nTool == -1)
return FALSE;
- TRACE (tooltips, "tool %d!\n", nTool);
+ TRACE("tool %d!\n", nTool);
/* copy tool data */
if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOA)) {
@@ -1317,7 +1317,7 @@
if (nTool == -1)
return FALSE;
- TRACE (tooltips, "tool %d!\n", nTool);
+ TRACE("tool %d!\n", nTool);
/* copy tool data */
if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOW)) {
@@ -1398,7 +1398,7 @@
POINT pt;
if (lParam == 0) {
- ERR (tooltips, "lpMsg == NULL!\n");
+ ERR("lpMsg == NULL!\n");
return 0;
}
@@ -1413,7 +1413,7 @@
ScreenToClient (lpMsg->hwnd, &pt);
infoPtr->nOldTool = infoPtr->nTool;
infoPtr->nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lpMsg->hwnd, &pt);
- TRACE (tooltips, "tool (%x) %d %d\n",
+ TRACE("tool (%x) %d %d\n",
hwnd, infoPtr->nOldTool, infoPtr->nTool);
TOOLTIPS_Hide (hwnd, infoPtr);
break;
@@ -1423,24 +1423,24 @@
ScreenToClient (lpMsg->hwnd, &pt);
infoPtr->nOldTool = infoPtr->nTool;
infoPtr->nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lpMsg->hwnd, &pt);
- TRACE (tooltips, "tool (%x) %d %d\n",
+ TRACE("tool (%x) %d %d\n",
hwnd, infoPtr->nOldTool, infoPtr->nTool);
- TRACE (tooltips, "WM_MOUSEMOVE (%04x %ld %ld)\n",
+ TRACE("WM_MOUSEMOVE (%04x %ld %ld)\n",
hwnd, pt.x, pt.y);
if ((infoPtr->bActive) && (infoPtr->nTool != infoPtr->nOldTool)) {
if (infoPtr->nOldTool == -1) {
SetTimer (hwnd, ID_TIMERSHOW, infoPtr->nInitialTime, 0);
- TRACE (tooltips, "timer 1 started!\n");
+ TRACE("timer 1 started!\n");
}
else {
TOOLTIPS_Hide (hwnd, infoPtr);
SetTimer (hwnd, ID_TIMERSHOW, infoPtr->nReshowTime, 0);
- TRACE (tooltips, "timer 2 started!\n");
+ TRACE("timer 2 started!\n");
}
}
if (infoPtr->nCurrentTool != -1) {
SetTimer (hwnd, ID_TIMERLEAVE, 100, 0);
- TRACE (tooltips, "timer 3 started!\n");
+ TRACE("timer 3 started!\n");
}
break;
}
@@ -1553,7 +1553,7 @@
nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
if (nTool == -1) return 0;
- TRACE (tooltips, "tool %d\n", nTool);
+ TRACE("tool %d\n", nTool);
toolPtr = &infoPtr->tools[nTool];
@@ -1565,7 +1565,7 @@
toolPtr->hinst = lpToolInfo->hinst;
if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
- TRACE (tooltips, "set string id %x!\n", (INT)lpToolInfo->lpszText);
+ TRACE("set string id %x!\n", (INT)lpToolInfo->lpszText);
toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
}
else if (lpToolInfo->lpszText) {
@@ -1607,7 +1607,7 @@
nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
if (nTool == -1) return 0;
- TRACE (tooltips, "tool %d\n", nTool);
+ TRACE("tool %d\n", nTool);
toolPtr = &infoPtr->tools[nTool];
@@ -1619,7 +1619,7 @@
toolPtr->hinst = lpToolInfo->hinst;
if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
- TRACE (tooltips, "set string id %x!\n", (INT)lpToolInfo->lpszText);
+ TRACE("set string id %x!\n", (INT)lpToolInfo->lpszText);
toolPtr->lpszText = lpToolInfo->lpszText;
}
else if (lpToolInfo->lpszText) {
@@ -1660,7 +1660,7 @@
/* activate */
infoPtr->nTrackTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
if (infoPtr->nTrackTool != -1) {
- TRACE (tooltips, "activated!\n");
+ TRACE("activated!\n");
infoPtr->bTrackActive = TRUE;
TOOLTIPS_TrackShow (hwnd, infoPtr);
}
@@ -1672,7 +1672,7 @@
infoPtr->bTrackActive = FALSE;
infoPtr->nTrackTool = -1;
- TRACE (tooltips, "deactivated!\n");
+ TRACE("deactivated!\n");
}
return 0;
@@ -1688,7 +1688,7 @@
infoPtr->yTrackPos = (INT)HIWORD(lParam);
if (infoPtr->bTrackActive) {
- TRACE (tooltips, "[%d %d]\n",
+ TRACE("[%d %d]\n",
infoPtr->xTrackPos, infoPtr->yTrackPos);
TOOLTIPS_TrackShow (hwnd, infoPtr);
@@ -1726,7 +1726,7 @@
nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
if (nTool == -1) return 0;
- TRACE (tooltips, "tool %d\n", nTool);
+ TRACE("tool %d\n", nTool);
toolPtr = &infoPtr->tools[nTool];
@@ -1779,7 +1779,7 @@
if (nTool == -1)
return 0;
- TRACE (tooltips, "tool %d\n", nTool);
+ TRACE("tool %d\n", nTool);
toolPtr = &infoPtr->tools[nTool];
@@ -1858,11 +1858,11 @@
nResult = (INT) SendMessageA (GetParent (hwnd), WM_NOTIFYFORMAT,
(WPARAM)hwnd, (LPARAM)NF_QUERY);
if (nResult == NFR_ANSI)
- TRACE (tooltips, " -- WM_NOTIFYFORMAT returns: NFR_ANSI\n");
+ TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n");
else if (nResult == NFR_UNICODE)
- FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n");
+ FIXME(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n");
else
- FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: error!\n");
+ FIXME(" -- WM_NOTIFYFORMAT returns: error!\n");
SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
@@ -1971,11 +1971,11 @@
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
INT nTool = (infoPtr->bTrackActive) ? infoPtr->nTrackTool : infoPtr->nTool;
- TRACE (tooltips, " nTool=%d\n", nTool);
+ TRACE(" nTool=%d\n", nTool);
if ((nTool > -1) && (nTool < infoPtr->uNumTools)) {
if (infoPtr->tools[nTool].uFlags & TTF_TRANSPARENT) {
- TRACE (tooltips, "-- in transparent mode!\n");
+ TRACE("-- in transparent mode!\n");
return HTTRANSPARENT;
}
}
@@ -2006,7 +2006,7 @@
infoPtr->hFont = (HFONT)wParam;
if ((LOWORD(lParam)) & (infoPtr->nCurrentTool != -1)) {
- FIXME (tooltips, "full redraw needed!\n");
+ FIXME("full redraw needed!\n");
}
return 0;
@@ -2065,7 +2065,7 @@
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
- TRACE (tooltips, "timer %d (%x) expired!\n", wParam, hwnd);
+ TRACE("timer %d (%x) expired!\n", wParam, hwnd);
switch (wParam)
{
@@ -2128,7 +2128,7 @@
infoPtr = TOOLTIPS_GetInfoPtr(lpttsi->hwndToolTip);
nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);
- TRACE (tooltips, "subclassed mouse message %04x\n", uMsg);
+ TRACE("subclassed mouse message %04x\n", uMsg);
infoPtr->nOldTool = infoPtr->nTool;
infoPtr->nTool = nTool;
TOOLTIPS_Hide (lpttsi->hwndToolTip, infoPtr);
@@ -2138,7 +2138,7 @@
infoPtr = TOOLTIPS_GetInfoPtr (lpttsi->hwndToolTip);
nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);
- TRACE (tooltips, "subclassed WM_MOUSEMOVE\n");
+ TRACE("subclassed WM_MOUSEMOVE\n");
infoPtr->nOldTool = infoPtr->nTool;
infoPtr->nTool = nTool;
@@ -2147,18 +2147,18 @@
if (infoPtr->nOldTool == -1) {
SetTimer (hwnd, ID_TIMERSHOW,
infoPtr->nInitialTime, 0);
- TRACE (tooltips, "timer 1 started!\n");
+ TRACE("timer 1 started!\n");
}
else {
TOOLTIPS_Hide (lpttsi->hwndToolTip, infoPtr);
SetTimer (hwnd, ID_TIMERSHOW,
infoPtr->nReshowTime, 0);
- TRACE (tooltips, "timer 2 started!\n");
+ TRACE("timer 2 started!\n");
}
}
if (infoPtr->nCurrentTool != -1) {
SetTimer (hwnd, ID_TIMERLEAVE, 100, 0);
- TRACE (tooltips, "timer 3 started!\n");
+ TRACE("timer 3 started!\n");
}
break;
}
@@ -2338,7 +2338,7 @@
default:
if (uMsg >= WM_USER)
- ERR (tooltips, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 80d5f62..cb4eb36 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -27,7 +27,7 @@
#include "winbase.h"
#include "commctrl.h"
#include "trackbar.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(trackbar)
@@ -105,7 +105,7 @@
else if (pos < infoPtr->nRangeMin)
pos = infoPtr->nRangeMin;
- TRACE (trackbar,"%.2f\n",pos);
+ TRACE("%.2f\n",pos);
return pos;
}
@@ -764,14 +764,14 @@
hwndTemp = infoPtr->hwndBuddyLA;
infoPtr->hwndBuddyLA = (HWND)lParam;
- FIXME (trackbar, "move buddy!\n");
+ FIXME("move buddy!\n");
}
else {
/* buddy is right or below */
hwndTemp = infoPtr->hwndBuddyRB;
infoPtr->hwndBuddyRB = (HWND)lParam;
- FIXME (trackbar, "move buddy!\n");
+ FIXME("move buddy!\n");
}
TRACKBAR_AlignBuddies (hwnd, infoPtr);
@@ -1142,7 +1142,7 @@
{
TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
- TRACE (trackbar,"\n");
+ TRACE("\n");
infoPtr->bFocus = FALSE;
infoPtr->flags &= ~TB_DRAG_MODE;
@@ -1287,7 +1287,7 @@
{
TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
- TRACE (trackbar,"\n");
+ TRACE("\n");
infoPtr->bFocus = TRUE;
InvalidateRect (hwnd, NULL, FALSE);
@@ -1311,7 +1311,7 @@
static BOOL
TRACKBAR_SendNotify (HWND hwnd, UINT code)
{
- TRACE (trackbar, "%x\n",code);
+ TRACE("%x\n",code);
if (GetWindowLongA (hwnd, GWL_STYLE) & TBS_VERT)
return (BOOL) SendMessageA (GetParent (hwnd),
@@ -1331,7 +1331,7 @@
DOUBLE dragPos;
char buf[80];
- TRACE (trackbar, "%x\n",wParam);
+ TRACE("%x\n",wParam);
if (dwStyle & TBS_VERT)
clickPlace=(SHORT)HIWORD(lParam);
@@ -1388,7 +1388,7 @@
TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
INT pos;
- TRACE (trackbar, "%x\n",wParam);
+ TRACE("%x\n",wParam);
pos=infoPtr->nPos;
switch (wParam) {
@@ -1619,7 +1619,7 @@
default:
if (uMsg >= WM_USER)
- ERR (trackbar, "unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 0e2099c..059ef51 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -44,7 +44,7 @@
#include "wingdi.h"
#include "commctrl.h"
#include "treeview.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(treeview)
@@ -323,7 +323,7 @@
parentItem=& infoPtr->items [(INT)wineItem->parent];
switch (parentItem->cChildren) {
case I_CHILDRENCALLBACK:
- FIXME (treeview,"we don't handle I_CHILDRENCALLBACK yet\n");
+ FIXME("we don't handle I_CHILDRENCALLBACK yet\n");
break;
case 1:
parentItem->cChildren=0;
@@ -390,7 +390,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
if (infoPtr==NULL) return 0;
if ((INT)wParam == TVSIL_NORMAL)
@@ -407,7 +407,7 @@
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
HIMAGELIST himlTemp;
- TRACE (treeview,"\n");
+ TRACE("\n");
switch ((INT)wParam) {
case TVSIL_NORMAL:
himlTemp = infoPtr->himlNormal;
@@ -432,7 +432,7 @@
INT cx,cy,prevHeight=infoPtr->uItemHeight;
HDC hdc;
- TRACE (treeview,"\n");
+ TRACE("\n");
if (wParam==-1) {
hdc=GetDC (hwnd);
infoPtr->uItemHeight=-1;
@@ -454,7 +454,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
return infoPtr->uItemHeight;
}
@@ -464,7 +464,7 @@
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
COLORREF prevColor=infoPtr->clrText;
- TRACE (treeview,"\n");
+ TRACE("\n");
infoPtr->clrText=(COLORREF) lParam;
return (LRESULT) prevColor;
}
@@ -474,7 +474,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
return (LRESULT) infoPtr->clrText;
}
@@ -484,7 +484,7 @@
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
COLORREF prevColor=infoPtr->clrBk;
- TRACE (treeview,"\n");
+ TRACE("\n");
infoPtr->clrBk=(COLORREF) lParam;
return (LRESULT) prevColor;
}
@@ -494,7 +494,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
return (LRESULT) infoPtr->clrBk;
}
@@ -530,7 +530,7 @@
cditem=TREEVIEW_SendCustomDrawItemNotify (hwnd, hdc, wineItem, drawmode);
- TRACE (treeview,"cditem:%d\n",cditem);
+ TRACE("cditem:%d\n",cditem);
if (cditem & CDRF_SKIPDEFAULT)
return;
@@ -733,7 +733,7 @@
}
if (wineItem->pszText== LPSTR_TEXTCALLBACKA) {
- TRACE (treeview,"LPSTR_TEXTCALLBACK\n");
+ TRACE("LPSTR_TEXTCALLBACK\n");
TREEVIEW_SendDispInfoNotify (hwnd, wineItem, TVN_GETDISPINFO, TVIF_TEXT);
}
@@ -798,7 +798,7 @@
HTREEITEM *iItem;
LPRECT lpRect = (LPRECT)lParam;
- TRACE (treeview,"\n");
+ TRACE("\n");
/*
* validate parameters
*/
@@ -832,7 +832,7 @@
lpRect->top = wineItem->rect.top;
}
- TRACE (treeview,"[L:%d R:%d T:%d B:%d]\n",
+ TRACE("[L:%d R:%d T:%d B:%d]\n",
lpRect->left,lpRect->right,
lpRect->top,lpRect->bottom);
@@ -860,7 +860,7 @@
tvItem=(LPTVITEMEXA) lParam;
iItem=(INT)tvItem->hItem;
- TRACE (treeview,"item %d,mask %x\n",iItem,tvItem->mask);
+ TRACE("item %d,mask %x\n",iItem,tvItem->mask);
wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)iItem);
if (!wineItem) return FALSE;
@@ -875,7 +875,7 @@
if (tvItem->mask & TVIF_INTEGRAL) {
wineItem->iIntegral=tvItem->iIntegral;
- FIXME (treeview," TVIF_INTEGRAL not supported yet\n");
+ FIXME(" TVIF_INTEGRAL not supported yet\n");
}
if (tvItem->mask & TVIF_PARAM) {
@@ -925,7 +925,7 @@
INT viewtop,viewbottom,viewleft,viewright;
TREEVIEW_ITEM *wineItem, *prevItem;
- TRACE (treeview,"\n");
+ TRACE("\n");
hdc=GetDC (hwnd);
@@ -967,7 +967,7 @@
wineItem=NULL;
indent=0;
x=y=0;
- TRACE (treeview, "[%d %d %d %d]\n",viewtop,viewbottom,viewleft,viewright);
+ TRACE("[%d %d %d %d]\n",viewtop,viewbottom,viewleft,viewright);
while (iItem) {
prevItem=wineItem;
@@ -1065,7 +1065,7 @@
(hwnd, CDDS_POSTPAINT, hdc, rect);
ReleaseDC (hwnd, hdc);
- TRACE (treeview,"done\n");
+ TRACE("done\n");
}
@@ -1074,7 +1074,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview, " %d\n",wParam);
+ TRACE(" %d\n",wParam);
if (!infoPtr) return FALSE;
switch (wParam) {
@@ -1088,7 +1088,7 @@
infoPtr->Timer &= ~TV_EDIT_TIMER_SET;
return 0;
default:
- ERR (treeview,"got unknown timer\n");
+ ERR("got unknown timer\n");
}
return 1;
@@ -1101,7 +1101,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
if (infoPtr->Timer & TV_REFRESH_TIMER_SET) {
KillTimer (hwnd, TV_REFRESH_TIMER);
}
@@ -1128,7 +1128,7 @@
if (tvItem->mask & TVIF_CHILDREN) {
if (TVIF_CHILDREN==I_CHILDRENCALLBACK)
- FIXME (treeview,"I_CHILDRENCALLBACK not supported\n");
+ FIXME("I_CHILDRENCALLBACK not supported\n");
tvItem->cChildren=wineItem->cChildren;
}
@@ -1142,7 +1142,7 @@
if (tvItem->mask & TVIF_INTEGRAL) {
tvItem->iIntegral=wineItem->iIntegral;
- FIXME (treeview," TVIF_INTEGRAL not supported yet\n");
+ FIXME(" TVIF_INTEGRAL not supported yet\n");
}
if (tvItem->mask & TVIF_PARAM) {
@@ -1160,14 +1160,14 @@
if (tvItem->mask & TVIF_TEXT) {
if (wineItem->pszText == LPSTR_TEXTCALLBACKA) {
tvItem->pszText = LPSTR_TEXTCALLBACKA; /* FIXME:send notification? */
- ERR (treeview," GetItem called with LPSTR_TEXTCALLBACK\n");
+ ERR(" GetItem called with LPSTR_TEXTCALLBACK\n");
}
else if (wineItem->pszText) {
lstrcpynA (tvItem->pszText, wineItem->pszText, tvItem->cchTextMax);
}
}
- TRACE(treeview,"item %d<%p>, txt %p, img %p, action %x\n",
+ TRACE("item %d<%p>, txt %p, img %p, action %x\n",
iItem,
tvItem,
tvItem->pszText,
@@ -1209,7 +1209,7 @@
break;
}
if (retval) {
- TRACE (treeview,"flags:%x, returns %u\n", flag, retval);
+ TRACE("flags:%x, returns %u\n", flag, retval);
return retval;
}
@@ -1238,17 +1238,17 @@
case TVGN_PREVIOUSVISIBLE:
returnItem=TREEVIEW_GetPrevListItem (infoPtr, wineItem);
break;
- default: FIXME (treeview,"Unknown msg %x,item %x\n", flag,iItem);
+ default: FIXME("Unknown msg %x,item %x\n", flag,iItem);
break;
}
if (returnItem) {
- TRACE (treeview,"flags:%x, item %d;returns %d\n", flag, iItem,
+ TRACE("flags:%x, item %d;returns %d\n", flag, iItem,
(INT)returnItem->hItem);
return (INT)returnItem->hItem;
}
- TRACE (treeview,"flags:%x, item %d;returns %d\n", flag, iItem,retval);
+ TRACE("flags:%x, item %d;returns %d\n", flag, iItem,retval);
return retval;
}
@@ -1258,7 +1258,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview," %d\n",infoPtr->uNumItems);
+ TRACE(" %d\n",infoPtr->uNumItems);
return (LRESULT) infoPtr->uNumItems;
}
@@ -1277,10 +1277,10 @@
TREEVIEW_ITEM *upSibling = NULL;
if (newItem == NULL)
- ERR(treeview, "NULL newItem, impossible condition\n");
+ ERR("NULL newItem, impossible condition\n");
if (parent == NULL)
- ERR(treeview, "NULL parent, impossible condition\n");
+ ERR("NULL parent, impossible condition\n");
if (sibling != NULL) /* Insert before this sibling for this parent */
{
@@ -1324,10 +1324,10 @@
TREEVIEW_ITEM *sibling = NULL;
if (newItem == NULL)
- ERR(treeview, "NULL newItem, impossible condition\n");
+ ERR("NULL newItem, impossible condition\n");
if (parent == NULL)
- ERR(treeview, "NULL parent, impossible condition\n");
+ ERR("NULL parent, impossible condition\n");
if (upSibling != NULL) /* Insert after this upsibling for this parent */
{
@@ -1531,10 +1531,10 @@
if (TRACE_ON(treeview)) {
for (i=0; i<infoPtr->uNumPtrsAlloced>>5; i++)
- TRACE (treeview,"%8x\n",infoPtr->freeList[i]);
+ TRACE("%8x\n",infoPtr->freeList[i]);
}
- if (!iItem) ERR (treeview, "Argh -- can't find free item.\n");
+ if (!iItem) ERR("Argh -- can't find free item.\n");
/*
* Find the parent item of the new item
@@ -1575,7 +1575,7 @@
*/
if (tvItem->pszText!=LPSTR_TEXTCALLBACKA)
{
- TRACE (treeview,"(%p,%s)\n", &tvItem->pszText, tvItem->pszText);
+ TRACE("(%p,%s)\n", &tvItem->pszText, tvItem->pszText);
len = lstrlenA (tvItem->pszText)+1;
wineItem->pszText= COMCTL32_Alloc (len+1);
lstrcpyA (wineItem->pszText, tvItem->pszText);
@@ -1583,7 +1583,7 @@
}
else
{
- TRACE (treeview,"LPSTR_TEXTCALLBACK\n");
+ TRACE("LPSTR_TEXTCALLBACK\n");
wineItem->pszText = LPSTR_TEXTCALLBACKA;
wineItem->cchTextMax = 0;
}
@@ -1687,7 +1687,7 @@
sibItem=&infoPtr->items [(INT)sibItem->sibling];
}
if (sibItem->hItem!=ptdi->hInsertAfter) {
- ERR (treeview, "tried to insert item after nonexisting handle.\n");
+ ERR("tried to insert item after nonexisting handle.\n");
break;
}
prevsib=sibItem;
@@ -1705,7 +1705,7 @@
/* Fill in info structure */
- TRACE (treeview,"new item %d; parent %d, mask %x\n", iItem,
+ TRACE("new item %d; parent %d, mask %x\n", iItem,
(INT)wineItem->parent,tvItem->mask);
wineItem->mask=tvItem->mask;
@@ -1714,7 +1714,7 @@
if (tvItem->mask & TVIF_CHILDREN) {
wineItem->cChildren=tvItem->cChildren;
if (tvItem->cChildren==I_CHILDRENCALLBACK)
- FIXME (treeview," I_CHILDRENCALLBACK not supported\n");
+ FIXME(" I_CHILDRENCALLBACK not supported\n");
}
wineItem->expandBox.left = 0; /* Initialize the expandBox */
@@ -1735,7 +1735,7 @@
wineItem->iSelectedImage=tvItem->iSelectedImage;
if (tvItem->mask & TVIF_STATE) {
- TRACE(treeview, "Changing item state from %d to %d\n",
+ TRACE("Changing item state from %d to %d\n",
wineItem->state,
tvItem->state);
wineItem->state=tvItem->state;
@@ -1759,7 +1759,7 @@
INT iItem;
TREEVIEW_ITEM *wineItem;
- TRACE (treeview,"\n");
+ TRACE("\n");
if (!infoPtr) return FALSE;
if (lParam == (INT)TVI_ROOT) {
@@ -1768,7 +1768,7 @@
iItem= (INT) lParam;
wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)iItem);
if (!wineItem) return FALSE;
- TRACE (treeview,"%s\n",wineItem->pszText);
+ TRACE("%s\n",wineItem->pszText);
TREEVIEW_RemoveItem (hwnd, wineItem);
}
@@ -1784,7 +1784,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
return infoPtr->uIndent;
}
@@ -1794,7 +1794,7 @@
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
INT newIndent;
- TRACE (treeview,"\n");
+ TRACE("\n");
newIndent=(INT) wParam;
if (newIndent < MINIMUM_INDENT) newIndent=MINIMUM_INDENT;
infoPtr->uIndent=newIndent;
@@ -1808,7 +1808,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
return infoPtr->hwndToolTip;
}
@@ -1820,7 +1820,7 @@
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
HWND prevToolTip;
- TRACE (treeview,"\n");
+ TRACE("\n");
prevToolTip=infoPtr->hwndToolTip;
infoPtr->hwndToolTip= (HWND) wParam;
@@ -1874,7 +1874,7 @@
TREEVIEW_Command (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE (treeview, "%x %ld\n",wParam, lParam);
+ TRACE("%x %ld\n",wParam, lParam);
switch (HIWORD(wParam))
{
@@ -1937,7 +1937,7 @@
infoPtr->uTotalWidth = LOWORD (lParam);
infoPtr->uTotalHeight = HIWORD (lParam);
} else {
- FIXME (treeview,"WM_SIZE flag %x %lx not handled\n", wParam, lParam);
+ FIXME("WM_SIZE flag %x %lx not handled\n", wParam, lParam);
}
TREEVIEW_QueueRefresh (hwnd);
@@ -1951,7 +1951,7 @@
{
LPSTYLESTRUCT lpss=(LPSTYLESTRUCT) lParam;
- TRACE (treeview,"(%x %lx)\n",wParam,lParam);
+ TRACE("(%x %lx)\n",wParam,lParam);
if (wParam & (GWL_STYLE))
SetWindowLongA( hwnd, GWL_STYLE, lpss->styleNew);
@@ -1969,19 +1969,19 @@
TEXTMETRICA tm;
HDC hdc;
- TRACE (treeview,"wnd %x\n",hwnd);
+ TRACE("wnd %x\n",hwnd);
/* allocate memory for info structure */
infoPtr = (TREEVIEW_INFO *) COMCTL32_Alloc (sizeof(TREEVIEW_INFO));
SetWindowLongA( hwnd, 0, (DWORD)infoPtr);
if (infoPtr == NULL) {
- ERR (treeview, "could not allocate info memory!\n");
+ ERR("could not allocate info memory!\n");
return 0;
}
if ((TREEVIEW_INFO*) GetWindowLongA( hwnd, 0) != infoPtr) {
- ERR (treeview, "pointer assignment error!\n");
+ ERR("pointer assignment error!\n");
return 0;
}
@@ -2076,7 +2076,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
TREEVIEW_RemoveTree (hwnd);
if (infoPtr->Timer & TV_REFRESH_TIMER_SET)
KillTimer (hwnd, TV_REFRESH_TIMER);
@@ -2094,12 +2094,12 @@
HDC hdc;
PAINTSTRUCT ps;
- TRACE (treeview,"\n");
+ TRACE("\n");
hdc = wParam==0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
TREEVIEW_Refresh (hwnd);
if(!wParam)
EndPaint (hwnd, &ps);
- TRACE (treeview,"done\n");
+ TRACE("done\n");
return DefWindowProcA (hwnd, WM_PAINT, wParam, lParam);
}
@@ -2127,7 +2127,7 @@
HBRUSH hBrush = CreateSolidBrush (infoPtr->clrBk);
RECT rect;
- TRACE (treeview,"\n");
+ TRACE("\n");
GetClientRect (hwnd, &rect);
FillRect ((HDC)wParam, &rect, hBrush);
DeleteObject (hBrush);
@@ -2150,7 +2150,7 @@
{
NMHDR nmhdr;
- TRACE (treeview, "%x\n",code);
+ TRACE("%x\n",code);
nmhdr.hwndFrom = hwnd;
nmhdr.idFrom = GetWindowLongA( hwnd, GWL_ID);
nmhdr.code = code;
@@ -2170,7 +2170,7 @@
NMTREEVIEWA nmhdr;
TREEVIEW_ITEM *wineItem;
- TRACE (treeview,"code:%x action:%x olditem:%x newitem:%x\n",
+ TRACE("code:%x action:%x olditem:%x newitem:%x\n",
code,action,(INT)oldItem,(INT)newItem);
nmhdr.hdr.hwndFrom = hwnd;
nmhdr.hdr.idFrom = GetWindowLongA( hwnd, GWL_ID);
@@ -2222,7 +2222,7 @@
NMTREEVIEWA nmhdr;
TREEVIEW_ITEM *wineItem;
- TRACE (treeview,"code:%x dragitem:%x\n", code,(INT)dragItem);
+ TRACE("code:%x dragitem:%x\n", code,(INT)dragItem);
nmhdr.hdr.hwndFrom = hwnd;
nmhdr.hdr.idFrom = GetWindowLongA( hwnd, GWL_ID);
@@ -2252,7 +2252,7 @@
BOOL retval;
char *buf;
- TRACE (treeview,"item %d, action %x, state %d\n",
+ TRACE("item %d, action %x, state %d\n",
(INT)wineItem->hItem,
what,
(INT)wineItem->state);
@@ -2278,7 +2278,7 @@
if (buf==tvdi.item.pszText) {
wineItem->cchTextMax = 128;
} else {
- TRACE (treeview,"user-supplied buffer\n");
+ TRACE("user-supplied buffer\n");
COMCTL32_Free (buf);
wineItem->cchTextMax = 0;
}
@@ -2303,7 +2303,7 @@
NMTVCUSTOMDRAW nmcdhdr;
LPNMCUSTOMDRAW nmcd;
- TRACE (treeview,"drawstage:%lx hdc:%x\n", dwDrawStage, hdc);
+ TRACE("drawstage:%lx hdc:%x\n", dwDrawStage, hdc);
nmcd= & nmcdhdr.nmcd;
nmcd->hdr.hwndFrom = hwnd;
@@ -2366,7 +2366,7 @@
nmcdhdr.clrTextBk= infoPtr->clrBk;
nmcdhdr.iLevel = wineItem->iLevel;
- TRACE (treeview,"drawstage:%lx hdc:%x item:%lx, itemstate:%x\n",
+ TRACE("drawstage:%lx hdc:%x item:%lx, itemstate:%x\n",
dwDrawStage, hdc, dwItemSpec, uItemState);
return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
@@ -2399,14 +2399,14 @@
if (!wineItem->cChildren)
return 0;
- TRACE (treeview,"For (%s) flags:%x item:%d state:%d\n",
+ TRACE("For (%s) flags:%x item:%d state:%d\n",
wineItem->pszText,
flag,
expand,
wineItem->state);
if (wineItem->cChildren==I_CHILDRENCALLBACK) {
- FIXME (treeview,"we don't handle I_CHILDRENCALLBACK yet\n");
+ FIXME("we don't handle I_CHILDRENCALLBACK yet\n");
return 0;
}
@@ -2421,7 +2421,7 @@
switch (flag)
{
case TVE_COLLAPSERESET:
- TRACE(treeview, " case TVE_COLLAPSERESET\n");
+ TRACE(" case TVE_COLLAPSERESET\n");
if (!wineItem->state & TVIS_EXPANDED)
return 0;
@@ -2430,7 +2430,7 @@
break;
case TVE_COLLAPSE:
- TRACE(treeview, " case TVE_COLLAPSE\n");
+ TRACE(" case TVE_COLLAPSE\n");
if (!wineItem->state & TVIS_EXPANDED)
return 0;
@@ -2438,15 +2438,15 @@
break;
case TVE_EXPAND:
- TRACE(treeview, " case TVE_EXPAND\n");
+ TRACE(" case TVE_EXPAND\n");
if (wineItem->state & TVIS_EXPANDED)
return 0;
- TRACE(treeview, " is not expanded...\n");
+ TRACE(" is not expanded...\n");
if (!(wineItem->state & TVIS_EXPANDEDONCE))
{
- TRACE(treeview, " and has never been expanded...\n");
+ TRACE(" and has never been expanded...\n");
wineItem->state |= TVIS_EXPANDED;
/* this item has never been expanded */
@@ -2457,7 +2457,7 @@
0,
(HTREEITEM)expand))
{
- TRACE(treeview, " TVN_ITEMEXPANDING returned TRUE, exiting...\n");
+ TRACE(" TVN_ITEMEXPANDING returned TRUE, exiting...\n");
return FALSE;
}
@@ -2472,14 +2472,14 @@
wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)expand);
if (! wineItem)
{
- ERR(treeview,
+ ERR(
"Catastropic situation, cannot retreive item #%d\n",
expand);
return FALSE;
}
wineItem->state |= TVIS_EXPANDEDONCE;
- TRACE(treeview, " TVN_ITEMEXPANDING sent...\n");
+ TRACE(" TVN_ITEMEXPANDING sent...\n");
TREEVIEW_SendTreeviewNotify (
hwnd,
@@ -2488,7 +2488,7 @@
0,
(HTREEITEM)expand);
- TRACE(treeview, " TVN_ITEMEXPANDED sent...\n");
+ TRACE(" TVN_ITEMEXPANDED sent...\n");
}
else
@@ -2499,14 +2499,14 @@
break;
case TVE_EXPANDPARTIAL:
- TRACE(treeview, " case TVE_EXPANDPARTIAL\n");
- FIXME (treeview, "TVE_EXPANDPARTIAL not implemented\n");
+ TRACE(" case TVE_EXPANDPARTIAL\n");
+ FIXME("TVE_EXPANDPARTIAL not implemented\n");
wineItem->state ^=TVIS_EXPANDED;
wineItem->state |=TVIS_EXPANDEDONCE;
break;
}
- TRACE(treeview, "Exiting, Item %d state is now %d...\n",
+ TRACE("Exiting, Item %d state is now %d...\n",
expand,
wineItem->state);
@@ -2627,11 +2627,11 @@
if (iLength == 0)
{
- ERR( treeview, "Problem retreiving new item label.");
+ ERR("Problem retreiving new item label.");
}
else if (iLength >= 1023)
{
- ERR( treeview,
+ ERR(
"Insuficient space to retrieve new item label, new label ignored.");
}
else
@@ -2644,7 +2644,7 @@
LPSTR tmpLabel = COMCTL32_Alloc( iLength+1 );
if ( tmpLabel == NULL )
- ERR( treeview,
+ ERR(
"OutOfMemory, cannot allocate space for label");
else
{
@@ -2672,14 +2672,14 @@
TREEVIEW_ITEM *wineItem;
POINT pt;
- TRACE (treeview,"\n");
+ TRACE("\n");
pt.x = (INT)LOWORD(lParam);
pt.y = (INT)HIWORD(lParam);
SetFocus (hwnd);
wineItem=TREEVIEW_HitTestPoint (hwnd, pt);
if (!wineItem) return 0;
- TRACE (treeview,"item %d \n",(INT)wineItem->hItem);
+ TRACE("item %d \n",(INT)wineItem->hItem);
if (TREEVIEW_SendSimpleNotify (hwnd, NM_DBLCLK)!=TRUE) { /* FIXME!*/
TREEVIEW_Expand (hwnd, (WPARAM) TVE_TOGGLE, (LPARAM) wineItem->hItem);
@@ -2700,7 +2700,7 @@
SetFocus (hwnd);
iItem=TREEVIEW_HitTest (hwnd, (LPARAM) &ht);
- TRACE (treeview,"item %d \n",iItem);
+ TRACE("item %d \n",iItem);
if (ht.flags & TVHT_ONITEMBUTTON) {
TREEVIEW_Expand (hwnd, (WPARAM) TVE_TOGGLE, (LPARAM) iItem);
@@ -2724,7 +2724,7 @@
ht.pt.x = (INT)LOWORD(lParam);
ht.pt.y = (INT)HIWORD(lParam);
- TRACE (treeview,"\n");
+ TRACE("\n");
/* Return true to cancel default behaviour */
if ( TREEVIEW_SendSimpleNotify (hwnd, NM_CLICK) )
@@ -2758,7 +2758,7 @@
return 0;
}
- TRACE(treeview,"Edit started for %s.\n", editItem->pszText);
+ TRACE("Edit started for %s.\n", editItem->pszText);
infoPtr->editItem = editItem->hItem;
SetWindowPos (
@@ -2798,7 +2798,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
infoPtr->uInternalStatus|=TV_RDRAG;
return 0;
}
@@ -2808,7 +2808,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"\n");
+ TRACE("\n");
if (TREEVIEW_SendSimpleNotify (hwnd, NM_RCLICK)) return 0;
infoPtr->uInternalStatus&= ~(TV_RDRAG | TV_RDRAGGING);
return 0;
@@ -2864,7 +2864,7 @@
HFONT hOldFont;
char *itemtxt;
- TRACE (treeview,"\n");
+ TRACE("\n");
if (!(infoPtr->himlNormal)) return 0;
dragItem=TREEVIEW_ValidItem (infoPtr, (HTREEITEM) lParam);
@@ -2877,7 +2877,7 @@
hOldFont=SelectObject (hdc, infoPtr->hFont);
GetTextExtentPoint32A (hdc, itemtxt, lstrlenA (itemtxt), &size);
- TRACE (treeview,"%d %d %s %d\n",size.cx,size.cy,itemtxt,lstrlenA(itemtxt));
+ TRACE("%d %d %s %d\n",size.cx,size.cy,itemtxt,lstrlenA(itemtxt));
hbmp=CreateCompatibleBitmap (htopdc, size.cx, size.cy);
hOldbmp=SelectObject (hdc, hbmp);
@@ -2920,7 +2920,7 @@
wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)newSelect);
- TRACE (treeview,"Entering item %d, flag %x, cause %x, state %d\n",
+ TRACE("Entering item %d, flag %x, cause %x, state %d\n",
(INT)newSelect,
action,
cause,
@@ -2986,13 +2986,13 @@
break;
case TVGN_FIRSTVISIBLE:
- FIXME (treeview, "FIRSTVISIBLE not implemented\n");
+ FIXME("FIRSTVISIBLE not implemented\n");
break;
}
TREEVIEW_QueueRefresh (hwnd);
- TRACE (treeview,"Leaving state %d\n", wineItem->state);
+ TRACE("Leaving state %d\n", wineItem->state);
return TRUE;
}
@@ -3013,7 +3013,7 @@
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE (treeview,"%x\n",infoPtr->hFont);
+ TRACE("%x\n",infoPtr->hFont);
return infoPtr->hFont;
}
@@ -3028,7 +3028,7 @@
INT height;
HDC hdc;
- TRACE (treeview,"%x %lx\n",wParam, lParam);
+ TRACE("%x %lx\n",wParam, lParam);
infoPtr->hFont = (HFONT)wParam;
@@ -3062,7 +3062,7 @@
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
int maxHeight;
- TRACE (treeview,"wp %x, lp %lx\n", wParam, lParam);
+ TRACE("wp %x, lp %lx\n", wParam, lParam);
if (!infoPtr->uInternalStatus & TV_VSCROLL) return FALSE;
switch (LOWORD (wParam)) {
@@ -3106,7 +3106,7 @@
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
int maxWidth;
- TRACE (treeview,"wp %lx, lp %x\n", lParam, wParam);
+ TRACE("wp %lx, lp %x\n", lParam, wParam);
if (!infoPtr->uInternalStatus & TV_HSCROLL) return FALSE;
@@ -3162,7 +3162,7 @@
TREEVIEW_ITEM *newItem = NULL;
- TRACE (treeview,"%x %lx\n",wParam, lParam);
+ TRACE("%x %lx\n",wParam, lParam);
if (prevSelect == 0)
return FALSE;
@@ -3289,7 +3289,7 @@
case VK_RETURN:
default:
- FIXME (treeview, "%x not implemented\n", wParam);
+ FIXME("%x not implemented\n", wParam);
break;
}
@@ -3337,7 +3337,7 @@
return TREEVIEW_InsertItemA (hwnd, wParam, lParam);
case TVM_INSERTITEMW:
- FIXME (treeview, "Unimplemented msg TVM_INSERTITEM32W\n");
+ FIXME("Unimplemented msg TVM_INSERTITEM32W\n");
return 0;
case TVM_DELETEITEM:
@@ -3374,22 +3374,22 @@
return TREEVIEW_GetItemA (hwnd, wParam, lParam);
case TVM_GETITEMW:
- FIXME (treeview, "Unimplemented msg TVM_GETITEM32W\n");
+ FIXME("Unimplemented msg TVM_GETITEM32W\n");
return 0;
case TVM_SETITEMA:
return TREEVIEW_SetItemA (hwnd, wParam, lParam);
case TVM_SETITEMW:
- FIXME (treeview, "Unimplemented msg TVM_SETITEMW\n");
+ FIXME("Unimplemented msg TVM_SETITEMW\n");
return 0;
case TVM_EDITLABELA:
- FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32A \n");
+ FIXME("Unimplemented msg TVM_EDITLABEL32A \n");
return 0;
case TVM_EDITLABELW:
- FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32W \n");
+ FIXME("Unimplemented msg TVM_EDITLABEL32W \n");
return 0;
case TVM_GETEDITCONTROL:
@@ -3405,11 +3405,11 @@
return TREEVIEW_CreateDragImage (hwnd, wParam, lParam);
case TVM_SORTCHILDREN:
- FIXME (treeview, "Unimplemented msg TVM_SORTCHILDREN\n");
+ FIXME("Unimplemented msg TVM_SORTCHILDREN\n");
return 0;
case TVM_ENSUREVISIBLE:
- FIXME (treeview, "Unimplemented msg TVM_ENSUREVISIBLE\n");
+ FIXME("Unimplemented msg TVM_ENSUREVISIBLE\n");
return 0;
case TVM_SORTCHILDRENCB:
@@ -3419,11 +3419,11 @@
return TREEVIEW_EndEditLabelNow (hwnd, wParam, lParam);
case TVM_GETISEARCHSTRINGA:
- FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32A\n");
+ FIXME("Unimplemented msg TVM_GETISEARCHSTRING32A\n");
return 0;
case TVM_GETISEARCHSTRINGW:
- FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32W\n");
+ FIXME("Unimplemented msg TVM_GETISEARCHSTRING32W\n");
return 0;
case TVM_GETTOOLTIPS:
@@ -3433,7 +3433,7 @@
return TREEVIEW_SetToolTips (hwnd, wParam);
case TVM_SETINSERTMARK:
- FIXME (treeview, "Unimplemented msg TVM_SETINSERTMARK\n");
+ FIXME("Unimplemented msg TVM_SETINSERTMARK\n");
return 0;
case TVM_SETITEMHEIGHT:
@@ -3455,23 +3455,23 @@
return TREEVIEW_GetTextColor (hwnd);
case TVM_SETSCROLLTIME:
- FIXME (treeview, "Unimplemented msg TVM_SETSCROLLTIME\n");
+ FIXME("Unimplemented msg TVM_SETSCROLLTIME\n");
return 0;
case TVM_GETSCROLLTIME:
- FIXME (treeview, "Unimplemented msg TVM_GETSCROLLTIME\n");
+ FIXME("Unimplemented msg TVM_GETSCROLLTIME\n");
return 0;
case TVM_SETINSERTMARKCOLOR:
- FIXME (treeview, "Unimplemented msg TVM_SETINSERTMARKCOLOR\n");
+ FIXME("Unimplemented msg TVM_SETINSERTMARKCOLOR\n");
return 0;
case TVM_SETUNICODEFORMAT:
- FIXME (treeview, "Unimplemented msg TVM_SETUNICODEFORMAT\n");
+ FIXME("Unimplemented msg TVM_SETUNICODEFORMAT\n");
return 0;
case TVM_GETUNICODEFORMAT:
- FIXME (treeview, "Unimplemented msg TVM_GETUNICODEFORMAT\n");
+ FIXME("Unimplemented msg TVM_GETUNICODEFORMAT\n");
return 0;
case WM_COMMAND:
@@ -3553,7 +3553,7 @@
default:
if (uMsg >= WM_USER)
- FIXME (treeview, "Unknown msg %04x wp=%08x lp=%08lx\n",
+ FIXME("Unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
@@ -3566,7 +3566,7 @@
{
WNDCLASSA wndClass;
- TRACE (treeview,"\n");
+ TRACE("\n");
if (GlobalFindAtomA (WC_TREEVIEWA)) return;
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index 8d8d567..a39e072 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -37,7 +37,7 @@
#include "commctrl.h"
#include "winnls.h"
#include "updown.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(updown)
@@ -64,7 +64,7 @@
static int accelIndex = -1;
-#define UNKNOWN_PARAM(msg, wParam, lParam) WARN(updown, \
+#define UNKNOWN_PARAM(msg, wParam, lParam) WARN(\
"UpDown Ctrl: Unknown parameter(s) for message " #msg \
"(%04x): wp=%04x lp=%08lx\n", msg, wParam, lParam);
@@ -215,7 +215,7 @@
if(*src || !UPDOWN_InBounds (hwnd, newVal))
return FALSE;
- TRACE(updown, "new value(%d) read from buddy (old=%d)\n",
+ TRACE("new value(%d) read from buddy (old=%d)\n",
newVal, infoPtr->CurVal);
}
@@ -240,7 +240,7 @@
if (!IsWindow(infoPtr->Buddy))
return FALSE;
- TRACE(updown, "set new value(%d) to buddy.\n",
+ TRACE("set new value(%d) to buddy.\n",
infoPtr->CurVal);
/*if the buddy is a list window, we must set curr index */
@@ -366,7 +366,7 @@
GetClassNameA (hwndBud, infoPtr->szBuddyClass, 40);
if(dwStyle & UDS_ARROWKEYS){
- FIXME(updown, "we need to subclass the buddy to process the arrow keys.\n");
+ FIXME("we need to subclass the buddy to process the arrow keys.\n");
}
/* do we need to do any adjustments? */
@@ -422,7 +422,7 @@
int old_val = infoPtr->CurVal;
NM_UPDOWN ni;
- TRACE(updown, "%s by %d\n", incr ? "inc" : "dec", delta);
+ TRACE("%s by %d\n", incr ? "inc" : "dec", delta);
/* check if we can do the modification first */
delta *= (incr ? 1 : -1) * (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1);
@@ -592,7 +592,7 @@
break;
default:
- ERR(updown, "Impossible case!\n");
+ ERR("Impossible case!\n");
}
}
@@ -629,7 +629,7 @@
if (dwStyle & UDS_AUTOBUDDY)
UPDOWN_SetBuddy (hwnd, GetWindow (hwnd, GW_HWNDPREV));
- TRACE(updown, "UpDown Ctrl creation, hwnd=%04x\n", hwnd);
+ TRACE("UpDown Ctrl creation, hwnd=%04x\n", hwnd);
break;
case WM_DESTROY:
@@ -638,7 +638,7 @@
COMCTL32_Free (infoPtr);
- TRACE(updown, "UpDown Ctrl destruction, hwnd=%04x\n", hwnd);
+ TRACE("UpDown Ctrl destruction, hwnd=%04x\n", hwnd);
break;
case WM_ENABLE:
@@ -728,7 +728,7 @@
return temp;
case UDM_SETACCEL:
- TRACE(updown, "UpDown Ctrl new accel info, hwnd=%04x\n", hwnd);
+ TRACE("UpDown Ctrl new accel info, hwnd=%04x\n", hwnd);
if(infoPtr->AccelVect){
COMCTL32_Free (infoPtr->AccelVect);
infoPtr->AccelCount = 0;
@@ -748,7 +748,7 @@
return infoPtr->Base;
case UDM_SETBASE:
- TRACE(updown, "UpDown Ctrl new base(%d), hwnd=%04x\n",
+ TRACE("UpDown Ctrl new base(%d), hwnd=%04x\n",
wParam, hwnd);
if ( !(wParam==10 || wParam==16) || lParam)
UNKNOWN_PARAM(UDM_SETBASE, wParam, lParam);
@@ -770,7 +770,7 @@
temp = infoPtr->Buddy;
infoPtr->Buddy = wParam;
UPDOWN_SetBuddy (hwnd, wParam);
- TRACE(updown, "UpDown Ctrl new buddy(%04x), hwnd=%04x\n",
+ TRACE("UpDown Ctrl new buddy(%04x), hwnd=%04x\n",
infoPtr->Buddy, hwnd);
return temp;
@@ -784,7 +784,7 @@
if (wParam || HIWORD(lParam))
UNKNOWN_PARAM(UDM_GETPOS, wParam, lParam);
temp = SLOWORD(lParam);
- TRACE(updown, "UpDown Ctrl new value(%d), hwnd=%04x\n",
+ TRACE("UpDown Ctrl new value(%d), hwnd=%04x\n",
temp, hwnd);
if(!UPDOWN_InBounds(hwnd, temp)){
if(temp < infoPtr->MinVal)
@@ -809,7 +809,7 @@
infoPtr->MaxVal = SLOWORD(lParam); /* UD_MINVAL <= Max <= UD_MAXVAL */
infoPtr->MinVal = SHIWORD(lParam); /* UD_MINVAL <= Min <= UD_MAXVAL */
/* |Max-Min| <= UD_MAXVAL */
- TRACE(updown, "UpDown Ctrl new range(%d to %d), hwnd=%04x\n",
+ TRACE("UpDown Ctrl new range(%d to %d), hwnd=%04x\n",
infoPtr->MinVal, infoPtr->MaxVal, hwnd);
break;
@@ -825,13 +825,13 @@
infoPtr->MaxVal = (INT)lParam;
if (infoPtr->MaxVal <= infoPtr->MinVal)
infoPtr->MaxVal = infoPtr->MinVal + 1;
- TRACE(updown, "UpDown Ctrl new range(%d to %d), hwnd=%04x\n",
+ TRACE("UpDown Ctrl new range(%d to %d), hwnd=%04x\n",
infoPtr->MinVal, infoPtr->MaxVal, hwnd);
break;
default:
if (message >= WM_USER)
- ERR (updown, "unknown msg %04x wp=%04x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%04x lp=%08lx\n",
message, wParam, lParam);
return DefWindowProcA (hwnd, message, wParam, lParam);
}
