[ros-diffs] [gbrunmar] 33848: * Fixes 14 wine tests for the edit control * Indentation fixes

[gbrunmar at svn.reactos.org]

Author: gbrunmar
Date: Wed Jun  4 01:08:37 2008
New Revision: 33848

URL: http://svn.reactos.org/svn/reactos?rev=33848&view=rev
Log:
* Fixes 14 wine tests for the edit control
* Indentation fixes

Modified:
    trunk/reactos/dll/win32/user32/controls/edit.c

Modified: trunk/reactos/dll/win32/user32/controls/edit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/edit.c?rev=33848&r1=33847&r2=33848&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Wed Jun  4 01:08:37 2008
@@ -256,7 +256,7 @@
 /*
  *	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_ContextMenu(EDITSTATE *es, INT x, INT y);
 static void	EDIT_WM_Copy(EDITSTATE *es);
@@ -869,20 +869,20 @@
 		}
 		break;
 
-        case WM_IME_CHAR:
-            if (!unicode)
-            {
-                WCHAR charW;
-                CHAR  strng[2];
-
-                strng[0] = wParam >> 8;
-                strng[1] = wParam & 0xff;
-                if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1);
-                else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1);
-		EDIT_WM_Char(es, charW);
-		break;
-            }
-            /* fall through */
+    case WM_IME_CHAR:
+        if (!unicode)
+        {
+            WCHAR charW;
+            CHAR  strng[2];
+
+            strng[0] = wParam >> 8;
+            strng[1] = wParam & 0xff;
+            if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1);
+            else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1);
+            result = EDIT_WM_Char(es, charW);
+	        break;
+        }
+        /* fall through */
 	case WM_CHAR:
 	{
 		WCHAR charW;
@@ -901,7 +901,7 @@
 		      SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0);
 		   break;
 		}
-		EDIT_WM_Char(es, charW);
+		result = EDIT_WM_Char(es, charW);
 		break;
 	}
 
@@ -4090,7 +4090,7 @@
  *	WM_CHAR
  *
  */
-static void EDIT_WM_Char(EDITSTATE *es, WCHAR c)
+static BOOL EDIT_WM_Char(EDITSTATE *es, WCHAR c)
 {
         BOOL control;
 
@@ -4161,6 +4161,8 @@
  		}
 		break;
 	}
+
+    return TRUE;
 }