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

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

May 26, 2022

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 May 26, 2022

May 26, 2022

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

Brendan Shanks : wow64: Ensure SECURITY_DESCRIPTOR fields are always initialized.
by Alexandre Julliard May 26, 2022

May 26, 2022

Module: wine Branch: master Commit: c9ae3c8a77ec1b28032104beca1424db2db7d723 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9ae3c8a77ec1b28032104be… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed May 25 20:07:46 2022 -0700 wow64: Ensure SECURITY_DESCRIPTOR fields are always initialized. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/wow64/wow64_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 1a9d05eaf43..b26148023db 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -146,17 +146,17 @@ static inline SECURITY_DESCRIPTOR *secdesc_32to64( SECURITY_DESCRIPTOR *out, con out->Control = sd->Control & ~SE_SELF_RELATIVE; if (sd->Control & SE_SELF_RELATIVE) { - if (sd->Owner) out->Owner = (PSID)((BYTE *)sd + sd->Owner); - if (sd->Group) out->Group = (PSID)((BYTE *)sd + sd->Group); - if ((sd->Control & SE_SACL_PRESENT) && sd->Sacl) out->Sacl = (PSID)((BYTE *)sd + sd->Sacl); - if ((sd->Control & SE_DACL_PRESENT) && sd->Dacl) out->Dacl = (PSID)((BYTE *)sd + sd->Dacl); + out->Owner = sd->Owner ? (PSID)((BYTE *)sd + sd->Owner) : NULL; + out->Group = sd->Group ? (PSID)((BYTE *)sd + sd->Group) : NULL; + out->Sacl = ((sd->Control & SE_SACL_PRESENT) && sd->Sacl) ? (PSID)((BYTE *)sd + sd->Sacl) : NULL; + out->Dacl = ((sd->Control & SE_DACL_PRESENT) && sd->Dacl) ? (PSID)((BYTE *)sd + sd->Dacl) : NULL; } else { out->Owner = ULongToPtr( sd->Owner ); out->Group = ULongToPtr( sd->Group ); - if (sd->Control & SE_SACL_PRESENT) out->Sacl = ULongToPtr( sd->Sacl ); - if (sd->Control & SE_DACL_PRESENT) out->Dacl = ULongToPtr( sd->Dacl ); + out->Sacl = (sd->Control & SE_SACL_PRESENT) ? ULongToPtr( sd->Sacl ) : NULL; + out->Dacl = (sd->Control & SE_DACL_PRESENT) ? ULongToPtr( sd->Dacl ) : NULL; } return out; }

1 0

Akihiro Sagawa : wineoss: Fix missing break statement.
by Alexandre Julliard May 26, 2022

May 26, 2022

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 May 26, 2022

May 26, 2022

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 : midimap: Handle MIDI running status.
by Alexandre Julliard May 26, 2022

May 26, 2022

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 May 26, 2022

May 26, 2022

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: Avoid leaking buffer list in wg_transform_read_data.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 2ae08f035fdb5665eab4cef6333344ace528c61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae08f035fdb5665eab4cef6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 23 17:53:02 2022 +0200 winegstreamer: Avoid leaking buffer list in wg_transform_read_data. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 9699d7e0a31..d75593daedd 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -448,6 +448,7 @@ NTSTATUS wg_transform_read_data(void *args) else if (!(transform->input = gst_buffer_list_new())) { GST_ERROR("Failed to allocate new input queue"); + gst_buffer_list_unref(input); return STATUS_NO_MEMORY; } else if ((ret = gst_pad_push_list(transform->my_src, input)))

1 0

Rémi Bernon : winegstreamer: Append a videoconvert element to wg_transform video output.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: ee7958bac7a176aa250cdcc23b9bb5c009204015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7958bac7a176aa250cdcc2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 13 00:52:55 2022 +0200 winegstreamer: Append a videoconvert element to wg_transform video output. 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 21392a82509..ae6e948318a 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -268,6 +268,11 @@ NTSTATUS wg_transform_create(void *args) break; case WG_MAJOR_TYPE_VIDEO: + if (!(element = create_element("videoconvert", "base")) + || !transform_append_element(transform, element, &first, &last)) + goto out; + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); break; case WG_MAJOR_TYPE_MPEG1_AUDIO:

1 0

Gabriel Ivăncescu : mshtml: Implement ontimeout event for XMLHttpRequest.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: b90c53797de4c3dd2d8ff2eaba7421dad411c972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b90c53797de4c3dd2d8ff2ea… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed May 25 19:13:16 2022 +0300 mshtml: Implement ontimeout event for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/script.c | 69 +++++++++++++++------ dlls/mshtml/tests/xhr.js | 35 ++++++++++- dlls/mshtml/xmlhttprequest.c | 9 +-- 6 files changed, 236 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b90c53797de4c3dd2d8f…

1 0