Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[tkreuzer] 38740: winbase.h: Add EncodePointer, DecodePointer, EncodeSystemPointer and DecodeSystemPointer

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 12 16:47:25 2009 New Revision: 38740 URL: http://svn.reactos.org/svn/reactos?rev=38740&view=rev Log: winbase.h: Add EncodePointer, DecodePointer, EncodeSystemPointer and DecodeSystemPointer Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Mon Jan 12 16:47:25 2009 @@ -1283,6 +1283,8 @@ BOOL WINAPI DebugBreakProcess(HANDLE); BOOL WINAPI DebugSetProcessKillOnExit(BOOL); #endif +PVOID WINAPI DecodePointer(PVOID); +PVOID WINAPI DecodeSystemPointer(PVOID); BOOL WINAPI DefineDosDeviceA(DWORD,LPCSTR,LPCSTR); BOOL WINAPI DefineDosDeviceW(DWORD,LPCWSTR,LPCWSTR); #define DefineHandleTable(w) ((w),TRUE) @@ -1312,6 +1314,8 @@ BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,PHANDLE,DWORD,BOOL,DWORD); BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE); BOOL WINAPI DuplicateTokenEx(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); +PVOID WINAPI EncodePointer(PVOID); +PVOID WINAPI EncodeSystemPointer(PVOID); BOOL WINAPI EncryptFileA(LPCSTR); BOOL WINAPI EncryptFileW(LPCWSTR); BOOL WINAPI EndUpdateResourceA(HANDLE,BOOL);

15 years, 8 months

[tkreuzer] 38739: Sync edit.c with wine head (Wine-1_1_12) Reduces failures from 18 to 13 and test doesn't keep a window open anymore. (Partly) revert 29649, 33848, 33909, 33910 as it's now implemented by wine 1.4 Francois Gouget <fgouget@free.fr> Don't put single quotes around '%s' when using the debugstr_*() functions. 1.5 Huw Davies <huw@codeweavers.com> user32: Keep track of whether the app has asked for the text buffer handle. 1.9 Dmitry Timoshkov <dmitry@codeweavers.com> user32: Fix some c

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 12 16:03:00 2009 New Revision: 38739 URL: http://svn.reactos.org/svn/reactos?rev=38739&view=rev Log: Sync edit.c with wine head (Wine-1_1_12) Reduces failures from 18 to 13 and test doesn't keep a window open anymore. (Partly) revert 29649, 33848, 33909, 33910 as it's now implemented by wine 1.4 Francois Gouget <fgouget(a)free.fr> Don't put single quotes around '%s' when using the debugstr_*() functions. 1.5 Huw Davies <huw(a)codeweavers.com> user32: Keep track of whether the app has asked for the text buffer handle. 1.9 Dmitry Timoshkov <dmitry(a)codeweavers.com> user32: Fix some compilation warnings in 64-bit mode. 1.15 Alexandre Julliard <julliard(a)winehq.org> user32: Store the builtin class names in Unicode. 1.16 Andrew Talbot <andrew.talbot(a)talbotville.com> user32: Constify some variables. 1.17 Gerald Pfeifer <gerald(a)pfeifer.com> user32: Factor in EDIT_WM_EraseBkGnd(). 1.18 Andrew Talbot <andrew.talbot(a)talbotville.com> user32: Remove unneeded casts. 1.19 Marcus Meissner <marcus(a)jet.franken.de> user32: Handle error returns from ImmGetCompositionString. 1.20 Lei Zhang <thestig(a)google.com> user32: Tweak how the edit control handles WM_GETDLGCODE. 1.21 Lei Zhang <thestig(a)google.com> user32: Handle WM_CHAR messages better in edit controls. 1.22 Lei Zhang <thestig(a)google.com> user32: Correctly handle VK_RETURN for edit controls with ES_WANTRETURN style. 1.23 Lei Zhang <thestig(a)google.com> user32: Fix WM_CHAR return value for edit controls. 1.24 Lei Zhang <thestig(a)google.com> user32: Handle ES_MULTILINE correctly for WM_KEYDOWN/VK_RETURN. 1.25 Lei Zhang <thestig(a)google.com> user32: Handle VK_ESCAPE correctly in EDIT_WM_KeyDown. 1.26 Lei Zhang <thestig(a)google.com> user32: Add edit control check to see if its in a dialog on WM_CHAR/VK_RETURN. 1.27 Lei Zhang <thestig(a)google.com> user32: Add edit control check to see if its in a dialog on WM_CHAR/VK_TAB. 1.28 Lei Zhang <thestig(a)google.com> user32: Fix a typo. 1.29 Lei Zhang <thestig(a)google.com> user32: Handle VK_TAB in EDIT_WM_KeyDown. 1.30 Lei Zhang <thestig(a)google.com> user32: Do checks in the right order in EDIT_BuildLineDefs_ML. 1.31 Lei Zhang <thestig(a)google.com> user32: Handle ctrl + home in edit control. 1.32 Lei Zhang <thestig(a)google.com> user32: Handle ctrl + end in edit control. 1.33 Alexandre Julliard <julliard(a)winehq.org> user32: Added support for WS_EX_RIGHT in the edit control. 1.34 Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> user32: Handle IME messages more gracefully. 1.35 Alexandre Julliard <julliard(a)winehq.org> user32: Remove redundant LocalUnlock calls. 1.36 Austin English <austinenglish(a)gmail.com> Spelling fixes. 1.37 Lei Zhang <thestig(a)google.com> user32: Handle VK_RETURN WM_KEYDOWN events better in edit controls. Elias Benali wrote the initial version of this patch. 1.38 Lei Zhang <thestig(a)google.com> user32: Edit controls should ignore WM_KEYDOWN on control + enter. 1.39 Andrew Talbot <andrew.talbot(a)talbotville.com> user32: Remove unused variables. 1.40 Hongbo Ni <hongbo(a)njstar.com> user32: Implement WM_UNICHAR for edit control. 1.41 Lei Zhang <thestig(a)google.com> user32: Send messages for edit control context menu operations. 1.42 Aric Stewart <aric(a)codeweavers.com> user32: Make sure our vertical line count is at least 1 even if there is an oversized font in the edit control. 1.43 Michael Stefaniuc <mstefani(a)redhat.de> user32: Remove superfluous casts of void pointers. 1.44 Francois Gouget <fgouget(a)codeweavers.com> user32: Remove WINAPI/CALLBACK on static functions where not needed. Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/include/user32p.h 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] Mon Jan 12 16:03:00 2009 @@ -24,7 +24,7 @@ * * This code was audited for completeness against the documented features * of Comctl32.dll version 6.0 on Oct. 8, 2004, by Dimitrie O. Paun. - * + * * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features, or bugs, please note them below. @@ -171,12 +171,12 @@ /* * These functions have trivial implementations * We still like to call them internally - * "static __inline" makes them more like macro's - */ -static __inline BOOL EDIT_EM_CanUndo(EDITSTATE *es); -static __inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es); -static __inline void EDIT_WM_Clear(EDITSTATE *es); -static __inline void EDIT_WM_Cut(EDITSTATE *es); + * "static inline" makes them more like macro's + */ +static inline BOOL EDIT_EM_CanUndo(const EDITSTATE *es); +static inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es); +static inline void EDIT_WM_Clear(EDITSTATE *es); +static inline void EDIT_WM_Cut(EDITSTATE *es); /* * Helper functions only valid for one type of control @@ -193,28 +193,26 @@ */ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count, INT action); static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap); -static void EDIT_ConfinePoint(EDITSTATE *es, LPINT x, LPINT y); +static void EDIT_ConfinePoint(const EDITSTATE *es, LPINT x, LPINT y); static void EDIT_GetLineRect(EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT rc); static void EDIT_InvalidateText(EDITSTATE *es, INT start, INT end); static void EDIT_LockBuffer(EDITSTATE *es); static BOOL EDIT_MakeFit(EDITSTATE *es, UINT size); static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size); static void EDIT_MoveBackward(EDITSTATE *es, BOOL extend); -static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend); -static void EDIT_MoveEndOfText(EDITSTATE *es, BOOL extend); +static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend, BOOL ctrl); static void EDIT_MoveForward(EDITSTATE *es, BOOL extend); -static void EDIT_MoveStartOfText(EDITSTATE *es, BOOL extend); -static void EDIT_MoveHome(EDITSTATE *es, BOOL extend); +static void EDIT_MoveHome(EDITSTATE *es, BOOL extend, BOOL ctrl); static void EDIT_MoveWordBackward(EDITSTATE *es, BOOL extend); static void EDIT_MoveWordForward(EDITSTATE *es, BOOL extend); static void EDIT_PaintLine(EDITSTATE *es, HDC hdc, INT line, BOOL rev); static INT EDIT_PaintText(EDITSTATE *es, HDC hdc, INT x, INT y, INT line, INT col, INT count, BOOL rev); static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap); static void EDIT_AdjustFormatRect(EDITSTATE *es); -static void EDIT_SetRectNP(EDITSTATE *es, LPRECT lprc); +static void EDIT_SetRectNP(EDITSTATE *es, const RECT *lprc); static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force); static void EDIT_UpdateScrollInfo(EDITSTATE *es); -static INT CALLBACK EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action); +static INT EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action); /* * EM_XXX message handlers */ @@ -225,10 +223,10 @@ static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es); #endif static INT EDIT_EM_GetLine(EDITSTATE *es, INT line, LPWSTR dst, BOOL unicode); -static LRESULT EDIT_EM_GetSel(EDITSTATE *es, PUINT start, PUINT end); +static LRESULT EDIT_EM_GetSel(const EDITSTATE *es, PUINT start, PUINT end); static LRESULT EDIT_EM_GetThumb(EDITSTATE *es); static INT EDIT_EM_LineFromChar(EDITSTATE *es, INT index); -static INT EDIT_EM_LineIndex(EDITSTATE *es, INT line); +static INT EDIT_EM_LineIndex(const EDITSTATE *es, INT line); static INT EDIT_EM_LineLength(EDITSTATE *es, INT index); static BOOL EDIT_EM_LineScroll(EDITSTATE *es, INT dx, INT dy); static BOOL EDIT_EM_LineScroll_internal(EDITSTATE *es, INT dx, INT dy); @@ -244,9 +242,9 @@ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, WORD left, WORD right, BOOL repaint); static void EDIT_EM_SetPasswordChar(EDITSTATE *es, WCHAR c); static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap); -static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, LPINT tabs); +static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, const INT *tabs); #ifndef __REACTOS__ -static BOOL EDIT_EM_SetTabStops16(EDITSTATE *es, INT count, LPINT16 tabs); +static BOOL EDIT_EM_SetTabStops16(EDITSTATE *es, INT count, const INT16 *tabs); #endif static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp); #ifndef __REACTOS__ @@ -256,14 +254,13 @@ /* * WM_XXX message handlers */ -static BOOL EDIT_WM_Char(EDITSTATE *es, WCHAR c); +static LRESULT 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); static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name); static LRESULT EDIT_WM_Destroy(EDITSTATE *es); -static LRESULT EDIT_WM_EraseBkGnd(EDITSTATE *es, HDC dc); -static INT EDIT_WM_GetText(EDITSTATE *es, INT count, LPWSTR dst, BOOL unicode); +static INT EDIT_WM_GetText(const EDITSTATE *es, INT count, LPWSTR dst, BOOL unicode); static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos); static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key); static LRESULT EDIT_WM_KillFocus(EDITSTATE *es); @@ -283,7 +280,7 @@ static LRESULT EDIT_WM_SysKeyDown(EDITSTATE *es, INT key, DWORD key_data); static void EDIT_WM_Timer(EDITSTATE *es); static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos); -static void EDIT_UpdateText(EDITSTATE *es, LPRECT rc, BOOL bErase); +static void EDIT_UpdateText(EDITSTATE *es, const RECT *rc, BOOL bErase); static void EDIT_UpdateTextRegion(EDITSTATE *es, HRGN hrgn, BOOL bErase); static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es); @@ -293,9 +290,10 @@ /********************************************************************* * edit class descriptor */ +static const WCHAR editW[] = {'E','d','i','t',0}; const struct builtin_class_descr EDIT_builtin_class = { - L"Edit", /* name */ + editW, /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ @@ -310,7 +308,7 @@ * EM_CANUNDO * */ -static __inline BOOL EDIT_EM_CanUndo(EDITSTATE *es) +static inline BOOL EDIT_EM_CanUndo(const EDITSTATE *es) { return (es->undo_insert_count || strlenW(es->undo_text)); } @@ -321,7 +319,7 @@ * EM_EMPTYUNDOBUFFER * */ -static __inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es) +static inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es) { es->undo_insert_count = 0; *es->undo_text = '\0'; @@ -333,7 +331,7 @@ * WM_CLEAR * */ -static __inline void EDIT_WM_Clear(EDITSTATE *es) +static inline void EDIT_WM_Clear(EDITSTATE *es) { static const WCHAR empty_stringW[] = {0}; @@ -350,7 +348,7 @@ * WM_CUT * */ -static __inline void EDIT_WM_Cut(EDITSTATE *es) +static inline void EDIT_WM_Cut(EDITSTATE *es) { EDIT_WM_Copy(es); EDIT_WM_Clear(es); @@ -392,14 +390,14 @@ return version; } -static __inline UINT get_text_length(EDITSTATE *es) +static inline UINT get_text_length(EDITSTATE *es) { if(es->text_length == (UINT)-1) es->text_length = strlenW(es->text); return es->text_length; } -static __inline void text_buffer_changed(EDITSTATE *es) +static inline void text_buffer_changed(EDITSTATE *es) { es->text_length = (UINT)-1; } @@ -421,12 +419,18 @@ return hbrush; } -static __inline LRESULT DefWindowProcT(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) +static inline LRESULT DefWindowProcT(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) { if(unicode) return DefWindowProcW(hwnd, msg, wParam, lParam); else return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +static inline INT get_vertical_line_count(EDITSTATE *es) +{ + INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + return max(1,vlc); } /********************************************************************* @@ -442,14 +446,14 @@ * names). * */ -static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +static LRESULT EditWndProc_common( HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; - TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); - + TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); + if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); @@ -486,7 +490,13 @@ #ifndef __REACTOS__ case EM_GETRECT16: if (lParam) - CONV_RECT32TO16(&es->format_rect, MapSL(lParam)); + { + RECT16 *r16 = MapSL(lParam); + r16->left = es->format_rect.left; + r16->top = es->format_rect.top; + r16->right = es->format_rect.right; + r16->bottom = es->format_rect.bottom; + } break; #endif case EM_GETRECT: @@ -498,7 +508,11 @@ case EM_SETRECT16: if ((es->style & ES_MULTILINE) && lParam) { RECT rc; - CONV_RECT16TO32(MapSL(lParam), &rc); + RECT16 *r16 = MapSL(lParam); + rc.left = r16->left; + rc.top = r16->top; + rc.right = r16->right; + rc.bottom = r16->bottom; EDIT_SetRectNP(es, &rc); EDIT_UpdateText(es, NULL, TRUE); } @@ -515,7 +529,11 @@ case EM_SETRECTNP16: if ((es->style & ES_MULTILINE) && lParam) { RECT rc; - CONV_RECT16TO32(MapSL(lParam), &rc); + RECT16 *r16 = MapSL(lParam); + rc.left = r16->left; + rc.top = r16->top; + rc.right = r16->right; + rc.bottom = r16->bottom; EDIT_SetRectNP(es, &rc); } break; @@ -646,7 +664,7 @@ LPSTR textA = (LPSTR)lParam; INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE); @@ -817,7 +835,7 @@ break; case EM_POSFROMCHAR: - if ((INT)wParam >= get_text_length(es)) result = -1; + if ((INT)wParam >= get_text_length(es)) result = -1; else result = EDIT_EM_PosFromChar(es, (INT)wParam, FALSE); break; @@ -840,39 +858,48 @@ case WM_GETDLGCODE: result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS; - + if (es->style & ES_MULTILINE) - { result |= DLGC_WANTALLKEYS; - break; - } if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) { int vk = (int)((LPMSG)lParam)->wParam; - if (es->hwndListBox && (vk == VK_RETURN || vk == VK_ESCAPE)) - { - if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) - result |= DLGC_WANTMESSAGE; - } - } - 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); - result = EDIT_WM_Char(es, charW); - break; - } - /* fall through */ + if (es->hwndListBox) + { + if (vk == VK_RETURN || vk == VK_ESCAPE) + if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) + result |= DLGC_WANTMESSAGE; + } + else + { + switch (vk) + { + case VK_ESCAPE: + SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); + break; + default: + break; + } + } + } + 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); + result = EDIT_WM_Char(es, charW); + break; + } + /* fall through */ case WM_CHAR: { WCHAR charW; @@ -885,15 +912,36 @@ MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1); } - if ((charW == VK_RETURN || charW == VK_ESCAPE) && es->hwndListBox) - { - if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) - SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0); - break; - } + if (es->hwndListBox) + { + if (charW == VK_RETURN || charW == VK_ESCAPE) + { + if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) + SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0); + break; + } + } result = EDIT_WM_Char(es, charW); break; } + + case WM_UNICHAR: + if (unicode) + { + if (wParam == UNICODE_NOCHAR) return TRUE; + if (wParam <= 0x000fffff) + { + if(wParam > 0xffff) /* convert to surrogates */ + { + wParam -= 0x10000; + EDIT_WM_Char(es, (wParam >> 10) + 0xd800); + EDIT_WM_Char(es, (wParam & 0x03ff) + 0xdc00); + } + else EDIT_WM_Char(es, wParam); + } + return 0; + } + break; case WM_CLEAR: EDIT_WM_Clear(es); @@ -920,12 +968,12 @@ LPWSTR nameW = NULL; if(nameA) { - INT countW = MultiByteToWideChar(CP_ACP, 0, nameA, -1, NULL, 0); - if((nameW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, countW); + INT countW = MultiByteToWideChar(CP_ACP, 0, nameA, -1, NULL, 0); + if((nameW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, countW); } result = EDIT_WM_Create(es, nameW); - HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, nameW); } break; @@ -939,7 +987,8 @@ break; case WM_ERASEBKGND: - result = EDIT_WM_EraseBkGnd(es, (HDC)wParam); + /* we do the proper erase in EDIT_WM_Paint */ + result = 1; break; case WM_GETFONT: @@ -1058,44 +1107,28 @@ } break; - - /* IME messages to make the edit control IME aware */ + + /* IME messages to make the edit control IME aware */ case WM_IME_SETCONTEXT: break; case WM_IME_STARTCOMPOSITION: - /* - * FIXME in IME: This message is not always sent like it should be - */ - if (es->selection_start != es->selection_end) - { - static const WCHAR empty_stringW[] = {0}; - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); - } es->composition_start = es->selection_end; es->composition_len = 0; break; case WM_IME_COMPOSITION: - { - int caret_pos = es->selection_end; - if (es->composition_len == 0) - { - if (es->selection_start != es->selection_end) - { - static const WCHAR empty_stringW[] = {0}; - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); - } - - es->composition_start = es->selection_end; - } - EDIT_ImeComposition(hwnd,lParam,es); - EDIT_SetCaretPos(es, caret_pos, es->flags & EF_AFTER_WRAP); - break; - } + EDIT_ImeComposition(hwnd, lParam, es); + break; case WM_IME_ENDCOMPOSITION: - es->composition_len= 0; + if (es->composition_len > 0) + { + static const WCHAR empty_stringW[] = {0}; + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + es->selection_end = es->selection_start; + es->composition_len= 0; + } break; case WM_IME_COMPOSITIONFULL: @@ -1106,15 +1139,15 @@ case WM_IME_CONTROL: break; - + default: result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); break; } - + if (es) EDIT_UnlockBuffer(es, FALSE); - TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); + TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); return result; } @@ -1232,7 +1265,7 @@ { if (current_position - es->text > iend) break; /* We reached end of line modifications */ - /* else recalulate this line */ + /* else recalculate this line */ } } @@ -1313,9 +1346,9 @@ current_line->width = (INT)LOWORD(GetTabbedTextExtentW(dc, current_position, current_line->net_length, es->tabs_count, es->tabs)); } - else if (orig_net_length < current_line->net_length && - current_line == start_line && - current_line->index != nstart_index) { + else if (current_line == start_line && + current_line->index != nstart_index && + orig_net_length < current_line->net_length) { /* The previous line expanded but it's still not as wide as the client rect */ /* The expansion is due to an upwards line wrap so we must partially include it in the update region */ @@ -1464,7 +1497,7 @@ */ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count, INT action) { - INT ret; + INT ret; #ifndef __REACTOS__ if (es->word_break_proc16) { @@ -1476,7 +1509,7 @@ countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); hglob16 = GlobalAlloc16(GMEM_MOVEABLE | GMEM_ZEROINIT, countA); - segptr = K32WOWGlobalLock16(hglob16); + segptr = WOWGlobalLock16(hglob16); WideCharToMultiByte(CP_ACP, 0, es->text + start, count, MapSL(segptr), countA, NULL, NULL); args[4] = SELECTOROF(segptr); args[3] = OFFSETOF(segptr); @@ -1521,7 +1554,7 @@ else ret = EDIT_WordBreakProc(es->text + start, index, count, action); - return ret; + return ret; } @@ -1676,7 +1709,7 @@ * (so CharFromPos returns the nearest _visible_ character) * */ -static void EDIT_ConfinePoint(EDITSTATE *es, LPINT x, LPINT y) +static void EDIT_ConfinePoint(const EDITSTATE *es, LPINT x, LPINT y) { *x = min(max(*x, es->format_rect.left), es->format_rect.right - 1); *y = min(max(*y, es->format_rect.top), es->format_rect.bottom - 1); @@ -1731,10 +1764,10 @@ * * EDIT_LockBuffer * - * This acts as a LOCAL_Lock(), but it locks only once. This way + * This acts as a LocalLock16(), but it locks only once. This way * you can call it whenever you like, without unlocking. * - * Initially the edit control allocates a HLOCAL32 buffer + * Initially the edit control allocates a HLOCAL32 buffer * (32 bit linear memory handler). However, 16 bit application * might send an EM_GETHANDLE message and expect a HLOCAL16 (16 bit SEG:OFF * handler). From that moment on we have to keep using this 16 bit memory @@ -1746,7 +1779,8 @@ static void EDIT_LockBuffer(EDITSTATE *es) { #ifndef __REACTOS__ - HINSTANCE16 hInstance = GetWindowLongW( es->hwndSelf, GWL_HINSTANCE ); + STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + HINSTANCE16 hInstance = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); #endif if (!es->text) { CHAR *textA = NULL; @@ -1766,8 +1800,11 @@ #ifndef __REACTOS__ else if(es->hloc16) { + HANDLE16 oldDS = stack16->ds; TRACE("Synchronizing with 16-bit ANSI buffer\n"); - textA = LOCAL_Lock(hInstance, es->hloc16); + stack16->ds = hInstance; + textA = MapSL(LocalLock16(es->hloc16)); + stack16->ds = oldDS; countA = strlen(textA) + 1; _16bit = TRUE; } @@ -1807,7 +1844,12 @@ MultiByteToWideChar(CP_ACP, 0, textA, countA, es->text, es->buffer_size + 1); #ifndef __REACTOS__ if(_16bit) - LOCAL_Unlock(hInstance, es->hloc16); + { + HANDLE16 oldDS = stack16->ds; + stack16->ds = hInstance; + LocalUnlock16(es->hloc16); + stack16->ds = oldDS; + } else #endif LocalUnlock(es->hloc32A); @@ -1847,7 +1889,7 @@ */ static void EDIT_ML_InvalidateText(EDITSTATE *es, INT start, INT end) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); INT sl = EDIT_EM_LineFromChar(es, start); INT el = EDIT_EM_LineFromChar(es, end); INT sc; @@ -2054,39 +2096,17 @@ * EDIT_MoveEnd * */ -static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend) +static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend, BOOL ctrl) { BOOL after_wrap = FALSE; INT e; /* Pass a high value in x to make sure of receiving the end of the line */ - if (es->style & ES_MULTILINE) + if (!ctrl && (es->style & ES_MULTILINE)) e = EDIT_CharFromPos(es, 0x3fffffff, HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), &after_wrap); else e = get_text_length(es); - EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, after_wrap); - EDIT_EM_ScrollCaret(es); -} - - -/********************************************************************* - * - * EDIT_MoveEndOfText - * - * Handler for Ctrl+End. Move to end of text. Only for multiline. - * - */ -static void EDIT_MoveEndOfText(EDITSTATE *es, BOOL extend) -{ - BOOL after_wrap = FALSE; - INT e; - - assert(es->style & ES_MULTILINE); - - /* Just give it impossible high x&y to get the index of the last char */ - e = EDIT_CharFromPos(es, 0x3fffffff, 0x3fffffff, &after_wrap); - EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, after_wrap); EDIT_EM_ScrollCaret(es); } @@ -2117,39 +2137,17 @@ /********************************************************************* * - * EDIT_MoveStartOfText - * - * Handler for Ctr+Home. Move to start of text. Only for multiline. - * - */ -static void EDIT_MoveStartOfText(EDITSTATE *es, BOOL extend) -{ - BOOL after_wrap = FALSE; - - assert(es->style & ES_MULTILINE); - - /* use CharFromPos instead of just plain zero, to get the wrap_flag */ - EDIT_CharFromPos(es, 0, 0, &after_wrap); - - - EDIT_EM_SetSel(es, 0, extend ? es->selection_end : 0, FALSE); - EDIT_EM_ScrollCaret(es); -} - - -/********************************************************************* - * * EDIT_MoveHome * * Home key: move to beginning of line. * */ -static void EDIT_MoveHome(EDITSTATE *es, BOOL extend) +static void EDIT_MoveHome(EDITSTATE *es, BOOL extend, BOOL ctrl) { INT e; /* Pass the x_offset in x to make sure of receiving the first position of the line */ - if (es->style & ES_MULTILINE) + if (!ctrl && (es->style & ES_MULTILINE)) e = EDIT_CharFromPos(es, -es->x_offset, HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), NULL); else @@ -2263,8 +2261,7 @@ e = li + EDIT_EM_LineLength(es, li); } } else { - e = li + (INT)EDIT_CallWordBreakProc(es, - li, e - li, ll, WB_LEFT); + e = li + EDIT_CallWordBreakProc(es, li, e - li, ll, WB_LEFT); } if (!extend) s = e; @@ -2319,7 +2316,8 @@ LRESULT pos; if (es->style & ES_MULTILINE) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); + if ((line < es->y_offset) || (line > es->y_offset + vlc) || (line >= es->line_count)) return; } else if (line) @@ -2371,10 +2369,10 @@ if (rev) { if (es->composition_len == 0) { - SetBkColor(dc, GetSysColor(COLOR_HIGHLIGHT)); - SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); - SetBkMode( dc, OPAQUE); - } + SetBkColor(dc, GetSysColor(COLOR_HIGHLIGHT)); + SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + SetBkMode( dc, OPAQUE); + } else { HFONT current = GetCurrentObject(dc,OBJ_FONT); @@ -2399,10 +2397,10 @@ if (rev) { if (es->composition_len == 0) { - SetBkColor(dc, BkColor); - SetTextColor(dc, TextColor); - SetBkMode( dc, BkMode); - } + SetBkColor(dc, BkColor); + SetTextColor(dc, TextColor); + SetBkMode( dc, BkMode); + } else { if (old_font) @@ -2446,8 +2444,8 @@ { INT fw, vlc, max_x_offset, max_y_offset; - vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; - es->format_rect.bottom = es->format_rect.top + max(1, vlc) * es->line_height; + vlc = get_vertical_line_count(es); + es->format_rect.bottom = es->format_rect.top + vlc * es->line_height; /* correct es->x_offset */ fw = es->format_rect.right - es->format_rect.left; @@ -2475,7 +2473,7 @@ if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); - + EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); } @@ -2488,18 +2486,18 @@ * it is also used to set the rect of a single line control * */ -static void EDIT_SetRectNP(EDITSTATE *es, LPRECT rc) +static void EDIT_SetRectNP(EDITSTATE *es, const RECT *rc) { LONG_PTR ExStyle; INT bw, bh; ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE); - + CopyRect(&es->format_rect, rc); - + if (ExStyle & WS_EX_CLIENTEDGE) { es->format_rect.left++; es->format_rect.right--; - + if (es->format_rect.bottom - es->format_rect.top >= es->line_height + 2) { @@ -2519,7 +2517,7 @@ es->format_rect.bottom -= bh; } } - + es->format_rect.left += es->left_margin; es->format_rect.right -= es->right_margin; EDIT_AdjustFormatRect(es); @@ -2587,26 +2585,31 @@ else if(es->hloc16) { UINT countA_new = WideCharToMultiByte(CP_ACP, 0, es->text, countW, NULL, 0, NULL, NULL); + TRACE("Synchronizing with 16-bit ANSI buffer\n"); TRACE("%d WCHARs translated to %d bytes\n", countW, countA_new); - countA = LOCAL_Size(hInstance, es->hloc16); + + stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + oldDS = stack16->ds; + stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); + + countA = LocalSize16(es->hloc16); if(countA_new > countA) { HLOCAL16 hloc16_new; UINT alloc_size = ROUND_TO_GROW(countA_new); TRACE("Resizing 16-bit ANSI buffer from %d to %d bytes\n", countA, alloc_size); - hloc16_new = LOCAL_ReAlloc(hInstance, es->hloc16, alloc_size, LMEM_MOVEABLE | LMEM_ZEROINIT); + hloc16_new = LocalReAlloc16(es->hloc16, alloc_size, LMEM_MOVEABLE | LMEM_ZEROINIT); if(hloc16_new) { es->hloc16 = hloc16_new; - countA = LOCAL_Size(hInstance, hloc16_new); + countA = LocalSize16(hloc16_new); TRACE("Real new size %d bytes\n", countA); } else WARN("FAILED! Will synchronize partially\n"); } - textA = LOCAL_Lock(hInstance, es->hloc16); - _16bit = TRUE; + textA = MapSL(LocalLock16(es->hloc16)); } #endif @@ -2614,13 +2617,16 @@ { WideCharToMultiByte(CP_ACP, 0, es->text, countW, textA, countA, NULL, NULL); #ifndef __REACTOS__ - if(_16bit) - LOCAL_Unlock(hInstance, es->hloc16); + if(stack16) + LocalUnlock16(es->hloc16); else #endif LocalUnlock(es->hloc32A); } +#ifndef __REACTOS__ + if (stack16) stack16->ds = oldDS; +#endif LocalUnlock(es->hloc32W); es->text = NULL; } @@ -2680,7 +2686,7 @@ * internally, so we can decide this for ourselves. * */ -static INT CALLBACK EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action) +static INT EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action) { INT ret = 0; @@ -2769,11 +2775,11 @@ * EM_FMTLINES * * Enable or disable soft breaks. - * + * * This means: insert or remove the soft linebreak character (\r\r\n). * Take care to check if the text still fits the buffer after insertion. * If not, notify with EN_ERRSPACE. - * + * */ static BOOL EDIT_EM_FmtLines(EDITSTATE *es, BOOL add_eol) { @@ -2827,6 +2833,7 @@ hLocal = es->hloc32A; } + es->flags |= EF_APP_HAS_HANDLE; TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); return hLocal; } @@ -2850,9 +2857,10 @@ */ static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es) { - HINSTANCE16 hInstance = GetWindowLongW( es->hwndSelf, GWL_HINSTANCE ); CHAR *textA; UINT countA, alloc_size; + STACK16FRAME* stack16; + HANDLE16 oldDS; if (!(es->style & ES_MULTILINE)) return 0; @@ -2860,11 +2868,15 @@ if (es->hloc16) return es->hloc16; - if (!LOCAL_HeapSize(hInstance)) { - if (!LocalInit16(hInstance, 0, - GlobalSize16(hInstance))) { + stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + oldDS = stack16->ds; + stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); + + if (!LocalHeapSize16()) { + + if (!LocalInit16(stack16->ds, 0, GlobalSize16(stack16->ds))) { ERR("could not initialize local heap\n"); - return 0; + goto done; } TRACE("local heap initialized\n"); } @@ -2873,22 +2885,26 @@ alloc_size = ROUND_TO_GROW(countA); TRACE("Allocating 16-bit ANSI alias buffer\n"); - if (!(es->hloc16 = LOCAL_Alloc(hInstance, LMEM_MOVEABLE | LMEM_ZEROINIT, alloc_size))) { + if (!(es->hloc16 = LocalAlloc16(LMEM_MOVEABLE | LMEM_ZEROINIT, alloc_size))) { ERR("could not allocate new 16 bit buffer\n"); - return 0; - } - - if (!(textA = (LPSTR)LOCAL_Lock(hInstance, es->hloc16))) { + goto done; + } + + if (!(textA = MapSL(LocalLock16( es->hloc16)))) { ERR("could not lock new 16 bit buffer\n"); - LOCAL_Free(hInstance, es->hloc16); + LocalFree16(es->hloc16); es->hloc16 = 0; - return 0; + goto done; } WideCharToMultiByte(CP_ACP, 0, es->text, -1, textA, countA, NULL, NULL); - LOCAL_Unlock(hInstance, es->hloc16); - - TRACE("Returning %04X, LocalSize() = %d\n", es->hloc16, LOCAL_Size(hInstance, es->hloc16)); + LocalUnlock16(es->hloc16); + es->flags |= EF_APP_HAS_HANDLE; + + TRACE("Returning %04X, LocalSize() = %d\n", es->hloc16, LocalSize16(es->hloc16)); + +done: + stack16->ds = oldDS; return es->hloc16; } #endif @@ -2945,7 +2961,7 @@ * EM_GETSEL * */ -static LRESULT EDIT_EM_GetSel(EDITSTATE *es, PUINT start, PUINT end) +static LRESULT EDIT_EM_GetSel(const EDITSTATE *es, PUINT start, PUINT end) { UINT s = es->selection_start; UINT e = es->selection_end; @@ -3015,10 +3031,10 @@ * EM_LINEINDEX * */ -static INT EDIT_EM_LineIndex(EDITSTATE *es, INT line) +static INT EDIT_EM_LineIndex(const EDITSTATE *es, INT line) { INT line_index; - LINEDEF *line_def; + const LINEDEF *line_def; if (!(es->style & ES_MULTILINE)) return 0; @@ -3299,11 +3315,11 @@ * such that buffer limit is honored. */ if ((honor_limit) && (size > es->buffer_limit)) { EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); - /* Buffer limit can be smaller than the actual length of text in combobox */ - if (es->buffer_limit < (tl - (e-s))) - strl = 0; - else - strl = es->buffer_limit - (tl - (e-s)); + /* Buffer limit can be smaller than the actual length of text in combobox */ + if (es->buffer_limit < (tl - (e-s))) + strl = 0; + else + strl = es->buffer_limit - (tl - (e-s)); } if (!EDIT_MakeFit(es, tl - (e - s) + strl)) @@ -3324,7 +3340,7 @@ if (strl) { /* there is an insertion */ tl = get_text_length(es); - TRACE("inserting stuff (tl %d, strl %d, selstart %d ('%s'), text '%s')\n", tl, strl, s, debugstr_w(es->text + s), debugstr_w(es->text)); + TRACE("inserting stuff (tl %d, strl %d, selstart %d (%s), text %s)\n", tl, strl, s, debugstr_w(es->text + s), debugstr_w(es->text)); for (p = es->text + tl ; p >= es->text + s ; p--) p[strl] = p[0]; for (i = 0 , p = es->text + s ; i < strl ; i++) @@ -3338,7 +3354,7 @@ if (es->style & ES_MULTILINE) { INT st = min(es->selection_start, es->selection_end); - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); hrgn = CreateRectRgn(0, 0, 0, 0); EDIT_BuildLineDefs_ML(es, st, st + strl, @@ -3351,7 +3367,7 @@ for (i = 0 , p = es->text ; i < e - s ; i++) p[i + s] = buf[i]; text_buffer_changed(es); - EDIT_BuildLineDefs_ML(es, s, e, + EDIT_BuildLineDefs_ML(es, s, e, abs(es->selection_end - es->selection_start) - strl, hrgn); strl = 0; e = s; @@ -3369,11 +3385,11 @@ strl--; EDIT_CalcLineWidth_SL(es); } - text_buffer_changed(es); + text_buffer_changed(es); EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); } } - + if (e != s) { if (can_undo) { utl = strlenW(es->undo_text); @@ -3425,7 +3441,7 @@ if (bufl) HeapFree(GetProcessHeap(), 0, buf); - + s += strl; /* If text has been deleted and we're right or center aligned then scroll rightward */ @@ -3502,7 +3518,7 @@ return (LRESULT)FALSE; } if (dy) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); /* check if we are going to move too far */ if(es->y_offset + dy > es->line_count - vlc) dy = es->line_count - vlc - es->y_offset; @@ -3528,7 +3544,6 @@ { if (es->style & ES_MULTILINE) { INT l; - INT li; INT vlc; INT ww; INT cw = es->char_width; @@ -3537,9 +3552,8 @@ INT dx = 0; l = EDIT_EM_LineFromChar(es, es->selection_end); - li = EDIT_EM_LineIndex(es, l); x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)); - vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + vlc = get_vertical_line_count(es); if (l >= es->y_offset + vlc) dy = l - vlc + 1 - es->y_offset; if (l < es->y_offset) @@ -3613,8 +3627,13 @@ #ifndef __REACTOS__ if(es->hloc16) { - LOCAL_Free(hInstance, es->hloc16); - es->hloc16 = (HLOCAL16)NULL; + STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + HANDLE16 oldDS = stack16->ds; + + stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); + LocalFree16(es->hloc16); + stack16->ds = oldDS; + es->hloc16 = 0; } #endif @@ -3682,7 +3701,9 @@ */ static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc) { - HINSTANCE16 hInstance = GetWindowLongW( es->hwndSelf, GWL_HINSTANCE ); + STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + HINSTANCE16 hInstance = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); + HANDLE16 oldDS = stack16->ds; INT countW, countA; HLOCAL hloc32W_new; WCHAR *textW; @@ -3704,8 +3725,9 @@ es->hloc32A = NULL; } - countA = LOCAL_Size(hInstance, hloc); - textA = LOCAL_Lock(hInstance, hloc); + stack16->ds = hInstance; + countA = LocalSize16(hloc); + textA = MapSL(LocalLock16(hloc)); countW = MultiByteToWideChar(CP_ACP, 0, textA, countA, NULL, 0); if(!(hloc32W_new = LocalAlloc(LMEM_MOVEABLE | LMEM_ZEROINIT, countW * sizeof(WCHAR)))) { @@ -3715,7 +3737,8 @@ textW = LocalLock(hloc32W_new); MultiByteToWideChar(CP_ACP, 0, textA, countA, textW, countW); LocalUnlock(hloc32W_new); - LOCAL_Unlock(hInstance, hloc); + LocalUnlock16(hloc); + stack16->ds = oldDS; if(es->hloc32W) LocalFree(es->hloc32W); @@ -3725,6 +3748,7 @@ es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; + es->flags |= EF_APP_HAS_HANDLE; EDIT_LockBuffer(es); es->x_offset = es->y_offset = 0; @@ -3745,7 +3769,7 @@ * * EM_SETLIMITTEXT * - * NOTE: this version currently implements WinNT limits + * NOTE: this version currently implements WinNT limits * */ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) @@ -3831,12 +3855,12 @@ es->right_margin = default_right_margin; es->format_rect.right -= es->right_margin; } - + if (action & (EC_LEFTMARGIN | EC_RIGHTMARGIN)) { EDIT_AdjustFormatRect(es); if (repaint) EDIT_UpdateText(es, NULL, TRUE); } - + TRACE("left=%d, right=%d\n", es->left_margin, es->right_margin); } @@ -3905,8 +3929,8 @@ * *sorting* the interval endpoints. Let's assume that we sort them * in this order: * start <= end <= old_start <= old_end - * Knuth 5.3.1 (p 183) asssures us that this can be done optimally - * in 5 comparisons; ie it's impossible to do better than the + * Knuth 5.3.1 (p 183) assures us that this can be done optimally + * in 5 comparisons; i.e. it is impossible to do better than the * following: */ ORDER_UINT(end, old_end); ORDER_UINT(start, old_start); @@ -3944,11 +3968,11 @@ * EM_SETTABSTOPS * */ -static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, LPINT tabs) +static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, const INT *tabs) { if (!(es->style & ES_MULTILINE)) return FALSE; - HeapFree(GetProcessHeap(), 0, es->tabs); + HeapFree(GetProcessHeap(), 0, es->tabs); es->tabs_count = count; if (!count) es->tabs = NULL; @@ -3971,12 +3995,11 @@ * EM_SETTABSTOPS16 * */ -static BOOL EDIT_EM_SetTabStops16(EDITSTATE *es, INT count, LPINT16 tabs) +static BOOL EDIT_EM_SetTabStops16(EDITSTATE *es, INT count, const INT16 *tabs) { if (!(es->style & ES_MULTILINE)) return FALSE; - if (es->tabs) - HeapFree(GetProcessHeap(), 0, es->tabs); + HeapFree(GetProcessHeap(), 0, es->tabs); es->tabs_count = count; if (!count) es->tabs = NULL; @@ -4074,6 +4097,7 @@ return TRUE; } + /* Helper function for WM_CHAR * * According to an MSDN blog article titled "Just because you're a control @@ -4083,20 +4107,38 @@ */ static BOOL EDIT_IsInsideDialog(EDITSTATE *es) { +#ifdef __REACTOS__ if (es->hwndParent && es->hwndParent != GetDesktopWindow()) { if (GetClassLongW (es->hwndParent, GCW_ATOM) == (DWORD)MAKEINTATOM(32770)) return TRUE; } return FALSE; -} +#else + WND *pParent; + BOOL r = FALSE; + + if (es->hwndParent) + { + pParent = WIN_GetPtr(es->hwndParent); + if (pParent && pParent != WND_OTHER_PROCESS && pParent != WND_DESKTOP) + { + if (pParent->flags & WIN_ISDIALOG) + r = TRUE; + WIN_ReleasePtr(pParent); + } + } + return r; +#endif +} + /********************************************************************* * * WM_CHAR * */ -static BOOL EDIT_WM_Char(EDITSTATE *es, WCHAR c) +static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) { BOOL control; @@ -4104,13 +4146,17 @@ switch (c) { case '\r': - /* If the edit doesn't want the return and it's not a multiline edit, do nothing */ - if(!(es->style & ES_MULTILINE) && !(es->style & ES_WANTRETURN)) - break; + /* If it's not a multiline edit box, it would be ignored below. + * For multiline edit without ES_WANTRETURN, we have to make a + * special case. + */ + if ((es->style & ES_MULTILINE) && !(es->style & ES_WANTRETURN)) + if (EDIT_IsInsideDialog(es)) + break; case '\n': if (es->style & ES_MULTILINE) { if (es->style & ES_READONLY) { - EDIT_MoveHome(es, FALSE); + EDIT_MoveHome(es, FALSE, FALSE); EDIT_MoveDown_ML(es, FALSE); } else { static const WCHAR cr_lfW[] = {'\r','\n',0}; @@ -4122,8 +4168,8 @@ if ((es->style & ES_MULTILINE) && !(es->style & ES_READONLY)) { static const WCHAR tabW[] = {'\t',0}; - if (EDIT_IsInsideDialog(es)) - break; + if (EDIT_IsInsideDialog(es)) + break; EDIT_EM_ReplaceSel(es, TRUE, tabW, TRUE, TRUE); } break; @@ -4140,7 +4186,7 @@ } break; case 0x03: /* ^C */ - if (!(es->style & ES_PASSWORD)) + if (!(es->style & ES_PASSWORD)) SendMessageW(es->hwndSelf, WM_COPY, 0, 0); break; case 0x16: /* ^V */ @@ -4151,16 +4197,16 @@ if (!((es->style & ES_READONLY) || (es->style & ES_PASSWORD))) SendMessageW(es->hwndSelf, WM_CUT, 0, 0); break; - case 0x1A: /* ^Z */ - if (!(es->style & ES_READONLY)) - SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); - break; + case 0x1A: /* ^Z */ + if (!(es->style & ES_READONLY)) + SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); + break; default: - /*If Edit control style is ES_NUMBER allow users to key in only numeric values*/ - if( (es->style & ES_NUMBER) && !( c >= '0' && c <= '9') ) - break; - + /*If Edit control style is ES_NUMBER allow users to key in only numeric values*/ + if( (es->style & ES_NUMBER) && !( c >= '0' && c <= '9') ) + break; + if (!(es->style & ES_READONLY) && (c >= ' ') && (c != 127)) { WCHAR str[2]; str[0] = c; @@ -4169,8 +4215,7 @@ } break; } - - return TRUE; + return 1; } @@ -4186,19 +4231,19 @@ switch (id) { case EM_UNDO: - EDIT_EM_Undo(es); + SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); break; case WM_CUT: - EDIT_WM_Cut(es); + SendMessageW(es->hwndSelf, WM_CUT, 0, 0); break; case WM_COPY: - EDIT_WM_Copy(es); + SendMessageW(es->hwndSelf, WM_COPY, 0, 0); break; case WM_PASTE: - EDIT_WM_Paste(es); + SendMessageW(es->hwndSelf, WM_PASTE, 0, 0); break; case WM_CLEAR: - EDIT_WM_Clear(es); + SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0); break; case EM_SETSEL: EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE); @@ -4305,7 +4350,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name) { RECT clientRect; - + TRACE("%s\n", debugstr_w(name)); /* * To initialize some final structure members, we call some helper @@ -4315,7 +4360,7 @@ */ EDIT_WM_SetFont(es, 0, FALSE); EDIT_EM_EmptyUndoBuffer(es); - + /* We need to calculate the format rect (applications may send EM_SETMARGINS before the control gets visible) */ GetClientRect(es->hwndSelf, &clientRect); @@ -4357,18 +4402,20 @@ LINEDEF *pc, *pp; if (es->hloc32W) { - while (LocalUnlock(es->hloc32W)) ; LocalFree(es->hloc32W); } if (es->hloc32A) { - while (LocalUnlock(es->hloc32A)) ; LocalFree(es->hloc32A); } #ifndef __REACTOS__ if (es->hloc16) { - HINSTANCE16 hInstance = GetWindowWord( es->hwndSelf, GWL_HINSTANCE ); - while (LOCAL_Unlock(hInstance, es->hloc16)) ; - LOCAL_Free(hInstance, es->hloc16); + STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + HANDLE16 oldDS = stack16->ds; + + stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); + while (LocalUnlock16(es->hloc16)) ; + LocalFree16(es->hloc16); + stack16->ds = oldDS; } #endif @@ -4389,22 +4436,10 @@ /********************************************************************* * - * WM_ERASEBKGND - * - */ -static LRESULT EDIT_WM_EraseBkGnd(EDITSTATE *es, HDC dc) -{ - /* we do the proper erase in EDIT_WM_Paint */ - return 1; -} - - -/********************************************************************* - * * WM_GETTEXT * */ -static INT EDIT_WM_GetText(EDITSTATE *es, INT count, LPWSTR dst, BOOL unicode) +static INT EDIT_WM_GetText(const EDITSTATE *es, INT count, LPWSTR dst, BOOL unicode) { if(!count) return 0; @@ -4666,18 +4701,10 @@ EDIT_MoveForward(es, shift); break; case VK_HOME: - if (control && (es->style & ES_MULTILINE)) { - EDIT_MoveStartOfText(es, shift); - } else { - EDIT_MoveHome(es, shift); /* start of line */ - } + EDIT_MoveHome(es, shift, control); break; case VK_END: - if (control && (es->style & ES_MULTILINE)) { - EDIT_MoveEndOfText(es, shift); - } else { - EDIT_MoveEnd(es, shift); /* end of line */ - } + EDIT_MoveEnd(es, shift, control); break; case VK_PRIOR: if (es->style & ES_MULTILINE) @@ -4707,7 +4734,7 @@ } else if (control) { /* delete to end of line */ EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); - EDIT_MoveEnd(es, TRUE); + EDIT_MoveEnd(es, TRUE, FALSE); EDIT_WM_Clear(es); } else { /* delete character right of caret */ @@ -4725,36 +4752,36 @@ } else if (control) EDIT_WM_Copy(es); break; - case VK_RETURN: - /* If the edit doesn't want the return send a message to the default object */ - if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) + case VK_RETURN: + /* If the edit doesn't want the return send a message to the default object */ + if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) { - HWND hwndParent; - DWORD dw; - - if (!EDIT_IsInsideDialog(es)) return 1; - if (control) break; - - hwndParent = GetParent(es->hwndSelf); - dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); - if (HIWORD(dw) == DC_HASDEFID) - { - SendMessageW( hwndParent, WM_COMMAND, - MAKEWPARAM( LOWORD(dw), BN_CLICKED ), - (LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); - } - else - SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); - } - break; - case VK_ESCAPE: - if (!(es->style & ES_MULTILINE)) - SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); - break; - case VK_TAB: - SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); - break; - } + HWND hwndParent; + DWORD dw; + + if (!EDIT_IsInsideDialog(es)) return 1; + if (control) break; + + hwndParent = GetParent(es->hwndSelf); + dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); + if (HIWORD(dw) == DC_HASDEFID) + { + SendMessageW( hwndParent, WM_COMMAND, + MAKEWPARAM( LOWORD(dw), BN_CLICKED ), + (LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); + } + else + SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); + } + break; + case VK_ESCAPE: + if (!(es->style & ES_MULTILINE)) + SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); + break; + case VK_TAB: + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); + break; + } return 0; } @@ -4904,7 +4931,7 @@ EDITSTATE *es; UINT alloc_size; - TRACE("Creating %s edit control, style = %08lx\n", + TRACE("Creating %s edit control, style = %08x\n", unicode ? "Unicode" : "ANSI", lpcs->style); if (!(es = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*es)))) @@ -4928,6 +4955,9 @@ if (es->style & ES_COMBO) es->hwndListBox = GetDlgItem(es->hwndParent, ID_CB_LISTBOX); + + /* FIXME: should we handle changes to WS_EX_RIGHT style after creation? */ + if (lpcs->dwExStyle & WS_EX_RIGHT) es->style |= ES_RIGHT; /* Number overrides lowercase overrides uppercase (at least it * does in Win95). However I'll bet that ES_NUMBER would be @@ -4983,7 +5013,7 @@ * If WS_BORDER without WS_EX_CLIENTEDGE is specified we shouldn't have * a nonclient area and we should handle painting the border ourselves. * - * When making modifications please ensure that the code still works + * When making modifications please ensure that the code still works * for edit controls created directly with style 0x50800000, exStyle 0 * (which should have a single pixel border) */ @@ -5025,7 +5055,7 @@ /* paint the border and the background */ IntersectClipRect(dc, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); - + if(es->style & WS_BORDER) { bw = GetSystemMetrics(SM_CXBORDER); bh = GetSystemMetrics(SM_CYBORDER); @@ -5034,7 +5064,7 @@ if(es->style & WS_HSCROLL) rc.bottom+=bh; if(es->style & WS_VSCROLL) rc.right+=bw; } - + /* Draw the frame. Same code as in nonclient.c */ old_brush = SelectObject(dc, GetSysColorBrush(COLOR_WINDOWFRAME)); PatBlt(dc, rc.left, rc.top, rc.right - rc.left, bh, PATCOPY); @@ -5042,12 +5072,12 @@ PatBlt(dc, rc.left, rc.bottom - 1, rc.right - rc.left, -bw, PATCOPY); PatBlt(dc, rc.right - 1, rc.top, -bw, rc.bottom - rc.top, PATCOPY); SelectObject(dc, old_brush); - + /* Keep the border clean */ IntersectClipRect(dc, rc.left+bw, rc.top+bh, max(rc.right-bw, rc.left+bw), max(rc.bottom-bh, rc.top+bh)); } - + GetClipBox(dc, &rc); FillRect(dc, &rc, brush); @@ -5066,7 +5096,7 @@ SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); GetClipBox(dc, &rcRgn); if (es->style & ES_MULTILINE) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); for (i = es->y_offset ; i <= min(es->y_offset + vlc, es->y_offset + es->line_count - 1) ; i++) { EDIT_GetLineRect(es, i, 0, -1, &rcLine); if (IntersectRect(&rc, &rcRgn, &rcLine)) @@ -5101,14 +5131,14 @@ OpenClipboard(es->hwndSelf); if ((hsrc = GetClipboardData(CF_UNICODETEXT))) { - src = (LPWSTR)GlobalLock(hsrc); + src = GlobalLock(hsrc); EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); GlobalUnlock(hsrc); } else if (es->style & ES_PASSWORD) { - /* clear selected text in password edit box even with empty clipboard */ - const WCHAR empty_strW[] = { 0 }; - EDIT_EM_ReplaceSel(es, TRUE, empty_strW, TRUE, TRUE); + /* clear selected text in password edit box even with empty clipboard */ + const WCHAR empty_strW[] = { 0 }; + EDIT_EM_ReplaceSel(es, TRUE, empty_strW, TRUE, TRUE); } CloseClipboard(); } @@ -5168,7 +5198,7 @@ if (font) SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); - + /* Reset the format rect and the margins */ GetClientRect(es->hwndSelf, &clientRect); EDIT_SetRectNP(es, &clientRect); @@ -5223,14 +5253,14 @@ "selection.\n"); EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE); - if (text) + if (text) { TRACE("%s\n", debugstr_w(text)); EDIT_EM_ReplaceSel(es, FALSE, text, FALSE, FALSE); if(!unicode) HeapFree(GetProcessHeap(), 0, textW); - } - else + } + else { static const WCHAR empty_stringW[] = {0}; TRACE("<NULL>\n"); @@ -5250,7 +5280,7 @@ EDIT_NOTIFY_PARENT(es, EN_CHANGE); } EDIT_EM_ScrollCaret(es); - EDIT_UpdateScrollInfo(es); + EDIT_UpdateScrollInfo(es); } @@ -5411,7 +5441,7 @@ INT vlc, new_y; /* Sanity check */ if(pos < 0 || pos > 100) return 0; - vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + vlc = get_vertical_line_count(es); new_y = pos * (es->line_count - vlc) / 100; dy = es->line_count ? (new_y - es->y_offset) : 0; TRACE("line_count=%d, y_offset=%d, pos=%d, dy = %d\n", @@ -5429,7 +5459,7 @@ INT vlc, new_y; /* Sanity check */ if(pos < 0 || pos > 100) return 0; - vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + vlc = get_vertical_line_count(es); new_y = pos * (es->line_count - vlc) / 100; dy = es->line_count ? (new_y - es->y_offset) : 0; TRACE("line_count=%d, y_offset=%d, pos=%d, dy = %d\n", @@ -5462,7 +5492,7 @@ else { /* Assume default scroll range 0-100 */ - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); ret = es->line_count ? es->y_offset * 100 / (es->line_count - vlc) : 0; } TRACE("EM_GETTHUMB: returning %ld\n", ret); @@ -5505,7 +5535,7 @@ * EDIT_UpdateText * */ -static void EDIT_UpdateText(EDITSTATE *es, LPRECT rc, BOOL bErase) +static void EDIT_UpdateText(EDITSTATE *es, const RECT *rc, BOOL bErase) { if (es->flags & EF_UPDATE) { es->flags &= ~EF_UPDATE; @@ -5515,44 +5545,38 @@ } /******************************************************************** - * + * * The Following code is to handle inline editing from IMEs */ -static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) -{ - DWORD dwBufLen; +static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) +{ + LONG buflen; LPWSTR lpCompStr = NULL; - HIMC hIMC; LPSTR lpCompStrAttr = NULL; DWORD dwBufLenAttr; - if (!(hIMC = ImmGetContext(hwnd))) - return; - - dwBufLen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); - - if (dwBufLen <= 0) + buflen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); + + if (buflen < 0) { - ImmReleaseContext(hwnd, hIMC); return; } - lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen); + lpCompStr = HeapAlloc(GetProcessHeap(),0,buflen + sizeof(WCHAR)); if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); - ImmReleaseContext(hwnd,hIMC); return; } - if (dwBufLen) - ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); - lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; + if (buflen) + ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, buflen); + lpCompStr[buflen/sizeof(WCHAR)] = 0; if (CompFlag & GCS_COMPATTR) { - /* + /* * We do not use the attributes yet. it would tell us what characters * are in transition and which are converted or decided upon */ @@ -5560,15 +5584,14 @@ if (dwBufLenAttr) { dwBufLenAttr ++; - lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr); + lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr+1); if (!lpCompStrAttr) { ERR("Unable to allocate IME Attribute String\n"); HeapFree(GetProcessHeap(),0,lpCompStr); - ImmReleaseContext(hwnd,hIMC); return; } - ImmGetCompositionStringW(hIMC,GCS_COMPATTR, lpCompStrAttr, + ImmGetCompositionStringW(hIMC,GCS_COMPATTR, lpCompStrAttr, dwBufLenAttr); lpCompStrAttr[dwBufLenAttr] = 0; } @@ -5579,7 +5602,7 @@ /* check for change in composition start */ if (es->selection_end < es->composition_start) es->composition_start = es->selection_end; - + /* replace existing selection string */ es->selection_start = es->composition_start; @@ -5596,35 +5619,28 @@ HeapFree(GetProcessHeap(),0,lpCompStrAttr); HeapFree(GetProcessHeap(),0,lpCompStr); - ImmReleaseContext(hwnd,hIMC); -} - -static void EDIT_GetResultStr(HWND hwnd, EDITSTATE *es) -{ - DWORD dwBufLen; +} + +static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) +{ + LONG buflen; LPWSTR lpResultStr; - HIMC hIMC; - - if ( !(hIMC = ImmGetContext(hwnd))) - return; - - dwBufLen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0); - if (dwBufLen <= 0) + + buflen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0); + if (buflen <= 0) { - ImmReleaseContext(hwnd, hIMC); return; } - lpResultStr = HeapAlloc(GetProcessHeap(),0, dwBufLen); + lpResultStr = HeapAlloc(GetProcessHeap(),0, buflen+sizeof(WCHAR)); if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n"); - ImmReleaseContext(hwnd, hIMC); return; } - ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, dwBufLen); - lpResultStr[dwBufLen/sizeof(WCHAR)] = 0; + ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, buflen); + lpResultStr[buflen/sizeof(WCHAR)] = 0; /* check for change in composition start */ if (es->selection_end < es->composition_start) @@ -5637,13 +5653,29 @@ es->composition_len = 0; HeapFree(GetProcessHeap(),0,lpResultStr); +} + +static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) +{ + HIMC hIMC; + int cursor; + + if (es->composition_len == 0 && es->selection_start != es->selection_end) + { + static const WCHAR empty_stringW[] = {0}; + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + es->composition_start = es->selection_end; + } + + hIMC = ImmGetContext(hwnd); + if (!hIMC) + return; + + if (CompFlag & GCS_RESULTSTR) + EDIT_GetResultStr(hIMC, es); + if (CompFlag & GCS_COMPSTR) + EDIT_GetCompositionStr(hIMC, CompFlag, es); + cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); ImmReleaseContext(hwnd, hIMC); -} - -static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) -{ - if (CompFlag & GCS_RESULTSTR) - EDIT_GetResultStr(hwnd,es); - if (CompFlag & GCS_COMPSTR) - EDIT_GetCompositionStr(hwnd, CompFlag, es); -} + EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP); +} Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Mon Jan 12 16:03:00 2009 @@ -243,5 +243,11 @@ # endif #endif +#ifdef _MSC_VER +#ifndef inline +#define inline __inline +#endif +#endif + #endif /* EOF */

15 years, 8 months

[dgorbachev] 38738: Update Spanish translations. Patch from Javier Remacha (remialdo gmail com). Bug #4021.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Jan 12 15:18:57 2009 New Revision: 38738 URL: http://svn.reactos.org/svn/reactos?rev=38738&view=rev Log: Update Spanish translations. Patch from Javier Remacha (remialdo gmail com). Bug #4021. Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] Mon Jan 12 15:18:57 2009 @@ -4,7 +4,7 @@ * FILE: base/applications/games/solitaire/lang/es-ES.rc * PURPOSE: Spanish Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) - * ACTUALIZADO: Javier Remacha - 18/12/17 + * ACTUALIZADO: Javier Remacha - 13/01/09 */ #include "resource.h" @@ -29,6 +29,7 @@ PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 END + IDD_CARDBACK DIALOGEX 6, 6, 221, 96 CAPTION "Seleccionar el reverso" FONT 8, "MS Shell Dlg" @@ -51,7 +52,7 @@ IDS_SOL_ABOUT "Solitario por J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "¿Finalizar el juego actual?" IDS_SOL_WIN "Felicidades, ¡¡Has ganado!!" - IDS_SOL_DEAL "Deal again?" + IDS_SOL_DEAL "¿Repartir de nuevo?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] Mon Jan 12 15:18:57 2009 @@ -2,21 +2,21 @@ IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 - LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 - LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + LTEXT "Bienvenido al Asistente para agregar hardware", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Este asistente le ayuda a:", -1, 114, 40, 182, 8 + LTEXT "1) Instalar software para que el hardware agregado a su equipo sea compatible.", -1, 121, 56, 184, 16 + LTEXT "2) Solucionar problemas originados por el hardware.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 - LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 + LTEXT "Si el hardware trae consigo un CD de instalación, es recomendable que use el CD del fabricante para instalar este hardware y haga clic en Cancelar para cerrar el asistente.", 503, 150, 106, 155, 50 + LTEXT "Haga clic en Siguiente para continuar.", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -25,63 +25,63 @@ IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "¿Ya ha conectado este hardware al equipo?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Sí, ya he conectado el hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, todavía no he agregado el hardware", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 - LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 - LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 + LTEXT "Seleccione de la siguiente lista el dispositivo de hardware instalado, haga clic en Siguiente para comprobar las propiedades del mismo o solucionar un posible problema.", -1, 21, 8, 275, 22 + LTEXT "Para agregar hardware que no está en la lista, haga clic en ""Agregar un nuevo dispositivo de hardware.""", -1, 21, 32, 275, 24 + LTEXT "&Hardware instalado:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 - LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP + LTEXT "El asistente puede buscar otro hardware e instalarlo automáticamente. Si conoce exactamente el modelo de hardware que desea instalar, puede seleccionarlo de una lista.", -1, 21, 8, 280, 24 + LTEXT "¿Qué desea que haga el asistente?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "&Buscar el instalar el hardware automáticamente (Recomendado)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "Instalar el hardware seleccionándolo manualmente de una lista (Avanzado)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Hardware detectado:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 - LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 + LTEXT "Si no encuentra el tipo de hardware que desea, haga clic en Mostrar todos los dispositivos.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "&Tipos de hardware comunes:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 - LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 + LTEXT "La búsqueda de hardware puede tardar varios minutos.", -1, 21, 8, 275, 15 + LTEXT "Progreso total:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8 @@ -89,58 +89,58 @@ IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "Completando el Asistente para agregar hardware", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Ha completado satisfactoriamente el Asistente para agregar hardware.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Para salir de este asistente, haga clic en Finalizar.", -1, 114, 166, 193, 8 END IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Completando el Asistente para agregar hardware", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "El asistente ha encontrado el siguiente hardware conectado a su equipo:", -1, 114, 32, 193, 19 + LTEXT "Para salir de este asistente, haga clic en Finalizar.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 - LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 + LTEXT "Finalización del Asistente para agregar hardware", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Estado actual del hardware que ha seleccionado:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 - LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "Para iniciar el solucionador de problemas que puede ayudarle a resolver posibles problemas, haga clic en Finalizar.", -1, 114, 136, 193, 24 + LTEXT "Para salir de este asistente, haga clic en Cancelar.", IDC_STATUSTEXT, 114, 166, 193, 8 END IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Asistente para agregar Hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 - LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "El Asistente para agregar hardware no puede continuar", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Para continuar, conecte este hardware al equipo.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "Apagar el equipo cuando &haga clic en Finalizar para poder abrirlo y conectar el hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "En muchos casos ReactOS instalará automáticamente el hardware después de conectarlo. Si ReactOS no lo encuentra, puede volver a abrir el asistente para instalar software compatible.", -1, 114, 98, 193, 32 + LTEXT "Para salir de este asistente, haga clic en Finalizar.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN - IDS_CPLNAME "Añade Nuevo Hardware" - IDS_CPLDESCRIPTION "Añade Nuevo Hardware a tu computadora." - IDS_SEARCHTITLE "Please wait while the wizard searches..." - IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." - IDS_ISCONNECTED "Is the hardware connected?" - IDS_PROBELISTTITLE "The following hardware is already installed on your computer" - IDS_ADDNEWDEVICE "Add a new hardware device" - IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_CPLNAME "Añade nuevo Hardware" + IDS_CPLDESCRIPTION "Añade nuevo Hardware a su equipo." + IDS_SEARCHTITLE "Por favor, espere mientras el asistente está buscando..." + IDS_SEARCHTEXT "El asistente está buscando hardware que haya sido conectado recientemente al equipo pero no se haya instalado todavía." + IDS_ISCONNECTED "¿El hardware está conectado?" + IDS_PROBELISTTITLE "El siguiente hardware ya está instalado en su equipo" + IDS_ADDNEWDEVICE "Añadir un nuevo dispositivo hardware" + IDS_SELECTWAYTITLE "El asistente puede ayudarle a instalar otro hardware" END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Mon Jan 12 15:18:57 2009 @@ -1,7 +1,7 @@ // Spanish language resource file // React Operating System 2005 // Samuel Serapión Vega -// Actualizado (Javier Remacha 2008/01/19) +// Actualizado (Javier Remacha 2009/01/13) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -262,10 +262,10 @@ BEGIN IDS_CPLSYSTEMNAME "Sistema" IDS_CPLSYSTEMDESCRIPTION "Muestra información sobre el sistema de su equipo y cambia la configuración del hardware, rendimiento y actualizaciones automáticas." - IDS_MEGABYTE "MB of RAM" - IDS_GIGABYTE "GB of RAM" - IDS_TERABYTE "TB of RAM" - IDS_PETABYTE "PB of RAM" + IDS_MEGABYTE "MB de RAM" + IDS_GIGABYTE "GB de RAM" + IDS_TERABYTE "TB de RAM" + IDS_PETABYTE "PB de RAM" IDS_VARIABLE "Variable" IDS_VALUE "Valor" IDS_NO_DUMP "(Ninguno)"

15 years, 8 months

[tkreuzer] 38737: revert last commit insetad remove UNICODE_NOCHAR from wine/winuser.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 12 15:12:10 2009 New Revision: 38737 URL: http://svn.reactos.org/svn/reactos?rev=38737&view=rev Log: revert last commit insetad remove UNICODE_NOCHAR from wine/winuser.h Modified: trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Jan 12 15:12:10 2009 @@ -1642,10 +1642,7 @@ #if(_WIN32_WINNT >= 0x0501) #define WM_UNICHAR 0x0109 #define WM_KEYLAST WM_UNICHAR -/* FIXME: HACK! */ -#ifndef UNICODE_NOCHAR #define UNICODE_NOCHAR 0xffff -#endif #else #define WM_KEYLAST 264 #endif Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Mon Jan 12 15:12:10 2009 @@ -21,8 +21,6 @@ #define WM_ALTTABACTIVE 0x0029 -#define UNICODE_NOCHAR 0xFFFF - #ifndef E_PROP_ID_UNSUPPORTED #define E_PROP_ID_UNSUPPORTED ((HRESULT)0x80070490) #endif

15 years, 8 months

[tkreuzer] 38736: define UNICODE_NOCHAR only if it wasn't already defined

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 12 14:59:51 2009 New Revision: 38736 URL: http://svn.reactos.org/svn/reactos?rev=38736&view=rev Log: define UNICODE_NOCHAR only if it wasn't already defined Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Jan 12 14:59:51 2009 @@ -1642,7 +1642,10 @@ #if(_WIN32_WINNT >= 0x0501) #define WM_UNICHAR 0x0109 #define WM_KEYLAST WM_UNICHAR +/* FIXME: HACK! */ +#ifndef UNICODE_NOCHAR #define UNICODE_NOCHAR 0xffff +#endif #else #define WM_KEYLAST 264 #endif

15 years, 8 months

[tkreuzer] 38735: Sort window messages by num, add WM_MENUDRAG, WM_MENUGETOBJECT, WM_UNICHAR

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 12 14:49:08 2009 New Revision: 38735 URL: http://svn.reactos.org/svn/reactos?rev=38735&view=rev Log: Sort window messages by num, add WM_MENUDRAG, WM_MENUGETOBJECT, WM_UNICHAR Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Jan 12 14:49:08 2009 @@ -101,26 +101,6 @@ #define CF_PRIVATELAST 767 #define CF_GDIOBJFIRST 768 #define CF_GDIOBJLAST 1023 - -/* Win32 4.0 messages for IME */ -#define WM_IME_SETCONTEXT 0x0281 -#define WM_IME_NOTIFY 0x0282 -#define WM_IME_CONTROL 0x0283 -#define WM_IME_COMPOSITIONFULL 0x0284 -#define WM_IME_SELECT 0x0285 -#define WM_IME_CHAR 0x0286 -/* Win32 5.0 messages for IME */ -#define WM_IME_REQUEST 0x0288 - -/* Win32 4.0 messages for IME */ -#define WM_IME_KEYDOWN 0x0290 -#define WM_IME_KEYUP 0x0291 - -/* Win32 4.0 messages for IME */ -#define WM_IME_STARTCOMPOSITION 0x010d -#define WM_IME_ENDCOMPOSITION 0x010e -#define WM_IME_COMPOSITION 0x010f -#define WM_IME_KEYLAST 0x010f #define HKL_NEXT 1 #define HKL_PREV 0 @@ -1521,23 +1501,8 @@ #define SPIF_SENDCHANGE 2 #define ATF_ONOFFFEEDBACK 2 #define ATF_TIMEOUTON 1 -#define WM_APP 32768 -#define WM_ACTIVATE 6 -#define WM_ACTIVATEAPP 28 -/* FIXME/CHECK: Are WM_AFX{FIRST,LAST} valid for WINVER < 0x400? */ -#define WM_AFXFIRST 864 -#define WM_AFXLAST 895 -#define WM_ASKCBFORMATNAME 780 -#define WM_CANCELJOURNAL 75 -#define WM_CANCELMODE 31 -#define WM_CAPTURECHANGED 533 -#define WM_CHANGECBCHAIN 781 #if (WINVER >= 0x0500) -#define WM_CHANGEUISTATE 295 -#define WM_UPDATEUISTATE 296 -#define WM_QUERYUISTATE 297 - #define UIS_SET 1 #define UIS_CLEAR 2 #define UIS_INITIALIZE 3 @@ -1565,178 +1530,165 @@ #define PBT_APMOEMEVENT 0x000B #define PBT_APMRESUMEAUTOMATIC 0x0012 -#define WM_CHAR 258 -#define WM_CHARTOITEM 47 -#define WM_CHILDACTIVATE 34 -#define WM_CLEAR 771 -#define WM_CLOSE 16 -#define WM_COMMAND 273 -#define WM_COMMNOTIFY 68 /* obsolete */ -#define WM_COMPACTING 65 -#define WM_COMPAREITEM 57 -#define WM_CONTEXTMENU 123 -#define WM_COPY 769 -#define WM_COPYDATA 74 + +/* Window messages */ +#define WM_NULL 0 #define WM_CREATE 1 -#define WM_CTLCOLORBTN 309 -#define WM_CTLCOLORDLG 310 -#define WM_CTLCOLOREDIT 307 -#define WM_CTLCOLORLISTBOX 308 -#define WM_CTLCOLORMSGBOX 306 -#define WM_CTLCOLORSCROLLBAR 311 -#define WM_CTLCOLORSTATIC 312 -#define WM_CUT 768 -#define WM_DEADCHAR 259 -#define WM_DELETEITEM 45 #define WM_DESTROY 2 -#define WM_DESTROYCLIPBOARD 775 -#define WM_DEVICECHANGE 537 -#define WM_DEVMODECHANGE 27 -#define WM_DISPLAYCHANGE 126 -#define WM_DRAWCLIPBOARD 776 -#define WM_DRAWITEM 43 -#define WM_DROPFILES 563 +#define WM_MOVE 3 +#define WM_SIZE 5 +#define WM_ACTIVATE 6 +#define WM_SETFOCUS 7 +#define WM_KILLFOCUS 8 #define WM_ENABLE 10 -#define WM_ENDSESSION 22 -#define WM_ENTERIDLE 289 -#define WM_ENTERMENULOOP 529 -#define WM_ENTERSIZEMOVE 561 -#define WM_ERASEBKGND 20 -#define WM_EXITMENULOOP 530 -#define WM_EXITSIZEMOVE 562 -#define WM_FONTCHANGE 29 -#define WM_GETDLGCODE 135 -#define WM_GETFONT 49 -#define WM_GETHOTKEY 51 -#define WM_GETICON 127 -#define WM_GETMINMAXINFO 36 +#define WM_SETREDRAW 11 +#define WM_SETTEXT 12 #define WM_GETTEXT 13 #define WM_GETTEXTLENGTH 14 -/* FIXME/CHECK: Are WM_HANDHEL{FIRST,LAST} valid for WINVER < 0x400? */ -#define WM_HANDHELDFIRST 856 -#define WM_HANDHELDLAST 863 +#define WM_PAINT 15 +#define WM_CLOSE 16 +#define WM_QUERYENDSESSION 17 +#define WM_QUIT 18 +#define WM_QUERYOPEN 19 +#define WM_ERASEBKGND 20 +#define WM_SYSCOLORCHANGE 21 +#define WM_ENDSESSION 22 +#define WM_SHOWWINDOW 24 +#define WM_SETTINGCHANGE 26 +#define WM_WININICHANGE 26 +#define WM_DEVMODECHANGE 27 +#define WM_ACTIVATEAPP 28 +#define WM_FONTCHANGE 29 +#define WM_TIMECHANGE 30 +#define WM_CANCELMODE 31 +#define WM_SETCURSOR 32 +#define WM_MOUSEACTIVATE 33 +#define WM_CHILDACTIVATE 34 +#define WM_QUEUESYNC 35 +#define WM_GETMINMAXINFO 36 +#define WM_PAINTICON 38 +#define WM_ICONERASEBKGND 39 +#define WM_NEXTDLGCTL 40 +#define WM_SPOOLERSTATUS 42 +#define WM_DRAWITEM 43 +#define WM_MEASUREITEM 44 +#define WM_DELETEITEM 45 +#define WM_VKEYTOITEM 46 +#define WM_CHARTOITEM 47 +#define WM_SETFONT 48 +#define WM_GETFONT 49 +#define WM_SETHOTKEY 50 +#define WM_GETHOTKEY 51 +#define WM_QUERYDRAGICON 55 +#define WM_COMPAREITEM 57 +#define WM_COMPACTING 65 +#define WM_COMMNOTIFY 68 /* obsolete */ +#define WM_WINDOWPOSCHANGING 70 +#define WM_WINDOWPOSCHANGED 71 +#define WM_POWER 72 +#define WM_COPYDATA 74 +#define WM_CANCELJOURNAL 75 + +#if (WINVER >= 0x0400) +#define WM_NOTIFY 78 +#define WM_INPUTLANGCHANGEREQUEST 80 +#define WM_INPUTLANGCHANGE 81 +#define WM_TCARD 82 #define WM_HELP 83 -#define WM_HOTKEY 786 -#define WM_HSCROLL 276 -#define WM_HSCROLLCLIPBOARD 782 -#define WM_ICONERASEBKGND 39 -#define WM_INITDIALOG 272 -#define WM_INITMENU 278 -#define WM_INITMENUPOPUP 279 -#define WM_INPUTLANGCHANGE 81 -#define WM_INPUTLANGCHANGEREQUEST 80 -#define WM_KEYDOWN 256 -#define WM_KEYUP 257 -#define WM_KILLFOCUS 8 -#define WM_MDIACTIVATE 546 -#define WM_MDICASCADE 551 -#define WM_MDICREATE 544 -#define WM_MDIDESTROY 545 -#define WM_MDIGETACTIVE 553 -#define WM_MDIICONARRANGE 552 -#define WM_MDIMAXIMIZE 549 -#define WM_MDINEXT 548 -#define WM_MDIREFRESHMENU 564 -#define WM_MDIRESTORE 547 -#define WM_MDISETMENU 560 -#define WM_MDITILE 550 -#define WM_MEASUREITEM 44 -#if (WINVER >= 0x0500) -#define WM_MENURBUTTONUP 290 -#define WM_UNINITMENUPOPUP 293 -#endif -#define WM_MENUCHAR 288 -#define WM_MENUCOMMAND 294 -#define WM_MENUSELECT 287 -#define WM_NEXTMENU 531 -#define WM_MOVE 3 -#define WM_MOVING 534 -#define WM_NCACTIVATE 134 -#define WM_NCCALCSIZE 131 +#define WM_USERCHANGED 84 +#define WM_NOTIFYFORMAT 85 +#define WM_CONTEXTMENU 123 +#define WM_STYLECHANGING 124 +#define WM_STYLECHANGED 125 +#define WM_DISPLAYCHANGE 126 +#define WM_GETICON 127 +#define WM_SETICON 128 +#endif /* (WINVER >= 0x0400) */ + #define WM_NCCREATE 129 #define WM_NCDESTROY 130 +#define WM_NCCALCSIZE 131 #define WM_NCHITTEST 132 -#define WM_NCLBUTTONDBLCLK 163 +#define WM_NCPAINT 133 +#define WM_NCACTIVATE 134 +#define WM_GETDLGCODE 135 +#define WM_SYNCPAINT 136 +#define WM_NCMOUSEMOVE 160 #define WM_NCLBUTTONDOWN 161 #define WM_NCLBUTTONUP 162 -#define WM_NCMBUTTONDBLCLK 169 +#define WM_NCLBUTTONDBLCLK 163 +#define WM_NCRBUTTONDOWN 164 +#define WM_NCRBUTTONUP 165 +#define WM_NCRBUTTONDBLCLK 166 #define WM_NCMBUTTONDOWN 167 #define WM_NCMBUTTONUP 168 +#define WM_NCMBUTTONDBLCLK 169 + #if (_WIN32_WINNT >= 0x0500) #define WM_NCXBUTTONDOWN 171 #define WM_NCXBUTTONUP 172 #define WM_NCXBUTTONDBLCLK 173 -#endif -#define WM_NCMOUSEMOVE 160 -#define WM_NCMOUSEHOVER 0x02A0 -#define WM_NCMOUSELEAVE 0x02A2 -#define WM_NCPAINT 133 -#define WM_NCRBUTTONDBLCLK 166 -#define WM_NCRBUTTONDOWN 164 -#define WM_NCRBUTTONUP 165 -#define WM_NEXTDLGCTL 40 -#define WM_NEXTMENU 531 -#define WM_NOTIFY 78 -#define WM_NOTIFYFORMAT 85 -#define WM_NULL 0 -#define WM_PAINT 15 -#define WM_PAINTCLIPBOARD 777 -#define WM_PAINTICON 38 -#define WM_PALETTECHANGED 785 -#define WM_PALETTEISCHANGING 784 -#define WM_PARENTNOTIFY 528 -#define WM_PASTE 770 -#define WM_PENWINFIRST 896 -#define WM_PENWINLAST 911 -#define WM_POWER 72 -#define WM_POWERBROADCAST 536 -#define WM_PRINT 791 -#define WM_PRINTCLIENT 792 -#define WM_QUERYDRAGICON 55 -#define WM_QUERYENDSESSION 17 -#define WM_QUERYNEWPALETTE 783 -#define WM_QUERYOPEN 19 -#define WM_QUEUESYNC 35 -#define WM_QUIT 18 -#define WM_RENDERALLFORMATS 774 -#define WM_RENDERFORMAT 773 -#define WM_SETCURSOR 32 -#define WM_SETFOCUS 7 -#define WM_SETFONT 48 -#define WM_SETHOTKEY 50 -#define WM_SETICON 128 -#define WM_SETREDRAW 11 -#define WM_SETTEXT 12 -#define WM_SETTINGCHANGE 26 -#define WM_SHOWWINDOW 24 -#define WM_SIZE 5 -#define WM_SIZECLIPBOARD 779 -#define WM_SIZING 532 -#define WM_SPOOLERSTATUS 42 -#define WM_STYLECHANGED 125 -#define WM_STYLECHANGING 124 -#define WM_SYSCHAR 262 -#define WM_SYSCOLORCHANGE 21 -#define WM_SYSCOMMAND 274 -#define WM_SYSDEADCHAR 263 +#endif /* (_WIN32_WINNT >= 0x0500) */ + +#define WM_KEYFIRST 256 +#define WM_KEYDOWN 256 +#define WM_KEYUP 257 +#define WM_CHAR 258 +#define WM_DEADCHAR 259 #define WM_SYSKEYDOWN 260 #define WM_SYSKEYUP 261 -#define WM_TCARD 82 -#define WM_TIMECHANGE 30 +#define WM_SYSCHAR 262 +#define WM_SYSDEADCHAR 263 +#if(_WIN32_WINNT >= 0x0501) +#define WM_UNICHAR 0x0109 +#define WM_KEYLAST WM_UNICHAR +#define UNICODE_NOCHAR 0xffff +#else +#define WM_KEYLAST 264 +#endif + +/* Win32 4.0 messages for IME */ +#if (WINVER >= 0x0400) +#define WM_IME_STARTCOMPOSITION 0x010d +#define WM_IME_ENDCOMPOSITION 0x010e +#define WM_IME_COMPOSITION 0x010f +#define WM_IME_KEYLAST 0x010f +#endif /* (WINVER >= 0x0400) */ + +#define WM_INITDIALOG 272 +#define WM_COMMAND 273 +#define WM_SYSCOMMAND 274 #define WM_TIMER 275 -#define WM_UNDO 772 -#define WM_USER 1024 -#define WM_USERCHANGED 84 -#define WM_VKEYTOITEM 46 +#define WM_HSCROLL 276 #define WM_VSCROLL 277 -#define WM_VSCROLLCLIPBOARD 778 -#define WM_WINDOWPOSCHANGED 71 -#define WM_WINDOWPOSCHANGING 70 -#define WM_WININICHANGE 26 -#define WM_KEYFIRST 256 -#define WM_KEYLAST 264 -#define WM_SYNCPAINT 136 -#define WM_MOUSEACTIVATE 33 +#define WM_INITMENU 278 +#define WM_INITMENUPOPUP 279 +#define WM_MENUSELECT 287 +#define WM_MENUCHAR 288 +#define WM_ENTERIDLE 289 + +#if (WINVER >= 0x0500) +#ifndef _WIN32_WCE +#define WM_MENURBUTTONUP 290 +#define WM_MENUDRAG 291 +#define WM_MENUGETOBJECT 292 +#define WM_UNINITMENUPOPUP 293 +#define WM_MENUCOMMAND 294 +#if(_WIN32_WINNT >= 0x0500) +#define WM_CHANGEUISTATE 295 +#define WM_UPDATEUISTATE 296 +#define WM_QUERYUISTATE 297 +#endif /* _WIN32_WINNT >= 0x0500 */ +#endif /* _WIN32_WCE */ +#endif /* (WINVER >= 0x0500) */ + +#define WM_CTLCOLORMSGBOX 306 +#define WM_CTLCOLOREDIT 307 +#define WM_CTLCOLORLISTBOX 308 +#define WM_CTLCOLORBTN 309 +#define WM_CTLCOLORDLG 310 +#define WM_CTLCOLORSCROLLBAR 311 +#define WM_CTLCOLORSTATIC 312 #define WM_MOUSEFIRST 512 #define WM_MOUSEMOVE 512 #define WM_LBUTTONDOWN 513 @@ -1763,8 +1715,80 @@ #else #define WM_MOUSELAST 521 #endif -#define WM_MOUSEHOVER 0x2A1 -#define WM_MOUSELEAVE 0x2A3 +#define WM_PARENTNOTIFY 528 +#define WM_ENTERMENULOOP 529 +#define WM_EXITMENULOOP 530 +#define WM_NEXTMENU 531 +#define WM_SIZING 532 +#define WM_CAPTURECHANGED 533 +#define WM_MOVING 534 +#define WM_POWERBROADCAST 536 +#define WM_DEVICECHANGE 537 +#define WM_MDICREATE 544 +#define WM_MDIDESTROY 545 +#define WM_MDIACTIVATE 546 +#define WM_MDIRESTORE 547 +#define WM_MDINEXT 548 +#define WM_MDIMAXIMIZE 549 +#define WM_MDITILE 550 +#define WM_MDICASCADE 551 +#define WM_MDIICONARRANGE 552 +#define WM_MDIGETACTIVE 553 +#define WM_MDISETMENU 560 +#define WM_ENTERSIZEMOVE 561 +#define WM_EXITSIZEMOVE 562 +#define WM_DROPFILES 563 +#define WM_MDIREFRESHMENU 564 + +/* Win32 4.0 messages for IME */ +#define WM_IME_SETCONTEXT 0x0281 +#define WM_IME_NOTIFY 0x0282 +#define WM_IME_CONTROL 0x0283 +#define WM_IME_COMPOSITIONFULL 0x0284 +#define WM_IME_SELECT 0x0285 +#define WM_IME_CHAR 0x0286 +/* Win32 5.0 messages for IME */ +#define WM_IME_REQUEST 0x0288 +/* Win32 4.0 messages for IME */ +#define WM_IME_KEYDOWN 0x0290 +#define WM_IME_KEYUP 0x0291 + +#define WM_NCMOUSEHOVER 0x02A0 +#define WM_NCMOUSELEAVE 0x02A2 +#define WM_MOUSEHOVER 0x02A1 +#define WM_MOUSELEAVE 0x02A3 + +#define WM_CUT 768 +#define WM_COPY 769 +#define WM_PASTE 770 +#define WM_CLEAR 771 +#define WM_UNDO 772 +#define WM_RENDERFORMAT 773 +#define WM_RENDERALLFORMATS 774 +#define WM_DESTROYCLIPBOARD 775 +#define WM_DRAWCLIPBOARD 776 +#define WM_PAINTCLIPBOARD 777 +#define WM_VSCROLLCLIPBOARD 778 +#define WM_SIZECLIPBOARD 779 +#define WM_ASKCBFORMATNAME 780 +#define WM_CHANGECBCHAIN 781 +#define WM_HSCROLLCLIPBOARD 782 +#define WM_PALETTEISCHANGING 784 +#define WM_PALETTECHANGED 785 +#define WM_QUERYNEWPALETTE 783 +#define WM_HOTKEY 786 +#define WM_PRINT 791 +#define WM_PRINTCLIENT 792 +#define WM_HANDHELDFIRST 856 +#define WM_HANDHELDLAST 863 +#define WM_AFXFIRST 864 +#define WM_AFXLAST 895 +#define WM_PENWINFIRST 896 +#define WM_PENWINLAST 911 +#define WM_USER 1024 +#define WM_APP 32768 + + #if (_WIN32_WINNT >= 0x0400) #define WHEEL_DELTA 120 #define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam)) @@ -1773,13 +1797,6 @@ #if (_WIN32_WINNT >= 0x0501) #define WM_THEMECHANGED 794 #endif -#ifndef _WIN32_WCE -#if(_WIN32_WINNT >= 0x0500) -#define WM_CHANGEUISTATE 295 -#define WM_UPDATEUISTATE 296 -#define WM_QUERYUISTATE 297 -#endif /* _WIN32_WINNT >= 0x0500 */ -#endif /* _WIN32_WCE */ #define BM_CLICK 245 #define BM_GETCHECK 240 #define BM_GETIMAGE 246

15 years, 8 months

[jimtabor] 38734: - Sort out common used DCE flags.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jan 12 14:43:34 2009 New Revision: 38734 URL: http://svn.reactos.org/svn/reactos?rev=38734&view=rev Log: - Sort out common used DCE flags. Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/dce.h Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Mon Jan 12 14:43:34 2009 @@ -265,8 +265,6 @@ will cause clipRgn to be deleted after ReleaseDC(). Now, how is the "system" supposed to tell what happened? */ -#define DCX_USESTYLE 0x00010000 -#define DCX_KEEPCLIPRGN 0x00040000 // <-- You do this! /* * FIXME: * - Drawing of WS_BORDER after scrollbars Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Jan 12 14:43:34 2009 @@ -496,6 +496,11 @@ #define WM_SYSTIMER 280 #define WM_POPUPSYSTEMMENU 787 +// +// Non SDK DCE types. +// +#define DCX_USESTYLE 0x00010000 +#define DCX_KEEPCLIPRGN 0x00040000 DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] Mon Jan 12 14:43:34 2009 @@ -41,8 +41,6 @@ #define DCX_DCEDIRTY 0x00002000 #define DCX_LAYEREDWIN 0x00004000 #define DCX_DCPOWNED 0x00008000 -#define DCX_USESTYLE 0x00010000 -#define DCX_KEEPCLIPRGN 0x00040000 #define DCX_NOCLIPCHILDREN 0x00080000 #define DCX_NORECOMPUTE 0x00100000

15 years, 8 months

[jimtabor] 38733: - Fix another wine test for SetWindowPos.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jan 12 14:00:41 2009 New Revision: 38733 URL: http://svn.reactos.org/svn/reactos?rev=38733&view=rev Log: - Fix another wine test for SetWindowPos. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Jan 12 14:00:41 2009 @@ -4300,6 +4300,22 @@ if (!(Window = UserGetWindowObject(hWnd))) { RETURN(FALSE); + } + + /* First make sure that coordinates are valid for WM_WINDOWPOSCHANGING */ + if (!(uFlags & SWP_NOMOVE)) + { + if (X < -32768) X = -32768; + else if (X > 32767) X = 32767; + if (Y < -32768) Y = -32768; + else if (Y > 32767) Y = 32767; + } + if (!(uFlags & SWP_NOSIZE)) + { + if (cx < 0) cx = 0; + else if (cx > 32767) cx = 32767; + if (cy < 0) cy = 0; + else if (cy > 32767) cy = 32767; } UserRefObjectCo(Window, &Ref);

15 years, 8 months

[janderwald] 38732: - fix me (add missing file)

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 12 12:40:08 2009 New Revision: 38732 URL: http://svn.reactos.org/svn/reactos?rev=38732&view=rev Log: - fix me (add missing file) Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c (with props) Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c [iso-8859-1] Mon Jan 12 12:40:08 2009 @@ -1,0 +1,148 @@ +#include "private.h" + + +NTSYSAPI +BOOLEAN +NTAPI +RtlCreateUnicodeString( + PUNICODE_STRING DestinationString, + PCWSTR SourceString +); + +static +NTSTATUS +RegisterConnection( + IN OUT PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN PUNICODE_STRING FromString, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN PUNICODE_STRING ToString, + IN ULONG ToPin) +{ + PHYSICAL_CONNECTION *NewConnection; + UNICODE_STRING FromUnicodeString = {0, 0, 0}; + UNICODE_STRING ToUnicodeString = {0, 0, 0}; + ISubdevice * FromSubDevice = NULL; + ISubdevice * ToSubDevice = NULL; + PCExtension* DeviceExt; + + DeviceExt = (PCExtension*)DeviceObject->DeviceExtension; + + + NTSTATUS Status = STATUS_SUCCESS; + + if (FromUnknown) + { + Status = FromUnknown->lpVtbl->QueryInterface(FromUnknown, &IID_ISubdevice, (PVOID*)&FromSubDevice); + if (!NT_SUCCESS(Status)) + return STATUS_INVALID_PARAMETER; + } + else + { + if (!RtlCreateUnicodeString(&FromUnicodeString, (PCWSTR)FromString)) + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (ToUnknown) + { + Status = ToUnknown->lpVtbl->QueryInterface(ToUnknown, &IID_ISubdevice, (PVOID*)&ToSubDevice); + } + else + { + if (!RtlCreateUnicodeString(&ToUnicodeString, (PCWSTR)ToString)) + Status = STATUS_INSUFFICIENT_RESOURCES; + } + + if (!NT_SUCCESS(Status)) + { + goto cleanup; + } + + NewConnection = ExAllocatePoolWithTag(NonPagedPool, sizeof(PHYSICAL_CONNECTION), TAG_PORTCLASS); + if (!NewConnection) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + NewConnection->FromPin = FromPin; + NewConnection->FromSubDevice = FromSubDevice; + NewConnection->FromUnicodeString = FromUnicodeString.Buffer; + NewConnection->ToPin = ToPin; + NewConnection->ToSubDevice = ToSubDevice; + NewConnection->ToUnicodeString = ToUnicodeString.Buffer; + + + InsertTailList(&DeviceExt->PhysicalConnectionList, &NewConnection->Entry); + return STATUS_SUCCESS; + +cleanup: + + if (FromSubDevice) + FromSubDevice->lpVtbl->Release(FromSubDevice); + + if (ToSubDevice) + ToSubDevice->lpVtbl->Release(ToSubDevice); + + if (FromUnicodeString.Buffer) + RtlFreeUnicodeString(&FromUnicodeString); + + if (ToUnicodeString.Buffer) + RtlFreeUnicodeString(&ToUnicodeString); + + return Status; +} + + + +/* + * @implemented + */ +NTSTATUS NTAPI +PcRegisterPhysicalConnection( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + if (!DeviceObject || !FromUnknown || !ToUnknown) + return STATUS_INVALID_PARAMETER; + + return RegisterConnection(DeviceObject, FromUnknown, NULL, FromPin, ToUnknown, NULL, ToPin); +} + +/* + * @implemented + */ +NTSTATUS NTAPI +PcRegisterPhysicalConnectionFromExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNICODE_STRING FromString, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + if (!DeviceObject || !FromString || !ToUnknown) + return STATUS_INVALID_PARAMETER; + + return RegisterConnection(DeviceObject, NULL, FromString, FromPin, ToUnknown, NULL, ToPin); +} + +/* + * @implemented + */ +NTSTATUS NTAPI +PcRegisterPhysicalConnectionToExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNICODE_STRING ToString, + IN ULONG ToPin) +{ + if (!DeviceObject || !FromUnknown || !ToString) + return STATUS_INVALID_PARAMETER; + + return RegisterConnection(DeviceObject, FromUnknown, NULL, FromPin, NULL, ToString, ToPin); +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 8 months

[janderwald] 38731: - Implement IPortTopology::NewRegistryKey, IPortWavePci::NewRegistryKey - Implement PcRegisterPhysicalConnection, PcRegisterPhysicalConnectionFromExternal, PcRegisterPhysicalConnectionToExternal- Implement PcRequestNewPowerState

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 12 12:37:02 2009 New Revision: 38731 URL: http://svn.reactos.org/svn/reactos?rev=38731&view=rev Log: - Implement IPortTopology::NewRegistryKey, IPortWavePci::NewRegistryKey - Implement PcRegisterPhysicalConnection, PcRegisterPhysicalConnectionFromExternal, PcRegisterPhysicalConnectionToExternal- Implement PcRequestNewPowerState Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Mon Jan 12 12:37:02 2009 @@ -168,7 +168,8 @@ RtlZeroMemory(portcls_ext, sizeof(PCExtension)); portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject; portcls_ext->StartDevice = StartDevice; - InitializeListHead(&portcls_ext->SubDeviceList); + InitializeListHead(&portcls_ext->SubDeviceList); + InitializeListHead(&portcls_ext->PhysicalConnectionList); status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, 0, NULL); if (!NT_SUCCESS(status)) Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Mon Jan 12 12:37:02 2009 @@ -1,0 +1,43 @@ + + +NTSTATUS +NewIrpStreamPhysical( + OUT IIrpStreamPhysical ** OutIIrpStreamPhysical, + IN IUnknown *OuterUnknown) +{ + return STATUS_UNSUCCESSFUL; +} + + +/* + * @implemented + */ + +NTSTATUS +NTAPI +PcNewIrpStreamPhysical( + OUT IIrpStreamPhysical ** OutIrpStreamPhysical, + IN IUnknown * OuterUnknown, + IN BOOLEAN Wait, + IN KSPIN_CONNECT *ConnectDetails, + IN PDEVICE_OBJECT DeviceObject, + IN PDMA_ADAPTER DmaAdapter) +{ + NTSTATUS Status; + IIrpStreamPhysical * Irp; + + Status = NewIrpStreamPhysical(&Irp, OuterUnknown); + if (!NT_SUCCESS(Status)) + return Status; + + + Status = Irp->lpVtbl->Init(Irp, Wait, ConnectDetails, DeviceObject, DmaAdapter); + if (!NT_SUCCESS(Status)) + { + Irp->lpVtbl->Release(Irp); + return Status; + } + + *OutIrpStreamPhysical = Irp; + return Status; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Mon Jan 12 12:37:02 2009 @@ -187,7 +187,15 @@ DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n"); return STATUS_UNSUCCESSFUL; } - return STATUS_UNSUCCESSFUL; + return PcNewRegistryKey(OutRegistryKey, + OuterUnknown, + RegistryKeyType, + DesiredAccess, + This->pDeviceObject, + NULL,//FIXME + ObjectAttributes, + CreateOptions, + Disposition); } static IPortTopologyVtbl vt_IPortTopology = Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Mon Jan 12 12:37:02 2009 @@ -247,7 +247,23 @@ IN ULONG CreateOptions OPTIONAL, OUT PULONG Disposition OPTIONAL) { - return STATUS_UNSUCCESSFUL; + IPortWavePciImpl * This = (IPortWavePciImpl*)iface; + + if (!This->bInitialized) + { + DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initiazed\n"); + return STATUS_UNSUCCESSFUL; + } + + return PcNewRegistryKey(OutRegistryKey, + OuterUnknown, + RegistryKeyType, + DesiredAccess, + This->pDeviceObject, + NULL,//FIXME + ObjectAttributes, + CreateOptions, + Disposition); } NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Jan 12 12:37:02 2009 @@ -11,6 +11,7 @@ <library>rtl</library> <library>hal</library> <file>api.c</file> + <file>connection.c</file> <file>dll.c</file> <file>dma_slave.c</file> <file>drm_port.c</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c [iso-8859-1] Mon Jan 12 12:37:02 2009 @@ -36,3 +36,50 @@ DeviceExt->AdapterPowerManagement = pPower; return STATUS_SUCCESS; } + + +static +VOID +NTAPI +PwrCompletionCallback( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR MinorFunction, + IN POWER_STATE PowerState, + IN PVOID Context, + IN PIO_STATUS_BLOCK IoStatus) +{ + KeSetEvent((PRKEVENT)Context, IO_NO_INCREMENT, FALSE); +} + +/* + * @implemented + */ +NTSTATUS NTAPI +PcRequestNewPowerState( + IN PDEVICE_OBJECT DeviceObject, + IN DEVICE_POWER_STATE RequestedNewState) +{ + KEVENT Event; + NTSTATUS Status; + POWER_STATE PowerState; + PCExtension* DeviceExt; + + if (!DeviceObject || !RequestedNewState) + return STATUS_INVALID_PARAMETER; + + DeviceExt = (PCExtension*)DeviceObject->DeviceExtension; + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + + PowerState.DeviceState = RequestedNewState; + PowerState.SystemState = PowerSystemUnspecified; + + Status = PoRequestPowerIrp(DeviceExt->PhysicalDeviceObject, IRP_MN_SET_POWER, PowerState, PwrCompletionCallback, (PVOID)&Event, NULL); + if (NT_SUCCESS(Status)) + { + KeWaitForSingleObject((PVOID)&Event, Executive, KernelMode, FALSE, NULL); + } + + + return Status; +} + Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Mon Jan 12 12:37:02 2009 @@ -15,6 +15,7 @@ #include <dmusicks.h> #include "interfaces.h" +#include <ks.h> #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_PORTCLASS TAG('P', 'C', 'L', 'S') @@ -86,6 +87,17 @@ KSOBJECT_HEADER ObjectHeader; }SUBDEVICE_ENTRY; +typedef struct +{ + LIST_ENTRY Entry; + ISubdevice * FromSubDevice; + LPWSTR FromUnicodeString; + ULONG FromPin; + ISubdevice * ToSubDevice; + LPWSTR ToUnicodeString; + ULONG ToPin; +}PHYSICAL_CONNECTION; + typedef struct { @@ -96,6 +108,7 @@ IResourceList* resources; LIST_ENTRY SubDeviceList; + LIST_ENTRY PhysicalConnectionList; } PCExtension; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Mon Jan 12 12:37:02 2009 @@ -11,29 +11,6 @@ #include "private.h" #include <portcls.h> - -/* - Factory Stubs -*/ - - - -/* =============================================================== - Power Management -*/ - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRequestNewPowerState( - IN PDEVICE_OBJECT pDeviceObject, - IN DEVICE_POWER_STATE RequestedNewState) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - /* =============================================================== Properties @@ -51,60 +28,3 @@ return STATUS_UNSUCCESSFUL; } -/* =============================================================== - Physical Connections -*/ - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRegisterPhysicalConnection( - IN PDEVICE_OBJECT DeviceObject, - IN PUNKNOWN FromUnknown, - IN ULONG FromPin, - IN PUNKNOWN ToUnknown, - IN ULONG ToPin) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRegisterPhysicalConnectionFromExternal( - IN PDEVICE_OBJECT DeviceObject, - IN PUNICODE_STRING FromString, - IN ULONG FromPin, - IN PUNKNOWN ToUnknown, - IN ULONG ToPin) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRegisterPhysicalConnectionToExternal( - IN PDEVICE_OBJECT DeviceObject, - IN PUNKNOWN FromUnknown, - IN ULONG FromPin, - IN PUNICODE_STRING ToString, - IN ULONG ToPin) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - - -/* =============================================================== - Misc -*/ - -/* - * @unimplemented - */

15 years, 8 months

← Newer
1
...
49
50
51
52
53
54
55
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009