[PATCH] comctl32/syslink: Properly handle '\r'
Fabian Maurer
dark.shadow4 at web.de
Sun Sep 1 08:23:36 CDT 2019
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46421
Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
---
dlls/comctl32/syslink.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index 7b9cccfc98..60bcc23187 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -565,12 +565,12 @@ static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int x, int *LineLen,
{
int i;
- for (i = 0; i < nFit; i++) if (Text[i] == '\n') break;
+ for (i = 0; i < nFit; i++) if (Text[i] == '\r' || Text[i] == '\n') break;
if (i == *LineLen) return FALSE;
/* check if we're in the middle of a word */
- if (Text[i] != '\n' && Text[i] != BreakChar)
+ if (Text[i] != '\r' && Text[i] != '\n' && Text[i] != BreakChar)
{
/* search for the beginning of the word */
while (i && Text[i - 1] != BreakChar) i--;
@@ -653,6 +653,12 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect)
/* skip break characters unless they're the first of the doc item */
if(tx != Current->Text || x == SL_LEFTMARGIN)
{
+ if (n && *tx == '\r')
+ {
+ tx++;
+ SkipChars++;
+ n--;
+ }
if (n && *tx == '\n')
{
tx++;
--
2.23.0
More information about the wine-devel
mailing list