2 Mar
2011
2 Mar
'11
10:55 a.m.
Author: tkreuzer
Date: Wed Mar 2 10:55:07 2011
New Revision: 50951
URL: http://svn.reactos.org/svn/reactos?rev=50951&view=rev
Log:
[FORMATTING]
user32/edit.c: Sync formatting changes from wine head, removes some unneccessary casts, no
code actual change.
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/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Wed Mar 2 10:55:07 2011
@@ -1653,8 +1653,8 @@
/* Notification is done in EDIT_EM_LineScroll */
if(dy) {
EDIT_EM_LineScroll(es, 0, dy);
- return MAKELONG((SHORT)dy, (BOOL)TRUE);
- }
+ return MAKELONG(dy, TRUE);
+ }
}
return (LRESULT)FALSE;
@@ -3090,6 +3090,7 @@
}
#endif
+
/*********************************************************************
*
* WM_CONTEXTMENU
@@ -3238,14 +3239,14 @@
nEUI = 2;
}
- SendMessageW(hLBox, WM_KEYDOWN, (WPARAM)key, 0);
+ SendMessageW(hLBox, WM_KEYDOWN, key, 0);
break;
case WM_SYSKEYDOWN: /* Handle Alt+up/down arrows */
if (nEUI)
SendMessageW(hCombo, CB_SHOWDROPDOWN, bDropped ? FALSE : TRUE, 0);
else
- SendMessageW(hLBox, WM_KEYDOWN, (WPARAM)VK_F4, 0);
+ SendMessageW(hLBox, WM_KEYDOWN, VK_F4, 0);
break;
}
@@ -3359,17 +3360,17 @@
/* If the edit doesn't want the return send a message to the default object */
if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN))
{
- DWORD dw;
+ DWORD dw;
if (!EDIT_IsInsideDialog(es)) break;
if (control) break;
- dw = SendMessageW( es->hwndParent, DM_GETDEFID, 0, 0 );
+ dw = SendMessageW(es->hwndParent, DM_GETDEFID, 0, 0);
if (HIWORD(dw) == DC_HASDEFID)
{
HWND hwDefCtrl = GetDlgItem(es->hwndParent, LOWORD(dw));
if (hwDefCtrl)
{
- SendMessageW(es->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl,
(LPARAM)TRUE);
+ SendMessageW(es->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl,
TRUE);
PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0);
}
}
@@ -3384,7 +3385,7 @@
SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0);
break;
}
- return TRUE;
+ return TRUE;
}
@@ -3839,7 +3840,7 @@
if (EDIT_CheckCombo(es, WM_SYSKEYDOWN, key))
return 0;
}
- return DefWindowProcW(es->hwndSelf, WM_SYSKEYDOWN, (WPARAM)key, (LPARAM)key_data);
+ return DefWindowProcW(es->hwndSelf, WM_SYSKEYDOWN, key, key_data);
}
@@ -3970,10 +3971,10 @@
TRACE("EM_GETTHUMB: returning %ld\n", ret);
return ret;
}
- case EM_LINESCROLL:
- TRACE("EM_LINESCROLL16\n");
- dx = pos;
- break;
+ case EM_LINESCROLL:
+ TRACE("EM_LINESCROLL16\n");
+ dx = pos;
+ break;
default:
ERR("undocumented WM_HSCROLL action %d (0x%04x), please report\n",
@@ -4094,7 +4095,7 @@
return ret;
}
case EM_LINESCROLL:
- TRACE("EM_LINESCROLL16 %d\n", pos);
+ TRACE("EM_LINESCROLL %d\n", pos);
dy = pos;
break;
@@ -4121,7 +4122,7 @@
static LRESULT EDIT_EM_GetThumb(EDITSTATE *es)
{
return MAKELONG(EDIT_WM_VScroll(es, EM_GETTHUMB, 0),
- EDIT_WM_HScroll(es, EM_GETTHUMB, 0));
+ EDIT_WM_HScroll(es, EM_GETTHUMB, 0));
}
@@ -4366,12 +4367,12 @@
return TRUE;
cleanup:
- SetWindowLongPtrW(es->hwndSelf, 0, 0);
- HeapFree(GetProcessHeap(), 0, es->first_line_def);
- HeapFree(GetProcessHeap(), 0, es->undo_text);
- if (es->hloc32W) LocalFree(es->hloc32W);
- HeapFree(GetProcessHeap(), 0, es);
- return FALSE;
+ SetWindowLongPtrW(es->hwndSelf, 0, 0);
+ HeapFree(GetProcessHeap(), 0, es->first_line_def);
+ HeapFree(GetProcessHeap(), 0, es->undo_text);
+ if (es->hloc32W) LocalFree(es->hloc32W);
+ HeapFree(GetProcessHeap(), 0, es);
+ return FALSE;
}
@@ -4448,8 +4449,8 @@
pc = pp;
}
- SetWindowLongPtrW( es->hwndSelf, 0, 0 );
- HeapFree(GetProcessHeap(), 0, es->undo_text);
+ SetWindowLongPtrW( es->hwndSelf, 0, 0 );
+ HeapFree(GetProcessHeap(), 0, es->undo_text);
HeapFree(GetProcessHeap(), 0, es);
return 0;
@@ -4471,8 +4472,7 @@
* The messages are in the order of the actual integer values
* (which can be found in include/windows.h)
*/
-LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
- WPARAM wParam, LPARAM lParam, BOOL unicode )
+LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL
unicode )
{
EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 );
LRESULT result = 0;
@@ -4595,8 +4595,8 @@
{
LPSTR textA = (LPSTR)lParam;
INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0);
- if(!(textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) break;
- MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW);
+ if (!(textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) break;
+ MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW);
}
EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE);
@@ -4908,7 +4908,7 @@
break;
case WM_MBUTTONDOWN:
- result = EDIT_WM_MButtonDown(es);
+ result = EDIT_WM_MButtonDown(es);
break;
case WM_MOUSEMOVE:
@@ -4985,8 +4985,8 @@
}
break;
-
- /* IME messages to make the edit control IME aware */
+
+ /* IME messages to make the edit control IME aware */
case WM_IME_SETCONTEXT:
break;