Skip to content

W
wine-winehq
Commit a099a555 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Converted to the new debug interface, using script written by Patrik

Stridvall.
parent fdcfdb9a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 617 additions and 617 deletions
dlls/comctl32/animate.c
View file @ a099a555
......@@ -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_OpenA (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ ANIMATE_Play (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ ANIMATE_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
/* 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 @@ ANIMATE_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/comboex.c
View file @ a099a555
......@@ -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_GetComboControl (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
TRACE (comboex, "\n");
TRACE("\n");
return (LRESULT)infoPtr->hwndCombo;
}
......@@ -50,7 +50,7 @@ COMBOEX_GetEditControl (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_GetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
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_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
/* 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_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
/* 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_Forward (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
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 @@ COMBOEX_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
/* 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 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/commctrl.c
View file @ a099a555
......@@ -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 @@ HMODULE COMCTL32_hModule = 0;
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 @@ COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
/* 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 @@ COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
/* 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 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
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 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
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 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
break;
default:
FIXME (commctrl, "Invalid Message 0x%x!\n", uMsg);
FIXME("Invalid Message 0x%x!\n", uMsg);
break;
}
}
......@@ -245,7 +245,7 @@ ShowHideMenuCtl (HWND hwnd, UINT uFlags, LPINT lpInfo)
{
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 @@ GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo)
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 @@ GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo)
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 @@ InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls)
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 @@ InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls)
break;
default:
FIXME (commctrl, "Unknown class! dwICC=0x%lX\n", dwMask);
FIXME("Unknown class! dwICC=0x%lX\n", dwMask);
break;
}
}
......@@ -819,7 +819,7 @@ HRESULT WINAPI
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 @@ COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi)
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);
......
dlls/comctl32/datetime.c
View file @ a099a555
......@@ -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 @@ DATETIME_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
/* 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 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
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 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/draglist.c
View file @ a099a555
......@@ -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 @@ BOOL WINAPI MakeDragList (HWND hwndLB)
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 @@ VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem)
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");
......
dlls/comctl32/header.c
View file @ a099a555
......@@ -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 @@ HEADER_InternalHitTest (HWND hwnd, LPPOINT lpPt, UINT *pFlags, INT *pItem)
if (infoPtr->uNumItem == 0) {
*pFlags |= HHT_NOWHERE;
*pItem = 1;
TRACE (header, "NOWHERE\n");
TRACE("NOWHERE\n");
return;
}
else {
......@@ -325,7 +325,7 @@ HEADER_InternalHitTest (HWND hwnd, LPPOINT lpPt, UINT *pFlags, INT *pItem)
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 @@ HEADER_InternalHitTest (HWND hwnd, LPPOINT lpPt, UINT *pFlags, INT *pItem)
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 @@ HEADER_InternalHitTest (HWND hwnd, LPPOINT lpPt, UINT *pFlags, INT *pItem)
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 @@ HEADER_InternalHitTest (HWND hwnd, LPPOINT lpPt, UINT *pFlags, INT *pItem)
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 @@ HEADER_SendClickNotify (HWND hwnd, UINT code, INT iItem)
static LRESULT
HEADER_CreateDragImage (HWND hwnd, WPARAM wParam)
{
FIXME (header, "empty stub!\n");
FIXME("empty stub!\n");
return 0;
}
......@@ -507,13 +507,13 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wParam)
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 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wParam)
}
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 @@ HEADER_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ HEADER_GetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ HEADER_Layout (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ HEADER_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ HEADER_SetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ HEADER_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
ReleaseDC (hwnd, hdc);
}
TRACE (header, "Begin tracking item %d!\n", nItem);
TRACE("Begin tracking item %d!\n", nItem);
}
}
......@@ -1247,11 +1247,11 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
}
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 @@ HEADER_SetCursor (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/hotkey.c
View file @ a099a555
......@@ -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 @@ HOTKEY_KeyDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_KeyUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
/* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd); */
FIXME (hotkey, " %d\n", wParam);
FIXME(" %d\n", wParam);
return 0;
}
......@@ -217,7 +217,7 @@ HOTKEY_SetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (LOWORD(lParam)) {
FIXME (hotkey, "force redraw!\n");
FIXME("force redraw!\n");
}
......@@ -242,11 +242,11 @@ HOTKEY_SysKeyDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_SysKeyUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
/* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd); */
FIXME (hotkey, " %d\n", wParam);
FIXME(" %d\n", wParam);
return 0;
}
......@@ -321,7 +321,7 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/ipaddress.c
View file @ a099a555
......@@ -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 @@ IPADDRESS_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
(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 @@ IPADDRESS_KillFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
HDC hdc;
TRACE (ipaddress,"\n");
TRACE("\n");
hdc = GetDC (hwnd);
IPADDRESS_Refresh (hwnd, hdc);
ReleaseDC (hwnd, hdc);
......@@ -191,7 +191,7 @@ IPADDRESS_SetFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
HDC hdc;
TRACE (ipaddress,"\n");
TRACE("\n");
hdc = GetDC (hwnd);
IPADDRESS_Refresh (hwnd, hdc);
......@@ -205,7 +205,7 @@ static LRESULT
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 @@ static BOOL
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 @@ IPADDRESS_SendIPAddressNotify (HWND hwnd, UINT field, BYTE newValue)
{
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 @@ IPADDRESS_ClearAddress (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ IPADDRESS_IsBlank (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ IPADDRESS_GetAddress (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_SetRange (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ IPADDRESS_SetAddress (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ IPADDRESS_SetFocusToField (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ IPADDRESS_SetFocusToField (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ IPADDRESS_GotoNextField (LPIP_SUBCLASS_INFO lpipsi, int currentfield)
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 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/monthcal.c
View file @ a099a555
......@@ -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 @@ MONTHCAL_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/nativefont.c
View file @ a099a555
......@@ -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 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/pager.c
View file @ a099a555
......@@ -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_GetButtonState (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
/* PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); */
FIXME (pager, "empty stub!\n");
FIXME("empty stub!\n");
return PGF_INVISIBLE;
}
......@@ -104,7 +104,7 @@ PAGER_RecalcSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ PAGER_SetButtonSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
infoPtr->nButtonSize = (INT)lParam;
FIXME (pager, "size=%d\n", infoPtr->nButtonSize);
FIXME("size=%d\n", infoPtr->nButtonSize);
/* FIXME: redraw */
......@@ -164,7 +164,7 @@ PAGER_SetChild (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ PAGER_SetPos (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
/* PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); */
TRACE (pager, "stub!\n");
TRACE("stub!\n");
return 0;
}
......@@ -349,7 +349,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/progress.c
View file @ a099a555
......@@ -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 @@ DEFAULT_DEBUG_CHANNEL(progress)
/* 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 @@ PROGRESS_Draw (HWND hwnd, HDC hdc)
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 @@ LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
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 @@ LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
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 );
}
......
dlls/comctl32/propsheet.c
View file @ a099a555
......@@ -16,7 +16,7 @@
#include "prsht.h"
#include "winnls.h"
#include "comctl32.h"
#include "debug.h"
#include "debugtools.h"
/******************************************************************************
......@@ -144,7 +144,7 @@ static BOOL PROPSHEET_CollectSheetInfo(LPCPROPSHEETHEADERA lppsh,
if (dwFlags & PSH_USEPSTARTPAGE)
{
TRACE(propsheet, "PSH_USEPSTARTPAGE is on");
TRACE("PSH_USEPSTARTPAGE is on");
psInfo->active_page = 0;
}
else
......@@ -268,7 +268,7 @@ BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEA lppsp,
/* 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 @@ static BOOL PROPSHEET_IsTooSmall(HWND hwndDlg, PropSheetInfo* psInfo)
* 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 @@ static BOOL PROPSHEET_IsTooSmall(HWND hwndDlg, PropSheetInfo* psInfo)
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 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
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 @@ static int PROPSHEET_CreatePage(HWND hwndParent,
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 @@ static void PROPSHEET_PressButton(HWND hwndDlg, int buttonID)
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 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
return FALSE;
if (hpage != NULL)
FIXME(propsheet, "Implement HPROPSHEETPAGE!\n");
FIXME("Implement HPROPSHEETPAGE!\n");
else
hwndPage = psInfo->proppage[index].hwndPage;
......@@ -1034,12 +1034,12 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg,
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 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg,
}
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 PropertySheetA(LPCPROPSHEETHEADERA lppsh)
*/
INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW propertySheetHeader)
{
FIXME(propsheet, "(%p): stub\n", propertySheetHeader);
FIXME("(%p): stub\n", propertySheetHeader);
return -1;
}
......@@ -1189,7 +1189,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
*/
HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage)
{
FIXME(propsheet, "(%p): stub\n", lpPropSheetPage);
FIXME("(%p): stub\n", lpPropSheetPage);
return 0;
}
......@@ -1429,7 +1429,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case PSM_ISDIALOGMESSAGE:
{
FIXME (propsheet, "Unimplemented msg PSM_ISDIALOGMESSAGE\n");
FIXME("Unimplemented msg PSM_ISDIALOGMESSAGE\n");
return 0;
}
......@@ -1438,19 +1438,19 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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:
......
dlls/comctl32/status.c
View file @ a099a555
......@@ -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 @@ STATUSBAR_SetParts (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ STATUSBAR_SetParts (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ STATUSBAR_SetTipTextA (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
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 @@ STATUSBAR_SetTipTextW (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
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 @@ STATUSBAR_SetUnicodeFormat (HWND hwnd, WPARAM wParam)
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 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/tab.c
View file @ a099a555
......@@ -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 @@ TAB_SetCurFocus (HWND hwnd,WPARAM wParam)
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 @@ TAB_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ static void TAB_SetItemBounds (HWND hwnd)
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 @@ TAB_InsertItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_InsertItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TAB_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TAB_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TAB_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TAB_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_GetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TRACE (tab,"\n");
TRACE("\n");
return (LRESULT)infoPtr->hFont;
}
......@@ -1471,7 +1471,7 @@ TAB_SetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
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_GetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TRACE (tab,"\n");
TRACE("\n");
return (LRESULT)infoPtr->himl;
}
......@@ -1498,7 +1498,7 @@ TAB_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/trackbar.c
View file @ a099a555
......@@ -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 @@ TRACKBAR_ConvertPlaceToPosition (TRACKBAR_INFO *infoPtr, int place,
else if (pos < infoPtr->nRangeMin)
pos = infoPtr->nRangeMin;
TRACE (trackbar,"%.2f\n",pos);
TRACE("%.2f\n",pos);
return pos;
}
......@@ -764,14 +764,14 @@ TRACKBAR_SetBuddy (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_KillFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
TRACE (trackbar,"\n");
TRACE("\n");
infoPtr->bFocus = FALSE;
infoPtr->flags &= ~TB_DRAG_MODE;
......@@ -1287,7 +1287,7 @@ TRACKBAR_SetFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
TRACE (trackbar,"\n");
TRACE("\n");
infoPtr->bFocus = TRUE;
InvalidateRect (hwnd, NULL, FALSE);
......@@ -1311,7 +1311,7 @@ TRACKBAR_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TRACKBAR_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_KeyDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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);
}
......
dlls/comctl32/updown.c
View file @ a099a555
......@@ -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 @@ DEFAULT_DEBUG_CHANNEL(updown)
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 @@ static BOOL UPDOWN_GetBuddyInt (HWND hwnd)
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 @@ static BOOL UPDOWN_SetBuddyInt (HWND hwnd)
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 @@ static BOOL UPDOWN_SetBuddy (HWND hwnd, HWND hwndBud)
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 @@ static void UPDOWN_DoAction (HWND hwnd, int delta, BOOL incr)
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 @@ static void UPDOWN_HandleMouseEvent (HWND hwnd, UINT msg, POINT pt)
break;
default:
ERR(updown, "Impossible case!\n");
ERR("Impossible case!\n");
}
}
......@@ -629,7 +629,7 @@ LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
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 @@ LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
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 @@ LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
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 @@ LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
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 @@ LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
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 @@ LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
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 @@ LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
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 @@ LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
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);
}
......
dlls/commdlg/cdlg32.c
View file @ a099a555
......@@ -8,7 +8,7 @@
#include "winbase.h"
#include "commdlg.h"
#include "cderr.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(commdlg)
......@@ -32,7 +32,7 @@ static int COMDLG32_Attach = 0;
*/
BOOL WINAPI COMDLG32_DllEntryPoint(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
{
TRACE(commdlg, "(%08x, %08lx, %p)\n", hInstance, Reason, Reserved);
TRACE("(%08x, %08lx, %p)\n", hInstance, Reason, Reserved);
switch(Reason)
{
......@@ -40,7 +40,7 @@ BOOL WINAPI COMDLG32_DllEntryPoint(HINSTANCE hInstance, DWORD Reason, LPVOID Res
COMDLG32_Attach++;
if(COMDLG32_hInstance)
{
ERR(commdlg, "comdlg32.dll instantiated twice in one address space!\n");
ERR("comdlg32.dll instantiated twice in one address space!\n");
/*
* We should return FALSE here, but that will break
* most apps that use CreateProcess because we do
......@@ -56,14 +56,14 @@ BOOL WINAPI COMDLG32_DllEntryPoint(HINSTANCE hInstance, DWORD Reason, LPVOID Res
{
if(!(COMDLG32_hInstance16 = LoadLibrary16("commdlg.dll")))
{
ERR(commdlg, "Could not load sibling commdlg.dll\n");
ERR("Could not load sibling commdlg.dll\n");
return FALSE;
}
}
if((COMDLG32_TlsIndex = TlsAlloc()) == 0xffffffff)
{
ERR(commdlg, "No space for COMDLG32 TLS\n");
ERR("No space for COMDLG32 TLS\n");
return FALSE;
}
break;
......@@ -109,7 +109,7 @@ LPVOID COMDLG32_AllocMem(
*/
void COMDLG32_SetCommDlgExtendedError(DWORD err)
{
TRACE(commdlg, "(%08lx)\n", err);
TRACE("(%08lx)\n", err);
TlsSetValue(COMDLG32_TlsIndex, (void *)err);
}
......
dlls/commdlg/colordlg.c
View file @ a099a555
......@@ -18,7 +18,7 @@
#include "dialog.h"
#include "dlgs.h"
#include "module.h"
#include "debug.h"
#include "debugtools.h"
#include "winproc.h"
#include "cderr.h"
......@@ -37,7 +37,7 @@ BOOL16 WINAPI ChooseColor16(LPCHOOSECOLOR16 lpChCol)
LPCVOID template;
HWND hwndDialog;
TRACE(commdlg,"ChooseColor\n");
TRACE("ChooseColor\n");
if (!lpChCol) return FALSE;
if (lpChCol->Flags & CC_ENABLETEMPLATEHANDLE)
......@@ -594,7 +594,7 @@ static void CC_PaintColorGraph(HWND16 hDlg)
if (lpp->hdcMem)
BitBlt(hDC,0,0,rect.right,rect.bottom,lpp->hdcMem,0,0,SRCCOPY);
else
WARN(commdlg,"choose color: hdcMem is not defined\n");
WARN("choose color: hdcMem is not defined\n");
ReleaseDC(hwnd,hDC);
}
}
......@@ -815,7 +815,7 @@ static LONG CC_WMInitDialog(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
POINT16 point;
struct CCPRIVATE * lpp;
TRACE(commdlg,"WM_INITDIALOG lParam=%08lX\n", lParam);
TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
lpp=calloc(1,sizeof(struct CCPRIVATE));
lpp->lpcc=(LPCHOOSECOLOR16)lParam;
......@@ -910,7 +910,7 @@ static LRESULT CC_WMCommand(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
HDC hdc;
COLORREF *cr;
struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER);
TRACE(commdlg,"CC_WMCommand wParam=%x lParam=%lx\n",wParam,lParam);
TRACE("CC_WMCommand wParam=%x lParam=%lx\n",wParam,lParam);
switch (wParam)
{
case 0x2c2: /* edit notify RGB */
......
dlls/commdlg/filedlg.c
View file @ a099a555
......@@ -19,7 +19,7 @@
#include "dlgs.h"
#include "module.h"
#include "drive.h"
#include "debug.h"
#include "debugtools.h"
#include "winproc.h"
#include "cderr.h"
......@@ -56,13 +56,13 @@ static BOOL FileDlg_Init(void)
if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 ||
hHDisk == 0 || hCDRom == 0 || hNet == 0)
{
ERR(commdlg, "Error loading icons !\n");
ERR("Error loading icons !\n");
return FALSE;
}
fldrInfo = (CURSORICONINFO *) GlobalLock16( hFolder2 );
if (!fldrInfo)
{
ERR(commdlg, "Error measuring icons !\n");
ERR("Error measuring icons !\n");
return FALSE;
}
fldrHeight = fldrInfo -> nHeight;
......@@ -183,7 +183,7 @@ BOOL16 WINAPI GetOpenFileName16(
if (!(lpofn->lpstrFilter))
{
str = SEGPTR_ALLOC(sizeof(defaultfilter));
TRACE(commdlg,"Alloc %p default for Filetype in GetOpenFileName\n",str);
TRACE("Alloc %p default for Filetype in GetOpenFileName\n",str);
memcpy(str,defaultfilter,sizeof(defaultfilter));
lpofn->lpstrFilter=SEGPTR_GET(str);
}
......@@ -191,7 +191,7 @@ BOOL16 WINAPI GetOpenFileName16(
if (!(lpofn->lpstrTitle))
{
str1 = SEGPTR_ALLOC(strlen(defaultopen)+1);
TRACE(commdlg,"Alloc %p default for Title in GetOpenFileName\n",str1);
TRACE("Alloc %p default for Title in GetOpenFileName\n",str1);
strcpy(str1,defaultopen);
lpofn->lpstrTitle=SEGPTR_GET(str1);
}
......@@ -205,14 +205,14 @@ BOOL16 WINAPI GetOpenFileName16(
if (str1)
{
TRACE(commdlg,"Freeing %p default for Title in GetOpenFileName\n",str1);
TRACE("Freeing %p default for Title in GetOpenFileName\n",str1);
SEGPTR_FREE(str1);
lpofn->lpstrTitle=0;
}
if (str)
{
TRACE(commdlg,"Freeing %p default for Filetype in GetOpenFileName\n",str);
TRACE("Freeing %p default for Filetype in GetOpenFileName\n",str);
SEGPTR_FREE(str);
lpofn->lpstrFilter=0;
}
......@@ -224,7 +224,7 @@ BOOL16 WINAPI GetOpenFileName16(
FreeResource16( hDlgTmpl );
}
TRACE(commdlg,"return lpstrFile='%s' !\n",
TRACE("return lpstrFile='%s' !\n",
(LPSTR)PTR_SEG_TO_LIN(lpofn->lpstrFile));
return bRet;
}
......@@ -346,7 +346,7 @@ BOOL16 WINAPI GetSaveFileName16(
if (!(lpofn->lpstrFilter))
{
str = SEGPTR_ALLOC(sizeof(defaultfilter));
TRACE(commdlg,"Alloc default for Filetype in GetSaveFileName\n");
TRACE("Alloc default for Filetype in GetSaveFileName\n");
memcpy(str,defaultfilter,sizeof(defaultfilter));
lpofn->lpstrFilter=SEGPTR_GET(str);
}
......@@ -354,7 +354,7 @@ BOOL16 WINAPI GetSaveFileName16(
if (!(lpofn->lpstrTitle))
{
str1 = SEGPTR_ALLOC(sizeof(defaultsave)+1);
TRACE(commdlg,"Alloc default for Title in GetSaveFileName\n");
TRACE("Alloc default for Title in GetSaveFileName\n");
strcpy(str1,defaultsave);
lpofn->lpstrTitle=SEGPTR_GET(str1);
}
......@@ -367,14 +367,14 @@ BOOL16 WINAPI GetSaveFileName16(
if (str1)
{
TRACE(commdlg,"Freeing %p default for Title in GetSaveFileName\n",str1);
TRACE("Freeing %p default for Title in GetSaveFileName\n",str1);
SEGPTR_FREE(str1);
lpofn->lpstrTitle=0;
}
if (str)
{
TRACE(commdlg,"Freeing %p default for Filetype in GetSaveFileName\n",str);
TRACE("Freeing %p default for Filetype in GetSaveFileName\n",str);
SEGPTR_FREE(str);
lpofn->lpstrFilter=0;
}
......@@ -386,7 +386,7 @@ BOOL16 WINAPI GetSaveFileName16(
FreeResource16( hDlgTmpl );
}
TRACE(commdlg, "return lpstrFile='%s' !\n",
TRACE("return lpstrFile='%s' !\n",
(LPSTR)PTR_SEG_TO_LIN(lpofn->lpstrFile));
return bRet;
}
......@@ -441,12 +441,12 @@ static BOOL FILEDLG_ScanDir(HWND16 hWnd, LPSTR newPath)
char* scptr; /* ptr on semi-colon */
char* filter = buffer;
TRACE(commdlg, "Using filter %s\n", filter);
TRACE("Using filter %s\n", filter);
SendMessageA(hlb, LB_RESETCONTENT, 0, 0);
while (filter) {
scptr = strchr(filter, ';');
if (scptr) *scptr = 0;
TRACE(commdlg, "Using file spec %s\n", filter);
TRACE("Using file spec %s\n", filter);
if (SendMessageA(hlb, LB_DIR, 0, (LPARAM)filter) == LB_ERR)
return FALSE;
if (scptr) *scptr = ';';
......@@ -700,7 +700,7 @@ static LONG FILEDLG_WMInitDialog(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
{
pstr = (LPSTR)PTR_SEG_TO_LIN(lpofn->lpstrCustomFilter);
n = 0;
TRACE(commdlg,"lpstrCustomFilter = %p\n", pstr);
TRACE("lpstrCustomFilter = %p\n", pstr);
while(*pstr)
{
old_pstr = pstr;
......@@ -708,7 +708,7 @@ static LONG FILEDLG_WMInitDialog(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
(LPARAM)lpofn->lpstrCustomFilter + n );
n += strlen(pstr) + 1;
pstr += strlen(pstr) + 1;
TRACE(commdlg,"add str='%s' "
TRACE("add str='%s' "
"associated to '%s'\n", old_pstr, pstr);
SendDlgItemMessage16(hWnd, cmb1, CB_SETITEMDATA16, i, (LPARAM)pstr);
n += strlen(pstr) + 1;
......@@ -725,7 +725,7 @@ static LONG FILEDLG_WMInitDialog(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
(LPARAM)lpofn->lpstrFilter + n );
n += strlen(pstr) + 1;
pstr += strlen(pstr) + 1;
TRACE(commdlg,"add str='%s' "
TRACE("add str='%s' "
"associated to '%s'\n", old_pstr, pstr);
SendDlgItemMessage16(hWnd, cmb1, CB_SETITEMDATA16, i, (LPARAM)pstr);
n += strlen(pstr) + 1;
......@@ -739,7 +739,7 @@ static LONG FILEDLG_WMInitDialog(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
strncpy(tmpstr, FILEDLG_GetFileType(PTR_SEG_TO_LIN(lpofn->lpstrCustomFilter),
PTR_SEG_TO_LIN(lpofn->lpstrFilter), lpofn->nFilterIndex - 1),511);
tmpstr[511]=0;
TRACE(commdlg,"nFilterIndex = %ld, SetText of edt1 to '%s'\n",
TRACE("nFilterIndex = %ld, SetText of edt1 to '%s'\n",
lpofn->nFilterIndex, tmpstr);
SetDlgItemTextA( hWnd, edt1, tmpstr );
/* get drive list */
......@@ -759,7 +759,7 @@ static LONG FILEDLG_WMInitDialog(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
if (!FILEDLG_ScanDir(hWnd, tmpstr)) {
*tmpstr = 0;
if (!FILEDLG_ScanDir(hWnd, tmpstr))
WARN(commdlg, "Couldn't read initial directory %s!\n",tmpstr);
WARN("Couldn't read initial directory %s!\n",tmpstr);
}
/* select current drive in combo 2, omit missing drives */
for(i=0, n=-1; i<=DRIVE_GetCurrentDrive(); i++)
......@@ -860,7 +860,7 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
if (lRet == LB_ERR)
return TRUE;
pstr = (LPSTR)SendDlgItemMessage16(hWnd, cmb1, CB_GETITEMDATA16, lRet, 0);
TRACE(commdlg,"Selected filter : %s\n", pstr);
TRACE("Selected filter : %s\n", pstr);
SetDlgItemTextA( hWnd, edt1, pstr );
FILEDLG_ScanDir(hWnd, tmpstr);
in_update=TRUE;
......@@ -884,7 +884,7 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
strcpy(tmpstr2, tmpstr);
*tmpstr=0;
}
TRACE(commdlg,"tmpstr=%s, tmpstr2=%s\n", tmpstr, tmpstr2);
TRACE("tmpstr=%s, tmpstr2=%s\n", tmpstr, tmpstr2);
SetDlgItemTextA( hWnd, edt1, tmpstr2 );
FILEDLG_ScanDir(hWnd, tmpstr);
return TRUE;
......@@ -897,7 +897,7 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
lRet = SendDlgItemMessage16(hWnd, cmb1, CB_GETCURSEL16, 0, 0);
if (lRet == LB_ERR) return TRUE;
lpofn->nFilterIndex = lRet + 1;
TRACE(commdlg,"lpofn->nFilterIndex=%ld\n", lpofn->nFilterIndex);
TRACE("lpofn->nFilterIndex=%ld\n", lpofn->nFilterIndex);
lstrcpynA(tmpstr2,
FILEDLG_GetFileType(PTR_SEG_TO_LIN(lpofn->lpstrCustomFilter),
PTR_SEG_TO_LIN(lpofn->lpstrFilter),
......
dlls/commdlg/filetitle.c
View file @ a099a555
......@@ -10,7 +10,7 @@
#include "wine/winestring.h"
#include "winbase.h"
#include "commdlg.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h" /* Has to go */
......@@ -26,7 +26,7 @@ short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf)
{
int i, len;
TRACE(commdlg,"(%p %p %d); \n", lpFile, lpTitle, cbBuf);
TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf);
if(lpFile == NULL || lpTitle == NULL)
return -1;
......@@ -56,7 +56,7 @@ short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf)
if(i == -1)
i++;
TRACE(commdlg,"---> '%s' \n", &lpFile[i]);
TRACE("---> '%s' \n", &lpFile[i]);
len = strlen(lpFile+i)+1;
if(cbBuf < len)
......
dlls/commdlg/finddlg.c
View file @ a099a555
......@@ -16,7 +16,7 @@
#include "dialog.h"
#include "dlgs.h"
#include "module.h"
#include "debug.h"
#include "debugtools.h"
#include "winproc.h"
#include "cderr.h"
......@@ -39,7 +39,7 @@ HWND16 WINAPI FindText16( SEGPTR find )
* For now, only the standard dialog works.
*/
if (lpFind->Flags & (FR_ENABLETEMPLATE | FR_ENABLETEMPLATEHANDLE |
FR_ENABLEHOOK)) FIXME(commdlg, ": unimplemented flag (ignored)\n");
FR_ENABLEHOOK)) FIXME(": unimplemented flag (ignored)\n");
if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, MAKEINTRESOURCEA(FINDDLGORD), RT_DIALOGA)))
{
COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
......@@ -73,7 +73,7 @@ HWND16 WINAPI ReplaceText16( SEGPTR find )
* and make CommDlgExtendedError() return the error condition.
*/
if (lpFind->Flags & (FR_ENABLETEMPLATE | FR_ENABLETEMPLATEHANDLE |
FR_ENABLEHOOK)) FIXME(commdlg, ": unimplemented flag (ignored)\n");
FR_ENABLEHOOK)) FIXME(": unimplemented flag (ignored)\n");
if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, MAKEINTRESOURCEA(REPLACEDLGORD), RT_DIALOGA)))
{
COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
......
dlls/commdlg/finddlg32.c
View file @ a099a555
......@@ -10,7 +10,7 @@
#include "commdlg.h"
#include "cderr.h"
#include "dlgs.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(commdlg)
......@@ -158,7 +158,7 @@ BOOL CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPARAM wParam
pdata = (COMDLG32_FR_Data *)lParam;
if(!SetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom, (HANDLE)pdata))
{
ERR(commdlg, "Could not Set prop; invent a gracefull exit?...\n");
ERR("Could not Set prop; invent a gracefull exit?...\n");
DestroyWindow(hDlgWnd);
return FALSE;
}
......@@ -237,12 +237,12 @@ BOOL CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPARAM wParam
case WM_HELP:
/* Heeeeelp! */
FIXME(commdlg, "Got WM_HELP. Who is gonna supply it?\n");
FIXME("Got WM_HELP. Who is gonna supply it?\n");
break;
case WM_CONTEXTMENU:
/* Heeeeelp! */
FIXME(commdlg, "Got WM_CONTEXTMENU. Who is gonna supply it?\n");
FIXME("Got WM_CONTEXTMENU. Who is gonna supply it?\n");
break;
/* FIXME: Handle F1 help */
......@@ -348,7 +348,7 @@ HWND COMDLG32_FR_DoFindReplace(
DWORD error;
LPDLGTEMPLATEW rcs;
TRACE(commdlg, "hInst=%08x, Flags=%08lx\n", pdata->fr.hInstance, pdata->fr.Flags);
TRACE("hInst=%08x, Flags=%08lx\n", pdata->fr.hInstance, pdata->fr.Flags);
if(!(pdata->fr.Flags & FR_ENABLETEMPLATEHANDLE))
{
......@@ -423,7 +423,7 @@ HWND WINAPI FindTextA(
) {
COMDLG32_FR_Data *pdata;
TRACE(commdlg, "LPFINDREPLACE=%p\n", pfr);
TRACE("LPFINDREPLACE=%p\n", pfr);
if(!COMDLG32_FR_CheckPartial(pfr, FALSE))
return 0;
......@@ -447,7 +447,7 @@ HWND WINAPI ReplaceTextA(
) {
COMDLG32_FR_Data *pdata;
TRACE(commdlg, "LPFINDREPLACE=%p\n", pfr);
TRACE("LPFINDREPLACE=%p\n", pfr);
if(!COMDLG32_FR_CheckPartial(pfr, TRUE))
return 0;
......@@ -472,7 +472,7 @@ HWND WINAPI FindTextW(
) {
COMDLG32_FR_Data *pdata;
TRACE(commdlg, "LPFINDREPLACE=%p\n", pfr);
TRACE("LPFINDREPLACE=%p\n", pfr);
if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
return 0;
......@@ -500,7 +500,7 @@ HWND WINAPI ReplaceTextW(
) {
COMDLG32_FR_Data *pdata;
TRACE(commdlg, "LPFINDREPLACE=%p\n", pfr);
TRACE("LPFINDREPLACE=%p\n", pfr);
if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
return 0;
......
dlls/commdlg/fontdlg.c
View file @ a099a555
......@@ -18,7 +18,7 @@
#include "dialog.h"
#include "dlgs.h"
#include "module.h"
#include "debug.h"
#include "debugtools.h"
#include "font.h"
#include "winproc.h"
#include "cderr.h"
......@@ -69,7 +69,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
cf32a.lpLogFont=&lf32a;
CFn_CHOOSEFONT16to32A(lpChFont, &cf32a);
TRACE(commdlg,"ChooseFont\n");
TRACE("ChooseFont\n");
if (!lpChFont) return FALSE;
if (lpChFont->Flags & CF_ENABLETEMPLATEHANDLE)
......@@ -157,7 +157,7 @@ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont)
}
if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS | CF_ENABLETEMPLATE |
CF_ENABLETEMPLATEHANDLE)) FIXME(commdlg, ": unimplemented flag (ignored)\n");
CF_ENABLETEMPLATEHANDLE)) FIXME(": unimplemented flag (ignored)\n");
hwndDialog = DIALOG_CreateIndirect(hInst, template, TRUE, lpChFont->hwndOwner,
(DLGPROC16)FormatCharDlgProcA, (LPARAM)lpChFont, WIN_PROC_32A );
if (hwndDialog) bRet = DIALOG_DoDialogBox(hwndDialog, lpChFont->hwndOwner);
......@@ -190,7 +190,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont)
}
if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS | CF_ENABLETEMPLATE |
CF_ENABLETEMPLATEHANDLE)) FIXME(commdlg, ": unimplemented flag (ignored)\n");
CF_ENABLETEMPLATEHANDLE)) FIXME(": unimplemented flag (ignored)\n");
memcpy(&cf32a, lpChFont, sizeof(cf32a));
memcpy(&lf32a, lpChFont->lpLogFont, sizeof(LOGFONTA));
lstrcpynWtoA(lf32a.lfFaceName, lpChFont->lpLogFont->lfFaceName, LF_FACESIZE);
......@@ -253,7 +253,7 @@ static INT AddFontFamily(LPLOGFONTA lplf, UINT nFontType,
int i;
WORD w;
TRACE(commdlg,"font=%s (nFontType=%d)\n", lplf->lfFaceName,nFontType);
TRACE("font=%s (nFontType=%d)\n", lplf->lfFaceName,nFontType);
if (lpcf->Flags & CF_FIXEDPITCHONLY)
if (!(lplf->lfPitchAndFamily & FIXED_PITCH))
......@@ -398,8 +398,8 @@ INT AddFontStyle(LPLOGFONTA lplf, UINT nFontType,
{
int i;
TRACE(commdlg,"(nFontType=%d)\n",nFontType);
TRACE(commdlg," %s h=%ld w=%ld e=%ld o=%ld wg=%ld i=%d u=%d s=%d"
TRACE("(nFontType=%d)\n",nFontType);
TRACE(" %s h=%ld w=%ld e=%ld o=%ld wg=%ld i=%d u=%d s=%d"
" ch=%d op=%d cp=%d q=%d pf=%xh\n",
lplf->lfFaceName,lplf->lfHeight,lplf->lfWidth,
lplf->lfEscapement,lplf->lfOrientation,
......@@ -469,11 +469,11 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
SetWindowLongA(hDlg, DWL_USER, lParam);
lpxx=lpcf->lpLogFont;
TRACE(commdlg,"WM_INITDIALOG lParam=%08lX\n", lParam);
TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
if (lpcf->lStructSize != sizeof(CHOOSEFONTA))
{
ERR(commdlg,"structure size failure !!!\n");
ERR("structure size failure !!!\n");
EndDialog (hDlg, 0);
return FALSE;
}
......@@ -517,7 +517,7 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
s.hWnd1=GetDlgItem(hDlg,cmb1);
s.lpcf32a=lpcf;
if (!EnumFontFamiliesA(hdc, NULL, FontFamilyEnumProc, (LPARAM)&s))
TRACE(commdlg,"EnumFontFamilies returns 0\n");
TRACE("EnumFontFamilies returns 0\n");
if (lpcf->Flags & CF_INITTOLOGFONTSTRUCT)
{
/* look for fitting font name in combobox1 */
......@@ -564,7 +564,7 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
}
else
{
WARN(commdlg,"HDC failure !!!\n");
WARN("HDC failure !!!\n");
EndDialog (hDlg, 0);
return FALSE;
}
......@@ -721,7 +721,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
HDC hdc;
LPLOGFONTA lpxx=lpcf->lpLogFont;
TRACE(commdlg,"WM_COMMAND wParam=%08lX lParam=%08lX\n", (LONG)wParam, lParam);
TRACE("WM_COMMAND wParam=%08lX lParam=%08lX\n", (LONG)wParam, lParam);
switch (LOWORD(wParam))
{
case cmb1:if (HIWORD(wParam)==CBN_SELCHANGE)
......@@ -739,7 +739,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
char str[256];
SendDlgItemMessageA(hDlg, cmb1, CB_GETLBTEXT, i,
(LPARAM)str);
TRACE(commdlg,"WM_COMMAND/cmb1 =>%s\n",str);
TRACE("WM_COMMAND/cmb1 =>%s\n",str);
s.hWnd1=GetDlgItem(hDlg, cmb2);
s.hWnd2=GetDlgItem(hDlg, cmb3);
s.lpcf32a=lpcf;
......@@ -751,7 +751,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
}
else
{
WARN(commdlg,"HDC failure !!!\n");
WARN("HDC failure !!!\n");
EndDialog (hDlg, 0);
return TRUE;
}
......@@ -762,7 +762,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
case cmb3:if (HIWORD(wParam)==CBN_SELCHANGE || HIWORD(wParam)== BN_CLICKED )
{
char str[256];
TRACE(commdlg,"WM_COMMAND/cmb2,3 =%08lX\n", lParam);
TRACE("WM_COMMAND/cmb2,3 =%08lX\n", lParam);
i=SendDlgItemMessageA(hDlg,cmb1,CB_GETCURSEL,0,0);
if (i==CB_ERR)
i=GetDlgItemTextA( hDlg, cmb1, str, 256 );
......@@ -884,7 +884,7 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
lpcf32a=(LPCHOOSEFONTA)lpcf->lpTemplateName;
if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf32a))
{
TRACE(commdlg, "CFn_WMInitDialog returned FALSE\n");
TRACE("CFn_WMInitDialog returned FALSE\n");
return FALSE;
}
if (CFn_HookCallChk(lpcf))
......@@ -910,9 +910,9 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
res=CFn_WMDestroy(hDlg, wParam32, lParam);
break;
case WM_CHOOSEFONT_GETLOGFONT:
TRACE(commdlg,"WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n",
TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n",
lParam);
FIXME(commdlg, "current logfont back to caller\n");
FIXME("current logfont back to caller\n");
break;
}
WINPROC_UnmapMsg16To32A(hDlg,uMsg32, wParam32, lParam, res);
......@@ -942,7 +942,7 @@ LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
lpcf=(LPCHOOSEFONTA)lParam;
if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf))
{
TRACE(commdlg, "CFn_WMInitDialog returned FALSE\n");
TRACE("CFn_WMInitDialog returned FALSE\n");
return FALSE;
}
if (CFn_HookCallChk32(lpcf))
......@@ -961,9 +961,9 @@ LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
case WM_DESTROY:
return CFn_WMDestroy(hDlg, wParam, lParam);
case WM_CHOOSEFONT_GETLOGFONT:
TRACE(commdlg,"WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n",
TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n",
lParam);
FIXME(commdlg, "current logfont back to caller\n");
FIXME("current logfont back to caller\n");
break;
}
return res;
......@@ -994,7 +994,7 @@ LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
lpcf32a=(LPCHOOSEFONTA)lpcf32w->lpTemplateName;
if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf32a))
{
TRACE(commdlg, "CFn_WMInitDialog returned FALSE\n");
TRACE("CFn_WMInitDialog returned FALSE\n");
return FALSE;
}
if (CFn_HookCallChk32((LPCHOOSEFONTA)lpcf32w))
......@@ -1014,9 +1014,9 @@ LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
case WM_DESTROY:
return CFn_WMDestroy(hDlg, wParam, lParam);
case WM_CHOOSEFONT_GETLOGFONT:
TRACE(commdlg,"WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n",
TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n",
lParam);
FIXME(commdlg, "current logfont back to caller\n");
FIXME("current logfont back to caller\n");
break;
}
return res;
......
dlls/commdlg/generic.c
View file @ a099a555
......@@ -9,7 +9,7 @@
#include "winbase.h"
#include "commdlg.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(commdlg)
......@@ -28,14 +28,14 @@ static int COMMDLG_Attach = 0;
*/
BOOL WINAPI COMMDLG_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, WORD ds, WORD HeapSize, DWORD res1, WORD res2)
{
TRACE(commdlg, "(%08lx, %04x, %04x, %04x, %08lx, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2);
TRACE("(%08lx, %04x, %04x, %04x, %08lx, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2);
switch(Reason)
{
case DLL_PROCESS_ATTACH:
COMMDLG_Attach++;
if(COMMDLG_hInstance)
{
ERR(commdlg, "commdlg.dll instantiated twice!\n");
ERR("commdlg.dll instantiated twice!\n");
/*
* We should return FALSE here, but that will break
* most apps that use CreateProcess because we do
......@@ -49,7 +49,7 @@ BOOL WINAPI COMMDLG_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, WORD ds, WORD
{
if(!(COMMDLG_hInstance32 = LoadLibraryA("comdlg32.dll")))
{
ERR(commdlg, "Could not load sibling comdlg32.dll\n");
ERR("Could not load sibling comdlg32.dll\n");
return FALSE;
}
}
......
dlls/commdlg/printdlg.c
View file @ a099a555
......@@ -18,7 +18,7 @@
#include "dialog.h"
#include "dlgs.h"
#include "module.h"
#include "debug.h"
#include "debugtools.h"
#include "winproc.h"
#include "cderr.h"
#include "winspool.h"
......@@ -40,7 +40,7 @@ BOOL16 WINAPI PrintDlg16( SEGPTR printdlg )
LPSTR rscname;
LPPRINTDLG16 lpPrint = (LPPRINTDLG16)PTR_SEG_TO_LIN(printdlg);
TRACE(commdlg,"(%p) -- Flags=%08lX\n", lpPrint, lpPrint->Flags );
TRACE("(%p) -- Flags=%08lX\n", lpPrint, lpPrint->Flags );
if (lpPrint->Flags & PD_RETURNDEFAULT)
/* FIXME: should fill lpPrint->hDevMode and lpPrint->hDevNames here */
......@@ -130,7 +130,7 @@ BOOL WINAPI PrintDlgA(
DWORD CopyOfEnumBytesNeeded;
PRINT_PTRA PrintStructures;
FIXME(commdlg, "KVG (%p): stub\n", lppd);
FIXME("KVG (%p): stub\n", lppd);
PrintStructures.lpPrintDlg = lppd;
if (!(hResInfo = FindResourceA(COMDLG32_hInstance, "PRINT32", RT_DIALOGA)))
......@@ -171,7 +171,7 @@ BOOL WINAPI PrintDlgA(
*/
if (lppd->Flags & PD_RETURNDEFAULT)
{
WARN(commdlg, ": PrintDlg was requested to return printer info only."
WARN(": PrintDlg was requested to return printer info only."
"\n The return value currently does NOT provide these.\n");
COMDLG32_SetCommDlgExtendedError(PDERR_NODEVICES);
/* return TRUE, thus never checked! */
......@@ -180,7 +180,7 @@ BOOL WINAPI PrintDlgA(
if (lppd->Flags & PD_PRINTSETUP)
{
FIXME(commdlg, ": PrintDlg was requested to display PrintSetup box.\n");
FIXME(": PrintDlg was requested to display PrintSetup box.\n");
COMDLG32_SetCommDlgExtendedError(PDERR_INITFAILURE);
return(FALSE);
}
......@@ -204,7 +204,7 @@ BOOL WINAPI PrintDlgA(
/* FIXME: Currently Unimplemented */
if (lppd->Flags & PD_NOWARNING)
{
WARN(commdlg, ": PD_NOWARNING Flag is not yet implemented.\n");
WARN(": PD_NOWARNING Flag is not yet implemented.\n");
}
/*
......@@ -214,7 +214,7 @@ BOOL WINAPI PrintDlgA(
if (lppd->Flags & (PD_ENABLEPRINTHOOK | PD_ENABLEPRINTTEMPLATE |
PD_ENABLEPRINTTEMPLATEHANDLE | PD_ENABLESETUPHOOK |
PD_ENABLESETUPTEMPLATE|PD_ENABLESETUPTEMPLATEHANDLE))
FIXME(commdlg, ": unimplemented flag (ignored)\n");
FIXME(": unimplemented flag (ignored)\n");
hwndDialog= DIALOG_CreateIndirect(hInst, ptr, TRUE, lppd->hwndOwner,
......@@ -234,7 +234,7 @@ BOOL WINAPI PrintDlgA(
*/
BOOL WINAPI PrintDlgW( LPPRINTDLGW printdlg )
{
FIXME(commdlg, "A really empty stub\n" );
FIXME("A really empty stub\n" );
return FALSE;
}
......@@ -280,11 +280,11 @@ LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
LPPRINTER_INFO_2A lppi = PrintStructures->lpPrinterInfo;
SetWindowLongA(hDlg, DWL_USER, lParam);
TRACE(commdlg,"WM_INITDIALOG lParam=%08lX\n", lParam);
TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
if (lppd->lStructSize != sizeof(PRINTDLGA))
{
FIXME(commdlg,"structure size failure !!!\n");
FIXME("structure size failure !!!\n");
/* EndDialog (hDlg, 0);
return FALSE;
*/ }
......@@ -346,7 +346,7 @@ LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
/* Collate pages */
if (lppd->Flags & PD_COLLATE)
FIXME(commdlg, "PD_COLLATE not implemented yet\n");
FIXME("PD_COLLATE not implemented yet\n");
/* print to file */
CheckDlgButton(hDlg, chx1, (lppd->Flags & PD_PRINTTOFILE) ? 1 : 0);
......@@ -363,7 +363,7 @@ LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
ShowWindow(GetDlgItem(hDlg, pshHelp), SW_HIDE);
}
TRACE(commdlg, "succesful!\n");
TRACE("succesful!\n");
return TRUE;
}
......@@ -395,7 +395,7 @@ BOOL PRINTDLG_ValidateAndDuplicateSettings(HWND hDlg,
nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage)
{
char TempBuffer[256];
FIXME(commdlg, "This MessageBox is not internationalised.");
FIXME("This MessageBox is not internationalised.");
sprintf(TempBuffer, "This value lies not within Page range\n"
"Please enter a value between %d and %d",
lppd->nMinPage, lppd->nMaxPage);
......@@ -427,17 +427,17 @@ static LRESULT PRINTDLG_WMCommand(HWND hDlg, WPARAM wParam,
switch (LOWORD(wParam))
{
case IDOK:
TRACE(commdlg, " OK button was hit\n");
TRACE(" OK button was hit\n");
if (PRINTDLG_ValidateAndDuplicateSettings(hDlg, PrintStructures) != TRUE)
return(FALSE);
DestroyWindow(hDlg);
return(TRUE);
case IDCANCEL:
TRACE(commdlg, " CANCEL button was hit\n");
TRACE(" CANCEL button was hit\n");
EndDialog(hDlg, FALSE);
return(FALSE);
case pshHelp:
TRACE(commdlg, " HELP button was hit\n");
TRACE(" HELP button was hit\n");
SendMessageA(lppd->hwndOwner, PrintStructures->HelpMessageID,
(WPARAM) hDlg, (LPARAM) lppd);
break;
......@@ -464,7 +464,7 @@ static LRESULT PRINTDLG_WMCommand(HWND hDlg, WPARAM wParam,
ClosePrinter(hPrinter);
}
else
WARN(commdlg, " Call to OpenPrinter did not succeed!\n");
WARN(" Call to OpenPrinter did not succeed!\n");
break;
}
case cmb4: /* Printer combobox */
......@@ -499,7 +499,7 @@ LRESULT WINAPI PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
PrintStructures=(PRINT_PTRA*) lParam;
if (!PRINTDLG_WMInitDialog(hDlg, wParam, lParam, PrintStructures))
{
TRACE(commdlg, "PRINTDLG_WMInitDialog returned FALSE\n");
TRACE("PRINTDLG_WMInitDialog returned FALSE\n");
return FALSE;
}
MessageBoxA(hDlg,"Warning: this dialog has no functionality yet!",
......@@ -528,7 +528,7 @@ LRESULT WINAPI PrintDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
switch (wMsg)
{
case WM_INITDIALOG:
TRACE(commdlg,"WM_INITDIALOG lParam=%08lX\n", lParam);
TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
ShowWindow16(hWnd, SW_SHOWNORMAL);
return (TRUE);
case WM_COMMAND:
......@@ -556,7 +556,7 @@ LRESULT WINAPI PrintSetupDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
switch (wMsg)
{
case WM_INITDIALOG:
TRACE(commdlg,"WM_INITDIALOG lParam=%08lX\n", lParam);
TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
ShowWindow16(hWnd, SW_SHOWNORMAL);
return (TRUE);
case WM_COMMAND:
......@@ -580,6 +580,6 @@ LRESULT WINAPI PrintSetupDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
* PageSetupDlgA (COMDLG32.15)
*/
BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
FIXME(commdlg,"(%p), stub!\n",setupdlg);
FIXME("(%p), stub!\n",setupdlg);
return FALSE;
}
dlls/shell32/brsfolder.c
View file @ a099a555
......@@ -7,7 +7,7 @@
#include "dlgs.h"
#include "win.h"
#include "sysmetrics.h"
#include "debug.h"
#include "debugtools.h"
#include "winreg.h"
#include "authors.h"
#include "winnls.h"
......@@ -41,7 +41,7 @@ static void InitializeTreeView(HWND hwndParent)
hwndTreeView = GetDlgItem (hwndParent, IDD_TREEVIEW);
Shell_GetImageList(NULL, &hImageList);
TRACE(shell,"dlg=%x tree=%x\n", hwndParent, hwndTreeView );
TRACE("dlg=%x tree=%x\n", hwndParent, hwndTreeView );
if (hImageList && hwndTreeView)
{ TreeView_SetImageList(hwndTreeView, hImageList, 0);
......@@ -66,7 +66,7 @@ static int GetIcon(LPITEMIDLIST lpi, UINT uFlags)
}
static void GetNormalAndSelectedIcons(LPITEMIDLIST lpifq,LPTVITEMA lpTV_ITEM)
{ TRACE (shell,"%p %p\n",lpifq, lpTV_ITEM);
{ TRACE("%p %p\n",lpifq, lpTV_ITEM);
lpTV_ITEM->iImage = GetIcon(lpifq, SHGFI_PIDL | SHGFI_SYSICONINDEX | SHGFI_SMALLICON);
lpTV_ITEM->iSelectedImage = GetIcon(lpifq, SHGFI_PIDL | SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_OPENICON);
......@@ -86,14 +86,14 @@ static BOOL GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST lpi, DWORD dwFlags, LPSTR l
BOOL bSuccess=TRUE;
STRRET str;
TRACE(shell,"%p %p %lx %p\n", lpsf, lpi, dwFlags, lpFriendlyName);
TRACE("%p %p %lx %p\n", lpsf, lpi, dwFlags, lpFriendlyName);
if (SUCCEEDED(IShellFolder_GetDisplayNameOf(lpsf, lpi, dwFlags, &str)))
{ bSuccess = StrRetToStrN (lpFriendlyName, MAX_PATH, &str, lpi);
}
else
bSuccess = FALSE;
TRACE(shell,"-- %s\n",lpFriendlyName);
TRACE("-- %s\n",lpFriendlyName);
return bSuccess;
}
......@@ -110,7 +110,7 @@ static void FillTreeView(IShellFolder * lpsf, LPITEMIDLIST pidl, HTREEITEM hPar
char szBuff[256];
HWND hwnd=GetParent(hwndTreeView);
TRACE(shell, "%p %p %x\n",lpsf, pidl, (INT)hParent);
TRACE("%p %p %x\n",lpsf, pidl, (INT)hParent);
SetCapture(GetParent(hwndTreeView));
SetCursor(LoadCursorA(0, IDC_WAITA));
......@@ -176,13 +176,13 @@ static LRESULT MsgNotify(HWND hWnd, UINT CtlID, LPNMHDR lpnmh)
IShellFolder * lpsf2=0;
TRACE(shell,"%x %x %p msg=%x\n", hWnd, CtlID, lpnmh, pnmtv->hdr.code);
TRACE("%x %x %p msg=%x\n", hWnd, CtlID, lpnmh, pnmtv->hdr.code);
switch (pnmtv->hdr.idFrom)
{ case IDD_TREEVIEW:
switch (pnmtv->hdr.code)
{ case TVN_DELETEITEM:
{ FIXME(shell,"TVN_DELETEITEM\n");
{ FIXME("TVN_DELETEITEM\n");
lptvid=(LPTV_ITEMDATA)pnmtv->itemOld.lParam;
IShellFolder_Release(lptvid->lpsfParent);
SHFree(lptvid->lpi);
......@@ -192,7 +192,7 @@ static LRESULT MsgNotify(HWND hWnd, UINT CtlID, LPNMHDR lpnmh)
break;
case TVN_ITEMEXPANDING:
{ FIXME(shell,"TVN_ITEMEXPANDING\n");
{ FIXME("TVN_ITEMEXPANDING\n");
if ((pnmtv->itemNew.state & TVIS_EXPANDEDONCE))
break;
......@@ -209,7 +209,7 @@ static LRESULT MsgNotify(HWND hWnd, UINT CtlID, LPNMHDR lpnmh)
break;
default:
FIXME(shell,"unhandled\n");
FIXME("unhandled\n");
break;
}
break;
......@@ -227,20 +227,20 @@ static LRESULT MsgNotify(HWND hWnd, UINT CtlID, LPNMHDR lpnmh)
*/
BOOL WINAPI BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
LPARAM lParam )
{ TRACE(shell,"hwnd=%i msg=%i 0x%08x 0x%08lx\n", hWnd, msg, wParam, lParam );
{ TRACE("hwnd=%i msg=%i 0x%08x 0x%08lx\n", hWnd, msg, wParam, lParam );
switch(msg)
{ case WM_INITDIALOG:
pidlRet = NULL;
lpBrowseInfo = (LPBROWSEINFOA) lParam;
if (lpBrowseInfo->lpfn)
FIXME(shell,"Callbacks not implemented\n");
FIXME("Callbacks not implemented\n");
if (lpBrowseInfo->ulFlags)
FIXME(shell,"flag %x not implemented\n", lpBrowseInfo->ulFlags);
FIXME("flag %x not implemented\n", lpBrowseInfo->ulFlags);
if (lpBrowseInfo->lpszTitle)
FIXME(shell,"title %s not displayed\n", lpBrowseInfo->lpszTitle);
FIXME("title %s not displayed\n", lpBrowseInfo->lpszTitle);
if ( lpBrowseInfo->pidlRoot )
FIXME(shell,"root is desktop\n");
FIXME("root is desktop\n");
InitializeTreeView ( hWnd);
return 1;
......@@ -272,7 +272,7 @@ BOOL WINAPI BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
*/
LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
{
TRACE(shell, "(%lx,%s) empty stub!\n", (DWORD)lpbi, lpbi->lpszTitle);
TRACE("(%lx,%s) empty stub!\n", (DWORD)lpbi, lpbi->lpszTitle);
return (LPITEMIDLIST) DialogBoxParamA( shell32_hInstance,
"SHBRSFORFOLDER_MSGBOX", 0,
......
dlls/shell32/classes.c
View file @ a099a555
......@@ -6,7 +6,7 @@
*/
#include <stdlib.h>
#include <string.h>
#include "debug.h"
#include "debugtools.h"
#include "winerror.h"
#include "winreg.h"
......@@ -18,7 +18,7 @@ DEFAULT_DEBUG_CHANNEL(shell)
BOOL HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len)
{ HKEY hkey;
TRACE(shell, "%s %p\n",szExtension, szFileType );
TRACE("%s %p\n",szExtension, szFileType );
if (RegOpenKeyExA(HKEY_CLASSES_ROOT,szExtension,0,0x02000000,&hkey))
{ return FALSE;
......@@ -31,7 +31,7 @@ BOOL HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len)
RegCloseKey(hkey);
TRACE(shell, "-- %s\n", szFileType );
TRACE("-- %s\n", szFileType );
return TRUE;
}
......@@ -39,7 +39,7 @@ BOOL HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD
{ HKEY hkey;
char sTemp[256];
TRACE(shell, "%s %s\n",szClass, szVerb );
TRACE("%s %s\n",szClass, szVerb );
sprintf(sTemp, "%s\\shell\\%s\\command",szClass, szVerb);
......@@ -53,7 +53,7 @@ BOOL HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD
}
RegCloseKey(hkey);
TRACE(shell, "-- %s\n", szDest );
TRACE("-- %s\n", szDest );
return TRUE;
......@@ -68,7 +68,7 @@ BOOL HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr)
char sTemp[256];
char sNum[5];
TRACE(shell, "%s\n",szClass );
TRACE("%s\n",szClass );
sprintf(sTemp, "%s\\DefaultIcon",szClass);
......@@ -89,7 +89,7 @@ BOOL HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr)
ParseFieldA (szDest, 1, szDest, len);
TRACE(shell, "-- %s %li\n", szDest, *dwNr );
TRACE("-- %s %li\n", szDest, *dwNr );
return TRUE;
......
dlls/shell32/contmenu.c
View file @ a099a555
......@@ -6,7 +6,7 @@
#include <string.h>
#include "winerror.h"
#include "debug.h"
#include "debugtools.h"
#include "pidl.h"
#include "wine/obj_base.h"
......@@ -37,7 +37,7 @@ static struct ICOM_VTABLE(IContextMenu) cmvt;
*/
BOOL IContextMenu_AllocPidlTable(IContextMenuImpl *This, DWORD dwEntries)
{
TRACE(shell,"(%p)->(entrys=%lu)\n",This, dwEntries);
TRACE("(%p)->(entrys=%lu)\n",This, dwEntries);
/*add one for NULL terminator */
dwEntries++;
......@@ -57,7 +57,7 @@ void IContextMenu_FreePidlTable(IContextMenuImpl *This)
{
int i;
TRACE(shell,"(%p)->()\n",This);
TRACE("(%p)->()\n",This);
if(This->aPidls)
{ for(i = 0; This->aPidls[i]; i++)
......@@ -76,7 +76,7 @@ BOOL IContextMenu_FillPidlTable(IContextMenuImpl *This, LPCITEMIDLIST *aPidls, U
{
UINT i;
TRACE(shell,"(%p)->(apidl=%p count=%u)\n",This, aPidls, uItemCount);
TRACE("(%p)->(apidl=%p count=%u)\n",This, aPidls, uItemCount);
if(This->aPidls)
{ for(i = 0; i < uItemCount; i++)
......@@ -94,7 +94,7 @@ BOOL IContextMenu_CanRenameItems(IContextMenuImpl *This)
{ UINT i;
DWORD dwAttributes;
TRACE(shell,"(%p)->()\n",This);
TRACE("(%p)->()\n",This);
if(This->aPidls)
{
......@@ -138,7 +138,7 @@ IContextMenu *IContextMenu_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST *a
for(u = 0; u < uItemCount; u++)
{ cm->bAllValues &= (_ILIsValue(aPidls[u]) ? 1 : 0);
}
TRACE(shell,"(%p)->()\n",cm);
TRACE("(%p)->()\n",cm);
shell32_ObjCount++;
return (IContextMenu*)cm;
}
......@@ -153,7 +153,7 @@ static HRESULT WINAPI IContextMenu_fnQueryInterface(IContextMenu *iface, REFIID
char xriid[50];
WINE_StringFromCLSID((LPCLSID)riid,xriid);
TRACE(shell,"(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
*ppvObj = NULL;
......@@ -164,16 +164,16 @@ static HRESULT WINAPI IContextMenu_fnQueryInterface(IContextMenu *iface, REFIID
{ *ppvObj = This;
}
else if(IsEqualIID(riid, &IID_IShellExtInit)) /*IShellExtInit*/
{ FIXME (shell,"-- LPSHELLEXTINIT pointer requested\n");
{ FIXME("-- LPSHELLEXTINIT pointer requested\n");
}
if(*ppvObj)
{
IContextMenu_AddRef((IContextMenu*)*ppvObj);
TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
return S_OK;
}
TRACE(shell,"-- Interface: E_NOINTERFACE\n");
TRACE("-- Interface: E_NOINTERFACE\n");
return E_NOINTERFACE;
}
......@@ -184,7 +184,7 @@ static ULONG WINAPI IContextMenu_fnAddRef(IContextMenu *iface)
{
ICOM_THIS(IContextMenuImpl, iface);
TRACE(shell,"(%p)->(count=%lu)\n",This, This->ref);
TRACE("(%p)->(count=%lu)\n",This, This->ref);
shell32_ObjCount++;
return ++(This->ref);
......@@ -197,12 +197,12 @@ static ULONG WINAPI IContextMenu_fnRelease(IContextMenu *iface)
{
ICOM_THIS(IContextMenuImpl, iface);
TRACE(shell,"(%p)->()\n",This);
TRACE("(%p)->()\n",This);
shell32_ObjCount--;
if (!--(This->ref))
{ TRACE(shell," destroying IContextMenu(%p)\n",This);
{ TRACE(" destroying IContextMenu(%p)\n",This);
if(This->pSFParent)
IShellFolder_Release(This->pSFParent);
......@@ -262,7 +262,7 @@ static HRESULT WINAPI IContextMenu_fnQueryContextMenu(
BOOL fExplore ;
TRACE(shell,"(%p)->(hmenu=%x indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
TRACE("(%p)->(hmenu=%x indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
if(!(CMF_DEFAULTONLY & uFlags))
{ if(!This->bAllValues)
......@@ -310,7 +310,7 @@ static HRESULT WINAPI IContextMenu_fnInvokeCommand(
SHELLEXECUTEINFOA sei;
int i;
TRACE(shell,"(%p)->(invcom=%p verb=%p wnd=%x)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
TRACE("(%p)->(invcom=%p verb=%p wnd=%x)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
if(HIWORD(lpcmi->lpVerb))
{ /* get the active IShellView */
......@@ -319,9 +319,9 @@ static HRESULT WINAPI IContextMenu_fnInvokeCommand(
IShellView_GetWindow(lpSV, &hWndSV);
/* these verbs are used by the filedialogs*/
TRACE(shell,"%s\n",lpcmi->lpVerb);
TRACE("%s\n",lpcmi->lpVerb);
if (! strcmp(lpcmi->lpVerb,CMDSTR_NEWFOLDER))
{ FIXME(shell,"%s not implemented\n",lpcmi->lpVerb);
{ FIXME("%s not implemented\n",lpcmi->lpVerb);
}
else if (! strcmp(lpcmi->lpVerb,CMDSTR_VIEWLIST))
{ SendMessageA(hWndSV, WM_COMMAND, MAKEWPARAM(FCIDM_SHVIEW_LISTVIEW,0),0 );
......@@ -330,7 +330,7 @@ static HRESULT WINAPI IContextMenu_fnInvokeCommand(
{ SendMessageA(hWndSV, WM_COMMAND, MAKEWPARAM(FCIDM_SHVIEW_REPORTVIEW,0),0 );
}
else
{ FIXME(shell,"please report: unknown verb %s\n",lpcmi->lpVerb);
{ FIXME("please report: unknown verb %s\n",lpcmi->lpVerb);
}
IShellView_Release(lpSV);
return NOERROR;
......@@ -395,7 +395,7 @@ static HRESULT WINAPI IContextMenu_fnGetCommandString(
HRESULT hr = E_INVALIDARG;
TRACE(shell,"(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
TRACE("(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
switch(uFlags)
{ case GCS_HELPTEXT:
......@@ -426,7 +426,7 @@ static HRESULT WINAPI IContextMenu_fnGetCommandString(
hr = NOERROR;
break;
}
TRACE(shell,"-- (%p)->(name=%s)\n",This, lpszName);
TRACE("-- (%p)->(name=%s)\n",This, lpszName);
return hr;
}
......@@ -444,7 +444,7 @@ static HRESULT WINAPI IContextMenu_fnHandleMenuMsg(
{
ICOM_THIS(IContextMenuImpl, iface);
TRACE(shell,"(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
TRACE("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
return E_NOTIMPL;
}
......
dlls/shell32/enumidlist.c
View file @ a099a555
......@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <string.h>
#include "debug.h"
#include "debugtools.h"
#include "wine/obj_base.h"
#include "wine/obj_enumidlist.h"
#include "winerror.h"
......@@ -55,7 +55,7 @@ IEnumIDList * IEnumIDList_Constructor(
lpeidl->mpLast=NULL;
lpeidl->mpCurrent=NULL;
TRACE(shell,"(%p)->(%s flags=0x%08lx)\n",lpeidl,debugstr_a(lpszPath),dwFlags);
TRACE("(%p)->(%s flags=0x%08lx)\n",lpeidl,debugstr_a(lpszPath),dwFlags);
if(!IEnumIDList_CreateEnumList((IEnumIDList*)lpeidl, lpszPath, dwFlags))
{ if (lpeidl)
......@@ -64,7 +64,7 @@ IEnumIDList * IEnumIDList_Constructor(
return NULL;
}
TRACE(shell,"-- (%p)->()\n",lpeidl);
TRACE("-- (%p)->()\n",lpeidl);
shell32_ObjCount++;
return (IEnumIDList*)lpeidl;
}
......@@ -81,7 +81,7 @@ static HRESULT WINAPI IEnumIDList_fnQueryInterface(
char xriid[50];
WINE_StringFromCLSID((LPCLSID)riid,xriid);
TRACE(shell,"(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
*ppvObj = NULL;
......@@ -94,11 +94,11 @@ static HRESULT WINAPI IEnumIDList_fnQueryInterface(
if(*ppvObj)
{ IEnumIDList_AddRef((IEnumIDList*)*ppvObj);
TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
return S_OK;
}
TRACE(shell,"-- Interface: E_NOINTERFACE\n");
TRACE("-- Interface: E_NOINTERFACE\n");
return E_NOINTERFACE;
}
......@@ -110,7 +110,7 @@ static ULONG WINAPI IEnumIDList_fnAddRef(
{
ICOM_THIS(IEnumIDListImpl,iface);
TRACE(shell,"(%p)->(%lu)\n",This,This->ref);
TRACE("(%p)->(%lu)\n",This,This->ref);
shell32_ObjCount++;
return ++(This->ref);
......@@ -123,12 +123,12 @@ static ULONG WINAPI IEnumIDList_fnRelease(
{
ICOM_THIS(IEnumIDListImpl,iface);
TRACE(shell,"(%p)->(%lu)\n",This,This->ref);
TRACE("(%p)->(%lu)\n",This,This->ref);
shell32_ObjCount--;
if (!--(This->ref))
{ TRACE(shell," destroying IEnumIDList(%p)\n",This);
{ TRACE(" destroying IEnumIDList(%p)\n",This);
IEnumIDList_DeleteList((IEnumIDList*)This);
HeapFree(GetProcessHeap(),0,This);
return 0;
......@@ -152,7 +152,7 @@ static HRESULT WINAPI IEnumIDList_fnNext(
HRESULT hr = S_OK;
LPITEMIDLIST temp;
TRACE(shell,"(%p)->(%ld,%p, %p)\n",This,celt,rgelt,pceltFetched);
TRACE("(%p)->(%ld,%p, %p)\n",This,celt,rgelt,pceltFetched);
/* It is valid to leave pceltFetched NULL when celt is 1. Some of explorer's
* subsystems actually use it (and so may a third party browser)
......@@ -193,7 +193,7 @@ static HRESULT WINAPI IEnumIDList_fnSkip(
DWORD dwIndex;
HRESULT hr = S_OK;
TRACE(shell,"(%p)->(%lu)\n",This,celt);
TRACE("(%p)->(%lu)\n",This,celt);
for(dwIndex = 0; dwIndex < celt; dwIndex++)
{ if(!This->mpCurrent)
......@@ -212,7 +212,7 @@ static HRESULT WINAPI IEnumIDList_fnReset(
{
ICOM_THIS(IEnumIDListImpl,iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
This->mpCurrent = This->mpFirst;
return S_OK;
}
......@@ -224,7 +224,7 @@ static HRESULT WINAPI IEnumIDList_fnClone(
{
ICOM_THIS(IEnumIDListImpl,iface);
TRACE(shell,"(%p)->() to (%p)->() E_NOTIMPL\n",This,ppenum);
TRACE("(%p)->() to (%p)->() E_NOTIMPL\n",This,ppenum);
return E_NOTIMPL;
}
/**************************************************************************
......@@ -247,7 +247,7 @@ static BOOL WINAPI IEnumIDList_fnCreateEnumList(
CHAR szDriveName[4];
CHAR szPath[MAX_PATH];
TRACE(shell,"(%p)->(path=%s flags=0x%08lx) \n",This,debugstr_a(lpszPath),dwFlags);
TRACE("(%p)->(path=%s flags=0x%08lx) \n",This,debugstr_a(lpszPath),dwFlags);
if (lpszPath && lpszPath[0]!='\0')
{ strcpy(szPath, lpszPath);
......@@ -260,7 +260,7 @@ static BOOL WINAPI IEnumIDList_fnCreateEnumList(
{ /* special case - we can't enumerate the Desktop level Objects (MyComputer,Nethood...
so we need to fake an enumeration of those.*/
if(!lpszPath)
{ TRACE (shell,"-- (%p)-> enumerate SHCONTF_FOLDERS (special) items\n",This);
{ TRACE("-- (%p)-> enumerate SHCONTF_FOLDERS (special) items\n",This);
/*create the pidl for This item */
pidl = _ILCreateMyComputer();
if(pidl)
......@@ -269,7 +269,7 @@ static BOOL WINAPI IEnumIDList_fnCreateEnumList(
}
}
else if (lpszPath[0]=='\0') /* enumerate the drives*/
{ TRACE (shell,"-- (%p)-> enumerate SHCONTF_FOLDERS (drives)\n",This);
{ TRACE("-- (%p)-> enumerate SHCONTF_FOLDERS (drives)\n",This);
dwDrivemap = GetLogicalDrives();
strcpy (szDriveName,"A:\\");
while (szDriveName[0]<='Z')
......@@ -285,7 +285,7 @@ static BOOL WINAPI IEnumIDList_fnCreateEnumList(
}
}
else
{ TRACE (shell,"-- (%p)-> enumerate SHCONTF_FOLDERS of %s\n",This,debugstr_a(szPath));
{ TRACE("-- (%p)-> enumerate SHCONTF_FOLDERS of %s\n",This,debugstr_a(szPath));
hFile = FindFirstFileA(szPath,&stffile);
if ( hFile != INVALID_HANDLE_VALUE )
{ do
......@@ -312,7 +312,7 @@ static BOOL WINAPI IEnumIDList_fnCreateEnumList(
/*enumerate the non-folder items (values) */
if(dwFlags & SHCONTF_NONFOLDERS)
{ if(lpszPath)
{ TRACE (shell,"-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n",This,debugstr_a(szPath));
{ TRACE("-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n",This,debugstr_a(szPath));
hFile = FindFirstFileA(szPath,&stffile);
if ( hFile != INVALID_HANDLE_VALUE )
{ do
......@@ -350,7 +350,7 @@ static BOOL WINAPI IEnumIDList_fnAddToEnumList(
LPENUMLIST pNew;
TRACE(shell,"(%p)->(pidl=%p)\n",This,pidl);
TRACE("(%p)->(pidl=%p)\n",This,pidl);
pNew = (LPENUMLIST)SHAlloc(sizeof(ENUMLIST));
if(pNew)
{ /*set the next pointer */
......@@ -370,7 +370,7 @@ static BOOL WINAPI IEnumIDList_fnAddToEnumList(
/*update the last item pointer */
This->mpLast = pNew;
TRACE(shell,"-- (%p)->(first=%p, last=%p)\n",This,This->mpFirst,This->mpLast);
TRACE("-- (%p)->(first=%p, last=%p)\n",This,This->mpFirst,This->mpLast);
return TRUE;
}
return FALSE;
......@@ -385,7 +385,7 @@ static BOOL WINAPI IEnumIDList_fnDeleteList(
LPENUMLIST pDelete;
TRACE(shell,"(%p)->()\n",This);
TRACE("(%p)->()\n",This);
while(This->mpFirst)
{ pDelete = This->mpFirst;
......
dlls/shell32/folders.c
View file @ a099a555
......@@ -10,7 +10,7 @@
#include "wine/obj_base.h"
#include "wine/obj_extracticon.h"
#include "debug.h"
#include "debugtools.h"
#include "winerror.h"
#include "pidl.h"
......@@ -51,7 +51,7 @@ IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl)
pdump(pidl);
TRACE(shell,"(%p)\n",ei);
TRACE("(%p)\n",ei);
shell32_ObjCount++;
return (IExtractIconA *)ei;
}
......@@ -64,7 +64,7 @@ static HRESULT WINAPI IExtractIconA_fnQueryInterface( IExtractIconA * iface, REF
char xriid[50];
WINE_StringFromCLSID((LPCLSID)riid,xriid);
TRACE(shell,"(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
*ppvObj = NULL;
......@@ -80,10 +80,10 @@ static HRESULT WINAPI IExtractIconA_fnQueryInterface( IExtractIconA * iface, REF
if(*ppvObj)
{ IExtractIconA_AddRef((IExtractIconA*) *ppvObj);
TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
return S_OK;
}
TRACE(shell,"-- Interface: E_NOINTERFACE\n");
TRACE("-- Interface: E_NOINTERFACE\n");
return E_NOINTERFACE;
}
......@@ -94,7 +94,7 @@ static ULONG WINAPI IExtractIconA_fnAddRef(IExtractIconA * iface)
{
ICOM_THIS(IExtractIconAImpl,iface);
TRACE(shell,"(%p)->(count=%lu)\n",This, This->ref );
TRACE("(%p)->(count=%lu)\n",This, This->ref );
shell32_ObjCount++;
......@@ -107,12 +107,12 @@ static ULONG WINAPI IExtractIconA_fnRelease(IExtractIconA * iface)
{
ICOM_THIS(IExtractIconAImpl,iface);
TRACE(shell,"(%p)->()\n",This);
TRACE("(%p)->()\n",This);
shell32_ObjCount--;
if (!--(This->ref))
{ TRACE(shell," destroying IExtractIcon(%p)\n",This);
{ TRACE(" destroying IExtractIcon(%p)\n",This);
SHFree(This->pidl);
HeapFree(GetProcessHeap(),0,This);
return 0;
......@@ -136,7 +136,7 @@ static HRESULT WINAPI IExtractIconA_fnGetIconLocation(
DWORD ret = S_FALSE, dwNr;
LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl);
TRACE (shell,"(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags);
TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags);
if (pwFlags)
*pwFlags = 0;
......@@ -195,7 +195,7 @@ static HRESULT WINAPI IExtractIconA_fnGetIconLocation(
}
}
TRACE (shell,"-- %s %x\n", (ret==NOERROR)?debugstr_a(szIconFile):"[error]", *piIndex);
TRACE("-- %s %x\n", (ret==NOERROR)?debugstr_a(szIconFile):"[error]", *piIndex);
return ret;
}
/**************************************************************************
......@@ -205,7 +205,7 @@ static HRESULT WINAPI IExtractIconA_fnExtract(IExtractIconA * iface, LPCSTR pszF
{
ICOM_THIS(IExtractIconAImpl,iface);
FIXME (shell,"(%p) (file=%p index=%u %p %p size=%u) semi-stub\n", This, pszFile, nIconIndex, phiconLarge, phiconSmall, nIconSize);
FIXME("(%p) (file=%p index=%u %p %p size=%u) semi-stub\n", This, pszFile, nIconIndex, phiconLarge, phiconSmall, nIconSize);
if (phiconLarge)
*phiconLarge = pImageList_GetIcon(ShellBigIconList, nIconIndex, ILD_TRANSPARENT);
......@@ -284,7 +284,7 @@ static HRESULT WINAPI IEIPersistFile_fnGetClassID(
static HRESULT WINAPI IEIPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode)
{
_ICOM_THIS_From_IPersistFile(IExtractIconA, iface);
FIXME(shell,"%p\n", This);
FIXME("%p\n", This);
return E_NOTIMPL;
}
......
dlls/shell32/regstream.c
View file @ a099a555
......@@ -5,7 +5,7 @@
#include "wine/obj_storage.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
#include "winerror.h"
#include "winreg.h"
......@@ -48,7 +48,7 @@ IStream *IStream_Constructor(HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD
{ if (dwType == REG_BINARY )
{ rstr->pszSubKey = HEAP_strdupA (GetProcessHeap(),0, pszSubKey);
rstr->pszValue = HEAP_strdupA (GetProcessHeap(),0, pszValue);
TRACE(shell,"(%p)->0x%08x,%s,%s,0x%08lx\n", rstr, hKey, pszSubKey, pszValue, grfMode);
TRACE("(%p)->0x%08x,%s,%s,0x%08lx\n", rstr, hKey, pszSubKey, pszValue, grfMode);
shell32_ObjCount++;
return (IStream*)rstr;
}
......@@ -73,7 +73,7 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO
char xriid[50];
WINE_StringFromCLSID((LPCLSID)riid,xriid);
TRACE(shell,"(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
*ppvObj = NULL;
......@@ -87,10 +87,10 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO
if(*ppvObj)
{
IStream_AddRef((IStream*)*ppvObj);
TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
return S_OK;
}
TRACE(shell,"-- Interface: E_NOINTERFACE\n");
TRACE("-- Interface: E_NOINTERFACE\n");
return E_NOINTERFACE;
}
......@@ -101,7 +101,7 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface)
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)->(count=%lu)\n",This, This->ref);
TRACE("(%p)->(count=%lu)\n",This, This->ref);
shell32_ObjCount++;
return ++(This->ref);
......@@ -114,12 +114,12 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface)
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)->()\n",This);
TRACE("(%p)->()\n",This);
shell32_ObjCount--;
if (!--(This->ref))
{ TRACE(shell," destroying SHReg IStream (%p)\n",This);
{ TRACE(" destroying SHReg IStream (%p)\n",This);
if (This->pszSubKey)
HeapFree(GetProcessHeap(),0,This->pszSubKey);
......@@ -145,7 +145,7 @@ HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG* pcbRe
DWORD dwBytesToRead, dwBytesLeft;
TRACE(shell,"(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead);
TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead);
if ( !pv )
return STG_E_INVALIDPOINTER;
......@@ -170,7 +170,7 @@ HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb, ULONG
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -178,7 +178,7 @@ HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, DWORD dw
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -186,7 +186,7 @@ HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize)
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -194,7 +194,7 @@ HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_INTEGER
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -202,7 +202,7 @@ HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags)
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -210,7 +210,7 @@ HRESULT WINAPI IStream_fnRevert (IStream * iface)
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -218,7 +218,7 @@ HRESULT WINAPI IStream_fnLockRegion (IStream * iface, ULARGE_INTEGER libOffset,
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -226,7 +226,7 @@ HRESULT WINAPI IStream_fnUnlockRegion (IStream * iface, ULARGE_INTEGER libOffset
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -234,7 +234,7 @@ HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfSt
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -242,7 +242,7 @@ HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm)
{
ICOM_THIS(ISHRegStream, iface);
TRACE(shell,"(%p)\n",This);
TRACE("(%p)\n",This);
return E_NOTIMPL;
}
......@@ -275,6 +275,6 @@ static struct ICOM_VTABLE(IStream) rstvt =
*/
IStream * WINAPI OpenRegStream(HKEY hkey, LPCSTR pszSubkey, LPCSTR pszValue, DWORD grfMode)
{
TRACE(shell,"(0x%08x,%s,%s,0x%08lx)\n",hkey, pszSubkey, pszValue, grfMode);
TRACE("(0x%08x,%s,%s,0x%08lx)\n",hkey, pszSubkey, pszValue, grfMode);
return IStream_Constructor(hkey, pszSubkey, pszValue, grfMode);
}
dlls/shell32/shellole.c
View file @ a099a555
......@@ -21,7 +21,7 @@
#include "winversion.h"
#include "winreg.h"
#include "winerror.h"
#include "debug.h"
#include "debugtools.h"
#include "shell32_main.h"
......@@ -36,7 +36,7 @@ static GetClassPtr SH_find_moduleproc(LPSTR dllname,HMODULE *xhmod,LPSTR name)
{ HMODULE hmod;
FARPROC dllunload,nameproc;
TRACE(shell,"dll=%s, hmodule=%p, name=%s\n",dllname, xhmod, name);
TRACE("dll=%s, hmodule=%p, name=%s\n",dllname, xhmod, name);
if (xhmod)
{ *xhmod = 0;
}
......@@ -73,7 +73,7 @@ static DWORD SH_get_instance(REFCLSID clsid,LPSTR dllname,LPVOID unknownouter,RE
char xclsid[50],xrefiid[50];
WINE_StringFromCLSID((LPCLSID)clsid,xclsid);
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
TRACE(shell,"\n\tCLSID:%s,%s,%p,\n\tIID:%s,%p\n",xclsid, dllname,unknownouter,xrefiid,inst);
TRACE("\n\tCLSID:%s,%s,%p,\n\tIID:%s,%p\n",xclsid, dllname,unknownouter,xrefiid,inst);
dllgetclassob = SH_find_moduleproc(dllname,NULL,"DllGetClassObject");
if (!dllgetclassob)
......@@ -84,7 +84,7 @@ static DWORD SH_get_instance(REFCLSID clsid,LPSTR dllname,LPVOID unknownouter,RE
if ((hres<0) || (hres>=0x80000000))
return hres;
if (!classfac)
{ FIXME(shell,"no classfactory, but hres is 0x%ld!\n",hres);
{ FIXME("no classfactory, but hres is 0x%ld!\n",hres);
return E_FAIL;
}
IClassFactory_CreateInstance(classfac,unknownouter,refiid,inst);
......@@ -115,7 +115,7 @@ LRESULT WINAPI SHCoCreateInstance(LPSTR aclsid,CLSID *clsid,LPUNKNOWN unknownout
}
strcpy(xclsid,aclsid);
}
TRACE(shell,"(%p,\n\tSID:\t%s,%p,\n\tIID:\t%s,%p)\n",aclsid,xclsid,unknownouter,xiid,inst);
TRACE("(%p,\n\tSID:\t%s,%p,\n\tIID:\t%s,%p)\n",aclsid,xclsid,unknownouter,xiid,inst);
sprintf(buffer,"CLSID\\%s\\InProcServer32",xclsid);
......@@ -129,7 +129,7 @@ LRESULT WINAPI SHCoCreateInstance(LPSTR aclsid,CLSID *clsid,LPUNKNOWN unknownout
return SH_get_instance(clsid,"shell32.dll",unknownouter,refiid,inst);
}
TRACE(shell, "Server dll is %s\n",path);
TRACE("Server dll is %s\n",path);
tmodellen=sizeof(tmodel);
type=REG_SZ;
if (RegQueryValueExA(inprockey,"ThreadingModel",NULL,&type,tmodel,&tmodellen))
......@@ -137,7 +137,7 @@ LRESULT WINAPI SHCoCreateInstance(LPSTR aclsid,CLSID *clsid,LPUNKNOWN unknownout
return SH_get_instance(clsid,"shell32.dll",unknownouter,refiid,inst);
}
TRACE(shell, "Threading model is %s\n",tmodel);
TRACE("Threading model is %s\n",tmodel);
hres=SH_get_instance(clsid,path,unknownouter,refiid,inst);
if (hres<0 || (hres>0x80000000))
......@@ -166,13 +166,13 @@ HRESULT WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid,REFIID iid,LPVOID *ppv)
char xclsid[50],xiid[50];
WINE_StringFromCLSID((LPCLSID)rclsid,xclsid);
WINE_StringFromCLSID((LPCLSID)iid,xiid);
TRACE(shell,"\n\tCLSID:\t%s,\n\tIID:\t%s\n",xclsid,xiid);
TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n",xclsid,xiid);
*ppv = NULL;
if(IsEqualCLSID(rclsid, &CLSID_ShellDesktop)||
IsEqualCLSID(rclsid, &CLSID_ShellLink))
{ if(IsEqualCLSID(rclsid, &CLSID_ShellDesktop)) /*debug*/
{ TRACE(shell,"-- requested CLSID_ShellDesktop\n");
{ TRACE("-- requested CLSID_ShellDesktop\n");
}
if (IsEqualCLSID(rclsid, &CLSID_ShellLink))
......@@ -191,10 +191,10 @@ HRESULT WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid,REFIID iid,LPVOID *ppv)
}
}
else
{ WARN(shell, "-- CLSID not found\n");
{ WARN("-- CLSID not found\n");
hres = CLASS_E_CLASSNOTAVAILABLE;
}
TRACE(shell,"-- pointer to class factory: %p\n",*ppv);
TRACE("-- pointer to class factory: %p\n",*ppv);
return hres;
}
......@@ -206,7 +206,7 @@ HRESULT WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid,REFIID iid,LPVOID *ppv)
*/
DWORD WINAPI SHCLSIDFromString (LPSTR clsid, CLSID *id)
{
TRACE (shell,"(%p(%s) %p)\n", clsid, clsid, id);
TRACE("(%p(%s) %p)\n", clsid, clsid, id);
return CLSIDFromString16(clsid, id);
}
......@@ -221,7 +221,7 @@ DWORD WINAPI SHCLSIDFromString (LPSTR clsid, CLSID *id)
* heap (ProcessHeap).
*/
DWORD WINAPI SHGetMalloc(LPMALLOC *lpmal)
{ TRACE(shell,"(%p)\n", lpmal);
{ TRACE("(%p)\n", lpmal);
return CoGetMalloc(0,lpmal);
}
......@@ -250,7 +250,7 @@ LPCLASSFACTORY IClassFactory_Constructor(void)
lpclf->ref = 1;
lpclf->lpvtbl = &clfvt;
TRACE(shell,"(%p)->()\n",lpclf);
TRACE("(%p)->()\n",lpclf);
shell32_ObjCount++;
return (LPCLASSFACTORY)lpclf;
}
......@@ -263,7 +263,7 @@ static HRESULT WINAPI IClassFactory_fnQueryInterface(
ICOM_THIS(IClassFactoryImpl,iface);
char xriid[50];
WINE_StringFromCLSID((LPCLSID)riid,xriid);
TRACE(shell,"(%p)->(\n\tIID:\t%s)\n",This,xriid);
TRACE("(%p)->(\n\tIID:\t%s)\n",This,xriid);
*ppvObj = NULL;
......@@ -276,10 +276,10 @@ static HRESULT WINAPI IClassFactory_fnQueryInterface(
if(*ppvObj)
{ IUnknown_AddRef((LPUNKNOWN)*ppvObj);
TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
return S_OK;
}
TRACE(shell,"-- Interface: E_NOINTERFACE\n");
TRACE("-- Interface: E_NOINTERFACE\n");
return E_NOINTERFACE;
}
/******************************************************************************
......@@ -288,7 +288,7 @@ static HRESULT WINAPI IClassFactory_fnQueryInterface(
static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface)
{
ICOM_THIS(IClassFactoryImpl,iface);
TRACE(shell,"(%p)->(count=%lu)\n",This,This->ref);
TRACE("(%p)->(count=%lu)\n",This,This->ref);
shell32_ObjCount++;
return ++(This->ref);
......@@ -299,11 +299,11 @@ static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface)
static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface)
{
ICOM_THIS(IClassFactoryImpl,iface);
TRACE(shell,"(%p)->(count=%lu)\n",This,This->ref);
TRACE("(%p)->(count=%lu)\n",This,This->ref);
shell32_ObjCount--;
if (!--(This->ref))
{ TRACE(shell,"-- destroying IClassFactory(%p)\n",This);
{ TRACE("-- destroying IClassFactory(%p)\n",This);
HeapFree(GetProcessHeap(),0,This);
return 0;
}
......@@ -321,7 +321,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(
char xriid[50];
WINE_StringFromCLSID((LPCLSID)riid,xriid);
TRACE(shell,"%p->(%p,\n\tIID:\t%s,%p)\n",This,pUnknown,xriid,ppObject);
TRACE("%p->(%p,\n\tIID:\t%s,%p)\n",This,pUnknown,xriid,ppObject);
*ppObject = NULL;
......@@ -345,7 +345,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(
{ pObj = (IUnknown *)IDataObject_Constructor(0,NULL,NULL,0);
}
else
{ ERR(shell,"unknown IID requested\n\tIID:\t%s\n",xriid);
{ ERR("unknown IID requested\n\tIID:\t%s\n",xriid);
return(E_NOINTERFACE);
}
......@@ -355,7 +355,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(
hres = pObj->lpvtbl->fnQueryInterface(pObj,riid, ppObject);
pObj->lpvtbl->fnRelease(pObj);
TRACE(shell,"-- Object created: (%p)->%p\n",This,*ppObject);
TRACE("-- Object created: (%p)->%p\n",This,*ppObject);
return hres;
}
......@@ -365,7 +365,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(
static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface, BOOL fLock)
{
ICOM_THIS(IClassFactoryImpl,iface);
TRACE(shell,"%p->(0x%x), not implemented\n",This, fLock);
TRACE("%p->(0x%x), not implemented\n",This, fLock);
return E_NOTIMPL;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment