January 2018 - Wine-commits

Piotr Caban : user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 910129fcf7a7ade52a78d588685a860acae8d8b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=910129fcf7a7ade52a78d588… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 5 19:25:20 2018 +0100 user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 0e64e85..956385f 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -703,8 +703,6 @@ static void CBPaintText( INT id, size = 0; LPWSTR pText = NULL; - if( lphc->wState & CBF_NOREDRAW ) return; - TRACE("\n"); /* follow Windows combobox that sends a bunch of text @@ -733,8 +731,9 @@ static void CBPaintText( if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); } - else if( IsWindowVisible( lphc->self )) /* paint text field ourselves */ + else if(!(lphc->wState & CBF_NOREDRAW) && IsWindowVisible( lphc->self )) { + /* paint text field ourselves */ HDC hdc = hdc_paint ? hdc_paint : GetDC(lphc->self); UINT itemState = ODS_COMBOBOXEDIT; HFONT hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0;

1 0

Piotr Caban : user32: Redraw combo text field even if it's empty.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: a912b2377117e4b826bdac09cfc87147da3a87c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a912b2377117e4b826bdac09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 5 19:25:33 2018 +0100 user32: Redraw combo text field even if it's empty. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 956385f..0c530f7 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -720,9 +720,6 @@ static void CBPaintText( pText[size] = '\0'; /* just in case */ } else return; } - else - if( !CB_OWNERDRAWN(lphc) ) - return; if( lphc->wState & CBF_EDIT ) {

1 0

Piotr Caban : user32: Add more CB_SETCURSEL tests on ComboBox.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: a5118adbbca903d686b8f12316ab642c682f3db9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5118adbbca903d686b8f123… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 5 19:25:46 2018 +0100 user32: Add more CB_SETCURSEL tests on ComboBox. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- dlls/user32/tests/msg.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 0c530f7..b69f892 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -726,7 +726,7 @@ static void CBPaintText( static const WCHAR empty_stringW[] = { 0 }; if( CB_HASSTRINGS(lphc) ) SetWindowTextW( lphc->hWndEdit, pText ? pText : empty_stringW ); if( lphc->wState & CBF_FOCUSED ) - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, MAXLONG); } else if(!(lphc->wState & CBF_NOREDRAW) && IsWindowVisible( lphc->self )) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..f391ab9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6625,6 +6625,14 @@ static const struct message SetCurSelComboSeq2[] = { 0 } }; +static const struct message SetCurSelComboSeq_edit[] = +{ + { CB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { WM_SETTEXT, sent|wparam, 0 }, + { EM_SETSEL, sent|wparam|lparam, 0, INT_MAX }, + { 0 } +}; + static const struct message WmKeyDownComboSeq[] = { { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, @@ -6926,6 +6934,14 @@ static void test_combobox_messages(void) log_all_parent_messages--; ok_sequence(SetFocusButtonSeq2, "SetFocus on a Button (2)", TRUE); + SetFocus(combo); + SendMessageA(combo, WM_SETREDRAW, FALSE, 0); + flush_sequence(); + log_all_parent_messages++; + SendMessageA(combo, CB_SETCURSEL, 0, 0); + log_all_parent_messages--; + ok_sequence(SetCurSelComboSeq_edit, "CB_SETCURSEL on a ComboBox with edit control", FALSE); + DestroyWindow(button); DestroyWindow(combo);

1 0

Alexandre Julliard : Release 3.0-rc5.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: bd41696680a15f399558b8635525537337f997d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd41696680a15f399558b863… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 20:59:29 2018 +0100 Release 3.0-rc5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 204 +++++++++++++++++++++++++++++++++++++++++++------------------- VERSION | 2 +- configure | 18 +++--- 4 files changed, 153 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd41696680a15f399558…

1 0

Tag wine-3.0-rc5 : Alexandre Julliard : Release 3.0-rc5
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: refs/tags/wine-3.0-rc5 Tag: 3ad561cd8eec161c001455b776d57165e492efc9 URL: https://source.winehq.org/git/wine.git/?a=tag;h=3ad561cd8eec161c001455b776d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 20:59:29 2018 +0100 Release 3.0-rc5

1 0

Alex Henrie : gameux/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 85d970b7c86617164ec6ec55802cf5f13734477e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d970b7c86617164ec6ec55… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 4 22:01:48 2018 -0700 gameux/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gameexplorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 1ef7a78..05c2a11 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -454,7 +454,7 @@ static void _findGameInstanceId(int line, ++dwMaxSubKeyLen; /* for string terminator */ lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); if(!lpName) hr = E_OUTOFMEMORY; - ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name"); + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name\n"); } if(SUCCEEDED(hr))

1 0

Louis Lenders : wtsapi32: Fix copy/paste error in comment.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 0bdd879fde17ded68f03502ae2ff44e14176fabb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bdd879fde17ded68f03502a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jan 4 10:10:00 2018 +0100 wtsapi32: Fix copy/paste error in comment. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c668604..aeb4b65 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -277,7 +277,7 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) } /************************************************************ - * WTSRegisterSessionNotification (WTSAPI32.@) + * WTSRegisterSessionNotificationEx (WTSAPI32.@) */ BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) {

1 0

Alexandre Julliard : ntdll: Fix source/destination confusion in vsscanf.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 62a1410a07476ac94acceaf2a9e65628d4b06ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a1410a07476ac94acceaf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 16:09:30 2018 +0100 ntdll: Fix source/destination confusion in vsscanf. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index eb762c6..c349add 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1178,19 +1178,19 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) else goto widecharacter; character: { /* read single character into char */ - char *str = suppress ? NULL : va_arg( ap, char * ); - char *pstr = str; + char *sptr = suppress ? NULL : va_arg( ap, char * ); + char *sptr_beg = sptr; unsigned size = UINT_MAX; if (width == -1) width = 1; while (width && nch != '\0') { if (!suppress) { - *str++ = nch; + *sptr++ = nch; if(size) size--; else { - *pstr = 0; + *sptr_beg = 0; return rd; } } @@ -1202,19 +1202,19 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) break; widecharacter: { /* read single character into a WCHAR */ - WCHAR *str = suppress ? NULL : va_arg( ap, WCHAR * ); - WCHAR *pstr = str; + WCHAR *sptr = suppress ? NULL : va_arg( ap, WCHAR * ); + WCHAR *sptr_beg = sptr; unsigned size = UINT_MAX; if (width == -1) width = 1; while (width && nch != '\0') { if (!suppress) { - *str++ = nch; + *sptr++ = nch; if (size) size--; else { - *pstr = 0; + *sptr_beg = 0; return rd; } } @@ -1248,10 +1248,10 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) break; case '[': { - char *str = suppress ? NULL : va_arg( ap, char * ); - char *sptr = str; + char *sptr = suppress ? NULL : va_arg( ap, char * ); + char *sptr_beg = sptr; RTL_BITMAP bitMask; - ULONG Mask[8]; + ULONG Mask[8] = { 0 }; BOOLEAN invert = FALSE; /* Set if we are NOT to find the chars */ unsigned size = UINT_MAX; @@ -1312,7 +1312,7 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) if(size > 1) size--; else { - *str = 0; + if (!suppress) *sptr_beg = 0; return rd; } }

1 0

Francois Gouget : ole32: Rename entry_updatable() to its more common spelling.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 5fd5618e3d334551defa35cba365b14edb55038f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd5618e3d334551defa35cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:55:48 2018 +0100 ole32: Rename entry_updatable() to its more common spelling. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ad55c6e..4ba0826 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2562,7 +2562,7 @@ static HRESULT WINAPI DataCache_IOleCache2_SetData( return OLE_E_BLANK; } -static BOOL entry_updateable( DataCacheEntry *entry, DWORD mode ) +static BOOL entry_updatable( DataCacheEntry *entry, DWORD mode ) { BOOL is_blank = entry->stgmedium.tymed == TYMED_NULL; @@ -2595,7 +2595,7 @@ static HRESULT WINAPI DataCache_UpdateCache( IOleCache2 *iface, IDataObject *dat { slots++; - if (!entry_updateable( cache_entry, mode )) + if (!entry_updatable( cache_entry, mode )) { done_one = TRUE; continue;

1 0

Francois Gouget : mshtml/tests: Fix typos in a few comments.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 325f438a41cf0c0621c7a72129dd80865991aa1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=325f438a41cf0c0621c7a721… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:57:22 2018 +0100 mshtml/tests: Fix typos in a few comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 2 +- dlls/mshtml/tests/events.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index f20fd3b..39860ff 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -266,7 +266,7 @@ function test_attach_in_attach() { calls += "div.onclick,"; div.attachEvent("onclick", function() { calls += "div.click,"; - /* listener attached inside an other attached listener will not ve invoked */ + /* listener attached inside another attached listener will not be invoked */ div.attachEvent("onclick", function () { ok(false, "unexpected call"); }); }); } diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index f7df4d8..f471b86 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -405,7 +405,7 @@ function test_init_event() { ok(e.target === elem, "target != elem"); ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented); - /* initEvent no longer has effect except reseting defaultPrevented */ + /* initEvent no longer has any effect except resetting defaultPrevented */ e.initEvent("test", true, false); ok(e.type === "NewTest", "type = " + e.type); ok(e.bubbles === false, "bubbles = " + e.bubbles);

1 0