Alexandre Julliard : user: Added fast 32->
16 mapping for button and scrollbar messages.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri May 26 13:55:03 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 8056e2422d9089d17b26bdfc8c531f339c53bb7c
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8056e2422d9089d17b26bdfc8c531f339c53bb7c
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri May 26 14:16:00 2006 +0200
user: Added fast 32->16 mapping for button and scrollbar messages.
---
dlls/user/winproc.c | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c
index da6e050..e53def2 100644
--- a/dlls/user/winproc.c
+++ b/dlls/user/winproc.c
@@ -760,24 +760,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h
*pwparam16 = (WPARAM16)LOWORD(wParam32);
switch(msg32)
{
- case SBM_SETRANGE:
- *pmsg16 = SBM_SETRANGE16;
- *plparam = MAKELPARAM(wParam32, *plparam);
- *pwparam16 = 0;
- return 0;
-
- case SBM_GETRANGE:
- *pmsg16 = SBM_GETRANGE16;
- return 1;
-
- case BM_GETCHECK:
- case BM_SETCHECK:
- case BM_GETSTATE:
- case BM_SETSTATE:
- case BM_SETSTYLE:
- *pmsg16 = (UINT16)msg32 + (BM_GETCHECK16 - BM_GETCHECK);
- return 0;
-
case EM_GETSEL:
case EM_GETRECT:
case EM_SETRECT:
@@ -1024,11 +1006,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN
{
switch(msg)
{
- case SBM_GETRANGE:
- *(LPINT)wParam = LOWORD(*result);
- *(LPINT)lParam = HIWORD(*result);
- break;
-
case LB_ADDFILE:
case LB_ADDSTRING:
case LB_DIR:
@@ -2254,6 +2231,21 @@ LRESULT WINPROC_CallProc32ATo16( winproc
lParam = convert_handle_32_to_16(lParam, GMEM_DDESHARE);
ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg );
break; /* FIXME don't know how to free allocated memory (handle) !! */
+ case SBM_SETRANGE:
+ ret = callback( HWND_16(hwnd), SBM_SETRANGE16, 0, MAKELPARAM(wParam, lParam), result, arg );
+ break;
+ case SBM_GETRANGE:
+ ret = callback( HWND_16(hwnd), SBM_GETRANGE16, wParam, lParam, result, arg );
+ *(LPINT)wParam = LOWORD(*result);
+ *(LPINT)lParam = HIWORD(*result);
+ break;
+ case BM_GETCHECK:
+ case BM_SETCHECK:
+ case BM_GETSTATE:
+ case BM_SETSTATE:
+ case BM_SETSTYLE:
+ ret = callback( HWND_16(hwnd), msg + BM_GETCHECK16 - BM_GETCHECK, wParam, lParam, result, arg );
+ break;
default:
{
UINT16 msg16;
More information about the wine-cvs
mailing list