October 2008 - Wine-commits

Alexandre Julliard : configure: Force -m32 option on x86_64 even if CC is already defined.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 0607637162fcb7eba260efda5a98a4be716acecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0607637162fcb7eba260efda5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 20 11:37:08 2008 +0200 configure: Force -m32 option on x86_64 even if CC is already defined. --- configure | 8 ++++---- configure.ac | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 119c985..dd5be9f 100755 --- a/configure +++ b/configure @@ -2225,10 +2225,10 @@ case $host in x86_64*linux*) if test "x$enable_win64" != "xyes" then - test -n "$CC" || CC="gcc -m32" - test -n "$CXX"|| CXX="g++ -m32" - test -n "$LD" || LD="ld -m elf_i386" - test -n "$AS" || AS="as --32" + CC="${CC:-gcc} -m32" + CXX="${CXX:-g++} -m32" + LD="${LD:-ld} -m elf_i386" + AS="${AS:-as} --32" host_cpu="i386" fi ;; diff --git a/configure.ac b/configure.ac index 91850de..0bbe496 100644 --- a/configure.ac +++ b/configure.ac @@ -84,10 +84,10 @@ case $host in x86_64*linux*) if test "x$enable_win64" != "xyes" then - test -n "$CC" || CC="gcc -m32" - test -n "$CXX"|| CXX="g++ -m32" - test -n "$LD" || LD="ld -m elf_i386" - test -n "$AS" || AS="as --32" + CC="${CC:-gcc} -m32" + CXX="${CXX:-g++} -m32" + LD="${LD:-ld} -m elf_i386" + AS="${AS:-as} --32" host_cpu="i386" fi ;;

1 0

Roderick Colenbrander : wined3d: arbfp_set_shader_blit should handle ENTER_GL/ LEAVE_GL instead of the caller.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 8a002b09c1513c47a8e07969ccc458d758b03d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a002b09c1513c47a8e07969c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 18 17:33:15 2008 +0000 wined3d: arbfp_set_shader_blit should handle ENTER_GL/LEAVE_GL instead of the caller. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/surface.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c457b32..2727124 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3662,8 +3662,10 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum t glDesc->conversion_group != WINED3DFMT_YV12) { TRACE("Format: %s\n", debug_d3dformat(glDesc->conversion_group)); /* Don't bother setting up a shader for unconverted formats */ + ENTER_GL(); glEnable(textype); checkGLcall("glEnable(textype)"); + LEAVE_GL(); return WINED3D_OK; } @@ -3691,12 +3693,14 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum t shader = gen_yuv_shader(device, glDesc->conversion_group, textype); } + ENTER_GL(); glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0, size)); checkGLcall("glProgramLocalParameter4fvARB"); + LEAVE_GL(); return WINED3D_OK; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7a42e5a..53392a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3485,10 +3485,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * rect.y1 += This->currentDesc.Height - h; rect.y2 += This->currentDesc.Height - h; } - ENTER_GL(); myDevice->blitter->set_shader((IWineD3DDevice *) myDevice, Src->resource.format, Src->glDescription.target, Src->pow2Width, Src->pow2Height); + ENTER_GL(); + /* Bind the texture */ glBindTexture(Src->glDescription.target, Src->glDescription.textureName); checkGLcall("glBindTexture");

1 0

Francois Gouget : dirent.h is a conditional include now.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 215738a1404570406f51fd5938f1f4c5a120653a URL: http://source.winehq.org/git/wine.git/?a=commit;h=215738a1404570406f51fd593… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 19 18:55:13 2008 +0200 dirent.h is a conditional include now. --- dlls/gdi32/freetype.c | 4 +++- dlls/kernel32/oldconfig.c | 4 +++- dlls/ntdll/directory.c | 4 +++- dlls/ntdll/server.c | 4 +++- dlls/shell32/shfldr_unixfs.c | 4 +++- dlls/shell32/trash.c | 4 +++- dlls/wineps.drv/mkagl.c | 6 +++++- dlls/wineps.drv/truetype.c | 4 +++- dlls/wineps.drv/type1afm.c | 4 +++- 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8b0d672..9692450 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -33,7 +33,9 @@ # include <sys/mman.h> #endif #include <string.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <stdio.h> #include <assert.h> diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 09e407b..ee41d81 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -32,7 +32,9 @@ # include <sys/stat.h> #endif #include <fcntl.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 0e99c4f..dee0ce6 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -24,7 +24,9 @@ #include "wine/port.h" #include <sys/types.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <errno.h> #include <fcntl.h> #include <stdarg.h> diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 6e41eb5..62ccc2c 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -23,7 +23,9 @@ #include <assert.h> #include <ctype.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <errno.h> #include <fcntl.h> #include <signal.h> diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 332dd45..b612ef7 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -128,7 +128,9 @@ #include <stdio.h> #include <stdarg.h> #include <limits.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <stdlib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 2762f04..a366f62 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -30,7 +30,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include "windef.h" #include "winbase.h" diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index 3606fe6..db789f1 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -16,8 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <sys/types.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <string.h> #include <stdlib.h> #include <stdio.h> diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c index 0254a75..b526959 100644 --- a/dlls/wineps.drv/truetype.c +++ b/dlls/wineps.drv/truetype.c @@ -59,7 +59,9 @@ #endif #include <sys/types.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <string.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index dd7e0ce..85aca42 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -32,7 +32,9 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <errno.h> #include <ctype.h> #include <limits.h> /* INT_MIN */

1 0

Francois Gouget : riched20/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 5eb8ab3deb7cbb4d786eb417469a57018ea1984f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb8ab3deb7cbb4d786eb4174… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 19 18:54:58 2008 +0200 riched20/tests: Add a trailing '\n' to an ok() call. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e3482ec..5b721a2 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5534,7 +5534,7 @@ static void test_word_wrap(void) pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); - ok(lines == 1, "Line wasn't expected to wrap (lines=%d).", lines); + ok(lines == 1, "Line wasn't expected to wrap (lines=%d).\n", lines); SetWindowLongW(hwnd, GWL_STYLE, dwCommonStyle); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point);

1 0

Rob Shearman : wrc: Don't accept "0" as a valid codepage in " #pragma code_page" directives.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: e3afab26917f4dc952dd10f0b33da6e38c6db6c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3afab26917f4dc952dd10f0b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Oct 19 10:59:32 2008 +0100 wrc: Don't accept "0" as a valid codepage in "#pragma code_page" directives. --- tools/wrc/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 6d5189a..863878a 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -373,7 +373,7 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) yy_pop_state(); while (*p < '0' || *p > '9') p++; current_codepage = strtol( p, NULL, 10 ); - if (current_codepage && current_codepage != CP_UTF8 && !wine_cp_get_table( current_codepage )) + if (current_codepage != CP_UTF8 && !wine_cp_get_table( current_codepage )) { parser_error("Codepage %d not supported", current_codepage); current_codepage = 0;

1 0

Rob Shearman : include: Fix the level of indirection for the umd_version parameter of the CheckInterfaceSupport method of IDXGIAdapter .
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 639c2de0616ecaeb16c45b66985b9a9bd25f0a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639c2de0616ecaeb16c45b669… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Oct 19 17:13:39 2008 +0100 include: Fix the level of indirection for the umd_version parameter of the CheckInterfaceSupport method of IDXGIAdapter. --- include/dxgi.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index c14ef2c..9ac585a 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -212,7 +212,7 @@ interface IDXGIAdapter : IDXGIObject ); HRESULT CheckInterfaceSupport( [in] REFGUID guid, - [out] LARGE_INTEGER umd_version + [out] LARGE_INTEGER *umd_version ); }

1 0

Dylan Smith : richedit: Test for EN_UPDATE notification when window isn' t visible.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: b5f59b996293e126615fbc2636512cfd12649641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f59b996293e126615fbc263… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Oct 19 04:42:42 2008 -0400 richedit: Test for EN_UPDATE notification when window isn't visible. --- dlls/riched20/tests/editor.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 18deadd..0036a4b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5143,7 +5143,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam static void test_eventMask(void) { HWND parent; - int ret; + int ret, style; WNDCLASSA cls; const char text[] = "foo bar\n"; int eventMask; @@ -5192,6 +5192,25 @@ static void test_eventMask(void) ok(queriedEventMask == (eventMask & ~ENM_CHANGE), "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); SendMessage(eventMaskEditHwnd, WM_SETREDRAW, TRUE, 0); + ok(IsWindowVisible(eventMaskEditHwnd), "Window should be visible.\n"); + + /* check to see if EN_UPDATE is sent when the editor isn't visible */ + SendMessage(eventMaskEditHwnd, WM_CLEAR, 0, 0); + style = GetWindowLong(eventMaskEditHwnd, GWL_STYLE); + SetWindowLong(eventMaskEditHwnd, GWL_STYLE, style & ~WS_VISIBLE); + ok(!IsWindowVisible(eventMaskEditHwnd), "Window shouldn't be visible.\n"); + watchForEventMask = EN_UPDATE; + queriedEventMask = 0; /* initialize to something other than we expect */ + SendMessage(eventMaskEditHwnd, EM_REPLACESEL, 0, (LPARAM) text); + todo_wine ok(queriedEventMask == 0, + "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); + SetWindowLong(eventMaskEditHwnd, GWL_STYLE, style); + ok(IsWindowVisible(eventMaskEditHwnd), "Window should be visible.\n"); + queriedEventMask = 0; /* initialize to something other than we expect */ + SendMessage(eventMaskEditHwnd, EM_REPLACESEL, 0, (LPARAM) text); + ok(queriedEventMask == eventMask, + "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); + DestroyWindow(parent); }

1 0

Dylan Smith : richedit: Test to see if WM_SETREDRAW removes the windows visibility.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 30ebfa6d74334fd5e4e3f209e79b26379f06357e URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ebfa6d74334fd5e4e3f209e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Oct 19 04:42:57 2008 -0400 richedit: Test to see if WM_SETREDRAW removes the windows visibility. --- dlls/riched20/tests/editor.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 0036a4b..b1b7101 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5186,7 +5186,10 @@ static void test_eventMask(void) /* check to see if EN_CHANGE is sent when redraw is turned off */ SendMessage(eventMaskEditHwnd, WM_CLEAR, 0, 0); + ok(IsWindowVisible(eventMaskEditHwnd), "Window should be visible.\n"); SendMessage(eventMaskEditHwnd, WM_SETREDRAW, FALSE, 0); + /* redraw is disabled by making the window invisible. */ + todo_wine ok(!IsWindowVisible(eventMaskEditHwnd), "Window shouldn't be visible.\n"); queriedEventMask = 0; /* initialize to something other than we expect */ SendMessage(eventMaskEditHwnd, EM_REPLACESEL, 0, (LPARAM) text); ok(queriedEventMask == (eventMask & ~ENM_CHANGE),

1 0

Dylan Smith : richedit: Prevent EN_UPDATE notifications when window isn' t visible.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: ae3394271db2217ec6c92ab3934a6f2b11eb6274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3394271db2217ec6c92ab39… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Oct 19 04:43:07 2008 -0400 richedit: Prevent EN_UPDATE notifications when window isn't visible. --- dlls/riched20/paint.c | 2 ++ dlls/riched20/tests/editor.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 2202967..9786af8 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -147,6 +147,8 @@ void ME_Repaint(ME_TextEditor *editor) ME_UpdateScrollBar(editor); FIXME("ME_Repaint had to call ME_WrapMarkedParagraphs\n"); } + if (!IsWindowVisible(editor->hWnd)) + return; if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify(editor, EN_UPDATE); UpdateWindow(editor->hWnd); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index b1b7101..c977257 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5205,7 +5205,7 @@ static void test_eventMask(void) watchForEventMask = EN_UPDATE; queriedEventMask = 0; /* initialize to something other than we expect */ SendMessage(eventMaskEditHwnd, EM_REPLACESEL, 0, (LPARAM) text); - todo_wine ok(queriedEventMask == 0, + ok(queriedEventMask == 0, "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); SetWindowLong(eventMaskEditHwnd, GWL_STYLE, style); ok(IsWindowVisible(eventMaskEditHwnd), "Window should be visible.\n");

1 0

Dylan Smith : richedit: Use the DefWindowProc to implement WM_SETREDRAW.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: c70f6a3933bc19b009f42f04164f4bbe0f6531b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70f6a3933bc19b009f42f041… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Oct 19 04:43:17 2008 -0400 richedit: Use the DefWindowProc to implement WM_SETREDRAW. --- dlls/riched20/editor.c | 24 +++++++----------------- dlls/riched20/editstr.h | 1 - dlls/riched20/paint.c | 30 ++++++++++-------------------- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/wrap.c | 39 ++++++++++++++++++++------------------- 5 files changed, 38 insertions(+), 58 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8caa1f8..792f05f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2229,7 +2229,6 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); - ed->bRedraw = TRUE; ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & (WS_HSCROLL|ES_AUTOHSCROLL)) ? FALSE : TRUE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; @@ -2808,11 +2807,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, editor->rgbBackColor = lParam; editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); } - if (editor->bRedraw) - { - InvalidateRect(hWnd, NULL, TRUE); - UpdateWindow(hWnd); - } + InvalidateRect(hWnd, NULL, TRUE); + UpdateWindow(hWnd); return lColor; } case EM_GETMODIFY: @@ -3604,7 +3600,6 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, goto do_default; break; case WM_PAINT: - if (editor->bRedraw) { HDC hDC; PAINTSTRUCT ps; @@ -3627,14 +3622,11 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return 0; case WM_ERASEBKGND: { - if (editor->bRedraw) + HDC hDC = (HDC)wParam; + RECT rc; + if (GetUpdateRect(hWnd,&rc,TRUE)) { - HDC hDC = (HDC)wParam; - RECT rc; - if (GetUpdateRect(hWnd,&rc,TRUE)) - { - FillRect(hDC, &rc, editor->hbrBackground); - } + FillRect(hDC, &rc, editor->hbrBackground); } return 1; } @@ -3953,9 +3945,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_SendRequestResize(editor, TRUE); return 0; case WM_SETREDRAW: - if ((editor->bRedraw = wParam)) - ME_RewrapRepaint(editor); - return 0; + return DefWindowProcW(hWnd, msg, wParam, lParam); case WM_SIZE: { GetClientRect(hWnd, &editor->rcFormat); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 7299ab3..248cc02 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -351,7 +351,6 @@ typedef struct tagME_TextEditor ME_FontCacheItem pFontCache[HFONT_CACHE_SIZE]; int nZoomNumerator, nZoomDenominator; RECT rcFormat; - BOOL bRedraw; BOOL bWordWrap; int nInvalidOfs; int nTextLimit; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 9786af8..40761db 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -175,8 +175,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor) ME_SendOldNotify(editor, EN_CHANGE); editor->nEventMask |= ENM_CHANGE; } - if (editor->bRedraw) - ME_Repaint(editor); + ME_Repaint(editor); ME_SendSelChange(editor); } @@ -189,10 +188,7 @@ ME_RewrapRepaint(ME_TextEditor *editor) ME_MarkAllForWrapping(editor); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); - if (editor->bRedraw) - { - ME_Repaint(editor); - } + ME_Repaint(editor); } int ME_twips2pointsX(ME_Context *c, int x) @@ -1076,17 +1072,14 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) si.nPos = 0; } - nNewPos = SetScrollInfo(editor->hWnd, SB_VERT, &si, editor->bRedraw); + nNewPos = SetScrollInfo(editor->hWnd, SB_VERT, &si, TRUE); editor->vert_si.nPos = nNewPos; nActualScroll = nOrigPos - nNewPos; - if (editor->bRedraw) - { - if (abs(nActualScroll) > editor->sizeWindow.cy) - InvalidateRect(editor->hWnd, NULL, TRUE); - else - ScrollWindowEx(editor->hWnd, 0, nActualScroll, NULL, NULL, NULL, NULL, SW_INVALIDATE); - ME_Repaint(editor); - } + if (abs(nActualScroll) > editor->sizeWindow.cy) + InvalidateRect(editor->hWnd, NULL, TRUE); + else + ScrollWindowEx(editor->hWnd, 0, nActualScroll, NULL, NULL, NULL, NULL, SW_INVALIDATE); + ME_Repaint(editor); hWnd = editor->hWnd; winStyle = GetWindowLongW(hWnd, GWL_STYLE); @@ -1095,7 +1088,6 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) || (winStyle & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) { - /* FIXME: ShowScrollBar will redraw the scrollbar when editor->bRedraw is FALSE */ ShowScrollBar(hWnd, SB_VERT, bScrollBarWillBeVisible); } ME_UpdateScrollBar(editor); @@ -1129,7 +1121,6 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if (bScrollBarWasVisible != bScrollBarWillBeVisible) { - /* FIXME: ShowScrollBar will redraw the scrollbar when editor->bRedraw is FALSE */ ShowScrollBar(hWnd, SB_VERT, bScrollBarWillBeVisible); ME_MarkAllForWrapping(editor); ME_WrapMarkedParagraphs(editor); @@ -1148,14 +1139,13 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) editor->vert_si.nPage = si.nPage; if (bScrollBarWillBeVisible) { - SetScrollInfo(hWnd, SB_VERT, &si, editor->bRedraw); + SetScrollInfo(hWnd, SB_VERT, &si, TRUE); } else { if (bScrollBarWasVisible && !(si.fMask & SIF_DISABLENOSCROLL)) { - SetScrollInfo(hWnd, SB_VERT, &si, editor->bRedraw); - /* FIXME: ShowScrollBar will redraw the scrollbar when editor->bRedraw is FALSE */ + SetScrollInfo(hWnd, SB_VERT, &si, TRUE); ShowScrollBar(hWnd, SB_VERT, FALSE); ME_ScrollAbs(editor, 0); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c977257..e3482ec 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5189,7 +5189,7 @@ static void test_eventMask(void) ok(IsWindowVisible(eventMaskEditHwnd), "Window should be visible.\n"); SendMessage(eventMaskEditHwnd, WM_SETREDRAW, FALSE, 0); /* redraw is disabled by making the window invisible. */ - todo_wine ok(!IsWindowVisible(eventMaskEditHwnd), "Window shouldn't be visible.\n"); + ok(!IsWindowVisible(eventMaskEditHwnd), "Window shouldn't be visible.\n"); queriedEventMask = 0; /* initialize to something other than we expect */ SendMessage(eventMaskEditHwnd, EM_REPLACESEL, 0, (LPARAM) text); ok(queriedEventMask == (eventMask & ~ENM_CHANGE), diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 53f0bfb..3ffe09a 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -735,30 +735,31 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { return bModified; } -void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) { +void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) +{ ME_Context c; + RECT rc; + int ofs; + ME_DisplayItem *item; ME_InitContext(&c, editor, GetDC(editor->hWnd)); - if (editor->bRedraw) - { - RECT rc = c.rcView; - int ofs = ME_GetYScrollPos(editor); - - ME_DisplayItem *item = editor->pBuffer->pFirst; - while(item != editor->pBuffer->pLast) { - if (item->member.para.nFlags & MEPF_REPAINT) { - rc.top = item->member.para.pt.y - ofs; - rc.bottom = item->member.para.pt.y + item->member.para.nHeight - ofs; - InvalidateRect(editor->hWnd, &rc, TRUE); - } - item = item->member.para.next_para; - } - if (editor->nTotalLength < editor->nLastTotalLength) - { - rc.top = editor->nTotalLength - ofs; - rc.bottom = editor->nLastTotalLength - ofs; + rc = c.rcView; + ofs = ME_GetYScrollPos(editor); + + item = editor->pBuffer->pFirst; + while(item != editor->pBuffer->pLast) { + if (item->member.para.nFlags & MEPF_REPAINT) { + rc.top = item->member.para.pt.y - ofs; + rc.bottom = item->member.para.pt.y + item->member.para.nHeight - ofs; InvalidateRect(editor->hWnd, &rc, TRUE); } + item = item->member.para.next_para; + } + if (editor->nTotalLength < editor->nLastTotalLength) + { + rc.top = editor->nTotalLength - ofs; + rc.bottom = editor->nLastTotalLength - ofs; + InvalidateRect(editor->hWnd, &rc, TRUE); } ME_DestroyContext(&c, editor->hWnd); }

1 0