Nikolay Sivov : riched20: Preserve higher bits of tabstop values (Coverity ).

Alexandre Julliard julliard at wine.codeweavers.com
Wed Dec 30 18:33:43 CST 2015


Module: wine
Branch: master
Commit: 0db7cb60028cb1ef3354ce6f3d064d3cafd22cd7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0db7cb60028cb1ef3354ce6f3d064d3cafd22cd7

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Dec 30 00:01:52 2015 +0300

riched20: Preserve higher bits of tabstop values (Coverity).

Bits 24-31 are reserved for tab alignment and tab leader style,
writer supports thatl.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/riched20/editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index a41f838..24121a7 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -943,7 +943,7 @@ void ME_RTFTblAttrHook(RTF_Info *info)
         ME_DisplayItem *para = info->editor->pCursors[0].pPara;
         PARAFORMAT2 *pFmt = para->member.para.pFmt;
         pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF;
-        pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam;
+        pFmt->rgxTabs[cellNum] |= 0x00FFFFFF & info->rtfParam;
       }
       info->tableDef->numCellsDefined++;
       break;




More information about the wine-cvs mailing list