Huw Davies : riched20: Don't try to wrap the end-of-paragraph run.
Alexandre Julliard
julliard at winehq.org
Fri Oct 7 14:46:46 CDT 2016
Module: wine
Branch: master
Commit: ab65c269f7c6979712a83cc9105a24cdacee2cf7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab65c269f7c6979712a83cc9105a24cdacee2cf7
Author: Huw Davies <huw at codeweavers.com>
Date: Fri Oct 7 10:49:30 2016 +0100
riched20: Don't try to wrap the end-of-paragraph run.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/riched20/wrap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c
index 24a7b16..4c73c5d 100644
--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -624,8 +624,8 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
wc->pt.x + run->nWidth - wc->context->pt.x > wc->nAvailWidth)
{
int loc = wc->context->pt.x + wc->nAvailWidth - wc->pt.x;
- /* total white run ? */
- if (run->nFlags & MERF_WHITESPACE) {
+ /* total white run or end para */
+ if (run->nFlags & (MERF_WHITESPACE | MERF_ENDPARA)) {
/* let the overflow logic handle it */
wc->bOverflown = TRUE;
return p;
More information about the wine-cvs
mailing list