<html>
<head>
<style>
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 10pt;
font-family:Verdana
}
</style>
</head>
<body class='hmmessage'>
---<br> dlls/user32/edit.c | 73 ++++++++++++++++++++++------------------------------<br> 1 files changed, 31 insertions(+), 42 deletions(-)<br><br>diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c<br>index eadcc3d..ca91d46 100644<br>--- a/dlls/user32/edit.c<br>+++ b/dlls/user32/edit.c<br>@@ -3357,43 +3357,6 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c)<br> <br> /*********************************************************************<br> *<br>- * WM_COMMAND<br>- *<br>- */<br>-static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND control)<br>-{<br>- if (code || control)<br>- return;<br>-<br>- switch (id) {<br>- case EM_UNDO:<br>- SendMessageW(es->hwndSelf, WM_UNDO, 0, 0);<br>- break;<br>- case WM_CUT:<br>- SendMessageW(es->hwndSelf, WM_CUT, 0, 0);<br>- break;<br>- case WM_COPY:<br>- SendMessageW(es->hwndSelf, WM_COPY, 0, 0);<br>- break;<br>- case WM_PASTE:<br>- SendMessageW(es->hwndSelf, WM_PASTE, 0, 0);<br>- break;<br>- case WM_CLEAR:<br>- SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0);<br>- break;<br>- case EM_SETSEL:<br>- EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE);<br>- EDIT_EM_ScrollCaret(es);<br>- break;<br>- default:<br>- ERR("unknown menu item, please report\n");<br>- break;<br>- }<br>-}<br>-<br>-<br>-/*********************************************************************<br>- *<br> * WM_CONTEXTMENU<br> *<br> * Note: the resource files resource/sysres_??.rc cannot define a<br>@@ -3415,6 +3378,8 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y)<br> UINT start = es->selection_start;<br> UINT end = es->selection_end;<br> <br>+ BOOL selectedMenuItem;<br>+<br> ORDER_UINT(start, end);<br> <br> /* undo */<br>@@ -3440,7 +3405,35 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y)<br> y = rc.top + (rc.bottom - rc.top) / 2;<br> }<br> <br>- TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL);<br>+ selectedMenuItem = TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TMPRETURNCMD, x, y, 0, es->hwndSelf, NULL);<br>+<br>+ switch (selectedMenuItem) {<br>+ case 0:<br>+ break;<br>+ case EM_UNDO:<br>+ SendMessageW(es->hwndSelf, WM_UNDO, 0, 0);<br>+ break;<br>+ case WM_CUT:<br>+ SendMessageW(es->hwndSelf, WM_CUT, 0, 0);<br>+ break;<br>+ case WM_COPY:<br>+ SendMessageW(es->hwndSelf, WM_COPY, 0, 0);<br>+ break;<br>+ case WM_PASTE:<br>+ SendMessageW(es->hwndSelf, WM_PASTE, 0, 0);<br>+ break;<br>+ case WM_CLEAR:<br>+ SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0);<br>+ break;<br>+ case EM_SETSEL:<br>+ EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE);<br>+ EDIT_EM_ScrollCaret(es);<br>+ break;<br>+ default:<br>+ ERR("unknown menu item, please report\n");<br>+ break;<br>+ }<br>+<br> DestroyMenu(menu);<br> }<br> <br>@@ -5192,10 +5185,6 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg,<br> EDIT_WM_Clear(es);<br> break;<br> <br>- case WM_COMMAND:<br>- EDIT_WM_Command(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam);<br>- break;<br>-<br> case WM_CONTEXTMENU:<br> EDIT_WM_ContextMenu(es, (short)LOWORD(lParam), (short)HIWORD(lParam));<br> break;<br>-- <br>1.5.6<br /><hr />Rediscover Hotmail�: Get e-mail storage that grows with you. <a href='http://windowslive.com/RediscoverHotmail?ocid=TXT_TAGLM_WL_HM_Rediscover_Storage2_042009' target='_new'>Check it out.</a></body>
</html>