Make use of the DEFAULT_DEBUG_CHANNEL where appropriate.
Use the default version of FIXME, ERR, WARN, TRACE for the default
channel.
diff --git a/windows/keyboard.c b/windows/keyboard.c
index 0e869e2..ee6b2ad 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -25,8 +25,8 @@
#include "struct32.h"
#include "winerror.h"
+DEFAULT_DEBUG_CHANNEL(keyboard)
DECLARE_DEBUG_CHANNEL(event)
-DECLARE_DEBUG_CHANNEL(keyboard)
/**********************************************************************/
@@ -137,7 +137,7 @@
*/
WORD WINAPI SetSpeed16(WORD unused)
{
- FIXME_(keyboard)("(%04x): stub\n",unused);
+ FIXME("(%04x): stub\n", unused);
return 0xffff;
}
@@ -146,7 +146,7 @@
*/
VOID WINAPI ScreenSwitchEnable16(WORD unused)
{
- FIXME_(keyboard)("(%04x): stub\n",unused);
+ FIXME("(%04x): stub\n", unused);
}
/**********************************************************************
@@ -154,7 +154,7 @@
*/
DWORD WINAPI OemKeyScan(WORD wOemChar)
{
- TRACE_(keyboard)("*OemKeyScan (%d)\n",wOemChar);
+ TRACE("*OemKeyScan (%d)\n", wOemChar);
return wOemChar;
}
@@ -187,7 +187,7 @@
*/
INT16 WINAPI GetKeyboardType16(INT16 nTypeFlag)
{
- TRACE_(keyboard)("(%d)\n",nTypeFlag);
+ TRACE("(%d)\n", nTypeFlag);
switch(nTypeFlag)
{
case 0: /* Keyboard type */
@@ -200,7 +200,7 @@
return 12; /* We're doing an 101 for now, so return 12 F-keys */
break;
default:
- WARN_(keyboard)("Unknown type\n");
+ WARN("Unknown type\n");
return 0; /* The book says 0 here, so 0 */
}
}
@@ -220,7 +220,7 @@
*/
INT16 WINAPI GetKBCodePage16(void)
{
- TRACE_(keyboard)("(void)\n");
+ TRACE("(void)\n");
return 850;
}
diff --git a/windows/message.c b/windows/message.c
index 9ceb0b0..ee0f803 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -29,8 +29,8 @@
#include "struct32.h"
#include "debugtools.h"
+DEFAULT_DEBUG_CHANNEL(msg)
DECLARE_DEBUG_CHANNEL(key)
-DECLARE_DEBUG_CHANNEL(msg)
DECLARE_DEBUG_CHANNEL(sendmsg)
#define WM_NCMOUSEFIRST WM_NCMOUSEMOVE
@@ -1343,8 +1343,8 @@
STRUCT32_MSG32to16( &msg32, lpmsg );
- TRACE_(msg)("message %04x, hwnd %04x, filter(%04x - %04x)\n", lpmsg->message,
- hwnd, first, last );
+ TRACE("message %04x, hwnd %04x, filter(%04x - %04x)\n",
+ lpmsg->message, hwnd, first, last );
return ret;
}
@@ -1389,7 +1389,7 @@
{
MSG_PeekMessage( lpmsg, hwnd, min, max, PM_REMOVE, FALSE );
- TRACE_(msg)("message %04x, hwnd %04x, filter(%04x - %04x)\n", lpmsg->message,
+ TRACE("message %04x, hwnd %04x, filter(%04x - %04x)\n", lpmsg->message,
hwnd, min, max );
HOOK_CallHooksA( WH_GETMESSAGE, HC_ACTION, 0, (LPARAM)lpmsg );
@@ -1433,7 +1433,8 @@
{
BOOL bRet = GetMessageA(lpmsg, hwnd, min, max);
if (bRet)
- FIXME_(sendmsg)("(%s) unicode<->ascii\n", SPY_GetMsgName(lpmsg->message));
+ FIXME_(sendmsg)("(%s) unicode<->ascii\n",
+ SPY_GetMsgName(lpmsg->message));
return bRet;
}
@@ -1470,19 +1471,19 @@
if (hwnd == HWND_BROADCAST)
{
WND *pDesktop = WIN_GetDesktop();
- TRACE_(msg)("HWND_BROADCAST !\n");
+ TRACE("HWND_BROADCAST !\n");
for (wndPtr=WIN_LockWndPtr(pDesktop->child); wndPtr; WIN_UpdateWndPtr(&wndPtr,wndPtr->next))
{
if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
{
- TRACE_(msg)("BROADCAST Message to hWnd=%04x m=%04X w=%04X l=%08lX !\n",
- wndPtr->hwndSelf, message, wParam, lParam);
+ TRACE("BROADCAST Message to hWnd=%04x m=%04X w=%04X l=%08lX !\n",
+ wndPtr->hwndSelf, message, wParam, lParam);
PostMessageA( wndPtr->hwndSelf, message, wParam, lParam );
}
}
WIN_ReleaseDesktop();
- TRACE_(msg)("End of HWND_BROADCAST !\n");
+ TRACE("End of HWND_BROADCAST !\n");
return TRUE;
}
@@ -1580,22 +1581,22 @@
}
WIN_ReleaseDesktop();
- TRACE_(msg)("HWND_BROADCAST !\n");
+ TRACE("HWND_BROADCAST !\n");
for (ppWnd = list; *ppWnd; ppWnd++)
{
WIN_UpdateWndPtr(&wndPtr,*ppWnd);
if (!IsWindow(wndPtr->hwndSelf)) continue;
if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
{
- TRACE_(msg)("BROADCAST Message to hWnd=%04x m=%04X w=%04lX l=%08lX !\n",
- wndPtr->hwndSelf, msg, (DWORD)wParam, lParam);
+ TRACE("BROADCAST Message to hWnd=%04x m=%04X w=%04lX l=%08lX !\n",
+ wndPtr->hwndSelf, msg, (DWORD)wParam, lParam);
MSG_SendMessage( wndPtr->hwndSelf, msg, wParam, lParam,
timeout, flags, pRes);
}
}
WIN_ReleaseWndPtr(wndPtr);
WIN_ReleaseWinArray(list);
- TRACE_(msg)("End of HWND_BROADCAST !\n");
+ TRACE("End of HWND_BROADCAST !\n");
return 1;
}
@@ -1628,7 +1629,7 @@
if (!(wndPtr = WIN_FindWndPtr( hwnd )))
{
- WARN_(msg)("invalid hwnd %04x\n", hwnd );
+ WARN("invalid hwnd %04x\n", hwnd );
return 0;
}
if (QUEUE_IsExitingQueue(wndPtr->hmemTaskQ))
@@ -2082,7 +2083,7 @@
BYTE wp[2];
if (message != WM_MOUSEMOVE && message != WM_TIMER)
- TRACE_(msg)("(%s, %04X, %08lX)\n",
+ TRACE("(%s, %04X, %08lX)\n",
SPY_GetMsgName(message), wParam, lParam );
if(message >= WM_KEYFIRST && message <= WM_KEYLAST)
TRACE_(key)("(%s, %04X, %08lX)\n",
@@ -2214,7 +2215,7 @@
if (painting && wndPtr &&
(wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
{
- ERR_(msg)("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
+ ERR("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
msg->hwnd);
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
/* Validate the update region to avoid infinite WM_PAINT loop */
@@ -2292,7 +2293,7 @@
if (painting && wndPtr &&
(wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
{
- ERR_(msg)("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
+ ERR("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
msg->hwnd);
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
/* Validate the update region to avoid infinite WM_PAINT loop */
@@ -2366,7 +2367,7 @@
if (painting && wndPtr &&
(wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
{
- ERR_(msg)("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
+ ERR("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
msg->hwnd);
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
/* Validate the update region to avoid infinite WM_PAINT loop */
@@ -2383,7 +2384,7 @@
*/
WORD WINAPI RegisterWindowMessage16( SEGPTR str )
{
- TRACE_(msg)("%08lx\n", (DWORD)str );
+ TRACE("%08lx\n", (DWORD)str );
return GlobalAddAtom16( str );
}
@@ -2393,7 +2394,7 @@
*/
WORD WINAPI RegisterWindowMessageA( LPCSTR str )
{
- TRACE_(msg)("%s\n", str );
+ TRACE("%s\n", str );
return GlobalAddAtomA( str );
}
@@ -2403,7 +2404,7 @@
*/
WORD WINAPI RegisterWindowMessageW( LPCWSTR str )
{
- TRACE_(msg)("%p\n", str );
+ TRACE("%p\n", str );
return GlobalAddAtomW( str );
}
@@ -2484,7 +2485,7 @@
*/
BOOL WINAPI SendNotifyMessageA(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
{ BOOL ret = TRUE;
- FIXME_(msg)("(%04x,%08x,%08x,%08lx) not complete\n",
+ FIXME("(%04x,%08x,%08x,%08lx) not complete\n",
hwnd, msg, wParam, lParam);
if ( GetCurrentThreadId() == GetWindowThreadProcessId ( hwnd, NULL))
@@ -2505,7 +2506,7 @@
*/
BOOL WINAPI SendNotifyMessageW(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
{ BOOL ret = TRUE;
- FIXME_(msg)("(%04x,%08x,%08x,%08lx) not complete\n",
+ FIXME("(%04x,%08x,%08x,%08lx) not complete\n",
hwnd, msg, wParam, lParam);
if ( GetCurrentThreadId() == GetWindowThreadProcessId ( hwnd, NULL))
@@ -2527,11 +2528,11 @@
HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam,
FARPROC lpResultCallBack,DWORD dwData)
{
- FIXME_(msg)("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
- hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
+ FIXME("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
+ hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
if ( hWnd == HWND_BROADCAST)
{ PostMessageA( hWnd, Msg, wParam, lParam);
- FIXME_(msg)("Broadcast: Callback will not be called!\n");
+ FIXME("Broadcast: Callback will not be called!\n");
return TRUE;
}
(lpResultCallBack)( hWnd, Msg, dwData, SendMessageA ( hWnd, Msg, wParam, lParam ));
@@ -2547,11 +2548,11 @@
HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam,
FARPROC lpResultCallBack,DWORD dwData)
{
- FIXME_(msg)("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
- hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
+ FIXME("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
+ hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
if ( hWnd == HWND_BROADCAST)
{ PostMessageW( hWnd, Msg, wParam, lParam);
- FIXME_(msg)("Broadcast: Callback will not be called!\n");
+ FIXME("Broadcast: Callback will not be called!\n");
return TRUE;
}
(lpResultCallBack)( hWnd, Msg, dwData, SendMessageA ( hWnd, Msg, wParam, lParam ));
diff --git a/windows/nonclient.c b/windows/nonclient.c
index 3788e47..5eadcee 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -28,7 +28,7 @@
#include "cache.h"
#include "bitmap.h"
-DECLARE_DEBUG_CHANNEL(nonclient)
+DEFAULT_DEBUG_CHANNEL(nonclient)
DECLARE_DEBUG_CHANNEL(shell)
BOOL NC_DrawGrayButton(HDC hdc, int x, int y);
@@ -115,7 +115,7 @@
DWORD exStyle )
{
if (TWEAK_WineLook > WIN31_LOOK)
- ERR_(nonclient)("Called in Win95 mode. Aiee! Please report this.\n" );
+ ERR("Called in Win95 mode. Aiee! Please report this.\n" );
if(style & WS_ICONIC) return;
/* Decide if the window will be managed (see CreateWindowEx) */
@@ -340,8 +340,8 @@
{
RECT rc = *rect;
- TRACE_(nonclient)("(%08x,%08x,%p,%08x,%08x,\"%s\",%08x)\n",
- hwnd, hdc, rect, hFont, hIcon, str, uFlags);
+ TRACE("(%08x,%08x,%p,%08x,%08x,\"%s\",%08x)\n",
+ hwnd, hdc, rect, hFont, hIcon, str, uFlags);
/* drawing background */
if (uFlags & DC_INBUTTON) {
@@ -426,7 +426,7 @@
/* drawing focus ??? */
if (uFlags & 0x2000)
- FIXME_(nonclient)("undocumented flag (0x2000)!\n");
+ FIXME("undocumented flag (0x2000)!\n");
return 0;
}
@@ -486,9 +486,9 @@
WS_EX_STATICEDGE | WS_EX_TOOLWINDOW);
if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME;
- TRACE_(nonclient)("(%d,%d)-(%d,%d) %08lx %d %08lx\n",
- rect->left, rect->top, rect->right, rect->bottom,
- style, menu, exStyle );
+ TRACE("(%d,%d)-(%d,%d) %08lx %d %08lx\n",
+ rect->left, rect->top, rect->right, rect->bottom,
+ style, menu, exStyle );
if (TWEAK_WineLook == WIN31_LOOK)
NC_AdjustRect( rect, style, menu, exStyle );
@@ -543,11 +543,10 @@
winRect->bottom -= tmpRect.bottom;
if (HAS_MENU(pWnd)) {
- TRACE_(nonclient)("Calling "
- "GetMenuBarHeight with HWND 0x%x, width %d, "
- "at (%d, %d).\n", pWnd->hwndSelf,
- winRect->right - winRect->left,
- -tmpRect.left, -tmpRect.top );
+ TRACE("Calling GetMenuBarHeight with HWND 0x%x, width %d, "
+ "at (%d, %d).\n", pWnd->hwndSelf,
+ winRect->right - winRect->left,
+ -tmpRect.left, -tmpRect.top );
winRect->top +=
MENU_GetMenuBarHeight( pWnd->hwndSelf,
@@ -665,8 +664,7 @@
{
RECT16 rect;
- TRACE_(nonclient)("hwnd=%04x pt=%d,%d\n",
- wndPtr->hwndSelf, pt.x, pt.y );
+ TRACE("hwnd=%04x pt=%d,%d\n", wndPtr->hwndSelf, pt.x, pt.y );
GetWindowRect16 (wndPtr->hwndSelf, &rect );
if (!PtInRect16( &rect, pt )) return HTNOWHERE;
@@ -801,8 +799,7 @@
{
RECT16 rect;
- TRACE_(nonclient)("hwnd=%04x pt=%d,%d\n",
- wndPtr->hwndSelf, pt.x, pt.y );
+ TRACE("hwnd=%04x pt=%d,%d\n", wndPtr->hwndSelf, pt.x, pt.y );
GetWindowRect16 (wndPtr->hwndSelf, &rect );
if (!PtInRect16( &rect, pt )) return HTNOWHERE;
@@ -1280,7 +1277,7 @@
INT width, height;
if (TWEAK_WineLook != WIN31_LOOK)
- ERR_(nonclient)("Called in Win95 mode. Aiee! Please report this.\n" );
+ ERR("Called in Win95 mode. Aiee! Please report this.\n" );
if (dlgFrame)
{
@@ -1651,7 +1648,7 @@
active = wndPtr->flags & WIN_NCACTIVATED;
- TRACE_(nonclient)("%04x %d\n", hwnd, active );
+ TRACE("%04x %d\n", hwnd, active );
if (!(hdc = GetDCEx( hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
((clip > 1) ? (DCX_INTERSECTRGN | DCX_KEEPCLIPRGN): 0) ))) return;
@@ -1766,12 +1763,13 @@
active = wndPtr->flags & WIN_NCACTIVATED;
- TRACE_(nonclient)("%04x %d\n", hwnd, active );
+ TRACE("%04x %d\n", hwnd, active );
- /* MSDN docs are pretty idiotic here, they say app CAN use clipRgn in the call to
- * GetDCEx implying that it is allowed not to use it either. However, the suggested
- * GetDCEx( , DCX_WINDOW | DCX_INTERSECTRGN) will cause clipRgn to be deleted
- * after ReleaseDC(). Now, how is the "system" supposed to tell what happened?
+ /* MSDN docs are pretty idiotic here, they say app CAN use clipRgn in
+ the call to GetDCEx implying that it is allowed not to use it either.
+ However, the suggested GetDCEx( , DCX_WINDOW | DCX_INTERSECTRGN)
+ will cause clipRgn to be deleted after ReleaseDC().
+ Now, how is the "system" supposed to tell what happened?
*/
if (!(hdc = GetDCEx( hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
@@ -1837,15 +1835,14 @@
RECT r = rect;
r.bottom = rect.top + GetSystemMetrics(SM_CYMENU);
- TRACE_(nonclient)("Calling DrawMenuBar with "
- "rect (%d, %d)-(%d, %d)\n", r.left, r.top,
- r.right, r.bottom);
+ TRACE("Calling DrawMenuBar with rect (%d, %d)-(%d, %d)\n",
+ r.left, r.top, r.right, r.bottom);
rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1;
}
- TRACE_(nonclient)("After MenuBar, rect is (%d, %d)-(%d, %d).\n",
- rect.left, rect.top, rect.right, rect.bottom );
+ TRACE("After MenuBar, rect is (%d, %d)-(%d, %d).\n",
+ rect.left, rect.top, rect.right, rect.bottom );
if (wndPtr->dwExStyle & WS_EX_CLIENTEDGE)
DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
@@ -2715,8 +2712,7 @@
POINT pt32;
UINT16 uCommand = wParam & 0xFFF0;
- TRACE_(nonclient)("Handling WM_SYSCOMMAND %x %d,%d\n",
- wParam, pt.x, pt.y );
+ TRACE("Handling WM_SYSCOMMAND %x %d,%d\n", wParam, pt.x, pt.y );
if (wndPtr->dwStyle & WS_CHILD && uCommand != SC_KEYMENU )
ScreenToClient16( wndPtr->parent->hwndSelf, &pt );
@@ -2781,7 +2777,7 @@
case SC_ARRANGE:
case SC_NEXTWINDOW:
case SC_PREVWINDOW:
- FIXME_(nonclient)("unimplemented!\n");
+ FIXME("unimplemented!\n");
break;
}
WIN_ReleaseWndPtr(wndPtr);
diff --git a/windows/painting.c b/windows/painting.c
index d356327..98a90ac 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -14,8 +14,8 @@
#include "wine/winuser16.h"
#include "cache.h"
+DEFAULT_DEBUG_CHANNEL(win)
DECLARE_DEBUG_CHANNEL(nonclient)
-DECLARE_DEBUG_CHANNEL(win)
/* client rect in window coordinates */
@@ -294,7 +294,7 @@
HideCaret( hwnd );
- TRACE_(win)("hrgnUpdate = %04x, \n", hrgnUpdate);
+ TRACE("hrgnUpdate = %04x, \n", hrgnUpdate);
if (GetClassWord16(wndPtr->hwndSelf, GCW_STYLE) & CS_PARENTDC)
{
@@ -314,11 +314,11 @@
/* ReleaseDC() in EndPaint() will delete the region */
}
- TRACE_(win)("hdc = %04x\n", lps->hdc);
+ TRACE("hdc = %04x\n", lps->hdc);
if (!lps->hdc)
{
- WARN_(win)("GetDCEx() failed in BeginPaint(), hwnd=%04x\n", hwnd);
+ WARN("GetDCEx() failed in BeginPaint(), hwnd=%04x\n", hwnd);
WIN_ReleaseWndPtr(wndPtr);
return 0;
}
@@ -336,7 +336,7 @@
IntersectRect16(&lps->rcPaint, &clientRect, &clipRect);
- TRACE_(win)("box = (%i,%i - %i,%i)\n", lps->rcPaint.left, lps->rcPaint.top,
+ TRACE("box = (%i,%i - %i,%i)\n", lps->rcPaint.left, lps->rcPaint.top,
lps->rcPaint.right, lps->rcPaint.bottom );
if (wndPtr->flags & WIN_NEEDS_ERASEBKGND)
@@ -546,7 +546,7 @@
r.right = wndPtr->rectWindow.right - wndPtr->rectWindow.left;
r.bottom = wndPtr->rectWindow.bottom - wndPtr->rectWindow.top;
- TRACE_(win)("\thwnd %04x [%04x] -> hrgn [%04x], flags [%04x]\n", wndPtr->hwndSelf, wndPtr->hrgnUpdate, hRgn, flags );
+ TRACE("\thwnd %04x [%04x] -> hrgn [%04x], flags [%04x]\n", wndPtr->hwndSelf, wndPtr->hrgnUpdate, hRgn, flags );
if( flags & RDW_INVALIDATE )
{
@@ -735,7 +735,7 @@
/* Erase/update the window itself ... */
- TRACE_(win)("\thwnd %04x [%04x] -> hrgn [%04x], flags [%04x]\n", hWnd, wndPtr->hrgnUpdate, hrgn, flags );
+ TRACE("\thwnd %04x [%04x] -> hrgn [%04x], flags [%04x]\n", hWnd, wndPtr->hrgnUpdate, hrgn, flags );
/*
* Check if this window should delay it's processing of WM_NCPAINT.
@@ -840,7 +840,7 @@
if( hrgnUpdate )
{
GetRgnBox( hrgnUpdate, &r );
- TRACE_(win)( "%04x (%04x) NULL %04x box (%i,%i-%i,%i) flags=%04x, exflags=%04x\n",
+ TRACE( "%04x (%04x) NULL %04x box (%i,%i-%i,%i) flags=%04x, exflags=%04x\n",
hwnd, wndPtr->hrgnUpdate, hrgnUpdate, r.left, r.top, r.right, r.bottom, flags, ex);
}
else
@@ -849,7 +849,7 @@
r = *rectUpdate;
else
SetRectEmpty( &r );
- TRACE_(win)( "%04x (%04x) %s %d,%d-%d,%d %04x flags=%04x, exflags=%04x\n",
+ TRACE( "%04x (%04x) %s %d,%d-%d,%d %04x flags=%04x, exflags=%04x\n",
hwnd, wndPtr->hrgnUpdate, rectUpdate ? "rect" : "NULL", r.left,
r.top, r.right, r.bottom, hrgnUpdate, flags, ex );
}
diff --git a/windows/win.c b/windows/win.c
index e2e292a..6429f73 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -34,8 +34,8 @@
#include "stackframe.h"
#include "debugtools.h"
+DEFAULT_DEBUG_CHANNEL(win)
DECLARE_DEBUG_CHANNEL(msg)
-DECLARE_DEBUG_CHANNEL(win)
/**********************************************************************/
@@ -128,7 +128,7 @@
if (ptr->dwMagic != WND_MAGIC) goto error;
if (ptr->hwndSelf != hwnd)
{
- ERR_(win)("Can't happen: hwnd %04x self pointer is %04x\n",hwnd, ptr->hwndSelf );
+ ERR("Can't happen: hwnd %04x self pointer is %04x\n",hwnd, ptr->hwndSelf );
goto error;
}
/* returns a locked pointer */
@@ -186,7 +186,7 @@
else if(wndPtr->irefCount < 0)
{
/* This else if is useful to monitor the WIN_ReleaseWndPtr function */
- ERR_(win)("forgot a Lock on %p somewhere\n",wndPtr);
+ ERR("forgot a Lock on %p somewhere\n",wndPtr);
}
/*unlock all WND structures for thread safeness*/
WIN_UnlockWnds();
@@ -220,14 +220,14 @@
if (!(ptr = WIN_FindWndPtr( hwnd )))
{
- WARN_(win)("%04x is not a window handle\n", hwnd );
+ WARN("%04x is not a window handle\n", hwnd );
return;
}
if (!GetClassNameA( hwnd, className, sizeof(className ) ))
strcpy( className, "#NULL#" );
- TRACE_(win)("Window %04x (%p):\n", hwnd, ptr );
+ TRACE("Window %04x (%p):\n", hwnd, ptr );
DPRINTF( "next=%p child=%p parent=%p owner=%p class=%p '%s'\n"
"inst=%04x taskQ=%04x updRgn=%04x active=%04x dce=%p idmenu=%08x\n"
"style=%08lx exstyle=%08lx wndproc=%08x text='%s'\n"
@@ -269,7 +269,7 @@
if (!ptr)
{
- WARN_(win)("Invalid window handle %04x\n", hwnd );
+ WARN("Invalid window handle %04x\n", hwnd );
return;
}
@@ -387,7 +387,7 @@
{
if (!(pWnd->dwStyle & WS_VISIBLE))
{
- TRACE_(win)("skipping window %04x\n",
+ TRACE("skipping window %04x\n",
pWnd->hwndSelf );
}
else if ((pWnd->hmemTaskQ == hQueue) &&
@@ -421,7 +421,7 @@
hwndRet = pWnd->hwndSelf;
WIN_ReleaseWndPtr(pWnd);
}
- TRACE_(win)("found %04x\n",hwndRet);
+ TRACE("found %04x\n",hwndRet);
return hwndRet;
}
@@ -437,7 +437,7 @@
HWND hwnd = wndPtr->hwndSelf;
WND *pWnd;
- TRACE_(win)("%04x\n", wndPtr->hwndSelf );
+ TRACE("%04x\n", wndPtr->hwndSelf );
/* free child windows */
WIN_LockWndPtr(wndPtr->child);
@@ -587,7 +587,7 @@
HWND hwndDesktop;
DESKTOP *pDesktop;
- TRACE_(win)("Creating desktop window\n");
+ TRACE("Creating desktop window\n");
if (!ICONTITLE_Init() ||
@@ -665,7 +665,7 @@
LRESULT (CALLBACK *localSend32)(HWND, UINT, WPARAM, LPARAM);
char buffer[256];
- TRACE_(win)("%s %s %08lx %08lx %d,%d %dx%d %04x %04x %08x %p\n",
+ TRACE("%s %s %08lx %08lx %d,%d %dx%d %04x %04x %08x %p\n",
unicode ? debugres_w((LPWSTR)cs->lpszName) : debugres_a(cs->lpszName),
unicode ? debugres_w((LPWSTR)cs->lpszClass) : debugres_a(cs->lpszClass),
cs->dwExStyle, cs->style, cs->x, cs->y, cs->cx, cs->cy,
@@ -678,11 +678,11 @@
/* Make sure parent is valid */
if (!IsWindow( cs->hwndParent ))
{
- WARN_(win)("Bad parent %04x\n", cs->hwndParent );
+ WARN("Bad parent %04x\n", cs->hwndParent );
return 0;
}
} else if ((cs->style & WS_CHILD) && !(cs->style & WS_POPUP)) {
- WARN_(win)("No parent for child window\n" );
+ WARN("No parent for child window\n" );
return 0; /* WS_CHILD needs a parent, but WS_POPUP doesn't */
}
@@ -690,7 +690,7 @@
if (!(classPtr = CLASS_FindClassByAtom( classAtom, win32?cs->hInstance:GetExePtr(cs->hInstance) )))
{
GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
- WARN_(win)("Bad class '%s'\n", buffer );
+ WARN("Bad class '%s'\n", buffer );
return 0;
}
@@ -765,7 +765,7 @@
if (!(hwnd = USER_HEAP_ALLOC( sizeof(*wndPtr) + classPtr->cbWndExtra
- sizeof(wndPtr->wExtra) )))
{
- TRACE_(win)("out of memory\n" );
+ TRACE("out of memory\n" );
return 0;
}
@@ -839,7 +839,7 @@
: HOOK_CallHooksA(WH_CBT, HCBT_CREATEWND, hwnd, (LPARAM)&cbtc);
if (ret)
{
- TRACE_(win)("CBT-hook returned 0\n");
+ TRACE("CBT-hook returned 0\n");
wndPtr->pDriver->pFinalize(wndPtr);
USER_HEAP_FREE( hwnd );
retvalue = 0;
@@ -958,7 +958,7 @@
/* send it anyway */
if (((wndPtr->rectClient.right-wndPtr->rectClient.left) <0)
||((wndPtr->rectClient.bottom-wndPtr->rectClient.top)<0))
- WARN_(win)("sending bogus WM_SIZE message 0x%08lx\n",
+ WARN("sending bogus WM_SIZE message 0x%08lx\n",
MAKELONG(wndPtr->rectClient.right-wndPtr->rectClient.left,
wndPtr->rectClient.bottom-wndPtr->rectClient.top));
SendMessageA( hwnd, WM_SIZE, SIZE_RESTORED,
@@ -1004,7 +1004,7 @@
if (!(wndPtr->dwStyle & WS_CHILD) && !wndPtr->owner)
HOOK_CallHooks16( WH_SHELL, HSHELL_WINDOWCREATED, hwnd, 0 );
- TRACE_(win)("created window %04x\n", hwnd);
+ TRACE("created window %04x\n", hwnd);
retvalue = hwnd;
goto end;
}
@@ -1013,7 +1013,7 @@
/* Abort window creation */
- WARN_(win)("aborted by WM_xxCREATE!\n");
+ WARN("aborted by WM_xxCREATE!\n");
WIN_ReleaseWndPtr(WIN_DestroyWindow( wndPtr ));
retvalue = 0;
end:
@@ -1149,11 +1149,11 @@
if (HIWORD(className))
{
LPSTR cn = HEAP_strdupWtoA( GetProcessHeap(), 0, className );
- WARN_(win)("Bad class name '%s'\n",cn);
+ WARN("Bad class name '%s'\n",cn);
HeapFree( GetProcessHeap(), 0, cn );
}
else
- WARN_(win)("Bad class name %p\n", className );
+ WARN("Bad class name %p\n", className );
return 0;
}
@@ -1276,7 +1276,7 @@
WIN_CheckFocus(pWnd);
}
else
- WARN_(win)("\tdestroyed itself while in WM_DESTROY!\n");
+ WARN("\tdestroyed itself while in WM_DESTROY!\n");
}
@@ -1297,7 +1297,7 @@
WND * wndPtr;
BOOL retvalue;
- TRACE_(win)("(%04x)\n", hwnd);
+ TRACE("(%04x)\n", hwnd);
/* Initialization */
@@ -1571,7 +1571,7 @@
{
ATOM atom = 0;
- TRACE_(win)("%04x %04x '%s' '%s'\n", parent,
+ TRACE("%04x %04x '%s' '%s'\n", parent,
child, HIWORD(className)?(char *)PTR_SEG_TO_LIN(className):"",
title ? title : "");
@@ -1687,7 +1687,7 @@
HWND WINAPI GetDesktopWindow(void)
{
if (pWndDesktop) return pWndDesktop->hwndSelf;
- ERR_(win)( "You need the -desktop option when running with native USER\n" );
+ ERR( "You need the -desktop option when running with native USER\n" );
ExitProcess(1);
return 0;
}
@@ -1722,7 +1722,7 @@
WND *wndPtr;
BOOL retvalue;
- TRACE_(win)("EnableWindow32: ( %x, %d )\n", hwnd, enable);
+ TRACE("EnableWindow32: ( %x, %d )\n", hwnd, enable);
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
if (enable && (wndPtr->dwStyle & WS_DISABLED))
@@ -1827,7 +1827,7 @@
{
if (offset + sizeof(WORD) > wndPtr->class->cbWndExtra)
{
- WARN_(win)("Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
retvalue = 0;
goto end;
}
@@ -1838,7 +1838,7 @@
{
case GWW_ID:
if (HIWORD(wndPtr->wIDmenu))
- WARN_(win)("GWW_ID: discards high bits of 0x%08x!\n",
+ WARN("GWW_ID: discards high bits of 0x%08x!\n",
wndPtr->wIDmenu);
retvalue = (WORD)wndPtr->wIDmenu;
goto end;
@@ -1847,12 +1847,12 @@
goto end;
case GWW_HINSTANCE:
if (HIWORD(wndPtr->hInstance))
- WARN_(win)("GWW_HINSTANCE: discards high bits of 0x%08x!\n",
+ WARN("GWW_HINSTANCE: discards high bits of 0x%08x!\n",
wndPtr->hInstance);
retvalue = (WORD)wndPtr->hInstance;
goto end;
default:
- WARN_(win)("Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
retvalue = 0;
goto end;
}
@@ -1882,7 +1882,7 @@
{
if (offset + sizeof(WORD) > wndPtr->class->cbWndExtra)
{
- WARN_(win)("Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
retval = 0;
goto end;
}
@@ -1895,7 +1895,7 @@
case GWW_HWNDPARENT: retval = SetParent( hwnd, newval );
goto end;
default:
- WARN_(win)("Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
retval = 0;
goto end;
}
@@ -1921,7 +1921,7 @@
{
if (offset + sizeof(LONG) > wndPtr->class->cbWndExtra)
{
- WARN_(win)("Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
retvalue = 0;
goto end;
}
@@ -1952,7 +1952,7 @@
case GWL_HINSTANCE: retvalue = wndPtr->hInstance;
goto end;
default:
- WARN_(win)("Unknown offset %d\n", offset );
+ WARN("Unknown offset %d\n", offset );
}
retvalue = 0;
end:
@@ -1979,7 +1979,7 @@
WND * wndPtr = WIN_FindWndPtr( hwnd );
STYLESTRUCT style;
- TRACE_(win)("%x=%p %x %lx %x\n",hwnd, wndPtr, offset, newval, type);
+ TRACE("%x=%p %x %lx %x\n",hwnd, wndPtr, offset, newval, type);
if (!wndPtr)
{
@@ -1992,7 +1992,7 @@
{
if (offset + sizeof(LONG) > wndPtr->class->cbWndExtra)
{
- WARN_(win)("Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
/* Is this the right error? */
SetLastError( ERROR_OUTOFMEMORY );
@@ -2051,7 +2051,7 @@
goto end;
default:
- WARN_(win)("Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
/* Don't think this is right error but it should do */
SetLastError( ERROR_OUTOFMEMORY );
@@ -2219,7 +2219,7 @@
*/
INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount )
{
- FIXME_(win)("(0x%08x,%p,0x%x),stub!\n",hwnd,lpString,nMaxCount);
+ FIXME("(0x%08x,%p,0x%x),stub!\n",hwnd,lpString,nMaxCount);
return GetWindowTextW(hwnd,lpString,nMaxCount);
}
@@ -2982,7 +2982,7 @@
{
WND *wndPtr = WIN_FindWndPtr(hWnd);
- TRACE_(win)("%04x\n", hWnd);
+ TRACE("%04x\n", hWnd);
if (!wndPtr) return FALSE;
@@ -3027,7 +3027,7 @@
{
HWND hWndOldModal = hwndSysModal;
hwndSysModal = hWnd;
- FIXME_(win)("EMPTY STUB !! SetSysModalWindow(%04x) !\n", hWnd);
+ FIXME("EMPTY STUB !! SetSysModalWindow(%04x) !\n", hWnd);
return hWndOldModal;
}
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index b4f858f..f7ad7d4 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -38,7 +38,7 @@
#include "windef.h"
#include "x11drv.h"
-DECLARE_DEBUG_CHANNEL(event)
+DEFAULT_DEBUG_CHANNEL(event)
DECLARE_DEBUG_CHANNEL(win)
/* X context to associate a hwnd to an X window */
@@ -163,7 +163,7 @@
{
XEvent event;
- TRACE_(event)( "called (thread %lx).\n", GetCurrentThreadId() );
+ TRACE( "called (thread %lx).\n", GetCurrentThreadId() );
EnterCriticalSection( &X11DRV_CritSection );
while ( XPending( display ) )
@@ -205,12 +205,12 @@
{
HWND hWnd;
- TRACE_(event)( "called.\n" );
+ TRACE( "called.\n" );
switch (event->type)
{
case SelectionNotify: /* all of these should be caught by XCheckTypedWindowEvent() */
- FIXME_(event)("Got SelectionNotify - must not happen!\n");
+ FIXME("Got SelectionNotify - must not happen!\n");
/* fall through */
/* We get all these because of StructureNotifyMask.
@@ -250,11 +250,11 @@
if ( !hWnd && event->xany.window != X11DRV_GetXRootWindow()
&& event->type != PropertyNotify )
- ERR_(event)("Got event %s for unknown Window %08lx\n",
- event_names[event->type], event->xany.window );
+ ERR("Got event %s for unknown Window %08lx\n",
+ event_names[event->type], event->xany.window );
else
- TRACE_(event)("Got event %s for hwnd %04x\n",
- event_names[event->type], hWnd );
+ TRACE("Got event %s for hwnd %04x\n",
+ event_names[event->type], hWnd );
switch(event->type)
{
@@ -389,11 +389,11 @@
break;
default:
- WARN_(event)("Unprocessed event %s for hwnd %04x\n",
+ WARN("Unprocessed event %s for hwnd %04x\n",
event_names[event->type], hWnd );
break;
}
- TRACE_(event)( "returns.\n" );
+ TRACE( "returns.\n" );
}
/***********************************************************************
@@ -450,7 +450,7 @@
TSXQueryTree( display, w, &root, &parent, &children, &total );
if( children ) TSXFree( children );
} while( parent && parent != ancestor );
- TRACE_(event)("\t%08x -> %08x\n", (unsigned)prev, (unsigned)w );
+ TRACE("\t%08x -> %08x\n", (unsigned)prev, (unsigned)w );
return ( parent ) ? w : 0 ;
}
@@ -886,7 +886,7 @@
BOOL bHavePixmap;
int xRc;
- TRACE_(event)("Request for %s\n", TSXGetAtomName(display, target));
+ TRACE("Request for %s\n", TSXGetAtomName(display, target));
/*
* Count the number of items we wish to expose as selection targets.
@@ -940,7 +940,7 @@
if (targets[i])
{
char *itemFmtName = TSXGetAtomName(display, targets[i]);
- TRACE_(event)("\tAtom# %d: Type %s\n", i, itemFmtName);
+ TRACE("\tAtom# %d: Type %s\n", i, itemFmtName);
TSXFree(itemFmtName);
}
}
@@ -948,14 +948,14 @@
#endif
/* Update the X property */
- TRACE_(event)("\tUpdating property %s...", TSXGetAtomName(display, rprop));
+ TRACE("\tUpdating property %s...", TSXGetAtomName(display, rprop));
/* We may want to consider setting the type to xaTargets instead,
* in case some apps expect this instead of XA_ATOM */
xRc = TSXChangeProperty(display, requestor, rprop,
XA_ATOM, 32, PropModeReplace,
(unsigned char *)targets, cTargets);
- TRACE_(event)("(Rc=%d)\n", xRc);
+ TRACE("(Rc=%d)\n", xRc);
HeapFree( GetProcessHeap(), 0, targets );
@@ -981,7 +981,7 @@
* windows clipboard format ID.
*/
itemFmtName = TSXGetAtomName(display, target);
- TRACE_(event)("Request for %s (wFormat=%x %s)\n",
+ TRACE("Request for %s (wFormat=%x %s)\n",
itemFmtName, CF_TEXT, CLIPBOARD_GetFormatName(CF_TEXT));
TSXFree(itemFmtName);
@@ -1007,11 +1007,11 @@
lpstr[j]='\0';
/* Update the X property */
- TRACE_(event)("\tUpdating property %s...\n", TSXGetAtomName(display, rprop));
+ TRACE("\tUpdating property %s...\n", TSXGetAtomName(display, rprop));
xRc = TSXChangeProperty(display, requestor, rprop,
XA_STRING, 8, PropModeReplace,
lpstr, j);
- TRACE_(event)("(Rc=%d)\n", xRc);
+ TRACE("(Rc=%d)\n", xRc);
GlobalUnlock16(hText);
HeapFree( GetProcessHeap(), 0, lpstr );
@@ -1042,14 +1042,14 @@
*/
itemFmtName = TSXGetAtomName(display, target);
wFormat = X11DRV_CLIPBOARD_MapPropertyToFormat(itemFmtName);
- TRACE_(event)("Request for %s (wFormat=%x %s)\n",
+ TRACE("Request for %s (wFormat=%x %s)\n",
itemFmtName, wFormat, CLIPBOARD_GetFormatName( wFormat));
TSXFree(itemFmtName);
hClipData = GetClipboardData(wFormat);
if ( !hClipData )
{
- TRACE_(event)("Could not retrieve a Pixmap compatible format from clipboard!\n");
+ TRACE("Could not retrieve a Pixmap compatible format from clipboard!\n");
rprop = None; /* Fail the request */
goto END;
}
@@ -1075,22 +1075,21 @@
}
else
{
- FIXME_(event)("%s to PIXMAP conversion not yet implemented!\n",
+ FIXME("%s to PIXMAP conversion not yet implemented!\n",
CLIPBOARD_GetFormatName(wFormat));
rprop = None;
goto END;
}
- TRACE_(event)("\tUpdating property %s on Window %ld with %s %ld...\n",
- TSXGetAtomName(display, rprop), (long)requestor,
- TSXGetAtomName(display, target),
- pixmap);
+ TRACE("\tUpdating property %s on Window %ld with %s %ld...\n",
+ TSXGetAtomName(display, rprop), (long)requestor,
+ TSXGetAtomName(display, target), pixmap);
/* Store the Pixmap handle in the property */
xRc = TSXChangeProperty(display, requestor, rprop, target,
32, PropModeReplace,
(unsigned char *)&pixmap, 1);
- TRACE_(event)("(Rc=%d)\n", xRc);
+ TRACE("(Rc=%d)\n", xRc);
/* Enable the code below if you want to handle destroying Pixmap resources
* in response to property notify events. Clients like XPaint don't
@@ -1102,8 +1101,8 @@
* pixmap when the client deletes the property atom.
*/
xRc = TSXGetWindowAttributes(display, requestor, &win_attr_src);
- TRACE_(event)("Turning on PropertyChangeEvent notifications from window %ld\n",
- (long)requestor);
+ TRACE("Turning on PropertyChangeEvent notifications from window %ld\n",
+ (long)requestor);
win_attr.event_mask = win_attr_src.your_event_mask | PropertyChangeMask;
TSXChangeWindowAttributes(display, requestor, CWEventMask, &win_attr);
@@ -1139,8 +1138,8 @@
*/
itemFmtName = TSXGetAtomName(display, target);
wFormat = X11DRV_CLIPBOARD_MapPropertyToFormat(itemFmtName);
- TRACE_(event)("Request for %s (wFormat=%x %s)\n",
- itemFmtName, wFormat, CLIPBOARD_GetFormatName( wFormat));
+ TRACE("Request for %s (wFormat=%x %s)\n",
+ itemFmtName, wFormat, CLIPBOARD_GetFormatName( wFormat));
TSXFree(itemFmtName);
hClipData = GetClipboardData16(wFormat);
@@ -1149,19 +1148,19 @@
{
cBytes = GlobalSize16(hClipData);
- TRACE_(event)("\tUpdating property %s, %d bytes...\n",
- TSXGetAtomName(display, rprop), cBytes);
+ TRACE("\tUpdating property %s, %d bytes...\n",
+ TSXGetAtomName(display, rprop), cBytes);
xRc = TSXChangeProperty(display, requestor, rprop,
target, 8, PropModeReplace,
(unsigned char *)lpClipData, cBytes);
- TRACE_(event)("(Rc=%d)\n", xRc);
+ TRACE("(Rc=%d)\n", xRc);
GlobalUnlock16(hClipData);
}
else
{
- TRACE_(event)("\tCould not retrieve native format!\n");
+ TRACE("\tCould not retrieve native format!\n");
rprop = None; /* Fail the request */
}
@@ -1204,13 +1203,14 @@
* (target,property) atom pairs.
*/
if(TSXGetWindowProperty(display, pevent->requestor, rprop,
- 0, 0x3FFF, False, AnyPropertyType, &atype, &aformat,
- &cTargetPropList, &remain, (unsigned char**)&targetPropList) != Success)
- TRACE_(event)("\tCouldn't read MULTIPLE property\n");
+ 0, 0x3FFF, False, AnyPropertyType, &atype,&aformat,
+ &cTargetPropList, &remain,
+ (unsigned char**)&targetPropList) != Success)
+ TRACE("\tCouldn't read MULTIPLE property\n");
else
{
- TRACE_(event)("\tType %s,Format %d,nItems %ld, Remain %ld\n",
- TSXGetAtomName(display,atype),aformat,cTargetPropList,remain);
+ TRACE("\tType %s,Format %d,nItems %ld, Remain %ld\n",
+ TSXGetAtomName(display, atype), aformat, cTargetPropList, remain);
/*
* Make sure we got what we expect.
@@ -1233,14 +1233,15 @@
char *propName = TSXGetAtomName(display, targetPropList[i+1]);
XSelectionRequestEvent event;
- TRACE_(event)("MULTIPLE(%d): Target='%s' Prop='%s'\n", i/2, targetName, propName);
+ TRACE("MULTIPLE(%d): Target='%s' Prop='%s'\n",
+ i/2, targetName, propName);
TSXFree(targetName);
TSXFree(propName);
/* We must have a non "None" property to service a MULTIPLE target atom */
if ( !targetPropList[i+1] )
{
- TRACE_(event)("\tMULTIPLE(%d): Skipping target with empty property!", i);
+ TRACE("\tMULTIPLE(%d): Skipping target with empty property!", i);
continue;
}
@@ -1341,7 +1342,7 @@
if(couldOpen) CloseClipboard();
if( rprop == None)
- TRACE_(event)("\tRequest ignored\n");
+ TRACE("\tRequest ignored\n");
/* reply to sender
* SelectionNotify should be sent only at the end of a MULTIPLE request
@@ -1355,7 +1356,7 @@
result.property = rprop;
result.target = event->target;
result.time = event->time;
- TRACE_(event)("Sending SelectionNotify event...\n");
+ TRACE("Sending SelectionNotify event...\n");
TSXSendEvent(display,event->requestor,False,NoEventMask,(XEvent*)&result);
}
}
@@ -1379,14 +1380,14 @@
static void EVENT_PropertyNotify( XPropertyEvent *event )
{
/* Check if we have any resources to free */
- TRACE_(event)("Received PropertyNotify event: ");
+ TRACE("Received PropertyNotify event: ");
switch(event->state)
{
case PropertyDelete:
{
- TRACE_(event)("\tPropertyDelete for atom %s on window %ld\n",
- TSXGetAtomName(event->display, event->atom), (long)event->window);
+ TRACE("\tPropertyDelete for atom %s on window %ld\n",
+ TSXGetAtomName(event->display, event->atom), (long)event->window);
if (X11DRV_CLIPBOARD_IsSelectionowner())
X11DRV_CLIPBOARD_FreeResources( event->atom );
@@ -1395,8 +1396,8 @@
case PropertyNewValue:
{
- TRACE_(event)("\tPropertyNewValue for atom %s on window %ld\n\n",
- TSXGetAtomName(event->display, event->atom), (long)event->window);
+ TRACE("\tPropertyNewValue for atom %s on window %ld\n\n",
+ TSXGetAtomName(event->display, event->atom), (long)event->window);
break;
}
@@ -1571,8 +1572,8 @@
AnyPropertyType, &u.atom_aux, &u.i,
&data_length, &aux_long, &p_data);
if (aux_long)
- WARN_(event)("property too large, truncated!\n");
- TRACE_(event)("urls=%s\n", p_data);
+ WARN("property too large, truncated!\n");
+ TRACE("urls=%s\n", p_data);
if( !aux_long && p_data) { /* don't bother if > 64K */
/* calculate length */
@@ -1645,13 +1646,13 @@
if (strncmp(p,"file:",5) == 0 ) {
INT len = GetShortPathNameA( p+5, p_drop, 65535 );
if (len) {
- TRACE_(event)("drop file %s as %s\n", p+5, p_drop);
+ TRACE("drop file %s as %s\n", p+5, p_drop);
p_drop += len+1;
} else {
- WARN_(event)("can't convert file %s to dos name \n", p+5);
+ WARN("can't convert file %s to dos name \n", p+5);
}
} else {
- WARN_(event)("unknown mime type %s\n", p);
+ WARN("unknown mime type %s\n", p);
}
if (next) {
*next = '\n';
@@ -1720,12 +1721,12 @@
dndSelection, 0, 65535, FALSE,
AnyPropertyType, &u.atom, &u.i,
&u.l, &u.l, &p_data);
- TRACE_(event)("message_type=%ld, data=%ld,%ld,%ld,%ld,%ld, msg=%s\n",
+ TRACE("message_type=%ld, data=%ld,%ld,%ld,%ld,%ld, msg=%s\n",
event->message_type, event->data.l[0], event->data.l[1],
event->data.l[2], event->data.l[3], event->data.l[4],
p_data);
#endif
- TRACE_(event)("unrecognized ClientMessage\n" );
+ TRACE("unrecognized ClientMessage\n" );
}
}
}
@@ -1842,22 +1843,22 @@
static void EVENT_ShmCompletion( XShmCompletionEvent *event )
{
- TRACE_(event)("Got ShmCompletion for drawable %ld (time %ld)\n", event->drawable, GetTickCount() );
+ TRACE("Got ShmCompletion for drawable %ld (time %ld)\n", event->drawable, GetTickCount() );
if (event->drawable == shm_draw) {
HANDLE event = shm_event;
shm_draw = 0;
SetEvent(event);
- TRACE_(event)("Event object triggered\n" );
- } else ERR_(event)("Got ShmCompletion for unknown drawable %ld\n", event->drawable );
+ TRACE("Event object triggered\n" );
+ } else ERR("Got ShmCompletion for unknown drawable %ld\n", event->drawable );
}
int X11DRV_EVENT_PrepareShmCompletion( Drawable dw )
{
if (shm_draw) {
- ERR_(event)("Multiple ShmCompletion requests not implemented\n");
+ ERR("Multiple ShmCompletion requests not implemented\n");
return 0;
}
- TRACE_(event)("Preparing ShmCompletion (%d) wait for drawable %ld (time %ld)\n", ShmCompletionType, dw, GetTickCount() );
+ TRACE("Preparing ShmCompletion (%d) wait for drawable %ld (time %ld)\n", ShmCompletionType, dw, GetTickCount() );
shm_draw = dw;
if (!shm_event)
/* use manual reset just in case */
@@ -1870,7 +1871,7 @@
void X11DRV_EVENT_WaitShmCompletion( int compl )
{
if (!compl) return;
- TRACE_(event)("Waiting for ShmCompletion (%d) (thread %lx) (time %ld)\n", ShmCompletionType, GetCurrentThreadId(), GetTickCount() );
+ TRACE("Waiting for ShmCompletion (%d) (thread %lx) (time %ld)\n", ShmCompletionType, GetCurrentThreadId(), GetTickCount() );
/* already triggered? */
if ( WaitForSingleObject( compl, 0 ) != WAIT_OBJECT_0 ) {
/* nope, may need to poll X event queue, in case the service thread is blocked */
@@ -1887,7 +1888,7 @@
} while ( WaitForMultipleObjects(2, hnd, FALSE, INFINITE) > WAIT_OBJECT_0 );
}
ResetEvent(compl); /* manual reset */
- TRACE_(event)("Wait complete (time %ld)\n", GetTickCount() );
+ TRACE("Wait complete (time %ld)\n", GetTickCount() );
}
#endif /* defined(HAVE_LIBXXSHM) */
diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c
index fe7607f..41a9c0d 100644
--- a/windows/x11drv/keyboard.c
+++ b/windows/x11drv/keyboard.c
@@ -30,8 +30,8 @@
#include "winnls.h"
#include "x11drv.h"
+DEFAULT_DEBUG_CHANNEL(keyboard)
DECLARE_DEBUG_CHANNEL(key)
-DECLARE_DEBUG_CHANNEL(keyboard)
DECLARE_DEBUG_CHANNEL(x11drv)
DECLARE_DEBUG_CHANNEL(dinput)
@@ -433,7 +433,7 @@
don't treat it. It's from the same key press. Then the state goes to ON.
And from there, a 'release' event will switch off the toggle key. */
*State=FALSE;
- TRACE_(keyboard)("INTERM : don\'t treat release of toggle key. InputKeyStateTable[%#x] = %#x\n",vkey,pKeyStateTable[vkey]);
+ TRACE("INTERM : don\'t treat release of toggle key. InputKeyStateTable[%#x] = %#x\n",vkey,pKeyStateTable[vkey]);
} else
{
down = (vkey==VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0);
@@ -442,7 +442,7 @@
{
if (Evtype!=KeyPress)
{
- TRACE_(keyboard)("ON + KeyRelease => generating DOWN and UP messages.\n");
+ TRACE("ON + KeyRelease => generating DOWN and UP messages.\n");
KEYBOARD_SendEvent( vkey, scan, down,
event_x, event_y, event_time );
KEYBOARD_SendEvent( vkey, scan, up,
@@ -454,7 +454,7 @@
else /* it was OFF */
if (Evtype==KeyPress)
{
- TRACE_(keyboard)("OFF + Keypress => generating DOWN and UP messages.\n");
+ TRACE("OFF + Keypress => generating DOWN and UP messages.\n");
KEYBOARD_SendEvent( vkey, scan, down,
event_x, event_y, event_time );
KEYBOARD_SendEvent( vkey, scan, up,
@@ -476,14 +476,14 @@
/* Do something if internal table state != X state for keycode */
if (((pKeyStateTable[vkey] & 0x80)!=0) != state)
{
- TRACE_(keyboard)("Adjusting state for vkey %#.2x. State before %#.2x \n",
+ TRACE("Adjusting state for vkey %#.2x. State before %#.2x \n",
vkey, pKeyStateTable[vkey]);
/* Fake key being pressed inside wine */
KEYBOARD_SendEvent( vkey, 0, state? 0 : KEYEVENTF_KEYUP,
0, 0, GetTickCount() );
- TRACE_(keyboard)("State after %#.2x \n",pKeyStateTable[vkey]);
+ TRACE("State after %#.2x \n",pKeyStateTable[vkey]);
}
}
@@ -505,9 +505,9 @@
char keys_return[32];
- TRACE_(keyboard)("called\n");
+ TRACE("called\n");
if (!TSXQueryKeymap(display, keys_return)) {
- ERR_(keyboard)("Error getting keymap !");
+ ERR("Error getting keymap !");
return;
}
@@ -566,15 +566,15 @@
if (!ksname)
ksname = "No Name";
TRACE_(key)("%s : keysym=%lX (%s), ascii chars=%u / %X / '%s'\n",
- (event->type == KeyPress) ? "KeyPress" : "KeyRelease",
- keysym, ksname, ascii_chars, Str[0] & 0xff, Str);
+ (event->type == KeyPress) ? "KeyPress" : "KeyRelease",
+ keysym, ksname, ascii_chars, Str[0] & 0xff, Str);
}
vkey = EVENT_event_to_vkey(event);
if (force_extended) vkey |= 0x100;
TRACE_(key)("keycode 0x%x converted to vkey 0x%x\n",
- event->keycode, vkey);
+ event->keycode, vkey);
if (vkey)
{
@@ -585,16 +585,16 @@
event_time );
break;
case VK_CAPITAL:
- TRACE_(keyboard)("Caps Lock event. (type %d). State before : %#.2x\n",event->type,pKeyStateTable[vkey]);
+ TRACE("Caps Lock event. (type %d). State before : %#.2x\n",event->type,pKeyStateTable[vkey]);
KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, event->type, event_x, event_y,
event_time );
- TRACE_(keyboard)("State after : %#.2x\n",pKeyStateTable[vkey]);
+ TRACE("State after : %#.2x\n",pKeyStateTable[vkey]);
break;
default:
/* Adjust the NUMLOCK state if it has been changed outside wine */
if (!(pKeyStateTable[VK_NUMLOCK] & 0x01) != !(event->state & NumLockMask))
{
- TRACE_(keyboard)("Adjusting NumLock state. \n");
+ TRACE("Adjusting NumLock state. \n");
KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyPress, event_x, event_y,
event_time );
KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyRelease, event_x, event_y,
@@ -603,7 +603,7 @@
/* Adjust the CAPSLOCK state if it has been changed outside wine */
if (!(pKeyStateTable[VK_CAPITAL] & 0x01) != !(event->state & LockMask))
{
- TRACE_(keyboard)("Adjusting Caps Lock state.\n");
+ TRACE("Adjusting Caps Lock state.\n");
KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, KeyPress, event_x, event_y,
event_time );
KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, KeyRelease, event_x, event_y,
@@ -648,11 +648,11 @@
syms = keysyms_per_keycode;
if (syms > 4) {
- WARN_(keyboard)("%d keysyms per keycode not supported, set to 4", syms);
+ WARN("%d keysyms per keycode not supported, set to 4", syms);
syms = 4;
}
for (current = 0; main_key_tab[current].lang; current++) {
- TRACE_(keyboard)("Attempting to match against layout %04x\n",
+ TRACE("Attempting to match against layout %04x\n",
main_key_tab[current].lang);
match = 0;
mismatch = 0;
@@ -703,7 +703,7 @@
}
}
}
- TRACE_(keyboard)("matches=%d, mismatches=%d, score=%d\n",
+ TRACE("matches=%d, mismatches=%d, score=%d\n",
match, mismatch, score);
if ((score > max_score) ||
((score == max_score) && (seq > max_seq))) {
@@ -716,7 +716,7 @@
}
/* we're done, report results if necessary */
if (!ismatch) {
- FIXME_(keyboard)(
+ FIXME(
"Your keyboard layout was not found!\n"
"Instead using closest match (%04x) for scancode mapping.\n"
"Please define your layout in windows/x11drv/keyboard.c and submit them\n"
@@ -724,7 +724,7 @@
"See documentation/keyboard for more information.\n",
main_key_tab[kbd_layout].lang);
}
- TRACE_(keyboard)("detected layout is %04x\n", main_key_tab[kbd_layout].lang);
+ TRACE("detected layout is %04x\n", main_key_tab[kbd_layout].lang);
}
/**********************************************************************
@@ -889,16 +889,16 @@
{
case 0xc1 : OEMvkey=0xdb; break;
case 0xe5 : OEMvkey=0xe9; break;
- case 0xf6 : OEMvkey=0xf5; WARN_(keyboard)("No more OEM vkey available!\n");
+ case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n");
}
vkey = OEMvkey;
if (TRACE_ON(keyboard))
{
- TRACE_(keyboard)("OEM specific virtual key %X assigned to keycode %X:\n",
+ TRACE("OEM specific virtual key %X assigned to keycode %X:\n",
OEMvkey, e2.keycode);
- TRACE_(keyboard)("(");
+ TRACE("(");
for (i = 0; i < keysyms_per_keycode; i += 1)
{
char *ksname;
@@ -960,8 +960,8 @@
keycode = TSXKeysymToKeycode(display, keysym | 0xFE00);
}
- TRACE_(keyboard)("VkKeyScan '%c'(%#lx, %lu): got keycode %#.2x\n",
- cChar,keysym,keysym,keycode);
+ TRACE("VkKeyScan '%c'(%#lx, %lu): got keycode %#.2x\n",
+ cChar,keysym,keysym,keycode);
if (keycode)
{
@@ -969,12 +969,12 @@
if (TSXKeycodeToKeysym(display,keycode,i)==keysym) index=i;
switch (index) {
case -1 :
- WARN_(keyboard)("Keysym %lx not found while parsing the keycode table\n",keysym); break;
+ WARN("Keysym %lx not found while parsing the keycode table\n",keysym); break;
case 0 : break;
case 1 : highbyte = 0x0100; break;
case 2 : highbyte = 0x0600; break;
case 3 : highbyte = 0x0700; break;
- default : ERR_(keyboard)("index %d found by XKeycodeToKeysym. please report! \n",index);
+ default : ERR("index %d found by XKeycodeToKeysym. please report! \n",index);
}
/*
index : 0 adds 0x0000
@@ -984,7 +984,7 @@
index : 3 adds 0x0700 (ctrl+alt+shift)
*/
}
- TRACE_(keyboard)(" ... returning %#.2x\n", keyc2vkey[keycode]+highbyte);
+ TRACE(" ... returning %#.2x\n", keyc2vkey[keycode]+highbyte);
return keyc2vkey[keycode]+highbyte; /* keycode -> (keyc2vkey) vkey */
}
@@ -993,10 +993,9 @@
*/
UINT16 X11DRV_KEYBOARD_MapVirtualKey(UINT16 wCode, UINT16 wMapType)
{
-#define returnMVK(value) { TRACE_(keyboard)("returning 0x%x.\n",value); return value; }
+#define returnMVK(value) { TRACE("returning 0x%x.\n",value); return value; }
- TRACE_(keyboard)("MapVirtualKey wCode=0x%x wMapType=%d ... \n",
- wCode,wMapType);
+ TRACE("MapVirtualKey wCode=0x%x wMapType=%d ... \n", wCode,wMapType);
switch(wMapType) {
case 0: { /* vkey-code to scan-code */
/* let's do vkey -> keycode -> scan */
@@ -1004,7 +1003,7 @@
for (keyc=min_keycode; keyc<=max_keycode; keyc++)
if ((keyc2vkey[keyc] & 0xFF) == wCode)
returnMVK (keyc2scan[keyc] & 0xFF);
- TRACE_(keyboard)("returning no scan-code.\n");
+ TRACE("returning no scan-code.\n");
return 0; }
case 1: { /* scan-code to vkey-code */
@@ -1013,7 +1012,7 @@
for (keyc=min_keycode; keyc<=max_keycode; keyc++)
if ((keyc2scan[keyc] & 0xFF) == (wCode & 0xFF))
returnMVK (keyc2vkey[keyc] & 0xFF);
- TRACE_(keyboard)("returning no vkey-code.\n");
+ TRACE("returning no vkey-code.\n");
return 0; }
case 2: { /* vkey-code to unshifted ANSI code */
@@ -1049,26 +1048,25 @@
if (!e.keycode)
{
- WARN_(keyboard)("Unknown virtual key %X !!! \n", wCode);
+ WARN("Unknown virtual key %X !!! \n", wCode);
return 0; /* whatever */
}
- TRACE_(keyboard)("Found keycode %d (0x%2X)\n",e.keycode,e.keycode);
+ TRACE("Found keycode %d (0x%2X)\n",e.keycode,e.keycode);
if (TSXLookupString(&e, s, 2, &keysym, NULL))
returnMVK (*s);
- TRACE_(keyboard)("returning no ANSI.\n");
+ TRACE("returning no ANSI.\n");
return 0;
}
case 3: /* **NT only** scan-code to vkey-code but distinguish between */
/* left and right */
- FIXME_(keyboard)(" stub for NT\n");
+ FIXME(" stub for NT\n");
return 0;
default: /* reserved */
- WARN_(keyboard)("Unknown wMapType %d !\n",
- wMapType);
+ WARN("Unknown wMapType %d !\n", wMapType);
return 0;
}
return 0;
@@ -1111,8 +1109,7 @@
}
ansi = X11DRV_KEYBOARD_MapVirtualKey(vkey, 2);
- TRACE_(keyboard)("scan 0x%04x, vkey 0x%04x, ANSI 0x%04x\n",
- scanCode, vkey, ansi);
+ TRACE("scan 0x%04x, vkey 0x%04x, ANSI 0x%04x\n", scanCode, vkey, ansi);
/* first get the name of the "regular" keys which is the Upper case
value of the keycap imprint. */
@@ -1152,8 +1149,8 @@
{
keys = TSXKeycodeToKeysym(display, keyc, 0);
name = TSXKeysymToString(keys);
- TRACE_(keyboard)("found scan=%04x keyc=%04x keysym=%04x string=%s\n",
- scanCode, keyc, (int)keys, name);
+ TRACE("found scan=%04x keyc=%04x keysym=%04x string=%s\n",
+ scanCode, keyc, (int)keys, name);
if (lpBuffer && nSize && name)
{
strncpy(lpBuffer, name, nSize);
@@ -1163,7 +1160,7 @@
/* Finally issue FIXME for unknown keys */
- FIXME_(keyboard)("(%08lx,%p,%d): unsupported key, vkey=%04x, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi);
+ FIXME("(%08lx,%p,%d): unsupported key, vkey=%04x, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi);
if (lpBuffer && nSize)
*lpBuffer = 0;
return 0;
@@ -1243,7 +1240,7 @@
return 's';
*/
}
- TRACE_(keyboard)("no character for dead keysym 0x%08lx\n",keysym);
+ TRACE("no character for dead keysym 0x%08lx\n",keysym);
return 0;
}
@@ -1278,12 +1275,12 @@
if (scanCode==0) {
/* This happens when doing Alt+letter : a fake 'down arrow' key press
event is generated by windows. Just ignore it. */
- TRACE_(keyboard)("scanCode=0, doing nothing\n");
+ TRACE("scanCode=0, doing nothing\n");
return 0;
}
if (scanCode & 0x8000)
{
- TRACE_(keyboard)("Key UP, doing nothing\n" );
+ TRACE("Key UP, doing nothing\n" );
return 0;
}
e.display = display;
@@ -1325,10 +1322,10 @@
if (!e.keycode)
{
- WARN_(keyboard)("Unknown virtual key %X !!! \n",virtKey);
+ WARN("Unknown virtual key %X !!! \n",virtKey);
return virtKey; /* whatever */
}
- else TRACE_(keyboard)("Found keycode %d (0x%2X)\n",e.keycode,e.keycode);
+ else TRACE("Found keycode %d (0x%2X)\n",e.keycode,e.keycode);
ret = TSXLookupString(&e, (LPVOID)lpChar, 2, &keysym, &cs);
if (ret == 0)
@@ -1351,10 +1348,10 @@
ksname = "No Name";
if ((keysym >> 8) != 0xff)
{
- ERR_(keyboard)("Please report: no char for keysym %04lX (%s) :\n",
- keysym, ksname);
- ERR_(keyboard)("(virtKey=%X,scanCode=%X,keycode=%X,state=%X)\n",
- virtKey, scanCode, e.keycode, e.state);
+ ERR("Please report: no char for keysym %04lX (%s) :\n",
+ keysym, ksname);
+ ERR("(virtKey=%X,scanCode=%X,keycode=%X,state=%X)\n",
+ virtKey, scanCode, e.keycode, e.state);
}
}
}
