From 6ff78347e2ef1f0028eff30c3a4fca47c159a166 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 12 Nov 2007 14:03:45 +0100 Subject: [PATCH] user32: Remove a few traces that only duplicate the relay information. --- dlls/user32/class.c | 14 -------------- dlls/user32/dde_client.c | 2 -- dlls/user32/dde_misc.c | 5 ----- dlls/user32/hook.c | 4 ---- dlls/user32/input.c | 3 --- dlls/user32/menu.c | 6 +----- dlls/user32/message.c | 4 ---- dlls/user32/scroll.c | 2 -- 8 files changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 3e2e9228d17..733dfa1c338 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -611,8 +611,6 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) { CLASS *classPtr = NULL; - TRACE("%s %p\n",debugstr_w(className), hInstance); - SERVER_START_REQ( destroy_class ) { req->instance = hInstance; @@ -637,8 +635,6 @@ WORD WINAPI GetClassWord( HWND hwnd, INT offset ) if (offset < 0) return GetClassLongA( hwnd, offset ); - TRACE("%p %x\n",hwnd, offset); - if (!(class = get_class_ptr( hwnd, FALSE ))) return 0; if (class == CLASS_OTHER_PROCESS) @@ -676,8 +672,6 @@ static ULONG_PTR CLASS_GetClassLong( HWND hwnd, INT offset, UINT size, CLASS *class; ULONG_PTR retvalue = 0; - TRACE("%p %d\n", hwnd, offset); - if (!(class = get_class_ptr( hwnd, FALSE ))) return 0; if (class == CLASS_OTHER_PROCESS) @@ -835,8 +829,6 @@ WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval ) if (offset < 0) return SetClassLongA( hwnd, offset, (DWORD)newval ); - TRACE("%p %d %x\n", hwnd, offset, newval); - if (!(class = get_class_ptr( hwnd, TRUE ))) return 0; SERVER_START_REQ( set_class_info ) @@ -870,8 +862,6 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, CLASS *class; ULONG_PTR retval = 0; - TRACE("%p %d %lx\n", hwnd, offset, newval); - if (!(class = get_class_ptr( hwnd, TRUE ))) return 0; if (offset >= 0) @@ -962,8 +952,6 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, */ DWORD WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval ) { - TRACE("%p %d %x\n", hwnd, offset, newval); - return CLASS_SetClassLong( hwnd, offset, newval, sizeof(LONG), TRUE ); } @@ -973,8 +961,6 @@ DWORD WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval ) */ DWORD WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval ) { - TRACE("%p %d %x\n", hwnd, offset, newval); - return CLASS_SetClassLong( hwnd, offset, newval, sizeof(LONG), FALSE ); } diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 3e22768303f..3bf717577d3 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1224,8 +1224,6 @@ BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction WDML_CONV* pConv; WDML_XACT* pXAct; - TRACE("(%08x,%p,%08x);\n", idInst, hConv, idTransaction); - if ((pInstance = WDML_GetInstance(idInst))) { if (hConv) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 974fde3f30c..16f36d52d7c 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -132,7 +132,6 @@ BOOL WINAPI UnpackDDElParam(UINT msg, LPARAM lParam, if (uiHi) *uiHi = 0; return FALSE; } - TRACE("unpacked: low %08lx, high %08lx\n", params[0], params[1]); if (uiLo) *uiLo = params[0]; if (uiHi) *uiHi = params[1]; GlobalUnlock( (HGLOBAL)lParam ); @@ -1126,8 +1125,6 @@ HSZ WINAPI DdeCreateStringHandleW(DWORD idInst, LPCWSTR psz, INT codepage) WDML_INSTANCE* pInstance; HSZ hsz = 0; - TRACE("(%d,%s,%d)\n", idInst, debugstr_w(psz), codepage); - pInstance = WDML_GetInstance(idInst); if (pInstance) { @@ -2026,8 +2023,6 @@ BOOL WINAPI DdeSetUserHandle(HCONV hConv, DWORD id, DWORD hUser) { WDML_CONV* pConv; - TRACE("(%p,%x,%x)\n", hConv, id, hUser); - pConv = WDML_GetConv(hConv, FALSE); if (pConv == NULL) return FALSE; diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 75e31e4ffc7..ed010a80ef4 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -518,8 +518,6 @@ BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook ) { BOOL ret; - TRACE( "%p\n", hhook ); - SERVER_START_REQ( remove_hook ) { req->handle = hhook; @@ -712,8 +710,6 @@ BOOL WINAPI UnhookWinEvent(HWINEVENTHOOK hEventHook) { BOOL ret; - TRACE( "%p\n", hEventHook ); - SERVER_START_REQ( remove_hook ) { req->handle = hEventHook; diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b385ee4ba91..dfb5201557f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -506,8 +506,6 @@ BOOL WINAPI SetKeyboardState( LPBYTE state ) { BOOL ret; - TRACE("(%p)\n", state); - SERVER_START_REQ( set_key_state ) { req->tid = GetCurrentThreadId(); @@ -580,7 +578,6 @@ WORD WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl) */ DWORD WINAPI OemKeyScan(WORD wOemChar) { - TRACE("(%d)\n", wOemChar); return wOemChar; } diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 59f84b94ccb..3a931219738 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3580,7 +3580,6 @@ DWORD WINAPI CheckMenuItem( HMENU hMenu, UINT id, UINT flags ) MENUITEM *item; DWORD ret; - TRACE("menu=%p id=%04x flags=%04x\n", hMenu, id, flags ); if (!(item = MENU_FindItem( &hMenu, &id, flags ))) return -1; ret = item->fState & MF_CHECKED; if (flags & MF_CHECKED) item->fState |= MF_CHECKED; @@ -3951,8 +3950,7 @@ BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, HBITMAP hNewUnCheck, HBITMAP hNewCheck) { MENUITEM *item; - TRACE("(%p, %04x, %04x, %p, %p)\n", - hMenu, nPos, wFlags, hNewCheck, hNewUnCheck); + if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; if (!hNewCheck && !hNewUnCheck) @@ -4884,8 +4882,6 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, MENUITEM *mi_first = NULL, *mi_check; HMENU m_first, m_check; - TRACE("%p: %u-%u, check %u, flags %04x\n", hMenu, first, last, check, bypos); - for (i = first; i <= last; i++) { UINT pos = i; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 46333b64dc0..53d1c1d35a2 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3486,8 +3486,6 @@ BOOL WINAPI KillTimer( HWND hwnd, UINT_PTR id ) { BOOL ret; - TRACE("%p %ld\n", hwnd, id ); - SERVER_START_REQ( kill_win_timer ) { req->win = hwnd; @@ -3507,8 +3505,6 @@ BOOL WINAPI KillSystemTimer( HWND hwnd, UINT_PTR id ) { BOOL ret; - TRACE("%p %ld\n", hwnd, id ); - SERVER_START_REQ( kill_win_timer ) { req->win = hwnd; diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index ec2fe136b32..f07bf75828b 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -2020,8 +2020,6 @@ BOOL WINAPI EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) BOOL bFineWithMe; SCROLLBAR_INFO *infoPtr; - TRACE("%p %d %d\n", hwnd, nBar, flags ); - flags &= ESB_DISABLE_BOTH; if (nBar == SB_BOTH)