user.exe: Remove some superfluous WPARAM/LPARAM casts.

This commit is contained in:
Michael Stefaniuc 2009-12-29 23:16:10 +01:00 committed by Alexandre Julliard
parent 36f9248c1a
commit 453cf859a8
4 changed files with 14 additions and 15 deletions

View File

@ -541,7 +541,7 @@ HWND16 WINAPI GetDlgItem16( HWND16 hwndDlg, INT16 id )
*/ */
void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString ) void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString )
{ {
SendDlgItemMessage16( hwnd, id, WM_SETTEXT, 0, (LPARAM)lpString ); SendDlgItemMessage16( hwnd, id, WM_SETTEXT, 0, lpString );
} }
@ -550,7 +550,7 @@ void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString )
*/ */
INT16 WINAPI GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len ) INT16 WINAPI GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len )
{ {
return (INT16)SendDlgItemMessage16( hwnd, id, WM_GETTEXT, len, (LPARAM)str ); return SendDlgItemMessage16( hwnd, id, WM_GETTEXT, len, str );
} }

View File

@ -2287,7 +2287,7 @@ static LRESULT edit_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B
(INT)(SHORT)LOWORD(lParam), FALSE ); (INT)(SHORT)LOWORD(lParam), FALSE );
break; break;
case EM_LINEINDEX16: case EM_LINEINDEX16:
if ((INT16)wParam == -1) wParam = (WPARAM)-1; if ((INT16)wParam == -1) wParam = -1;
result = wow_handlers32.edit_proc( hwnd, msg - msg16_offset, wParam, lParam, FALSE ); result = wow_handlers32.edit_proc( hwnd, msg - msg16_offset, wParam, lParam, FALSE );
break; break;
case EM_SETSEL16: case EM_SETSEL16:

View File

@ -2743,22 +2743,21 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj,
SetCursor(hCurrentCursor); SetCursor(hCurrentCursor);
/* send WM_DRAGLOOP */ /* send WM_DRAGLOOP */
SendMessage16( hWnd, WM_DRAGLOOP, (WPARAM16)(hCurrentCursor != hBummer), SendMessage16( hWnd, WM_DRAGLOOP, hCurrentCursor != hBummer, spDragInfo );
(LPARAM) spDragInfo );
/* send WM_DRAGSELECT or WM_DRAGMOVE */ /* send WM_DRAGSELECT or WM_DRAGMOVE */
if( hCurrentWnd != lpDragInfo->hScope ) if( hCurrentWnd != lpDragInfo->hScope )
{ {
if( hCurrentWnd ) if( hCurrentWnd )
SendMessage16( hCurrentWnd, WM_DRAGSELECT, 0, SendMessage16( hCurrentWnd, WM_DRAGSELECT, 0,
(LPARAM)MAKELONG(LOWORD(spDragInfo)+sizeof(DRAGINFO16), MAKELPARAM(LOWORD(spDragInfo)+sizeof(DRAGINFO16),
HIWORD(spDragInfo)) ); HIWORD(spDragInfo)) );
hCurrentWnd = lpDragInfo->hScope; hCurrentWnd = lpDragInfo->hScope;
if( hCurrentWnd ) if( hCurrentWnd )
SendMessage16( hCurrentWnd, WM_DRAGSELECT, 1, (LPARAM)spDragInfo); SendMessage16( hCurrentWnd, WM_DRAGSELECT, 1, spDragInfo);
} }
else else
if( hCurrentWnd ) if( hCurrentWnd )
SendMessage16( hCurrentWnd, WM_DRAGMOVE, 0, (LPARAM)spDragInfo); SendMessage16( hCurrentWnd, WM_DRAGMOVE, 0, spDragInfo);
} while( msg.message != WM_LBUTTONUP && msg.message != WM_NCLBUTTONUP ); } while( msg.message != WM_LBUTTONUP && msg.message != WM_NCLBUTTONUP );
@ -2769,7 +2768,7 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj,
if( hCurrentCursor != hBummer ) if( hCurrentCursor != hBummer )
msg.lParam = SendMessage16( lpDragInfo->hScope, WM_DROPOBJECT, msg.lParam = SendMessage16( lpDragInfo->hScope, WM_DROPOBJECT,
(WPARAM16)hWnd, (LPARAM)spDragInfo ); hWnd, spDragInfo );
else else
msg.lParam = 0; msg.lParam = 0;
GlobalFree16(hDragInfo); GlobalFree16(hDragInfo);

View File

@ -347,7 +347,7 @@ INT16 WINAPI GetWindowText16( HWND16 hwnd, SEGPTR lpString, INT16 nMaxCount )
*/ */
BOOL16 WINAPI SetWindowText16( HWND16 hwnd, SEGPTR lpString ) BOOL16 WINAPI SetWindowText16( HWND16 hwnd, SEGPTR lpString )
{ {
return SendMessage16( hwnd, WM_SETTEXT, 0, (LPARAM)lpString ); return SendMessage16( hwnd, WM_SETTEXT, 0, lpString );
} }
@ -1475,9 +1475,9 @@ void WINAPI PaintRect16( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc,
HWND parent = WIN_Handle32(hwndParent), hwnd32 = WIN_Handle32(hwnd); HWND parent = WIN_Handle32(hwndParent), hwnd32 = WIN_Handle32(hwnd);
if (!parent) return; if (!parent) return;
hbrush = SendMessageW( parent, WM_CTLCOLORMSGBOX + hbrush, (WPARAM)hdc, (LPARAM)hwnd32 ); hbrush = SendMessageW( parent, WM_CTLCOLORMSGBOX + hbrush, hdc, (LPARAM)hwnd32 );
if (!hbrush) hbrush = DefWindowProcW( parent, WM_CTLCOLORMSGBOX + hbrush, if (!hbrush) hbrush = DefWindowProcW( parent, WM_CTLCOLORMSGBOX + hbrush,
(WPARAM)hdc, (LPARAM)hwnd32 ); hdc, (LPARAM)hwnd32 );
} }
if (hbrush) FillRect16( hdc, rect, hbrush ); if (hbrush) FillRect16( hdc, rect, hbrush );
} }
@ -1493,9 +1493,9 @@ HBRUSH16 WINAPI GetControlBrush16( HWND16 hwnd, HDC16 hdc, UINT16 ctlType )
HWND parent = GetParent( hwnd32 ); HWND parent = GetParent( hwnd32 );
if (!parent) parent = hwnd32; if (!parent) parent = hwnd32;
ret = SendMessageW( parent, WM_CTLCOLORMSGBOX + ctlType, (WPARAM)hdc, (LPARAM)hwnd32 ); ret = SendMessageW( parent, WM_CTLCOLORMSGBOX + ctlType, hdc, (LPARAM)hwnd32 );
if (!ret) ret = DefWindowProcW( parent, WM_CTLCOLORMSGBOX + ctlType, if (!ret) ret = DefWindowProcW( parent, WM_CTLCOLORMSGBOX + ctlType,
(WPARAM)hdc, (LPARAM)hwnd32 ); hdc, (LPARAM)hwnd32 );
return ret; return ret;
} }