June 2008 - Wine-Commits - list.winehq.org

Dylan Smith : richedit: Fixed the forward word movement bug.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: ba747f4514a7d5bcc70bf6ea592c53cabe09770d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba747f4514a7d5bcc70bf6ea5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:33:19 2008 -0400 richedit: Fixed the forward word movement bug. Using Ctrl-RightArrow to move to the start of the next word did not previously work when at the start of a word. This means that Ctrl-RightArrow would not work twice in a row since it should move to the start of the next word. --- dlls/riched20/string.c | 16 ++------- dlls/riched20/tests/editor.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 2ec0092..84efdbe 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -317,18 +317,10 @@ ME_WordBreakProc(LPWSTR s, INT start, INT len, INT code) return start; case WB_RIGHT: case WB_MOVEWORDRIGHT: - if (start && ME_IsWSpace(s[start - 1])) - { - while (start < len && ME_IsWSpace(s[start])) - start++; - } - else - { - while (start < len && !ME_IsWSpace(s[start])) - start++; - while (start < len && ME_IsWSpace(s[start])) - start++; - } + while (start < len && !ME_IsWSpace(s[start])) + start++; + while (start < len && ME_IsWSpace(s[start])) + start++; return start; } return 0; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2de076e..50b69b8 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4424,6 +4424,77 @@ static void test_undo_coalescing(void) DestroyWindow(hwnd); } +/* Used to simulate a Ctrl-Arrow Key press. */ +#define SEND_CTRL_EXT_KEY(hwnd, vk, scancode) \ + keybd_event(VK_CONTROL, 0x1d, 0, 0);\ + keybd_event(vk, scancode, KEYEVENTF_EXTENDEDKEY, 0);\ + keybd_event(vk, scancode | 0x80, KEYEVENTF_KEYUP | KEYEVENTF_EXTENDEDKEY, 0);\ + keybd_event(VK_CONTROL, 0x1d | 0x80, KEYEVENTF_KEYUP, 0); \ + while (PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE)) { \ + TranslateMessage(&msg); \ + DispatchMessage(&msg); \ + } +#define SEND_CTRL_LEFT(hwnd) SEND_CTRL_EXT_KEY(hwnd, VK_LEFT, 0x4b) +#define SEND_CTRL_RIGHT(hwnd) SEND_CTRL_EXT_KEY(hwnd, VK_RIGHT, 0x4d) + +static void test_word_movement(){ + HWND hwnd; + int result; + int sel_start, sel_end; + MSG msg; + + /* multi-line control inserts CR normally */ + hwnd = new_richedit(NULL); + + SendMessage(hwnd, WM_SETFOCUS, (WPARAM)hwnd, 0); + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"one two three"); + ok (result == TRUE, "Failed to clear the text.\n"); + SendMessage(hwnd, EM_SETSEL, 0, 0); + /* |one two three */ + + SEND_CTRL_RIGHT(hwnd) + /* one |two three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 4, "Cursur is at %d instead of %d\n", sel_start, 4); + + SEND_CTRL_RIGHT(hwnd) + /* one two |three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 9, "Cursur is at %d instead of %d\n", sel_start, 9); + + SEND_CTRL_LEFT(hwnd) + /* one |two three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 4, "Cursur is at %d instead of %d\n", sel_start, 4); + + SEND_CTRL_LEFT(hwnd) + /* |one two three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 0, "Cursur is at %d instead of %d\n", sel_start, 0); + + SendMessage(hwnd, EM_SETSEL, 8, 8); + /* one two | three */ + SEND_CTRL_RIGHT(hwnd) + /* one two |three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 9, "Cursur is at %d instead of %d\n", sel_start, 9); + + SendMessage(hwnd, EM_SETSEL, 11, 11); + /* one two th|ree */ + SEND_CTRL_LEFT(hwnd) + /* one two |three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 9, "Cursur is at %d instead of %d\n", sel_start, 9); + + DestroyWindow(hwnd); +} + START_TEST( editor ) { MSG msg; @@ -4470,6 +4541,7 @@ START_TEST( editor ) test_EM_AUTOURLDETECT(); test_eventMask(); test_undo_coalescing(); + test_word_movement(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Dylan Smith : richedit: Prevented an assertion error on startup when run on Windows.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 67024f0f3448e970aaa75fa4de546cfd8aa0fc44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67024f0f3448e970aaa75fa4d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:33:13 2008 -0400 richedit: Prevented an assertion error on startup when run on Windows. The call to GetClientRect returns 0 values for the returned RECT when called in WM_NCCREATE in on Windows, which ended up causing an assertion error when Wine's riched20.dll replaces the native version. Moving the call to WM_CREATE fixes this problem (probably because NCCALCSIZE is called in between). --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b9f41d2..e71c384 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1666,7 +1666,6 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->mode = TM_RICHTEXT | TM_MULTILEVELUNDO | TM_MULTICODEPAGE; ed->AutoURLDetect_bEnable = FALSE; ed->bHaveFocus = FALSE; - GetClientRect(hWnd, &ed->rcFormat); for (i=0; i<HFONT_CACHE_SIZE; i++) { ed->pFontCache[i].nRefs = 0; @@ -2934,6 +2933,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return (wParam >= 0x40000) ? 0 : MAKELONG( pt.x, pt.y ); } case WM_CREATE: + GetClientRect(hWnd, &editor->rcFormat); if (GetWindowLongW(hWnd, GWL_STYLE) & WS_HSCROLL) { /* Squelch the default horizontal scrollbar it would make */ ShowScrollBar(editor->hWnd, SB_HORZ, FALSE);

1 0

Dylan Smith : richedit: Prevented NULL value from being used to avoid a page fault.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 1840a5bcadc93aa5bdf8f4b5130aca21e6fd0f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1840a5bcadc93aa5bdf8f4b51… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:33:06 2008 -0400 richedit: Prevented NULL value from being used to avoid a page fault. --- dlls/riched20/para.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 8380a79..d6a06d3 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -104,7 +104,7 @@ void ME_MarkForWrapping(ME_TextEditor *editor, ME_DisplayItem *first, const ME_D void ME_MarkForPainting(ME_TextEditor *editor, ME_DisplayItem *first, const ME_DisplayItem *last) { - while(first != last) + while(first != last && first) { first->member.para.nFlags |= MEPF_REPAINT; first = first->member.para.next_para;

1 0

Dylan Smith : richedit: Show caret after pasting or streaming in text.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 6c2026a348b275e6524dab1b145e0fe4f5ccdbbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2026a348b275e6524dab1b1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:32:59 2008 -0400 richedit: Show caret after pasting or streaming in text. There was a missing call to ShowCaret after the caret was created. --- dlls/riched20/editor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 60db1bf..b9f41d2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1148,7 +1148,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!(format & SFF_SELECTION)) { ME_ClearTempStyle(editor); } + HideCaret(editor->hWnd); ME_MoveCaret(editor); + ShowCaret(editor->hWnd); ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE);

1 0

Dylan Smith : richedit: Null pointer check missing on optional parameter.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: eaf7becabd8457c849135e18c269e634202a52d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf7becabd8457c849135e18c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:32:52 2008 -0400 richedit: Null pointer check missing on optional parameter. The function ME_FindRunInRow uses two parameters to return values by reference, and treated these parameters as if they were optional except for the start of the function which set *pbCaretAtEnd without checking to see if was a NULL pointer. --- dlls/riched20/caret.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 02c375c..5ed2329 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -975,13 +975,13 @@ static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pR pNext = ME_FindItemFwd(pRow, diRunOrStartRow); assert(pNext->type == diRun); pLastRun = pNext; - *pbCaretAtEnd = FALSE; + if (pbCaretAtEnd) *pbCaretAtEnd = FALSE; + if (pOffset) *pOffset = 0; do { int run_x = pNext->member.run.pt.x; int width = pNext->member.run.nWidth; if (x < run_x) { - if (pOffset) *pOffset = 0; return pNext; } if (x >= run_x && x < run_x+width) @@ -1001,12 +1001,9 @@ static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pR if ((pLastRun->member.run.nFlags & MERF_ENDPARA) == 0) { pNext = ME_FindItemFwd(pNext, diRun); - if (pbCaretAtEnd) *pbCaretAtEnd = 1; - if (pOffset) *pOffset = 0; + if (pbCaretAtEnd) *pbCaretAtEnd = TRUE; return pNext; } else { - if (pbCaretAtEnd) *pbCaretAtEnd = 0; - if (pOffset) *pOffset = 0; return pLastRun; } }

1 0

Dylan Smith : richedit: Added missing defines and structures to richedit.h.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: cc23d3ef3dd65cae1c53fb0231a414e7bc43f35f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc23d3ef3dd65cae1c53fb023… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 09:58:05 2008 -0400 richedit: Added missing defines and structures to richedit.h. --- include/richedit.h | 394 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 383 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc23d3ef3dd65cae1c53f…

1 0

Alexandre Julliard : ntdll: Force execute permission again on the stack after clearing it.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 58d076b419c2b5ae01fd37ebcf95da9063103687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d076b419c2b5ae01fd37ebc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 21:10:57 2008 +0200 ntdll: Force execute permission again on the stack after clearing it. --- dlls/ntdll/loader.c | 6 +----- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/virtual.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c05e01f..5d47b19 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2423,11 +2423,7 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; - /* clear the stack contents before calling the main entry point, some broken apps need that */ - wine_anon_mmap( NtCurrentTeb()->Tib.StackLimit, - (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit, - PROT_READ | PROT_WRITE, MAP_FIXED ); - + virtual_clear_thread_stack(); if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); return; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index cba9643..6f428e0 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -134,6 +134,7 @@ extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] /* virtual memory */ extern NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T stack_size ); +extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); extern NTSTATUS VIRTUAL_HandleFault(LPCVOID addr); extern void VIRTUAL_SetForceExec( BOOL enable ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5977300..f14085d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1243,6 +1243,21 @@ done: /*********************************************************************** + * virtual_clear_thread_stack + * + * Clear the stack contents before calling the main entry point, some broken apps need that. + */ +void virtual_clear_thread_stack(void) +{ + void *stack = NtCurrentTeb()->Tib.StackLimit; + size_t size = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + + wine_anon_mmap( stack, size, PROT_READ | PROT_WRITE, MAP_FIXED ); + if (force_exec_prot) mprotect( stack, size, PROT_READ | PROT_WRITE | PROT_EXEC ); +} + + +/*********************************************************************** * VIRTUAL_HandleFault */ NTSTATUS VIRTUAL_HandleFault( LPCVOID addr )

1 0

Alexandre Julliard : widl: [default] is an allowed attribute for union fields.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 6e9a6577c378f9fb613c48ffb3dd8437729484c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9a6577c378f9fb613c48ffb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 21:10:25 2008 +0200 widl: [default] is an allowed attribute for union fields. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8257035..bb54b43 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2260,7 +2260,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_CONST */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "const" }, /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "context_handle" }, /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, - /* ATTR_DEFAULT */ { 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, "default" }, + /* ATTR_DEFAULT */ { 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, "default" }, /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "defaultvalue" }, /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "defaultvtable" },

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a couple of shader_addline() calls.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 756b401f8dbdd19c9bef564cd49b450e2bb30d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756b401f8dbdd19c9bef564cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 26 14:08:59 2008 +0200 wined3d: Add a trailing '\n' to a couple of shader_addline() calls. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6729977..1f5df18 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2834,8 +2834,8 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, semantic *semantics_in, sema if (!semantics_out) { /* Save gl_FrontColor & gl_FrontSecondaryColor before overwriting them. */ - shader_addline(buffer, "vec4 front_color = gl_FrontColor;"); - shader_addline(buffer, "vec4 front_secondary_color = gl_FrontSecondaryColor;"); + shader_addline(buffer, "vec4 front_color = gl_FrontColor;\n"); + shader_addline(buffer, "vec4 front_secondary_color = gl_FrontSecondaryColor;\n"); } for(i = 0; i < MAX_REG_INPUT; i++) {

1 0

Francois Gouget : configure: Fix the isinf() detection. Fixes compilation on Solaris.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 2fef93a857c50ec6df129e20055ecd3d4c3edd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fef93a857c50ec6df129e200… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 26 15:59:05 2008 +0200 configure: Fix the isinf() detection. Fixes compilation on Solaris. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 40365dc..2f13aa8 100755 --- a/configure +++ b/configure @@ -21374,7 +21374,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -float f = 0.0; isinf(f) +float f = 0.0; int i=isinf(f) ; return 0; } diff --git a/configure.ac b/configure.ac index a3bf985..8695b89 100644 --- a/configure.ac +++ b/configure.ac @@ -1612,7 +1612,7 @@ fi dnl Check for isinf AC_CACHE_CHECK([for isinf], ac_cv_have_isinf, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; int i=isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])) if test "$ac_cv_have_isinf" = "yes" then AC_DEFINE(HAVE_ISINF, 1, [Define to 1 if you have the `isinf' function.])

1 0