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

Fabian Maurer : user32/combo: Properly handle WM_CTLCOLOR* messages.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: ce50dc4a3e9f8ed23242df45e6df7ccf8976bdb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce50dc4a3e9f8ed23242df45… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Nov 4 10:30:29 2019 +0300 user32/combo: Properly handle WM_CTLCOLOR* messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fbec0ba9eeb12cc153e1e4e0ca98734fe5bc593a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/combo.c | 12 ++++++++++++ dlls/user32/tests/combo.c | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 59c2e6484c..4ddccd6c95 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1988,6 +1988,18 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar if (GET_WHEEL_DELTA_WPARAM(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0); return TRUE; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + if (lphc->owner) + return SendMessageW(lphc->owner, message, wParam, lParam); + break; + /* Combo messages */ case CB_ADDSTRING: diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 289e1d3f56..6b51ff9719 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -854,7 +854,6 @@ static void test_combo_ctlcolor(void) for (i = 0; i < ARRAY_SIZE(messages); ++i) { brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); - todo_wine ok(brush == brush_red, "%u: unexpected brush %p, expected got %p.\n", i, brush, brush_red); } @@ -865,7 +864,6 @@ static void test_combo_ctlcolor(void) for (i = 0; i < ARRAY_SIZE(messages); ++i) { brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); - todo_wine ok(!brush, "%u: unexpected brush %p.\n", i, brush); }

1 0

Alistair Leslie-Hughes : dmloader: Stop after find first matching object.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 4e520837812af5f4d58d524d31009b0b027d3960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e520837812af5f4d58d524d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 22 08:22:35 2019 +0000 dmloader: Stop after find first matching object. This stops a crash in Legoland on startup when finding cached objects. Placing a break in each of the if's causes the wrong object to be loaded. The help states it looks at each type in order. So, we might have to loop the cache multiple times to ensure that when an object has flag DMUS_OBJ_OBJECT, it's preferred over a DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH match. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4aee9ba5ad1c7df34a06fe2bbe39ae33fd8ffcee) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 8b979da36a..0a3f62a111 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -208,6 +208,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac TRACE(": not loaded yet\n"); pObjectEntry = pExistingEntry; } + break; } else if ((pDesc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) &&

1 0

Damjan Jovanovic : comctl32: Allocate the right wstr size for the TVN_GETDISPINFOW reply.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 4fcde9a3c9789eef5a6870b3a42bef284ecbda07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fcde9a3c9789eef5a6870b3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 26 18:08:22 2019 +0200 comctl32: Allocate the right wstr size for the TVN_GETDISPINFOW reply. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25264 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d558896fff1df9b595cb1d74ce387852c8a4eaab) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 85a963ddc1..07df66566a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -758,7 +758,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, else { int len = max(lstrlenW(callback.item.pszText) + 1, TEXT_CALLBACK_SIZE); - LPWSTR newText = heap_realloc(item->pszText, len); + LPWSTR newText = heap_realloc(item->pszText, len*sizeof(WCHAR)); TRACE("returned wstr %s, len=%d\n", debugstr_w(callback.item.pszText), len);

1 0

Kevin Puetz : winegcc: Correctly pass the '-' file name (stdin) to the compiler.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 6cc918ac6249fc2902a19173bb041750c67240cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc918ac6249fc2902a19173… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Sep 24 18:35:03 2019 +0200 winegcc: Correctly pass the '-' file name (stdin) to the compiler. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38300 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d5e175e32b64cd734c142cfc583f17bccb03ec5b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winegcc/winegcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 71ebf123e3..c8f9111382 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -686,7 +686,7 @@ no_compat_defines: /* last, but not least, the files */ for ( j = 0; j < opts->files->size; j++ ) { - if (opts->files->base[j][0] != '-') + if (opts->files->base[j][0] != '-' || !opts->files->base[j][1]) /* not an option or bare '-' (i.e. stdin) */ strarray_add(comp_args, opts->files->base[j]); } @@ -1447,7 +1447,7 @@ int main(int argc, char **argv) /* parse options */ for ( i = 1 ; i < argc ; i++ ) { - if (argv[i][0] == '-') /* option */ + if (argv[i][0] == '-' && argv[i][1]) /* option, except '-' alone is stdin, which is a file */ { /* determine if this switch is followed by a separate argument */ next_is_arg = 0;

1 0

Alistair Leslie-Hughes : dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: c3a9c354992a144c5aa5636eb63084508fefcb0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3a9c354992a144c5aa5636e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 18 03:07:53 2019 +0000 dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit de11d172dc701740fb58fc9510eb344b23210f20) Conflicts: dlls/dmstyle/styletrack.c dlls/dmstyle/tests/dmstyle.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/styletrack.c | 30 +++++++++++++++++++++++++----- dlls/dmstyle/tests/dmstyle.c | 7 +++---- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 79b4787ca0..dae9111b06 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -120,12 +120,32 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); + struct list *item = NULL; + + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) + return E_POINTER; + + if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) { + LIST_FOR_EACH (item, &This->Items) { + DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry); + if (style->pObject) { + IDirectMusicStyle8_AddRef(style->pObject); + *((IDirectMusicStyle8**)param) = style->pObject; + + return S_OK; + } + } + + return DMUS_E_NOT_FOUND; + } + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 4c09d44712..568137e0c0 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -279,12 +279,11 @@ static void test_track(void) else todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); } - todo_wine { hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + todo_wine_if(class[i].clsid != &CLSID_DirectMusicStyleTrack) + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); - } + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); if (class[i].clsid == &CLSID_DirectMusicMuteTrack) {

1 0

Jeff Smith : kernel32: Quote first command line arg in process paramenters.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 29e934979ebbefe0523408b9f224da5503809cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e934979ebbefe0523408b9… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Oct 4 23:18:22 2019 -0500 kernel32: Quote first command line arg in process paramenters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47790 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ceb32f668360ef51b932fa6350858a6b8d2d26ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f9f18d6e84..709313ceca 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -953,7 +953,7 @@ static BOOL build_command_line( WCHAR **argv ) has_space=FALSE; bcount=0; a=*arg; - if( !*a ) has_space=TRUE; + if( arg == argv || !*a ) has_space=TRUE; while (*a!='\0') { if (*a=='\\') { bcount++; @@ -990,7 +990,7 @@ static BOOL build_command_line( WCHAR **argv ) /* Check for quotes and spaces in this argument */ has_space=has_quote=FALSE; a=*arg; - if( !*a ) has_space=TRUE; + if( arg == argv || !*a ) has_space=TRUE; while (*a!='\0') { if (*a==' ' || *a=='\t') { has_space=TRUE;

1 0

Myah Caron : kernel32: Allow NtQueryDirectoryFile underfilling FileInformation.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 825d60d32fc45a07f9b1be608c0b34fc6f97205b URL: https://source.winehq.org/git/wine.git/?a=commit;h=825d60d32fc45a07f9b1be60… Author: Myah Caron <qsniyg(a)mail.com> Date: Sat Nov 23 19:01:43 2019 +0100 kernel32: Allow NtQueryDirectoryFile underfilling FileInformation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47832 Signed-off-by: Myah Caron <qsniyg(a)mail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1658d5a20de4b12df539f3e5ecc11b81984684a4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index ffd12155c9..3049a99df0 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2112,7 +2112,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, } info->data_len = io.Information; - if (!has_wildcard || info->data_len < info->data_size - max_entry_size) + if (!has_wildcard) { if (has_wildcard) /* release unused buffer space */ HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY,

1 0

Damjan Jovanovic : comctl32: Test treeview text trimming after label editing is complete.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 7abfa62850fc89ecea709c81d3503c02fb6f47e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7abfa62850fc89ecea709c81… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:07 2019 +0200 comctl32: Test treeview text trimming after label editing is complete. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8fd0ecc6cd0bf99803d8e8ac1a520d93b53b52f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 9e74016a08..3e9666f535 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1576,7 +1576,7 @@ static void test_itemedit(void) DWORD r; HWND edit; TVITEMA item; - CHAR buffA[20]; + CHAR buffA[500]; HWND hTree; hTree = create_treeview_control(0); @@ -1675,8 +1675,41 @@ static void test_itemedit(void) ok(IsWindow(edit), "Expected valid handle\n"); r = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); expect(MAX_PATH - 1, r); + /* WM_SETTEXT can set more... */ + memset(buffA, 'a', ARRAY_SIZE(buffA)); + buffA[ARRAY_SIZE(buffA)-1] = 0; + r = SetWindowTextA(edit, buffA); + expect(TRUE, r); + r = GetWindowTextA(edit, buffA, ARRAY_SIZE(buffA)); + expect(ARRAY_SIZE(buffA) - 1, r); + /* ...but it's trimmed to MAX_PATH chars when editing ends */ r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + + /* We can't get around that MAX_PATH limit by increasing EM_SETLIMITTEXT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + SendMessageA(edit, EM_SETLIMITTEXT, ARRAY_SIZE(buffA)-1, 0); + memset(buffA, 'a', ARRAY_SIZE(buffA)); + buffA[ARRAY_SIZE(buffA)-1] = 0; + r = SetWindowTextA(edit, buffA); + expect(TRUE, r); + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); DestroyWindow(hTree); }

1 0

Damjan Jovanovic : comctl32: Test text buffer passed to TVN_ENDLABELEDIT is always MAX_PATH chars long.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 016bcb6f57fcf3e662d858b1919ff3de694eea88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=016bcb6f57fcf3e662d858b1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:09 2019 +0200 comctl32: Test text buffer passed to TVN_ENDLABELEDIT is always MAX_PATH chars long. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 565b0f5d5079eeb17dbf3aaa22088d022428cb07) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 3e9666f535..6b97853377 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1320,7 +1320,13 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, break; } - case TVN_ENDLABELEDITA: return TRUE; + case TVN_ENDLABELEDITA: + { + NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; + if (disp->item.mask & TVIF_TEXT) + todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + return TRUE; + } case TVN_ITEMEXPANDINGA: { UINT newmask = pTreeView->itemNew.mask & ~TVIF_CHILDREN;

1 0

Damjan Jovanovic : comctl32: Test overwriting of pszText contents in TVN_ENDLABELEDIT.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: c3399383e4183f685c9237e7e6ac06db312475db URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3399383e4183f685c9237e7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:11 2019 +0200 comctl32: Test overwriting of pszText contents in TVN_ENDLABELEDIT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1fa32f9a5396934c6788ac02402cccc020237bf4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 6b97853377..bfde77df79 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -42,6 +42,7 @@ static BOOL g_get_rect_in_expand; static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; +static const char *g_endedit_overwrite_contents; static HFONT g_customdraw_font; static BOOL g_v6; @@ -1324,7 +1325,11 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, { NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; if (disp->item.mask & TVIF_TEXT) + { todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + if (g_endedit_overwrite_contents) + strcpy(disp->item.pszText, g_endedit_overwrite_contents); + } return TRUE; } case TVN_ITEMEXPANDINGA: @@ -1717,6 +1722,23 @@ static void test_itemedit(void) expect(TRUE, r); todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + /* Overwriting of pszText contents in TVN_ENDLABELEDIT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = SetWindowTextA(edit, "old"); + expect(TRUE, r); + g_endedit_overwrite_contents = "<new_contents>"; + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + g_endedit_overwrite_contents = NULL; + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + expect(0, strcmp(item.pszText, "<new_contents>")); + DestroyWindow(hTree); }

1 0