ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Add 16-bit translation for parameters of the WM_H/VSCROLL edit messages.

This commit is contained in:
Alexandre Julliard 2009-12-15 13:22:45 +01:00
parent 8649f73056
commit 6af1df86ce
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/user32/edit.c
View File

@ -51,11 +51,8 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"
#include "wownt32.h"
#include "win.h" #include "win.h"
#include "imm.h" #include "imm.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "controls.h" #include "controls.h"
#include "user_private.h" #include "user_private.h"
@ -3918,7 +3915,6 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos)
* although it's also a regular control message. * although it's also a regular control message.
*/ */
case EM_GETTHUMB: /* this one is used by NT notepad */ case EM_GETTHUMB: /* this one is used by NT notepad */
case EM_GETTHUMB16:
{ {
LRESULT ret; LRESULT ret;
if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL) if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL)
@ -3932,7 +3928,7 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos)
TRACE("EM_GETTHUMB: returning %ld\n", ret); TRACE("EM_GETTHUMB: returning %ld\n", ret);
return ret; return ret;
} }
case EM_LINESCROLL16: case EM_LINESCROLL:
TRACE("EM_LINESCROLL16\n"); TRACE("EM_LINESCROLL16\n");
dx = pos; dx = pos;
break; break;
@ -4042,7 +4038,6 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos)
* although it's also a regular control message. * although it's also a regular control message.
*/ */
case EM_GETTHUMB: /* this one is used by NT notepad */ case EM_GETTHUMB: /* this one is used by NT notepad */
case EM_GETTHUMB16:
{ {
LRESULT ret; LRESULT ret;
if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_VSCROLL) if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_VSCROLL)
@ -4056,8 +4051,8 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos)
TRACE("EM_GETTHUMB: returning %ld\n", ret); TRACE("EM_GETTHUMB: returning %ld\n", ret);
return ret; return ret;
} }
case EM_LINESCROLL16: case EM_LINESCROLL:
TRACE("EM_LINESCROLL16 %d\n", pos); TRACE("EM_LINESCROLL %d\n", pos);
dy = pos; dy = pos;
break; break;
@ -4083,8 +4078,8 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos)
*/ */
static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) static LRESULT EDIT_EM_GetThumb(EDITSTATE *es)
{ {
return MAKELONG(EDIT_WM_VScroll(es, EM_GETTHUMB16, 0), return MAKELONG(EDIT_WM_VScroll(es, EM_GETTHUMB, 0),
EDIT_WM_HScroll(es, EM_GETTHUMB16, 0)); EDIT_WM_HScroll(es, EM_GETTHUMB, 0));
} }

5
dlls/user32/msg16.c
View File

@ -1038,6 +1038,11 @@ static LRESULT edit_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B
case WM_NCDESTROY: case WM_NCDESTROY:
edit_destroy_handle( hwnd ); edit_destroy_handle( hwnd );
return wow_handlers32.edit_proc( hwnd, msg, wParam, lParam, unicode ); /* no unlock on destroy */ return wow_handlers32.edit_proc( hwnd, msg, wParam, lParam, unicode ); /* no unlock on destroy */
case WM_HSCROLL:
case WM_VSCROLL:
if (LOWORD(wParam) == EM_GETTHUMB16 || LOWORD(wParam) == EM_LINESCROLL16) wParam -= msg16_offset;
result = wow_handlers32.edit_proc( hwnd, msg, wParam, lParam, unicode );
break;
default: default:
result = wow_handlers32.edit_proc( hwnd, msg, wParam, lParam, unicode ); result = wow_handlers32.edit_proc( hwnd, msg, wParam, lParam, unicode );
break; break;