April 2020 - Wine-commits - list.winehq.org

Akihiro Sagawa : comctl32/tests: Add tests to show no NM_RELEASEDCAPTURE notifications in the updown control.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 46a10a18a3fa02a89f4c5556b3bd23a4dc540dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a10a18a3fa02a89f4c5556… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 25 19:27:02 2019 +0900 comctl32/tests: Add tests to show no NM_RELEASEDCAPTURE notifications in the updown control. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5555044aa62758a6de45d524a606d62fa45d3c6d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/updown.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 1f4e38f0eb..e48a868d3e 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -28,7 +28,6 @@ * - check UDM_SETBUDDY message * - check UDM_GETBUDDY message * - up-down control and buddy control must have the same parent - * - up-down control notifies its parent window when its position changes with UDN_DELTAPOS + WM_VSCROLL or WM_HSCROLL * - check UDS_ALIGN[LEFT,RIGHT]...check that width of buddy window is decreased * - check that UDS_SETBUDDYINT sets the caption of the buddy window when it is changed * - check that the thousands operator is set for large numbers @@ -165,6 +164,32 @@ static const struct message test_updown_pos_nochange_seq[] = { { 0 } }; +static const struct message test_updown_pos_notifications_seq[] = { + { WM_CTLCOLOREDIT, sent|optional }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_SETFOCUS) }, + { WM_NOTIFY, sent|id, 0, 0, UDN_DELTAPOS }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_UPDATE) }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_CHANGE) }, + { WM_VSCROLL, sent|wparam, MAKELONG(SB_THUMBPOSITION, 51) }, + { WM_CTLCOLOREDIT, sent|optional }, + { WM_VSCROLL, sent|wparam, MAKELONG(SB_ENDSCROLL, 51) }, + /* no WM_NOTIFY(NM_RELEASEDCAPTURE) message */ + { 0 } +}; + +static const struct message test_updown_pos_notifications_horz_seq[] = { + { WM_CTLCOLOREDIT, sent|optional }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_SETFOCUS) }, + { WM_NOTIFY, sent|id, 0, 0, UDN_DELTAPOS }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_UPDATE) }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_CHANGE) }, + { WM_HSCROLL, sent|wparam, MAKELONG(SB_THUMBPOSITION, 51) }, + { WM_CTLCOLOREDIT, sent|optional }, + { WM_HSCROLL, sent|wparam, MAKELONG(SB_ENDSCROLL, 51) }, + /* no WM_NOTIFY(NM_RELEASEDCAPTURE) message */ + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -186,6 +211,8 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + if (message == WM_NOTIFY && lParam) + msg.id = ((NMHDR*)lParam)->code; add_message(sequences, PARENT_SEQ_INDEX, &msg); } @@ -900,6 +927,52 @@ static void test_CreateUpDownControl(void) DestroyWindow(updown); } +static void test_updown_pos_notifications(void) +{ + HWND updown; + RECT rect; + UINT x, y; + int result; + + /* test updown control notifications without UDS_HORZ style */ + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT, g_edit); + SetFocus(updown); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* click on the up-arrow button */ + GetClientRect(updown, &rect); + x = rect.left + (rect.right - rect.left) / 2; + y = rect.top + (rect.bottom - rect.top) / 4; + result = SendMessageA(updown, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + expect(result, 0); + result = SendMessageA(updown, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + expect(result, 0); + + ok_sequence(sequences, PARENT_SEQ_INDEX, test_updown_pos_notifications_seq, + "test updown to parent notify (vertical)", TRUE); + + DestroyWindow(updown); + + /* test updown control notifications with UDS_HORZ style */ + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT | UDS_HORZ, g_edit); + SetFocus(updown); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* click on the right-arrow button */ + GetClientRect(updown, &rect); + x = rect.left + (rect.right - rect.left) * 3 / 4; + y = rect.top + (rect.bottom - rect.top) / 2; + result = SendMessageA(updown, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + expect(result, 0); + result = SendMessageA(updown, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + expect(result, 0); + + ok_sequence(sequences, PARENT_SEQ_INDEX, test_updown_pos_notifications_horz_seq, + "test updown to parent notify (horizontal)", TRUE); + + DestroyWindow(updown); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -931,6 +1004,7 @@ START_TEST(updown) test_updown_unicode(); test_UDS_SETBUDDYINT(); test_CreateUpDownControl(); + test_updown_pos_notifications(); DestroyWindow(g_edit); DestroyWindow(parent_wnd);

1 0

Akihiro Sagawa : comctl32/updown: Suppress the NM_RELEASEDCAPTURE notification.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 17c72ce2ca69c57e81519a116c4287ac1207cf0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c72ce2ca69c57e81519a11… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 25 19:27:04 2019 +0900 comctl32/updown: Suppress the NM_RELEASEDCAPTURE notification. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47427 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9dbe886e3ffd1c38a89f9cf256b7d172e408ec58) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/updown.c | 4 ++-- dlls/comctl32/updown.c | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index e48a868d3e..e7ceeffd4c 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -949,7 +949,7 @@ static void test_updown_pos_notifications(void) expect(result, 0); ok_sequence(sequences, PARENT_SEQ_INDEX, test_updown_pos_notifications_seq, - "test updown to parent notify (vertical)", TRUE); + "test updown to parent notify (vertical)", FALSE); DestroyWindow(updown); @@ -968,7 +968,7 @@ static void test_updown_pos_notifications(void) expect(result, 0); ok_sequence(sequences, PARENT_SEQ_INDEX, test_updown_pos_notifications_horz_seq, - "test updown to parent notify (horizontal)", TRUE); + "test updown to parent notify (horizontal)", FALSE); DestroyWindow(updown); } diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 8dec7a4807..c748a914d8 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -781,14 +781,8 @@ static BOOL UPDOWN_CancelMode (UPDOWN_INFO *infoPtr) KillTimer (infoPtr->Self, TIMER_ACCEL); KillTimer (infoPtr->Self, TIMER_AUTOPRESS); - if (GetCapture() == infoPtr->Self) { - NMHDR hdr; - hdr.hwndFrom = infoPtr->Self; - hdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); - hdr.code = NM_RELEASEDCAPTURE; - SendMessageW(infoPtr->Notify, WM_NOTIFY, hdr.idFrom, (LPARAM)&hdr); + if (GetCapture() == infoPtr->Self) ReleaseCapture(); - } infoPtr->Flags &= ~FLAG_PRESSED; InvalidateRect (infoPtr->Self, NULL, FALSE);

1 0

Fabian Maurer : comctl32/syslink: Properly handle '\r'.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 583feb4b7cc2c04a78f91a24eeae1b79c67d1ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=583feb4b7cc2c04a78f91a24… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Sep 1 15:23:36 2019 +0200 comctl32/syslink: Properly handle '\r'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46421 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 04f75040ec0da9b3992d68790e60bfd5893a306f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- 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 cd9d5311fd..464bcc624d 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -566,12 +566,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--; @@ -654,6 +654,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++;

1 0

Bernhard belacker : cmd.exe: Command type with multiple files should print filenames to stderr.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: f94d88e8a9974e1ba77078a331cea16e0a2a46c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94d88e8a9974e1ba77078a3… Author: Bernhard belacker <bernhardu(a)mailbox.org> Date: Tue Aug 20 15:46:37 2019 +0200 cmd.exe: Command type with multiple files should print filenames to stderr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46983 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4684e1a9c67039be1504af0f836c13e5045b14d6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd | 10 +++++++++- programs/cmd/tests/test_builtins.cmd.exp | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 209de26f10..759e3c8003 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4561,8 +4561,8 @@ void WCMD_type (WCHAR *args) { errorlevel = 1; } else { if (writeHeaders) { - static const WCHAR fmt[] = {'\n','%','1','\n','\n','\0'}; - WCMD_output(fmt, thisArg); + static const WCHAR fmt[] = {'\n','%','1','\n','\n','\n','\0'}; + WCMD_output_stderr(fmt, thisArg); } while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer) - 1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f4dfc9f26d..a992cda480 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -875,7 +875,15 @@ type ."\foobaz" echo ---2 type ".\foobaz" echo ---3 -del foobaz +echo foo> foobay +echo ---4 +type foobaz foobay > foobax 2> foobaw +echo ---5 +type foobax +echo ---6 +type foobaw +echo ---7 +del foobaz foobay foobax foobaw echo ------------ Testing NUL ------------ md foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d78d91a6cf..488c8e6fd8 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -659,6 +659,20 @@ bar ---2 bar ---3 +---4 +---5 +bar +foo +---6 + +foobaz + + + +foobay + + +---7 ------------ Testing NUL ------------ bar bar

1 0

Akihiro Sagawa : msvcrt/tests: Add more tests for _mbsspn and _mbsspnp.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: ed576ab2f918c2e9e3fcaadb846ef0326e06b40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed576ab2f918c2e9e3fcaadb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 2 19:50:19 2019 +0200 msvcrt/tests: Add more tests for _mbsspn and _mbsspnp. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c62c51c04ae22f1d9d85f76caf200c625c2e2ad0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/string.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 79a502bca9..154b964485 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -516,13 +516,29 @@ static void test_mbsspn( void) unsigned char str2[]="shiraz"; unsigned char set[]="abc"; unsigned char empty[]=""; - int ret; + unsigned char mbstr[]=" 2019\x94\x4e" "6\x8c\x8e" "29\x93\xfa"; + unsigned char mbset1[]="0123456789 \x94\x4e"; + unsigned char mbset2[]=" \x94\x4e\x8c\x8e"; + int ret, cp = _getmbcp(); + ret=_mbsspn( str1, set); ok( ret==3, "_mbsspn returns %d should be 3\n", ret); ret=_mbsspn( str2, set); ok( ret==0, "_mbsspn returns %d should be 0\n", ret); ret=_mbsspn( str1, empty); ok( ret==0, "_mbsspn returns %d should be 0\n", ret); + + _setmbcp( 932); + ret=_mbsspn( mbstr, mbset1); + todo_wine ok( ret==8, "_mbsspn returns %d should be 8\n", ret); + ret=_mbsspn( mbstr, mbset2); + ok( ret==1, "_mbsspn returns %d should be 1\n", ret); + ret=_mbsspn( mbstr+8, mbset1); + ok( ret==0, "_mbsspn returns %d should be 0\n", ret); + ret=_mbsspn( mbstr+8, mbset2); + todo_wine ok( ret==2, "_mbsspn returns %d should be 2\n", ret); + + _setmbcp( cp); } static void test_mbsspnp( void) @@ -532,7 +548,12 @@ static void test_mbsspnp( void) unsigned char set[]="abc"; unsigned char empty[]=""; unsigned char full[]="abcenrt"; + unsigned char mbstr[]=" 2019\x94\x4e" "6\x8c\x8e" "29\x93\xfa"; + unsigned char mbset1[]="0123456789 \x94\x4e"; + unsigned char mbset2[]=" \x94\x4e\x8c\x8e"; unsigned char* ret; + int cp = _getmbcp(); + ret=_mbsspnp( str1, set); ok( ret[0]=='e', "_mbsspnp returns %c should be e\n", ret[0]); ret=_mbsspnp( str2, set); @@ -541,6 +562,18 @@ static void test_mbsspnp( void) ok( ret[0]=='c', "_mbsspnp returns %c should be c\n", ret[0]); ret=_mbsspnp( str1, full); ok( ret==NULL, "_mbsspnp returns %p should be NULL\n", ret); + + _setmbcp( 932); + ret=_mbsspnp( mbstr, mbset1); + todo_wine ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); + ret=_mbsspnp( mbstr, mbset2); + ok( ret==mbstr+1, "_mbsspnp returns %p should be %p\n", ret, mbstr+1); + ret=_mbsspnp( mbstr+8, mbset1); + ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); + ret=_mbsspnp( mbstr+8, mbset2); + todo_wine ok( ret==mbstr+10, "_mbsspnp returns %p should be %p\n", ret, mbstr+10); + + _setmbcp( cp); } static void test_strdup(void)

1 0

Akihiro Sagawa : msvcrt: Fix _mbsspn implementation.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: ce8d7855f291439a1ac5d647adbd3a1c3036db7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce8d7855f291439a1ac5d647… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 2 19:50:24 2019 +0200 msvcrt: Fix _mbsspn implementation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f0f93c791f2bf79a2ea750f89dcd168bb20e529f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/mbcs.c | 24 ++++++++---------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d00c31af4c..edf919c435 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2006,27 +2006,19 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) { const unsigned char *p, *q; + unsigned int pc, qc; for (p = string; *p; p++) { - if (_ismbblead(*p)) - { - for (q = set; *q; q += 2) - { - if (!q[1]) - break; - if ((*p == *q) && (p[1] == q[1])) - break; - } - if (!q[0] || !q[1]) break; - } - else + pc = _mbsnextc(p); + for (q = set; *q; q++) { - for (q = set; *q; q++) - if (*p == *q) - break; - if (!*q) break; + qc = _mbsnextc(q); + if (pc == qc) break; + if (qc > 255 && q[1]) q++; } + if (!*q) break; + if (pc > 255 && p[1]) p++; } return p - string; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 154b964485..7fe6474e2b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -530,13 +530,13 @@ static void test_mbsspn( void) _setmbcp( 932); ret=_mbsspn( mbstr, mbset1); - todo_wine ok( ret==8, "_mbsspn returns %d should be 8\n", ret); + ok( ret==8, "_mbsspn returns %d should be 8\n", ret); ret=_mbsspn( mbstr, mbset2); ok( ret==1, "_mbsspn returns %d should be 1\n", ret); ret=_mbsspn( mbstr+8, mbset1); ok( ret==0, "_mbsspn returns %d should be 0\n", ret); ret=_mbsspn( mbstr+8, mbset2); - todo_wine ok( ret==2, "_mbsspn returns %d should be 2\n", ret); + ok( ret==2, "_mbsspn returns %d should be 2\n", ret); _setmbcp( cp); }

1 0

Akihiro Sagawa : msvcrt: Reimplement _mbsspnp using _mbsspn.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 8ce3f988887087d7bf52719f30491c19d2aef2bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce3f988887087d7bf52719f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 2 19:50:29 2019 +0200 msvcrt: Reimplement _mbsspnp using _mbsspn. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47693 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab525d3f6f813e23af8164ed2d6023f3eeb3e018) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/mbcs.c | 47 +++++++++++++++------------------------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index edf919c435..d594a743b3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2006,19 +2006,26 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) { const unsigned char *p, *q; - unsigned int pc, qc; for (p = string; *p; p++) { - pc = _mbsnextc(p); for (q = set; *q; q++) { - qc = _mbsnextc(q); - if (pc == qc) break; - if (qc > 255 && q[1]) q++; + if (_ismbblead(*q)) + { + if (p[0] == q[0] && p[1] == q[1]) + { + p++; + break; + } + q++; + } + else + { + if (p[0] == q[0]) break; + } } if (!*q) break; - if (pc > 255 && p[1]) p++; } return p - string; } @@ -2028,32 +2035,8 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se */ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* set) { - const unsigned char *p, *q; - - for (p = string; *p; p++) - { - if (_ismbblead(*p)) - { - for (q = set; *q; q += 2) - { - if (!q[1]) - break; - if ((*p == *q) && (p[1] == q[1])) - break; - } - if (!q[0] || !q[1]) break; - } - else - { - for (q = set; *q; q++) - if (*p == *q) - break; - if (!*q) break; - } - } - if (*p == '\0') - return NULL; - return (unsigned char *)p; + string += _mbsspn( string, set ); + return *string ? (unsigned char*)string : NULL; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7fe6474e2b..c510514c02 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -565,13 +565,13 @@ static void test_mbsspnp( void) _setmbcp( 932); ret=_mbsspnp( mbstr, mbset1); - todo_wine ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); + ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); ret=_mbsspnp( mbstr, mbset2); ok( ret==mbstr+1, "_mbsspnp returns %p should be %p\n", ret, mbstr+1); ret=_mbsspnp( mbstr+8, mbset1); ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); ret=_mbsspnp( mbstr+8, mbset2); - todo_wine ok( ret==mbstr+10, "_mbsspnp returns %p should be %p\n", ret, mbstr+10); + ok( ret==mbstr+10, "_mbsspnp returns %p should be %p\n", ret, mbstr+10); _setmbcp( cp); }

1 0

Piotr Caban : wbemdisp: Handle NULL signatures in init_members.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 8aab6644c025ebc5a8c88741c424efd4cd751c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aab6644c025ebc5a8c88741… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 2 23:49:43 2019 +0200 wbemdisp: Handle NULL signatures in init_members. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47709 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5e4472d425b2efdcb94a197dd480b3a8a6f235fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemdisp/locator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index c307e347cf..b23719a5b9 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -620,8 +620,8 @@ static HRESULT init_members( struct object *object ) { count++; SysFreeString( name ); - IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); + if (sig_in) IWbemClassObject_Release( sig_in ); + if (sig_out) IWbemClassObject_Release( sig_out ); } IWbemClassObject_EndMethodEnumeration( object->object ); } @@ -659,8 +659,8 @@ static HRESULT init_members( struct object *object ) IWbemClassObject_EndMethodEnumeration( object->object ); goto error; } - IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); + if (sig_in) IWbemClassObject_Release( sig_in ); + if (sig_out) IWbemClassObject_Release( sig_out ); TRACE( "added method %s\n", debugstr_w(name) ); } IWbemClassObject_EndMethodEnumeration( object->object );

1 0

Fabian Maurer : shell32: Prevent text truncation inside the old "browse folder" dialog.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 22d4fbae9d7d2116add1568cd6be42724899d39c URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d4fbae9d7d2116add1568c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Sep 20 23:34:43 2019 +0200 shell32: Prevent text truncation inside the old "browse folder" dialog. We use the same height for the title as in the new "browse folder" dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46404 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b7bca1be24df0f5f59b1f3bc86d0f599b216a13a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 46f0b6f12d..f19b09f8c2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -274,7 +274,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 134, 176, 50, 14, WS_GROUP | WS_TABSTOP - LTEXT "", IDD_TITLE, 5, 4, 180, 12 + LTEXT "", IDD_TITLE, 5, 4, 180, 24 LTEXT "", IDD_STATUS, 5, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |

1 0

Andrew Eikum : winex11.drv: Throttle calls to XResetScreenSaver.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 01ea6a5b63be3924055b59893b388ad85bf23a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ea6a5b63be3924055b5989… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 17 08:09:36 2019 -0500 winex11.drv: Throttle calls to XResetScreenSaver. Frequent calls to XResetScreenSaver cause performance problems on some GPU drivers, see https://bugs.freedesktop.org/show_bug.cgi?id=110659 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cb703739e5c138e3beffab321b84edb129156000) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/window.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340e19..7589b3228e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1792,10 +1792,20 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, switch (msg) { case WM_WINE_NOTIFY_ACTIVITY: - XResetScreenSaver( gdi_display ); - XFlush( gdi_display ); + { + static ULONGLONG last = 0; + ULONGLONG now = GetTickCount64(); + /* calling XResetScreenSaver too often can cause performance + * problems, so throttle it */ + if (now > last + 5000) + { + XResetScreenSaver( gdi_display ); + XFlush( gdi_display ); + last = now; + } break; } + } return desktop_orig_wndproc( hwnd, msg, wp, lp ); }

1 0