November 2019 - Wine-Devel - list.winehq.org

[PATCH] comctl32/listbox: Do no limit item height to 255.
by Nikolay Sivov Nov. 7, 2019

Nov. 7, 2019

From: Francois Gouget <fgouget(a)free.fr> The change happened between Windows 10 1607 and 1709 in comctl32 v6. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ab4c481aab..0d6dcd6a0b 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1280,7 +1280,7 @@ static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) */ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BOOL repaint ) { - if (height > MAXBYTE) + if (height > MAXWORD) return -1; if (!height) height = 1; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 70e212892a..dc3b247fb6 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -769,11 +769,27 @@ static void test_listbox_height(void) r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); ok( r == 20, "height wrong\n"); + /* Before Windows 10 1709 (or 1703?) the item height was limited to 255. + * Since then, with comctl32 V6 the limit is 65535. + */ r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 256, 0 )); - ok( r == -1, "Failed to set item height, %d.\n", r); + ok(r == 0 || broken(r == -1), "Failed to set item height, %d.\n", r); + if (r == -1) + { + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "Unexpected item height %d.\n", r); + } + else + { + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 256, "Unexpected item height %d.\n", r); - r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); - ok( r == 20, "Unexpected item height %d.\n", r); + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 65535, 0 )); + ok(r == 0, "Failed to set item height, %d.\n", r); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 65535, "Unexpected item height %d.\n", r); + } r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0xff, 0 )); ok( r == 0, "send message failed\n"); -- 2.24.0.rc1

1 0

[PATCH] xmllite: Update current pointer after reader_skipn call.
by Jacek Caban Nov. 7, 2019

Nov. 7, 2019

The buffer may be reallocated. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH v5] user32: Implement DM_REPOSITION message
by katahiromz . Nov. 7, 2019

Nov. 7, 2019

See attachment.

2 1

[PATCH v2] user32/tests: Tests for DM_REPOSITION message
by katahiromz . Nov. 7, 2019

Nov. 7, 2019

>user32: >dialog.c:1987: Test failed: dialog doesn't use message box font Why it failed? This is not related to message box.

1 0

[PATCH v2] user32/tests: Tests for DM_REPOSITION message
by katahiromz . Nov. 7, 2019

Nov. 7, 2019

See attachment.

2 1

Re: [PATCH] user32: Implement DM_REPOSITION message
by Marvin Nov. 7, 2019

Nov. 7, 2019

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=59376 Your paranoid android. === debian10 (64 bit WoW report) === user32: clipboard.c:833: Test failed: 2: gle 5 clipboard.c:838: Test failed: 2.0: got 0000 instead of 000d clipboard.c:868: Test failed: 2: gle 1418 clipboard.c:717: Test failed: 3: gle 5 clipboard.c:719: Test failed: 3: gle 1418 clipboard.c:746: Test failed: 3: count 5 clipboard.c:749: Test failed: 3: gle 1418 clipboard.c:755: Test failed: 3: 0003 not available clipboard.c:757: Test failed: 3: count 5 instead of 2 clipboard.c:760: Test failed: 3: gle 5 clipboard.c:765: Test failed: 3.0: got 0000 instead of 000e clipboard.c:805: Test failed: 3: gle 1418 clipboard.c:815: Test failed: 3: count 5 clipboard.c:818: Test failed: 3: gle 1418 clipboard.c:826: Test failed: 3: 0003 not available clipboard.c:828: Test failed: 3: count 5 instead of 2 clipboard.c:833: Test failed: 3: gle 5 clipboard.c:838: Test failed: 3.0: got 0000 instead of 000e clipboard.c:868: Test failed: 3: gle 1418 clipboard.c:717: Test failed: 4: gle 5 clipboard.c:719: Test failed: 4: gle 1418 clipboard.c:746: Test failed: 4: count 6 clipboard.c:749: Test failed: 4: gle 1418 clipboard.c:757: Test failed: 4: count 6 instead of 2 clipboard.c:760: Test failed: 4: gle 5 clipboard.c:765: Test failed: 4.0: got 0000 instead of 0003 clipboard.c:805: Test failed: 4: gle 1418 clipboard.c:815: Test failed: 4: count 6 clipboard.c:818: Test failed: 4: gle 1418 clipboard.c:828: Test failed: 4: count 6 instead of 2 clipboard.c:833: Test failed: 4: gle 5 clipboard.c:838: Test failed: 4.0: got 0000 instead of 0003 clipboard.c:868: Test failed: 4: gle 1418 clipboard.c:717: Test failed: 5: gle 5 clipboard.c:719: Test failed: 5: gle 1418 clipboard.c:746: Test failed: 5: count 7 clipboard.c:749: Test failed: 5: gle 1418 clipboard.c:755: Test failed: 5: 0008 not available clipboard.c:755: Test failed: 5: 0011 not available clipboard.c:757: Test failed: 5: count 7 instead of 3 clipboard.c:760: Test failed: 5: gle 5 clipboard.c:765: Test failed: 5.0: got 0000 instead of 0002 clipboard.c:805: Test failed: 5: gle 1418 clipboard.c:815: Test failed: 5: count 7 clipboard.c:818: Test failed: 5: gle 1418 clipboard.c:826: Test failed: 5: 0008 not available clipboard.c:826: Test failed: 5: 0011 not available clipboard.c:828: Test failed: 5: count 7 instead of 3 clipboard.c:833: Test failed: 5: gle 5 clipboard.c:838: Test failed: 5.0: got 0000 instead of 0002 clipboard.c:868: Test failed: 5: gle 1418 clipboard.c:717: Test failed: 6: gle 5 clipboard.c:719: Test failed: 6: gle 1418 clipboard.c:746: Test failed: 6: count 8 clipboard.c:749: Test failed: 6: gle 1418 clipboard.c:755: Test failed: 6: 0011 not available clipboard.c:757: Test failed: 6: count 8 instead of 3 clipboard.c:760: Test failed: 6: gle 5 clipboard.c:765: Test failed: 6.0: got 0000 instead of 0008 clipboard.c:805: Test failed: 6: gle 1418 clipboard.c:815: Test failed: 6: count 8 clipboard.c:818: Test failed: 6: gle 1418 clipboard.c:826: Test failed: 6: 0011 not available clipboard.c:828: Test failed: 6: count 8 instead of 3 clipboard.c:833: Test failed: 6: gle 5 clipboard.c:838: Test failed: 6.0: got 0000 instead of 0008 clipboard.c:868: Test failed: 6: gle 1418 clipboard.c:717: Test failed: 7: gle 5 clipboard.c:719: Test failed: 7: gle 1418 clipboard.c:746: Test failed: 7: count 9 clipboard.c:749: Test failed: 7: gle 1418 clipboard.c:757: Test failed: 7: count 9 instead of 3 clipboard.c:760: Test failed: 7: gle 5 clipboard.c:765: Test failed: 7.0: got 0000 instead of 0011 clipboard.c:805: Test failed: 7: gle 1418 clipboard.c:815: Test failed: 7: count 9 clipboard.c:818: Test failed: 7: gle 1418 clipboard.c:828: Test failed: 7: count 9 instead of 3 clipboard.c:833: Test failed: 7: gle 5 clipboard.c:838: Test failed: 7.0: got 0000 instead of 0011 clipboard.c:868: Test failed: 7: gle 1418 clipboard.c:874: Test failed: gle 5 clipboard.c:876: Test failed: gle 1418 clipboard.c:878: Test failed: gle 1418

1 0

[PATCH v4] user32: Implement DM_REPOSITION message
by katahiromz . Nov. 7, 2019

Nov. 7, 2019

See attachment.

2 1

[PATCH] user32/tests: Tests for DM_REPOSITION message
by katahiromz . Nov. 7, 2019

Nov. 7, 2019

See attachment.

2 1

[PATCH] dmband: Handle the DirectX 7 version of DMUS_IO_INSTRUMENT structure.
by Alistair Leslie-Hughes Nov. 7, 2019

Nov. 7, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmband/band.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 4338791971b..b6c22186cce 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -171,6 +171,10 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { band_IDirectMusicObject_ParseDescriptor }; +#define CCSIZEOF_STRUCT(type,field) ((INT_PTR)&(((type *)0)->field) + sizeof(((type*)0)->field)) + +#define DMUS_IO_INSTRUMENT_DX7_SIZE CCSIZEOF_STRUCT(DMUS_IO_INSTRUMENT, dwChannelPriority) + /* IDirectMusicBandImpl IPersistStream part: */ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) @@ -199,8 +203,14 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_CHUNK: { TRACE_(dmfile)(": Instrument chunk\n"); - if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) return E_FAIL; - IStream_Read (pStm, &inst, sizeof(DMUS_IO_INSTRUMENT), NULL); + if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT) && Chunk.dwSize != DMUS_IO_INSTRUMENT_DX7_SIZE) { + ERR_(dmfile)("unexpected size %d\n", Chunk.dwSize); + return E_FAIL; + } + IStream_Read (pStm, &inst, Chunk.dwSize, NULL); + if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) + inst.nPitchBendRange = 0; + TRACE_(dmfile)(" - dwPatch: %u\n", inst.dwPatch); TRACE_(dmfile)(" - dwAssignPatch: %u\n", inst.dwAssignPatch); TRACE_(dmfile)(" - dwNoteRanges[0]: %u\n", inst.dwNoteRanges[0]); -- 2.24.0.rc1

1 0

[PATCH v3] user32: Implement DM_REPOSITION message
by katahiromz . Nov. 7, 2019

Nov. 7, 2019

See attachment.

2 1