From: Jacek Caban jacek@codeweavers.com
--- dlls/user32/hook.c | 6 +++--- dlls/user32/user_private.h | 2 +- dlls/user32/winproc.c | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index b2e213f42fe..024bb5b7116 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -478,7 +478,7 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) { cbtc.hwndInsertAfter = HWND_TOP; unpack_message( (HWND)params->wparam, WM_CREATE, NULL, (LPARAM *)&cbtc.lpcs, - ret_ptr, ret_size, FALSE ); + ret_ptr, FALSE ); params->lparam = (LPARAM)&cbtc; ret_size = sizeof(*cbtc.lpcs); } @@ -490,7 +490,7 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) size_t offset = (lparam_offset + sizeof(*cwp) + 15) & ~15;
unpack_message( cwp->hwnd, cwp->message, &cwp->wParam, &cwp->lParam, - (char *)params + offset, size - offset, !params->prev_unicode ); + (char *)params + offset, !params->prev_unicode ); ret_size = 0; break; } @@ -501,7 +501,7 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) size_t offset = (lparam_offset + sizeof(*cwpret) + 15) & ~15;
unpack_message( cwpret->hwnd, cwpret->message, &cwpret->wParam, &cwpret->lParam, - (char *)params + offset, size - offset, !params->prev_unicode ); + (char *)params + offset, !params->prev_unicode ); ret_size = 0; break; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a9bbdd16fb0..50d4005d973 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -52,7 +52,7 @@ extern BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM extern void free_cached_data( UINT format, HANDLE handle ); extern HANDLE render_synthesized_format( UINT format, UINT from ); extern void unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void *buffer, size_t size, BOOL ansi ); + void *buffer, BOOL ansi );
extern void CLIPBOARD_ReleaseOwner( HWND hwnd ); extern HDC get_display_dc(void); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 8804199aed1..d2e4b29fc44 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -738,8 +738,7 @@ static size_t string_size( const void *str, BOOL ansi ) * * Unpack a message received from win32u. */ -void unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void *buffer, size_t size, BOOL ansi ) +void unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void *buffer, BOOL ansi ) { switch(message) { @@ -816,7 +815,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) buffer = (char *)params + offset;
unpack_message( params->hwnd, params->msg, ¶ms->wparam, ¶ms->lparam, - buffer, packed_size, params->ansi ); + buffer, params->ansi ); }
result = dispatch_win_proc_params( params );