wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

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

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

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 : 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 : 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 : 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

Gabriel Ivăncescu : winetest/tests: Add CORS page for testing CORS and XDomainRequest.
by Alexandre Julliard 26 May '22

26 May '22

Module: tools Branch: master Commit: a24ddb1c0fd1fbe896490db0b763da119627b7ab URL: https://source.winehq.org/git/tools.git/?a=commit;h=a24ddb1c0fd1fbe896490db… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 17:13:54 2022 +0300 winetest/tests: Add CORS page for testing CORS and XDomainRequest. "text/plain" content type is important since native has too many restrictions on XDomainRequest and doesn't support anything else. The fact the file is a html page also enables detection testing instead of it reading the header only. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/.htaccess | 7 +++++++ winetest/tests/cors.html | 1 + 2 files changed, 8 insertions(+) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index 73bab30..18c8b24 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -24,3 +24,10 @@ Header set Pragma "no-cache" Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" </ifModule> </FilesMatch> + +<Files cors.html> +<ifModule mod_headers.c> +Header set Access-Control-Allow-Origin "*" +Header set Content-Type "text/plain" +</ifModule> +</Files> diff --git a/winetest/tests/cors.html b/winetest/tests/cors.html new file mode 100644 index 0000000..3a73f89 --- /dev/null +++ b/winetest/tests/cors.html @@ -0,0 +1 @@ +<html><body>test</body></html>

1 0

Rémi Bernon : winegstreamer: Expose output media type attributes from the stream format.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 99ce6e87a3b22c5602d7bbedd43bb40627b63321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ce6e87a3b22c5602d7bbed… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 13 00:17:28 2022 +0200 winegstreamer: Expose output media type attributes from the stream format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 17 +++++------ dlls/winegstreamer/gst_private.h | 3 +- dlls/winegstreamer/h264_decoder.c | 57 ++++++++++++++++++++--------------- dlls/winegstreamer/main.c | 6 ++-- dlls/winegstreamer/quartz_transform.c | 2 +- dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_transform.c | 6 ++++ dlls/winegstreamer/wma_decoder.c | 2 +- 8 files changed, 54 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99ce6e87a3b22c5602d7…

1 0

Rémi Bernon : winegstreamer: Support wg_transform output format change events.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 8abbc0096da3b6e836d9b7559eb31a73f113bc2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8abbc0096da3b6e836d9b755… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 13 00:17:28 2022 +0200 winegstreamer: Support wg_transform output format change events. Adding an info structure to the sample when the caps have changed, removing if once it has been reported to the caller, and optionally returning the new stream format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 4 ---- dlls/winegstreamer/h264_decoder.c | 7 +++++++ dlls/winegstreamer/quartz_transform.c | 2 ++ dlls/winegstreamer/wg_transform.c | 24 +++++++++++++++++++++++- dlls/winegstreamer/wma_decoder.c | 8 ++++++++ 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9de7308f9ff..419faa61e2b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -7187,20 +7187,16 @@ static void test_h264_decoder(void) ok(i == 2, "got %lu iterations\n", i); todo_wine ok(h264_encoded_data_len == 1180, "got h264_encoded_data_len %lu\n", h264_encoded_data_len); - todo_wine ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#lx\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %lu\n", output.dwStreamID); ok(!!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE, "got dwStatus %#lx\n", output.dwStatus); ok(!output.pEvents, "got pEvents %p\n", output.pEvents); - todo_wine ok(status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS, "got status %#lx\n", status); hr = IMFSample_GetTotalLength(output.pSample, &length); ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); - todo_wine ok(length == 0, "got length %lu\n", length); ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 66d53a3a5ce..b3452269f04 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -571,6 +571,13 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, hr = wg_transform_read_data(decoder->wg_transform, wg_sample); mf_destroy_wg_sample(wg_sample); + + if (hr == MF_E_TRANSFORM_STREAM_CHANGE) + { + samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; + *status |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; + } + return hr; } diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 7986997abef..e093e2c201e 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -358,6 +358,8 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa } if (FAILED(hr)) { + if (hr == MF_E_TRANSFORM_STREAM_CHANGE) + FIXME("Unexpected stream format change!\n"); IMediaSample_Release(output_sample); return hr; } diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index f8211001be9..06b26a04310 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -52,17 +52,27 @@ struct wg_transform guint input_max_length; GstAtomicQueue *output_queue; GstSample *output_sample; + bool output_caps_changed; GstCaps *output_caps; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_transform *transform = gst_pad_get_element_private(pad); + GstStructure *info = NULL; GstSample *sample; GST_LOG("transform %p, buffer %p.", transform, buffer); - if (!(sample = gst_sample_new(buffer, transform->output_caps, NULL, NULL))) + if (transform->output_caps_changed && !(info = gst_structure_new_empty("format-changed"))) + { + GST_ERROR("Failed to allocate transform %p output sample info.", transform); + gst_buffer_unref(buffer); + return GST_FLOW_ERROR; + } + transform->output_caps_changed = false; + + if (!(sample = gst_sample_new(buffer, transform->output_caps, NULL, info))) { GST_ERROR("Failed to allocate transform %p output sample.", transform); gst_buffer_unref(buffer); @@ -88,6 +98,9 @@ static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent gst_event_parse_caps(event, &caps); + transform->output_caps_changed = transform->output_caps_changed + || !gst_caps_is_always_compatible(transform->output_caps, caps); + gst_caps_unref(transform->output_caps); transform->output_caps = gst_caps_ref(caps); break; @@ -505,6 +518,15 @@ NTSTATUS wg_transform_read_data(void *args) output_buffer = gst_sample_get_buffer(transform->output_sample); + if (gst_sample_get_info(transform->output_sample)) + { + gst_sample_set_info(transform->output_sample, NULL); + + params->result = MF_E_TRANSFORM_STREAM_CHANGE; + GST_INFO("Format changed detected, returning no output"); + return STATUS_SUCCESS; + } + if ((status = read_transform_output_data(output_buffer, sample))) return status; diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 70563649c9c..ca53816f134 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -593,6 +593,14 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, } mf_destroy_wg_sample(wg_sample); + + if (hr == MF_E_TRANSFORM_STREAM_CHANGE) + { + FIXME("Unexpected stream format change!\n"); + samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; + *status |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; + } + return hr; }

1 0

Rémi Bernon : winegstreamer: Track caps changes and keep them with the output buffers.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 6abd8e23b8be24af194d97c2fa6bd9e9fed4b29a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6abd8e23b8be24af194d97c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 23:53:15 2022 +0200 winegstreamer: Track caps changes and keep them with the output buffers. Using a GstSample queue instead of GstBuffer queue to combine both. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 76 +++++++++++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index d75593daedd..f8211001be9 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -51,40 +51,77 @@ struct wg_transform GstBufferList *input; guint input_max_length; GstAtomicQueue *output_queue; - GstBuffer *output_buffer; + GstSample *output_sample; + GstCaps *output_caps; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_transform *transform = gst_pad_get_element_private(pad); + GstSample *sample; GST_LOG("transform %p, buffer %p.", transform, buffer); - gst_atomic_queue_push(transform->output_queue, buffer); + if (!(sample = gst_sample_new(buffer, transform->output_caps, NULL, NULL))) + { + GST_ERROR("Failed to allocate transform %p output sample.", transform); + gst_buffer_unref(buffer); + return GST_FLOW_ERROR; + } + gst_atomic_queue_push(transform->output_queue, sample); + gst_buffer_unref(buffer); return GST_FLOW_OK; } +static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) +{ + struct wg_transform *transform = gst_pad_get_element_private(pad); + + GST_LOG("transform %p, type \"%s\".", transform, GST_EVENT_TYPE_NAME(event)); + + switch (event->type) + { + case GST_EVENT_CAPS: + { + GstCaps *caps; + + gst_event_parse_caps(event, &caps); + + gst_caps_unref(transform->output_caps); + transform->output_caps = gst_caps_ref(caps); + break; + } + default: + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); + break; + } + + gst_event_unref(event); + return TRUE; +} + NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; - GstBuffer *buffer; + GstSample *sample; if (transform->input) gst_buffer_list_unref(transform->input); gst_element_set_state(transform->container, GST_STATE_NULL); - if (transform->output_buffer) - gst_buffer_unref(transform->output_buffer); - while ((buffer = gst_atomic_queue_pop(transform->output_queue))) - gst_buffer_unref(buffer); + if (transform->output_sample) + gst_sample_unref(transform->output_sample); + while ((sample = gst_atomic_queue_pop(transform->output_queue))) + gst_sample_unref(sample); g_object_unref(transform->their_sink); g_object_unref(transform->their_src); g_object_unref(transform->container); g_object_unref(transform->my_sink); g_object_unref(transform->my_src); + gst_caps_unref(transform->output_caps); gst_atomic_queue_unref(transform->output_queue); free(transform); @@ -162,10 +199,10 @@ static bool transform_append_element(struct wg_transform *transform, GstElement NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; - GstCaps *raw_caps = NULL, *src_caps = NULL, *sink_caps = NULL; struct wg_format output_format = *params->output_format; struct wg_format input_format = *params->input_format; GstElement *first = NULL, *last = NULL, *element; + GstCaps *raw_caps = NULL, *src_caps = NULL; NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; struct wg_transform *transform; @@ -194,9 +231,9 @@ NTSTATUS wg_transform_create(void *args) if (!transform->my_src) goto out; - if (!(sink_caps = wg_format_to_caps(&output_format))) + if (!(transform->output_caps = wg_format_to_caps(&output_format))) goto out; - if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps))) + if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, transform->output_caps))) goto out; transform->my_sink = gst_pad_new_from_template(template, "sink"); g_object_unref(template); @@ -204,13 +241,14 @@ NTSTATUS wg_transform_create(void *args) goto out; gst_pad_set_element_private(transform->my_sink, transform); + gst_pad_set_event_function(transform->my_sink, transform_sink_event_cb); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); /* Since we append conversion elements, we don't want to filter decoders * based on the actual output caps now. Matching decoders with the * raw output media type should be enough. */ - media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); + media_type = gst_structure_get_name(gst_caps_get_structure(transform->output_caps, 0)); if (!(raw_caps = gst_caps_new_empty_simple(media_type))) goto out; @@ -316,7 +354,6 @@ NTSTATUS wg_transform_create(void *args) || !gst_pad_push_event(transform->my_src, event)) goto out; - gst_caps_unref(sink_caps); gst_caps_unref(src_caps); GST_INFO("Created winegstreamer transform %p.", transform); @@ -330,8 +367,8 @@ out: gst_object_unref(transform->their_src); if (transform->my_sink) gst_object_unref(transform->my_sink); - if (sink_caps) - gst_caps_unref(sink_caps); + if (transform->output_caps) + gst_caps_unref(transform->output_caps); if (transform->my_src) gst_object_unref(transform->my_src); if (src_caps) @@ -440,6 +477,7 @@ NTSTATUS wg_transform_read_data(void *args) struct wg_transform *transform = params->transform; struct wg_sample *sample = params->sample; GstBufferList *input = transform->input; + GstBuffer *output_buffer; GstFlowReturn ret; NTSTATUS status; @@ -457,7 +495,7 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_UNSUCCESSFUL; } - if (!transform->output_buffer && !(transform->output_buffer = gst_atomic_queue_pop(transform->output_queue))) + if (!transform->output_sample && !(transform->output_sample = gst_atomic_queue_pop(transform->output_queue))) { sample->size = 0; params->result = MF_E_TRANSFORM_NEED_MORE_INPUT; @@ -465,13 +503,15 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_SUCCESS; } - if ((status = read_transform_output_data(transform->output_buffer, sample))) + output_buffer = gst_sample_get_buffer(transform->output_sample); + + if ((status = read_transform_output_data(output_buffer, sample))) return status; if (!(sample->flags & WG_SAMPLE_FLAG_INCOMPLETE)) { - gst_buffer_unref(transform->output_buffer); - transform->output_buffer = NULL; + gst_sample_unref(transform->output_sample); + transform->output_sample = NULL; } params->result = S_OK;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022