May 2022 - Wine-commits - list.winehq.org

Huw Davies : kernelbase: Avoid relying on the exception handler to test that handle != NULL.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: f27a77e593f687f06080aa91112157bbb86d861c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f27a77e593f687f06080aa91… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 10 14:06:49 2022 +0000 kernelbase: Avoid relying on the exception handler to test that handle != NULL. Fixes a regression in SlingPlayer 2 caused by commit a76518c186ac0893ea460cd3b061096f1b05c8cc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52127 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernelbase/memory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index b89ab04a38f..9490626a40a 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -883,6 +883,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) TRACE_(globalmem)( "handle %p\n", handle ); + if (!handle) return NULL; if ((ret = unsafe_ptr_from_HLOCAL( handle ))) { __TRY

1 0

Rémi Bernon : ntdll: Rename block specific flag constants.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: b57dca8826bb2f76e9597ceb29702d72a9c0901a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b57dca8826bb2f76e9597ceb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 12:11:29 2022 +0200 ntdll: Rename block specific flag constants. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 61 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b57dca8826bb2f76e959…

1 0

Rémi Bernon : ntdll: Use flag combination to mark free list headers.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: ea533f1869c4234b736dc603992e2daafb0b4405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea533f1869c4234b736dc603… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 27 09:11:58 2022 +0200 ntdll: Use flag combination to mark free list headers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0760675ec4e..0f75ef1fe81 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -87,6 +87,7 @@ C_ASSERT( sizeof(struct block) == 8 ); #define BLOCK_FLAG_FREE 0x00000001 #define BLOCK_FLAG_PREV_FREE 0x00000002 +#define BLOCK_FLAG_FREE_LINK 0x00000003 /* entry to link free blocks in free lists */ @@ -971,7 +972,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, list_init( &heap->freeList[0].arena.entry ); for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) { - pEntry->arena.size = 0 | BLOCK_FLAG_FREE; + pEntry->arena.size = BLOCK_FLAG_FREE_LINK; pEntry->arena.magic = ARENA_FREE_MAGIC; if (i) list_add_after( &pEntry[-1].arena.entry, &pEntry->arena.entry ); } @@ -1028,8 +1029,8 @@ static struct block *find_free_block( HEAP *heap, SIZE_T block_size, SUBHEAP **s while ((ptr = list_next( &heap->freeList[0].arena.entry, ptr ))) { entry = LIST_ENTRY( ptr, struct entry, entry ); - if (entry->size == (0 | BLOCK_FLAG_FREE)) continue; block = (struct block *)entry; + if (block_get_flags( block ) == BLOCK_FLAG_FREE_LINK) continue; if (block_get_size( block ) >= block_size) { *subheap = find_subheap( heap, block, FALSE ); @@ -1078,6 +1079,7 @@ static BOOL is_valid_free_block( const HEAP *heap, const struct block *block ) unsigned int i; if ((subheap = find_subheap( heap, block, FALSE ))) return TRUE; + if (block_get_flags( block ) != BLOCK_FLAG_FREE_LINK) return FALSE; for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == (struct block *)&heap->freeList[i].arena) return TRUE; return FALSE; }

1 0

Rémi Bernon : ntdll: Use a block member in the free list entry struct.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 7964d641225dd322557db16b5c89ed6e5734ed8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7964d641225dd322557db16b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 00:06:27 2022 +0200 ntdll: Use a block member in the free list entry struct. And use ARENA_FLAG_FREE|ARENA_FLAG_PREV_FREE flag combination to mark and ignore free list links. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0f75ef1fe81..411bb26aa3d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -94,9 +94,8 @@ C_ASSERT( sizeof(struct block) == 8 ); typedef struct entry { - DWORD size; /* Block size; must be the first field */ - DWORD magic; /* Magic number */ - struct list entry; /* Entry in free list */ + struct block block; + struct list entry; } ARENA_FREE; typedef struct @@ -972,8 +971,8 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, list_init( &heap->freeList[0].arena.entry ); for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) { - pEntry->arena.size = BLOCK_FLAG_FREE_LINK; - pEntry->arena.magic = ARENA_FREE_MAGIC; + block_set_size( &pEntry->arena.block, BLOCK_FLAG_FREE_LINK, 0 ); + block_set_type( &pEntry->arena.block, ARENA_FREE_MAGIC ); if (i) list_add_after( &pEntry[-1].arena.entry, &pEntry->arena.entry ); } @@ -1080,7 +1079,7 @@ static BOOL is_valid_free_block( const HEAP *heap, const struct block *block ) if ((subheap = find_subheap( heap, block, FALSE ))) return TRUE; if (block_get_flags( block ) != BLOCK_FLAG_FREE_LINK) return FALSE; - for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == (struct block *)&heap->freeList[i].arena) return TRUE; + for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == &heap->freeList[i].arena.block) return TRUE; return FALSE; }

1 0

Akihiro Sagawa : midimap: Handle MIDI running status.
by Alexandre Julliard 26 May '22

26 May '22

Module: wine Branch: master Commit: 4c535a7f7546f2dfe504c47dfc416d3cdd0a5ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c535a7f7546f2dfe504c47d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 26 23:38:43 2022 +0900 midimap: Handle MIDI running status. Wine's midiOutShortMsg() can't handle the MIDI message if the status byte is omitted. Omitting status byte is valid and called "running status". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53003 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 12555f5309a..e04fe721364 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -101,6 +101,7 @@ typedef struct tagMIDIMAPDATA struct tagMIDIMAPDATA* self; MIDIOUTPORT* ChannelMap[16]; MIDIOPENDESC midiDesc; + BYTE runningStatus; WORD wCbFlags; } MIDIMAPDATA; @@ -301,6 +302,7 @@ static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) mom->self = mom; mom->wCbFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); mom->midiDesc = *lpDesc; + mom->runningStatus = 0; for (chn = 0; chn < 16; chn++) { @@ -380,6 +382,7 @@ static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPara if (ret != MMSYSERR_NOERROR) break; } } + mom->runningStatus = 0; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; MIDIMAP_NotifyClient(mom, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); @@ -388,16 +391,31 @@ static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPara static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) { - BYTE lb = LOBYTE(LOWORD(dwParam)); - WORD chn = lb & 0x0F; + BYTE status = LOBYTE(LOWORD(dwParam)); + WORD chn; DWORD ret = MMSYSERR_NOERROR; if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; + if (status < 0x80) + { + if (mom->runningStatus) + { + status = mom->runningStatus; + dwParam = ((LOWORD(dwParam) << 8) | status); + } + else + { + FIXME("ooch %Ix\n", dwParam); + return MMSYSERR_NOERROR; + } + } + chn = status & 0x0F; + if (!mom->ChannelMap[chn]) return MMSYSERR_NOERROR; - switch (lb & 0xF0) + switch (status & 0xF0) { case 0x80: case 0x90: @@ -423,6 +441,7 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) } ret = midiOutShortMsg(mom->ChannelMap[chn]->hMidi, dwParam); } + mom->runningStatus = status; break; case 0xF0: for (chn = 0; chn < 16; chn++) @@ -430,6 +449,9 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) if (mom->ChannelMap[chn]->loaded > 0) ret = midiOutShortMsg(mom->ChannelMap[chn]->hMidi, dwParam); } + /* system common message */ + if (status <= 0xF7) + mom->runningStatus = 0; break; default: FIXME("ooch %Ix\n", dwParam); @@ -511,6 +533,8 @@ static DWORD modReset(MIDIMAPDATA* mom) if (ret != MMSYSERR_NOERROR) break; } } + mom->runningStatus = 0; + return ret; }

1 0

Akihiro Sagawa : winealsa: Use the symbolic name for MIDI_CTL_ALL_SOUNDS_OFF.
by Alexandre Julliard 26 May '22

26 May '22

Module: wine Branch: master Commit: 0bd43e778536557be3d79d1f5d6787d072e1b306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bd43e778536557be3d79d1f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 26 23:38:45 2022 +0900 winealsa: Use the symbolic name for MIDI_CTL_ALL_SOUNDS_OFF. MIDI_CTL_ALL_SOUNDS_OFF is channel dependent. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsamidi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 12a469533d9..ccb9146ed2b 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -922,13 +922,10 @@ static UINT midi_out_reset(WORD dev_id) if (!dests[dev_id].bEnabled) return MIDIERR_NODEVICE; /* stop all notes */ - /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that - * it's channel dependent... - */ for (chn = 0; chn < 16; chn++) { /* turn off every note */ - midi_out_data(dev_id, 0x7800 | MIDI_CMD_CONTROL | chn); + midi_out_data(dev_id, (MIDI_CTL_ALL_SOUNDS_OFF << 8) | MIDI_CMD_CONTROL | chn); /* remove sustain on all channels */ midi_out_data(dev_id, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn); }

1 0

Akihiro Sagawa : winealsa: Handle MIDI running status.
by Alexandre Julliard 26 May '22

26 May '22

Module: wine Branch: master Commit: 2250769e353d6e92d96772437f754240ebe7ce8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2250769e353d6e92d9677243… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 26 23:38:47 2022 +0900 winealsa: Handle MIDI running status. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsamidi.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index ccb9146ed2b..6350e3e4265 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -55,6 +55,7 @@ struct midi_dest { BOOL bEnabled; MIDIOPENDESC midiDesc; + BYTE runningStatus; WORD wFlags; MIDIOUTCAPSW caps; snd_seq_t *seq; @@ -539,6 +540,7 @@ static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, stru return MMSYSERR_NOTENABLED; } + dest->runningStatus = 0; dest->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); dest->midiDesc = *midi_desc; dest->seq = midi_seq; @@ -639,9 +641,7 @@ static UINT midi_out_close(WORD dev_id, struct notify_context *notify) static UINT midi_out_data(WORD dev_id, UINT data) { - BYTE evt = LOBYTE(LOWORD(data)); - BYTE d1 = HIBYTE(LOWORD(data)); - BYTE d2 = LOBYTE(HIWORD(data)); + BYTE evt = LOBYTE(LOWORD(data)), d1, d2; struct midi_dest *dest; TRACE("(%04X, %08X);\n", dev_id, data); @@ -656,6 +656,28 @@ static UINT midi_out_data(WORD dev_id, UINT data) WARN("can't play !\n"); return MIDIERR_NODEVICE; } + + if (evt & 0x80) + { + d1 = HIBYTE(LOWORD(data)); + d2 = LOBYTE(HIWORD(data)); + if (evt < 0xF0) + dest->runningStatus = evt; + else if (evt <= 0xF7) + dest->runningStatus = 0; + } + else if (dest->runningStatus) + { + evt = dest->runningStatus; + d1 = LOBYTE(LOWORD(data)); + d2 = HIBYTE(LOWORD(data)); + } + else + { + FIXME("ooch %x\n", data); + return MMSYSERR_NOERROR; + } + switch (dest->caps.wTechnology) { case MOD_SYNTH: @@ -724,6 +746,7 @@ static UINT midi_out_data(WORD dev_id, UINT data) { BYTE reset_sysex_seq[] = {MIDI_CMD_COMMON_SYSEX, 0x7e, 0x7f, 0x09, 0x01, 0xf7}; snd_seq_ev_set_sysex(&event, sizeof(reset_sysex_seq), reset_sysex_seq); + dest->runningStatus = 0; break; } case 0x01: /* MTC Quarter frame */ @@ -855,6 +878,7 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct return MMSYSERR_NOTENABLED; } + dest->runningStatus = 0; hdr->dwFlags &= ~MHDR_INQUEUE; hdr->dwFlags |= MHDR_DONE; set_out_notify(notify, dest, dev_id, MOM_DONE, (DWORD_PTR)hdr, 0); @@ -929,6 +953,7 @@ static UINT midi_out_reset(WORD dev_id) /* remove sustain on all channels */ midi_out_data(dev_id, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn); } + dests[dev_id].runningStatus = 0; /* FIXME: the LongData buffers must also be returned to the app */ return MMSYSERR_NOERROR; }

1 0

Akihiro Sagawa : wineoss: Fix missing break statement.
by Alexandre Julliard 26 May '22

26 May '22

Module: wine Branch: master Commit: feb8487796d0ee4049c1d62b630f44ee3507bc38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb8487796d0ee4049c1d62b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 26 23:38:49 2022 +0900 wineoss: Fix missing break statement. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/ossmidi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index b27383d878d..18d0cc5749f 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1035,6 +1035,7 @@ static UINT midi_out_port_data(WORD dev_id, UINT data) case 0x03: /* Song Select. */ SEQ_MIDIOUT(dev, evt); SEQ_MIDIOUT(dev, d1); + break; case 0x02: /* Song Position Pointer. */ SEQ_MIDIOUT(dev, evt); SEQ_MIDIOUT(dev, d1);

1 0

Akihiro Sagawa : wineoss: Handle MIDI running status.
by Alexandre Julliard 26 May '22

26 May '22

Module: wine Branch: master Commit: 413ba35b904a31a1c74f02c907e44059b2c3c832 URL: https://source.winehq.org/git/wine.git/?a=commit;h=413ba35b904a31a1c74f02c9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 26 23:38:51 2022 +0900 wineoss: Handle MIDI running status. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/ossmidi.c | 70 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 18d0cc5749f..1fd9cc216a1 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -57,6 +57,7 @@ struct midi_dest { BOOL bEnabled; MIDIOPENDESC midiDesc; + BYTE runningStatus; WORD wFlags; MIDIHDR *lpQueueHdr; void *lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ @@ -725,6 +726,7 @@ static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, stru return MMSYSERR_NOTENABLED; } + dest->runningStatus = 0; dest->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); dest->lpQueueHdr= NULL; @@ -787,14 +789,31 @@ static UINT midi_out_close(WORD dev_id, struct notify_context *notify) static UINT midi_out_fm_data(WORD dev_id, UINT data) { struct midi_dest *dest = dests + dev_id; - WORD evt = LOBYTE(LOWORD(data)); - WORD d1 = HIBYTE(LOWORD(data)); - WORD d2 = LOBYTE(HIWORD(data)); + BYTE evt = LOBYTE(LOWORD(data)), d1, d2; sFMextra *extra = dest->lpExtra; sVoice *voice = extra->voice; sChannel *channel = extra->channel; int chn = (evt & 0x0F), i, nv; + if (evt & 0x80) + { + d1 = HIBYTE(LOWORD(data)); + d2 = LOBYTE(HIWORD(data)); + if (evt < 0xF0) + dest->runningStatus = evt; + } + else if (dest->runningStatus) + { + evt = dest->runningStatus; + d1 = LOBYTE(LOWORD(data)); + d2 = HIBYTE(LOWORD(data)); + } + else + { + FIXME("ooch %x\n", data); + return MMSYSERR_NOERROR; + } + /* FIXME: chorus depth controller is not used */ switch (evt & 0xF0) @@ -962,10 +981,13 @@ static UINT midi_out_fm_data(WORD dev_id, UINT data) { case 0x0F: /* Reset */ midi_out_fm_reset(dev_id); + dest->runningStatus = 0; break; default: WARN("Unsupported (yet) system event %02x\n", evt & 0x0F); } + if (evt <= 0xF7) + dest->runningStatus = 0; break; default: WARN("Internal error, shouldn't happen (event=%08x)\n", evt & 0xF0); @@ -978,9 +1000,8 @@ static UINT midi_out_fm_data(WORD dev_id, UINT data) static UINT midi_out_port_data(WORD dev_id, UINT data) { - WORD evt = LOBYTE(LOWORD(data)); - WORD d1 = HIBYTE(LOWORD(data)); - WORD d2 = LOBYTE(HIWORD(data)); + struct midi_dest *dest = dests + dev_id; + BYTE evt = LOBYTE(LOWORD(data)), d1, d2; int dev = dev_id - num_synths; if (dev < 0) @@ -989,6 +1010,23 @@ static UINT midi_out_port_data(WORD dev_id, UINT data) return MIDIERR_NODEVICE; } + if (evt & 0x80) + { + d1 = HIBYTE(LOWORD(data)); + d2 = LOBYTE(HIWORD(data)); + } + else if (dest->runningStatus) + { + evt = dest->runningStatus; + d1 = LOBYTE(LOWORD(data)); + d2 = HIBYTE(LOWORD(data)); + } + else + { + FIXME("ooch %x\n", data); + return MMSYSERR_NOERROR; + } + switch (evt & 0xF0) { case MIDI_NOTEOFF: @@ -996,13 +1034,21 @@ static UINT midi_out_port_data(WORD dev_id, UINT data) case MIDI_KEY_PRESSURE: case MIDI_CTL_CHANGE: case MIDI_PITCH_BEND: - SEQ_MIDIOUT(dev, evt); + if (LOBYTE(LOWORD(data)) >= 0x80) + { + SEQ_MIDIOUT(dev, evt); + dest->runningStatus = evt; + } SEQ_MIDIOUT(dev, d1); SEQ_MIDIOUT(dev, d2); break; case MIDI_PGM_CHANGE: case MIDI_CHN_PRESSURE: - SEQ_MIDIOUT(dev, evt); + if (LOBYTE(LOWORD(data)) >= 0x80) + { + SEQ_MIDIOUT(dev, evt); + dest->runningStatus = evt; + } SEQ_MIDIOUT(dev, d1); break; case MIDI_SYSTEM_PREFIX: @@ -1030,6 +1076,7 @@ static UINT midi_out_port_data(WORD dev_id, UINT data) SEQ_MIDIOUT(dev, 0x09); SEQ_MIDIOUT(dev, 0x01); SEQ_MIDIOUT(dev, 0xf7); + dest->runningStatus = 0; break; case 0x01: /* MTC Quarter frame */ case 0x03: /* Song Select. */ @@ -1041,6 +1088,8 @@ static UINT midi_out_port_data(WORD dev_id, UINT data) SEQ_MIDIOUT(dev, d1); SEQ_MIDIOUT(dev, d2); } + if (evt <= 0xF7) /* System Exclusive, System Common Message */ + dest->runningStatus = 0; break; } @@ -1149,6 +1198,7 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct return MMSYSERR_NOTENABLED; } + dest->runningStatus = 0; hdr->dwFlags &= ~MHDR_INQUEUE; hdr->dwFlags |= MHDR_DONE; set_out_notify(notify, dest, dev_id, MOM_DONE, (UINT_PTR)hdr, 0); @@ -1218,9 +1268,6 @@ static UINT midi_out_reset(WORD dev_id) if (!dest->bEnabled) return MIDIERR_NODEVICE; /* stop all notes */ - /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that - * it's channel dependent... - */ for (chn = 0; chn < 16; chn++) { /* turn off every note */ @@ -1228,6 +1275,7 @@ static UINT midi_out_reset(WORD dev_id) /* remove sustain on all channels */ midi_out_data(dev_id, (CTL_SUSTAIN << 8) | MIDI_CTL_CHANGE | chn); } + dest->runningStatus = 0; /* FIXME: the LongData buffers must also be returned to the app */ return MMSYSERR_NOERROR; }

1 0

Gabriel Ivăncescu : winepulse: Try to obtain shorter device names if it exceeds 62 chars.
by Alexandre Julliard 26 May '22

26 May '22

Module: wine Branch: master Commit: ccc9f1d2ce23c8fbb3059934f82079692e04e49c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccc9f1d2ce23c8fbb3059934… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:06:37 2022 +0300 winepulse: Try to obtain shorter device names if it exceeds 62 chars. If the device desc is longer than the limit, we try to obtain product name or alsa name (if product name does not fit in the limit), as otherwise there is no point to do it anyway. Then the profile desc is appended if it doesn't cause us to exceed the limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 92 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1254509f3ce..0e504b6b6dd 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -426,6 +426,81 @@ static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } +#define MAX_DEVICE_NAME_LEN 62 + +static WCHAR *get_device_name(const char *desc, pa_proplist *proplist) +{ + /* + Some broken apps (e.g. Split/Second with fmodex) can't handle names that + are too long and crash even on native. If the device desc is too long, + we'll attempt to incrementally build it to try to stay under the limit. + ( + 1 is to check against truncated buffer after ntdll_umbstowcs ) + */ + WCHAR buf[MAX_DEVICE_NAME_LEN + 1]; + + /* For monitors of sinks; this does not seem to be localized in PA either */ + static const WCHAR monitor_of[] = {'M','o','n','i','t','o','r',' ','o','f',' '}; + + size_t len = strlen(desc); + WCHAR *name, *tmp; + + if (!(name = malloc((len + 1) * sizeof(WCHAR)))) + return NULL; + if (!(len = ntdll_umbstowcs(desc, len, name, len))) { + free(name); + return NULL; + } + + if (len > MAX_DEVICE_NAME_LEN && proplist) { + const char *prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS); + unsigned prop_len, rem = ARRAY_SIZE(buf); + BOOL monitor = FALSE; + + if (prop && !strcmp(prop, "monitor")) { + rem -= ARRAY_SIZE(monitor_of); + monitor = TRUE; + } + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) { + prop = pa_proplist_gets(proplist, "alsa.card_name"); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) + prop = NULL; + } + + if (prop) { + /* We know we have a name that fits within the limit now */ + WCHAR *p = name; + + if (monitor) { + memcpy(p, monitor_of, sizeof(monitor_of)); + p += ARRAY_SIZE(monitor_of); + } + len = ntdll_umbstowcs(prop, strlen(prop), p, rem); + rem -= len; + p += len; + + if (rem > 2) { + rem--; /* space */ + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION); + if (prop && prop[0] && (len = ntdll_umbstowcs(prop, strlen(prop), p + 1, rem)) && len != rem) { + *p++ = ' '; + p += len; + } + } + len = p - name; + } + } + name[len] = '\0'; + + if ((tmp = realloc(name, (len + 1) * sizeof(WCHAR)))) + name = tmp; + return name; +} + static void fill_device_info(PhysDevice *dev, pa_proplist *p) { const char *buffer; @@ -452,27 +527,18 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - UINT channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *desc) { - size_t len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); - WCHAR *wname; if (!dev) return; - if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + if (!(dev->name = get_device_name(desc, proplist))) { free(dev); return; } - - if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || - !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { - free(wname); - free(dev); - return; - } - dev->name[name_len] = 0; dev->form = form; dev->index = index; dev->channel_mask = channel_mask; @@ -480,6 +546,8 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); + + TRACE("%s\n", debugstr_w(dev->name)); } static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata)

1 0