Piotr Caban : comctl32: Fix non printable characters handling in SB_SETTEXT.
Alexandre Julliard
julliard at winehq.org
Tue Jul 21 15:40:20 CDT 2020
Module: wine
Branch: master
Commit: 1bd27e50d25fd057a57fec89f06d6e20176c5ef4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bd27e50d25fd057a57fec89f06d6e20176c5ef4
Author: Piotr Caban <piotr at codeweavers.com>
Date: Tue Jul 21 12:21:00 2020 +0200
comctl32: Fix non printable characters handling in SB_SETTEXT.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/status.c | 2 +-
dlls/comctl32/tests/status.c | 22 ++++++++++++++--------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index cad56c7e2a..f76f6262cc 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -744,7 +744,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style,
if (ntext) {
idx = ntext;
while (*idx) {
- if(!iswprint(*idx))
+ if(*idx < ' ' && *idx != '\t')
*idx = ' ';
idx++;
}
diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c
index c7d9989218..f7eec88c61 100644
--- a/dlls/comctl32/tests/status.c
+++ b/dlls/comctl32/tests/status.c
@@ -261,6 +261,7 @@ static void test_status_control(void)
char ch;
char chstr[10] = "Inval id";
COLORREF crColor = RGB(0,0,0);
+ WCHAR wbuf[20];
hWndStatus = create_status_control(WS_VISIBLE | SBT_TOOLTIPS, 0);
@@ -316,28 +317,33 @@ static void test_status_control(void)
expect(2,borders[2]);
/* Test resetting text with different characters */
+ r = SendMessageA(hWndStatus, SB_SETPARTS, 4, (LPARAM)nParts);
+ expect(TRUE,r);
r = SendMessageA(hWndStatus, SB_SETTEXTA, 0, (LPARAM)"First at Again");
expect(TRUE,r);
r = SendMessageA(hWndStatus, SB_SETTEXTA, 1, (LPARAM)"Invalid\tChars\\7\7");
- expect(TRUE,r);
+ expect(TRUE,r);
r = SendMessageA(hWndStatus, SB_SETTEXTA, 2, (LPARAM)"InvalidChars\\n\n");
- expect(TRUE,r);
+ expect(TRUE,r);
+ r = SendMessageW(hWndStatus, SB_SETTEXTW, 3, (LPARAM)L"Non printable\x80");
+ expect(TRUE,r);
/* Get text again */
r = SendMessageA(hWndStatus, SB_GETTEXTA, 0, (LPARAM) charArray);
ok(strcmp(charArray,"First at Again") == 0, "Expected First at Again, got %s\n", charArray);
- expect(11,LOWORD(r));
- expect(0,HIWORD(r));
+ ok(r == 11, "r = %d\n", r);
+
r = SendMessageA(hWndStatus, SB_GETTEXTA, 1, (LPARAM) charArray);
ok(strcmp(charArray,"Invalid\tChars\\7 ") == 0, "Expected Invalid\tChars\\7 , got %s\n", charArray);
+ ok(r == 16, "r = %d\n", r);
- expect(16,LOWORD(r));
- expect(0,HIWORD(r));
r = SendMessageA(hWndStatus, SB_GETTEXTA, 2, (LPARAM) charArray);
ok(strcmp(charArray,"InvalidChars\\n ") == 0, "Expected InvalidChars\\n , got %s\n", charArray);
+ ok(r == 15, "r = %d\n", r);
- expect(15,LOWORD(r));
- expect(0,HIWORD(r));
+ r = SendMessageW(hWndStatus, SB_GETTEXTW, 3, (LPARAM) wbuf);
+ ok(wcscmp(wbuf, L"Non printable\x80") == 0, "got %s\n", wine_dbgstr_w(wbuf));
+ ok(r == 14, "r = %d\n", r);
/* test more nonprintable chars */
for(ch = 0x00; ch < 0x7F; ch++) {
More information about the wine-cvs
mailing list