[cwittich] 31104: Dmitry Timoshkov : wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility. <dmitry at codeweavers.com>
Author: cwittich Date: Sun Dec 9 17:15:31 2007 New Revision: 31104
URL: http://svn.reactos.org/svn/reactos?rev=31104&view=rev Log: Dmitry Timoshkov : wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility. <dmitry at codeweavers.com>
Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/misc/dde.c trunk/reactos/dll/win32/user32/misc/ddeclient.c trunk/reactos/dll/win32/user32/misc/ddeserver.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/spy.c
Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/e... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c Sun Dec 9 17:15:31 2007 @@ -458,7 +458,7 @@ EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0;
- TRACE("hwnd=%p msg=%x (%s) wparam=%x lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); + TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam);
if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); @@ -5283,7 +5283,7 @@ } else if (GWL_EXSTYLE == which) { ; /* FIXME - what is needed here */ } else { - WARN ("Invalid style change %d\n",which); + WARN ("Invalid style change %ld\n",which); }
return 0;
Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/s... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c Sun Dec 9 17:15:31 2007 @@ -729,7 +729,7 @@ WPARAM wParam /* [in] Variable input including enable state */, LPARAM lParam /* [in] Variable input including input point */) { - TRACE("Wnd=%p wParam=%d lParam=%ld\n", Wnd, wParam, lParam); + TRACE("Wnd=%p wParam=%ld lParam=%ld\n", Wnd, wParam, lParam);
/* hide caret on first KEYDOWN to prevent flicker */ if (0 == (lParam & PFD_DOUBLEBUFFER_DONTCARE)) @@ -1445,14 +1445,14 @@ case 0x00ed: case 0x00ee: case 0x00ef: - WARN("unknown Win32 msg %04x wp=%08x lp=%08lx\n", + WARN("unknown Win32 msg %04x wp=%08lx lp=%08lx\n", Msg, wParam, lParam ); break;
default: if (WM_USER <= Msg) { - WARN("unknown msg %04x wp=%04x lp=%08lx\n", Msg, wParam, lParam); + WARN("unknown msg %04x wp=%04lx lp=%08lx\n", Msg, wParam, lParam); } return DefWindowProcW(Wnd, Msg, wParam, lParam ); }
Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.c... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dde.c (original) +++ trunk/reactos/dll/win32/user32/misc/dde.c Sun Dec 9 17:15:31 2007 @@ -117,7 +117,7 @@ ERR("GlobalLock failed (%lx)\n", lParam); return FALSE; } - TRACE("unpacked: low %08x, high %08x\n", params[0], params[1]); + TRACE("unpacked: low %08lx, high %08lx\n", params[0], params[1]); if (uiLo) *uiLo = params[0]; if (uiHi) *uiHi = params[1]; GlobalUnlock( (HGLOBAL)lParam ); @@ -192,7 +192,7 @@ } params[0] = uiLo; params[1] = uiHi; - TRACE("Reusing pack %08x %08x\n", uiLo, uiHi); + TRACE("Reusing pack %08lx %08lx\n", uiLo, uiHi); GlobalUnlock( (HGLOBAL)lParam ); return lParam;
Modified: trunk/reactos/dll/win32/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddecl... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeclient.c (original) +++ trunk/reactos/dll/win32/user32/misc/ddeclient.c Sun Dec 9 17:15:31 2007 @@ -526,7 +526,7 @@
case WM_DDE_DATA: UnpackDDElParam(WM_DDE_DATA, msg->lParam, &uiLo, &uiHi); - TRACE("Got the result (%08x)\n", uiLo); + TRACE("Got the result (%08lx)\n", uiLo);
hsz = WDML_MakeHszFromAtom(pConv->instance, uiHi);
@@ -1272,7 +1272,7 @@ WDML_CONV* pConv = NULL; HSZ hszSrv, hszTpc;
- TRACE("%p %04x %08x %08lx\n", hwnd, iMsg, wParam , lParam); + TRACE("%p %04x %08lx %08lx\n", hwnd, iMsg, wParam , lParam);
if (iMsg == WM_DDE_ACK && /* in the initial WM_INITIATE sendmessage */
Modified: trunk/reactos/dll/win32/user32/misc/ddeserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddese... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeserver.c (original) +++ trunk/reactos/dll/win32/user32/misc/ddeserver.c Sun Dec 9 17:15:31 2007 @@ -983,7 +983,7 @@ WDML_CONV* pConv; WDML_XACT* pXAct = NULL;
- TRACE("%p %04x %08x %08lx\n", hwndServer, iMsg, wParam , lParam); + TRACE("%p %04x %08lx %08lx\n", hwndServer, iMsg, wParam , lParam);
if (iMsg == WM_DESTROY) {
Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/md... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c Sun Dec 9 17:15:31 2007 @@ -1052,7 +1052,7 @@ { MDICLIENTINFO *ci = NULL;
- TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
if (WM_NCCREATE != message && NULL == (ci = get_client_info(hwnd))) { @@ -1370,7 +1370,7 @@ { MDICLIENTINFO *ci = get_client_info( hwndMDIClient );
- TRACE("%p %p %04x (%s) %08x %08lx\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %p %04x (%s) %08lx %08lx\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
if (ci) { @@ -1468,7 +1468,7 @@ HWND client = GetParent(hwnd); MDICLIENTINFO *ci = get_client_info( client );
- TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); #ifndef __REACTOS__ hwnd = WIN_GetFullHandle( hwnd ); #endif @@ -1511,7 +1511,7 @@ HWND client = GetParent(hwnd); MDICLIENTINFO *ci = get_client_info( client );
- TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); #ifndef __REACTOS__ hwnd = WIN_GetFullHandle( hwnd ); #endif @@ -1713,7 +1713,7 @@ default: return 0; } - TRACE("wParam = %04x\n", wParam); + TRACE("wParam = %04lx\n", wParam); SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, (LPARAM)msg->wParam); return 1; }
Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/me... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Sun Dec 9 17:15:31 2007 @@ -940,7 +940,7 @@ static LRESULT WINAPI PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) { - TRACE("hwnd=%x msg=0x%04x wp=0x%04x lp=0x%08lx\n", Wnd, Message, wParam, lParam); + TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
switch(Message) {
Modified: trunk/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/sp... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/spy.c (original) +++ trunk/reactos/dll/win32/user32/windows/spy.c Sun Dec 9 17:15:31 2007 @@ -2390,7 +2390,7 @@ p = SPY_Bsearch_Notify (&spnfy_array[0], end_spnfy_array, pnmh->code); if (p) { - TRACE("NMHDR hwndFrom=%p idFrom=0x%08x code=%s<0x%08x>, extra=0x%x\n", + TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=%s<0x%08x>, extra=0x%x\n", pnmh->hwndFrom, pnmh->idFrom, p->name, pnmh->code, p->len); dumplen = p->len;
@@ -2412,7 +2412,7 @@ } } else - TRACE("NMHDR hwndFrom=%p idFrom=0x%08x code=0x%08x\n", + TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code); } default: @@ -2446,13 +2446,13 @@ { #ifndef __REACTOS__ case SPY_DISPATCHMESSAGE16: - TRACE("%*s(%04x) %-16s message [%04x] %s dispatched wp=%04x lp=%08lx\n", + TRACE("%*s(%04x) %-16s message [%04x] %s dispatched wp=%04lx lp=%08lx\n", indent, "", HWND_16(hWnd), debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam); break; #endif case SPY_DISPATCHMESSAGE: - TRACE("%*s(%p) %-16s message [%04x] %s dispatched wp=%08x lp=%08lx\n", + TRACE("%*s(%p) %-16s message [%04x] %s dispatched wp=%08lx lp=%08lx\n", indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam); break; @@ -2467,12 +2467,12 @@ else sprintf( taskName, "tid %04lx", GetCurrentThreadId() ); #ifndef __REACTOS__ if (iFlag == SPY_SENDMESSAGE16) - TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n", + TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04lx lp=%08lx\n", indent, "", HWND_16(hWnd), debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, taskName, wParam, lParam ); else #endif - { TRACE("%*s(%p) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n", + { TRACE("%*s(%p) %-16s message [%04x] %s sent from %s wp=%08lx lp=%08lx\n", indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, taskName, wParam, lParam ); SPY_DumpStructure(&sp_e, TRUE); @@ -2483,14 +2483,14 @@ #ifndef __REACTOS__ case SPY_DEFWNDPROC16: if( SPY_ExcludeDWP ) return; - TRACE("%*s(%04x) DefWindowProc16: %s [%04x] wp=%04x lp=%08lx\n", + TRACE("%*s(%04x) DefWindowProc16: %s [%04x] wp=%04lx lp=%08lx\n", indent, "", HWND_16(hWnd), sp_e.msg_name, msg, wParam, lParam ); break; #endif
case SPY_DEFWNDPROC: if( SPY_ExcludeDWP ) return; - TRACE("%*s(%p) DefWindowProc32: %s [%04x] wp=%08x lp=%08lx\n", + TRACE("%*s(%p) DefWindowProc32: %s [%04x] wp=%08lx lp=%08lx\n", indent, "", hWnd, sp_e.msg_name, msg, wParam, lParam ); break;
-
cwittich＠svn.reactos.org