Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dmitry Timoshkov : wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility. <dmitry at codeweavers.com>

Browse source 
svn path=/trunk/; revision=31104
This commit is contained in:
Christoph von Wittich 2007-12-09 14:15:31 +00:00
parent da3a3f761b
commit 609e6d2ac0
8 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/user32/controls/edit.c
View file

@ -458,7 +458,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 );
LRESULT result = 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) if (!es && msg != WM_NCCREATE)
return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); return DefWindowProcT(hwnd, msg, wParam, lParam, unicode);
@ -5283,7 +5283,7 @@ static LRESULT EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES
} else if (GWL_EXSTYLE == which) { } else if (GWL_EXSTYLE == which) {
; /* FIXME - what is needed here */ ; /* FIXME - what is needed here */
} else { } else {
WARN ("Invalid style change %d\n",which); WARN ("Invalid style change %ld\n",which);
} }
return 0; return 0;

6
reactos/dll/win32/user32/controls/scrollbar.c
View file

@ -729,7 +729,7 @@ IntScrollHandleKbdEvent(
WPARAM wParam /* [in] Variable input including enable state */, WPARAM wParam /* [in] Variable input including enable state */,
LPARAM lParam /* [in] Variable input including input point */) 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 */ /* hide caret on first KEYDOWN to prevent flicker */
if (0 == (lParam & PFD_DOUBLEBUFFER_DONTCARE)) if (0 == (lParam & PFD_DOUBLEBUFFER_DONTCARE))
@ -1445,14 +1445,14 @@ ScrollBarWndProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
case 0x00ed: case 0x00ed:
case 0x00ee: case 0x00ee:
case 0x00ef: 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 ); Msg, wParam, lParam );
break; break;
default: default:
if (WM_USER <= Msg) 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 ); return DefWindowProcW(Wnd, Msg, wParam, lParam );
} }

4
reactos/dll/win32/user32/misc/dde.c
View file

@ -117,7 +117,7 @@ BOOL WINAPI UnpackDDElParam(UINT msg, LPARAM lParam,
ERR("GlobalLock failed (%lx)\n", lParam); ERR("GlobalLock failed (%lx)\n", lParam);
return FALSE; 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 (uiLo) *uiLo = params[0];
if (uiHi) *uiHi = params[1]; if (uiHi) *uiHi = params[1];
GlobalUnlock( (HGLOBAL)lParam ); GlobalUnlock( (HGLOBAL)lParam );
@ -192,7 +192,7 @@ LPARAM WINAPI ReuseDDElParam(LPARAM lParam, UINT msgIn, UINT msgOut,
} }
params[0] = uiLo; params[0] = uiLo;
params[1] = uiHi; params[1] = uiHi;
TRACE("Reusing pack %08x %08x\n", uiLo, uiHi); TRACE("Reusing pack %08lx %08lx\n", uiLo, uiHi);
GlobalUnlock( (HGLOBAL)lParam ); GlobalUnlock( (HGLOBAL)lParam );
return lParam; return lParam;

4
reactos/dll/win32/user32/misc/ddeclient.c
View file

@ -526,7 +526,7 @@ static WDML_QUEUE_STATE WDML_HandleRequestReply(WDML_CONV* pConv, MSG* msg, WDML
case WM_DDE_DATA: case WM_DDE_DATA:
UnpackDDElParam(WM_DDE_DATA, msg->lParam, &uiLo, &uiHi); 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); hsz = WDML_MakeHszFromAtom(pConv->instance, uiHi);
@ -1272,7 +1272,7 @@ static LRESULT CALLBACK WDML_ClientProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA
WDML_CONV* pConv = NULL; WDML_CONV* pConv = NULL;
HSZ hszSrv, hszTpc; 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 && if (iMsg == WM_DDE_ACK &&
/* in the initial WM_INITIATE sendmessage */ /* in the initial WM_INITIATE sendmessage */

2
reactos/dll/win32/user32/misc/ddeserver.c
View file

@ -983,7 +983,7 @@ static LRESULT CALLBACK WDML_ServerConvProc(HWND hwndServer, UINT iMsg, WPARAM w
WDML_CONV* pConv; WDML_CONV* pConv;
WDML_XACT* pXAct = NULL; 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) if (iMsg == WM_DESTROY)
{ {

10
reactos/dll/win32/user32/windows/mdi.c
View file

@ -1052,7 +1052,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
{ {
MDICLIENTINFO *ci = NULL; 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))) if (WM_NCCREATE != message && NULL == (ci = get_client_info(hwnd)))
{ {
@ -1370,7 +1370,7 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient,
{ {
MDICLIENTINFO *ci = get_client_info( hwndMDIClient ); 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) if (ci)
{ {
@ -1468,7 +1468,7 @@ LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message,
HWND client = GetParent(hwnd); HWND client = GetParent(hwnd);
MDICLIENTINFO *ci = get_client_info( client ); 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__ #ifndef __REACTOS__
hwnd = WIN_GetFullHandle( hwnd ); hwnd = WIN_GetFullHandle( hwnd );
#endif #endif
@ -1511,7 +1511,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
HWND client = GetParent(hwnd); HWND client = GetParent(hwnd);
MDICLIENTINFO *ci = get_client_info( client ); 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__ #ifndef __REACTOS__
hwnd = WIN_GetFullHandle( hwnd ); hwnd = WIN_GetFullHandle( hwnd );
#endif #endif
@ -1713,7 +1713,7 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg )
default: default:
return 0; return 0;
} }
TRACE("wParam = %04x\n", wParam); TRACE("wParam = %04lx\n", wParam);
SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, (LPARAM)msg->wParam); SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, (LPARAM)msg->wParam);
return 1; return 1;
} }

2
reactos/dll/win32/user32/windows/menu.c
View file

@ -940,7 +940,7 @@ MenuDrawPopupMenu(HWND Wnd, HDC Dc, HMENU Menu)
static LRESULT WINAPI static LRESULT WINAPI
PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) 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) switch(Message)
{ {

16
reactos/dll/win32/user32/windows/spy.c
View file

@ -2390,7 +2390,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter)
p = SPY_Bsearch_Notify (&spnfy_array[0], end_spnfy_array, p = SPY_Bsearch_Notify (&spnfy_array[0], end_spnfy_array,
pnmh->code); pnmh->code);
if (p) { 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); pnmh->hwndFrom, pnmh->idFrom, p->name, pnmh->code, p->len);
dumplen = p->len; dumplen = p->len;
@ -2412,7 +2412,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter)
} }
} }
else 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); pnmh->hwndFrom, pnmh->idFrom, pnmh->code);
} }
default: default:
@ -2446,13 +2446,13 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
{ {
#ifndef __REACTOS__ #ifndef __REACTOS__
case SPY_DISPATCHMESSAGE16: 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), indent, "", HWND_16(hWnd),
debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam); debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam);
break; break;
#endif #endif
case SPY_DISPATCHMESSAGE: 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, indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg,
sp_e.msg_name, wParam, lParam); sp_e.msg_name, wParam, lParam);
break; break;
@ -2467,12 +2467,12 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
else sprintf( taskName, "tid %04lx", GetCurrentThreadId() ); else sprintf( taskName, "tid %04lx", GetCurrentThreadId() );
#ifndef __REACTOS__ #ifndef __REACTOS__
if (iFlag == SPY_SENDMESSAGE16) 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, indent, "", HWND_16(hWnd), debugstr_w(sp_e.wnd_name), msg,
sp_e.msg_name, taskName, wParam, lParam ); sp_e.msg_name, taskName, wParam, lParam );
else else
#endif #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, indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg,
sp_e.msg_name, taskName, wParam, lParam ); sp_e.msg_name, taskName, wParam, lParam );
SPY_DumpStructure(&sp_e, TRUE); SPY_DumpStructure(&sp_e, TRUE);
@ -2483,14 +2483,14 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
#ifndef __REACTOS__ #ifndef __REACTOS__
case SPY_DEFWNDPROC16: case SPY_DEFWNDPROC16:
if( SPY_ExcludeDWP ) return; 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 ); indent, "", HWND_16(hWnd), sp_e.msg_name, msg, wParam, lParam );
break; break;
#endif #endif
case SPY_DEFWNDPROC: case SPY_DEFWNDPROC:
if( SPY_ExcludeDWP ) return; 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, indent, "", hWnd, sp_e.msg_name,
msg, wParam, lParam ); msg, wParam, lParam );
break; break;