Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixes 14 wine tests for the edit control

Browse source 
* Indentation fixes

svn path=/trunk/; revision=33848
This commit is contained in:
Gregor Brunmar 2008-06-04 06:08:37 +00:00
parent 01c9364e27
commit f91ca27dd7
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -256,7 +256,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es);
/* /*
* WM_XXX message handlers * WM_XXX message handlers
*/ */
static void EDIT_WM_Char(EDITSTATE *es, WCHAR c); static BOOL EDIT_WM_Char(EDITSTATE *es, WCHAR c);
static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND conrtol); static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND conrtol);
static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y); static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y);
static void EDIT_WM_Copy(EDITSTATE *es); static void EDIT_WM_Copy(EDITSTATE *es);
@ -869,20 +869,20 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
} }
break; break;
case WM_IME_CHAR: case WM_IME_CHAR:
if (!unicode) if (!unicode)
{ {
WCHAR charW; WCHAR charW;
CHAR strng[2]; CHAR strng[2];
strng[0] = wParam >> 8; strng[0] = wParam >> 8;
strng[1] = wParam & 0xff; strng[1] = wParam & 0xff;
if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1);
else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1); else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1);
EDIT_WM_Char(es, charW); result = EDIT_WM_Char(es, charW);
break; break;
} }
/* fall through */ /* fall through */
case WM_CHAR: case WM_CHAR:
{ {
WCHAR charW; WCHAR charW;
@ -901,7 +901,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0); SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0);
break; break;
} }
EDIT_WM_Char(es, charW); result = EDIT_WM_Char(es, charW);
break; break;
} }
@ -4090,7 +4090,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es)
* WM_CHAR * WM_CHAR
* *
*/ */
static void EDIT_WM_Char(EDITSTATE *es, WCHAR c) static BOOL EDIT_WM_Char(EDITSTATE *es, WCHAR c)
{ {
BOOL control; BOOL control;
@ -4161,6 +4161,8 @@ static void EDIT_WM_Char(EDITSTATE *es, WCHAR c)
} }
break; break;
} }
return TRUE;
} }