March 2022 - Wine-Devel - list.winehq.org

[PATCH 4/4] winealsa: Move the midi seq lock to the unixlib.
by Huw Davies March 14, 2022

March 14, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 1 + dlls/winealsa.drv/alsa.c | 2 + dlls/winealsa.drv/alsamidi.c | 64 +++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 97 +++++++++++++++++------------------ dlls/winealsa.drv/unixlib.h | 4 ++ 5 files changed, 118 insertions(+), 50 deletions(-) create mode 100644 dlls/winealsa.drv/alsamidi.c diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 2158e087251..41be57d8b83 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -9,5 +9,6 @@ EXTRADLLFLAGS = -mcygwin C_SRCS = \ alsa.c \ + alsamidi.c \ midi.c \ mmdevdrv.c diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 085066622c0..cdc3d81d8cc 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2444,4 +2444,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, get_prop_value, + + midi_seq_lock, /* temporary */ }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c new file mode 100644 index 00000000000..ab4de4f7f9e --- /dev/null +++ b/dlls/winealsa.drv/alsamidi.c @@ -0,0 +1,64 @@ +/* + * MIDI driver for ALSA (unixlib) + * + * Copyright 1994 Martin Ayotte + * Copyright 1998 Luiz Otavio L. Zorzella + * Copyright 1998, 1999 Eric POUECH + * Copyright 2003 Christian Costa + * Copyright 2022 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> +#include <pthread.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "mmdeviceapi.h" + +#include "wine/unixlib.h" + +#include "unixlib.h" + +static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; + +static void seq_lock(void) +{ + pthread_mutex_lock(&seq_mutex); +} + +static void seq_unlock(void) +{ + pthread_mutex_unlock(&seq_mutex); +} + +NTSTATUS midi_seq_lock(void *args) +{ + if (args) seq_lock(); + else seq_unlock(); + + return STATUS_SUCCESS; +} diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index e65cae6cda5..dff77ce88d8 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1,17 +1,11 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ - /* - * Sample MIDI Wine Driver for ALSA (basically Linux) + * MIDI driver for ALSA (PE-side) * - * Copyright 1994 Martin Ayotte - * Copyright 1998 Luiz Otavio L. Zorzella (init procedures) - * Copyright 1998/1999 Eric POUECH : - * 98/7 changes for making this MIDI driver work on OSS - * current support is limited to MIDI ports of OSS systems - * 98/9 rewriting MCI code for MIDI - * 98/11 split in midi.c and mcimidi.c - * Copyright 2003 Christian Costa : - * ALSA port + * Copyright 1994 Martin Ayotte + * Copyright 1998 Luiz Otavio L. Zorzella + * Copyright 1998, 1999 Eric POUECH + * Copyright 2003 Christian Costa + * Copyright 2022 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,9 +20,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * TODO: Finish midi record - * */ #include "config.h" @@ -40,18 +31,22 @@ #include <fcntl.h> #include <errno.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winuser.h" -#include "winnls.h" +#include "winternl.h" #include "mmddk.h" -#include "mmreg.h" -#include "dsound.h" +#include "mmdeviceapi.h" + #include "wine/debug.h" +#include "wine/unixlib.h" #include <alsa/asoundlib.h> +#include "unixlib.h" + WINE_DEFAULT_DEBUG_CHANNEL(midi); typedef struct { @@ -81,14 +76,6 @@ static int MODM_NumDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; -static CRITICAL_SECTION midiSeqLock; -static CRITICAL_SECTION_DEBUG midiSeqLockDebug = -{ - 0, 0, &midiSeqLock, - { &midiSeqLockDebug.ProcessLocksList, &midiSeqLockDebug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": midiSeqLock") } -}; -static CRITICAL_SECTION midiSeqLock = { &midiSeqLockDebug, -1, 0, 0, 0, 0 }; static snd_seq_t* midiSeq = NULL; static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; @@ -107,6 +94,16 @@ static CRITICAL_SECTION crit_sect = { &critsect_debug, -1, 0, 0, 0, 0 }; static int end_thread; static HANDLE hThread; +static void seq_lock(void) +{ + ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)1); +} + +static void seq_unlock(void) +{ + ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)0); +} + /*======================================================================* * Low level MIDI implementation * *======================================================================*/ @@ -215,7 +212,7 @@ static BOOL midi_warn = TRUE; */ static int midiOpenSeq(BOOL create_client) { - EnterCriticalSection(&midiSeqLock); + seq_lock(); if (numOpenMidiSeq == 0) { if (snd_seq_open(&midiSeq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0) { @@ -224,7 +221,7 @@ static int midiOpenSeq(BOOL create_client) WARN("Error opening ALSA sequencer.\n"); } midi_warn = FALSE; - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); return -1; } @@ -242,7 +239,7 @@ static int midiOpenSeq(BOOL create_client) } } numOpenMidiSeq++; - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); return 0; } @@ -251,13 +248,13 @@ static int midiOpenSeq(BOOL create_client) */ static int midiCloseSeq(void) { - EnterCriticalSection(&midiSeqLock); + seq_lock(); if (--numOpenMidiSeq == 0) { snd_seq_delete_simple_port(midiSeq, port_in); snd_seq_close(midiSeq); midiSeq = NULL; } - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); return 0; } @@ -381,11 +378,11 @@ static DWORD WINAPI midRecThread(LPVOID arg) while(!end_thread) { TRACE("Thread loop\n"); - EnterCriticalSection(&midiSeqLock); + seq_lock(); npfd = snd_seq_poll_descriptors_count(midiSeq, POLLIN); pfd = HeapAlloc(GetProcessHeap(), 0, npfd * sizeof(struct pollfd)); snd_seq_poll_descriptors(midiSeq, pfd, npfd, POLLIN); - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); /* Check if an event is present */ if (poll(pfd, npfd, 250) <= 0) { @@ -404,18 +401,18 @@ static DWORD WINAPI midRecThread(LPVOID arg) do { snd_seq_event_t *ev; - EnterCriticalSection(&midiSeqLock); + seq_lock(); snd_seq_event_input(midiSeq, &ev); - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); if (ev) { handle_midi_event(ev); snd_seq_free_event(ev); } - EnterCriticalSection(&midiSeqLock); + seq_lock(); ret = snd_seq_event_input_pending(midiSeq, 0); - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); } while(ret > 0); HeapFree(GetProcessHeap(), 0, pfd); @@ -489,10 +486,10 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].startTime = 0; /* Connect our app port to the device port */ - EnterCriticalSection(&midiSeqLock); + seq_lock(); ret = snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port); - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); if (ret < 0) return MMSYSERR_NOTENABLED; @@ -550,9 +547,9 @@ static DWORD midClose(WORD wDevID) TRACE("Stopped thread for midi-in\n"); } - EnterCriticalSection(&midiSeqLock); + seq_lock(); snd_seq_disconnect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port); - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); midiCloseSeq(); MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); @@ -752,7 +749,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiOutDev[wDevID].midiDesc = *lpDesc; - EnterCriticalSection(&midiSeqLock); + seq_lock(); /* Create a port dedicated to a specific device */ /* Keep the old name without a number for the first port */ if (wDevID) @@ -780,7 +777,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) wDevID, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port, snd_strerror(ret)); } - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); if (port_out < 0) return MMSYSERR_NOTENABLED; @@ -817,11 +814,11 @@ static DWORD modClose(WORD wDevID) case MOD_FMSYNTH: case MOD_MIDIPORT: case MOD_SYNTH: - EnterCriticalSection(&midiSeqLock); + seq_lock(); TRACE("Deleting port :%d, connected to %d:%d\n", MidiOutDev[wDevID].port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); snd_seq_delete_simple_port(midiSeq, MidiOutDev[wDevID].port_out); MidiOutDev[wDevID].port_out = -1; - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); midiCloseSeq(); break; default: @@ -942,9 +939,9 @@ static DWORD modData(WORD wDevID, DWORD dwParam) break; } if (handled) { - EnterCriticalSection(&midiSeqLock); + seq_lock(); snd_seq_event_output_direct(midiSeq, &event); - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); } } break; @@ -1033,9 +1030,9 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out); snd_seq_ev_set_subs(&event); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); - EnterCriticalSection(&midiSeqLock); + seq_lock(); snd_seq_event_output_direct(midiSeq, &event); - LeaveCriticalSection(&midiSeqLock); + seq_unlock(); HeapFree(GetProcessHeap(), 0, lpNewData); break; default: diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index c2de48cef65..89afcb71bec 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -232,8 +232,12 @@ enum alsa_funcs alsa_set_event_handle, alsa_is_started, alsa_get_prop_value, + + alsa_midi_seq_lock, /* temporary */ }; +NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; + extern unixlib_handle_t alsa_handle; #define ALSA_CALL(func, params) __wine_unix_call(alsa_handle, alsa_ ## func, params) -- 2.25.1

2 1

[PATCH 3/4] winealsa: Remove a workaround for versions of alsa-lib before 1.0.12.
by Huw Davies March 14, 2022

March 14, 2022

Version 1.0.12 was released in 2006. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 699790d380d..e65cae6cda5 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -54,10 +54,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#ifndef SND_SEQ_PORT_TYPE_PORT -#define SND_SEQ_PORT_TYPE_PORT (1<<19) /* Appears in version 1.0.12rc1 */ -#endif - typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ MIDIOPENDESC midiDesc; -- 2.25.1

2 1

[PATCH 2/4] winealsa: Remove several unused members.
by Huw Davies March 14, 2022

March 14, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index e61dae12860..699790d380d 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -60,14 +60,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; - unsigned char incoming[3]; - unsigned char incPrev; - char incLen; DWORD startTime; MIDIINCAPSW caps; snd_seq_addr_t addr; @@ -75,12 +70,8 @@ typedef struct { typedef struct { BOOL bEnabled; - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; - LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; - void* lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ MIDIOUTCAPSW caps; snd_seq_addr_t addr; int port_out; @@ -497,11 +488,8 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].dwTotalPlayed = 0; - MidiInDev[wDevID].bufsize = 0x3FFF; MidiInDev[wDevID].midiDesc = *lpDesc; MidiInDev[wDevID].state = 0; - MidiInDev[wDevID].incLen = 0; MidiInDev[wDevID].startTime = 0; /* Connect our app port to the device port */ @@ -571,7 +559,6 @@ static DWORD midClose(WORD wDevID) LeaveCriticalSection(&midiSeqLock); midiCloseSeq(); - MidiInDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; @@ -752,8 +739,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_INVALFLAG; } - MidiOutDev[wDevID].lpExtra = 0; - switch (MidiOutDev[wDevID].caps.wTechnology) { case MOD_FMSYNTH: case MOD_MIDIPORT: @@ -769,10 +754,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) } MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiOutDev[wDevID].lpQueueHdr = NULL; - MidiOutDev[wDevID].dwTotalPlayed = 0; - MidiOutDev[wDevID].bufsize = 0x3FFF; MidiOutDev[wDevID].midiDesc = *lpDesc; EnterCriticalSection(&midiSeqLock); @@ -853,10 +834,6 @@ static DWORD modClose(WORD wDevID) return MMSYSERR_NOTENABLED; } - HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); - MidiOutDev[wDevID].lpExtra = 0; - - MidiOutDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); MidiOutDev[wDevID].midiDesc.hMidi = 0; return ret; -- 2.25.1

2 1

[PATCH v3 1/3] winegstreamer: Implement WMA decoder Process(Input|Output) error checks.
by Rémi Bernon March 14, 2022

March 14, 2022

Checking that WMA decoder ignores any incorrectly sized input sample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Same as v2, but rebased. dlls/mf/tests/mf.c | 23 +++++++++++++--------- dlls/winegstreamer/wma_decoder.c | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d23dcdce064..3bc2a4d1fa8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6035,6 +6035,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_OUTPUT_STREAM_INFO output_info; + MFT_OUTPUT_DATA_BUFFER outputs[2]; MFT_INPUT_STREAM_INFO input_info; MFT_OUTPUT_DATA_BUFFER output; const BYTE *wma_encoded_data; @@ -6212,7 +6213,7 @@ static void test_wma_decoder(void) ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %lu\n", ret); - sample = create_sample(wma_encoded_data + wma_block_size, wma_block_size - wma_block_size / 2); + sample = create_sample(wma_encoded_data, wma_block_size + 1); hr = IMFTransform_ProcessInput(transform, 0, sample, 0); todo_wine ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); @@ -6235,16 +6236,13 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "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_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#lx\n", output.dwStatus); ok(!output.pEvents, "got pEvents %p\n", output.pEvents); - todo_wine ok(status == 0, "got status %#lx\n", status); sample = create_sample(wma_encoded_data, wma_block_size); @@ -6257,16 +6255,25 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); ok(!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#lx\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#lx\n", status); + status = 0xdeadbeef; + memset(&output, 0, sizeof(output)); + output_info.cbSize = sizeof(wma_decoded_data); + sample = create_sample(NULL, output_info.cbSize); + outputs[0].pSample = sample; + sample = create_sample(NULL, output_info.cbSize); + outputs[1].pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 2, outputs, &status); + ok(hr == E_INVALIDARG, "ProcessOutput returned %#lx\n", hr); + IMFSample_Release(outputs[0].pSample); + IMFSample_Release(outputs[1].pSample); + i = 1; status = 0xdeadbeef; output_info.cbSize = sizeof(wma_decoded_data); @@ -6337,7 +6344,6 @@ static void test_wma_decoder(void) ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); ok(output.pSample == sample, "got pSample %p\n", output.pSample); ok(output.dwStatus == 0, "got dwStatus %#lx\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#lx\n", status); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %lu\n", ret); @@ -6353,7 +6359,6 @@ static void test_wma_decoder(void) ok(output.dwStatus == 0 || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7)) /* Win7 */, "got dwStatus %#lx\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#lx\n", status); check_sample(sample, NULL, 0, NULL); ret = IMFSample_Release(sample); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 6c198706944..a35da1cdc70 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -520,14 +520,47 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_INPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, id %lu, sample %p, flags %#lx stub!\n", iface, id, sample, flags); + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) + return hr; + return E_NOTIMPL; } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_OUTPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status); + + if (count > 1) + return E_INVALIDARG; + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(iface, 0, &info))) + return hr; + + *status = 0; + samples[0].dwStatus = 0; + if (!samples[0].pSample) + { + samples[0].dwStatus = MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE; + return MF_E_TRANSFORM_NEED_MORE_INPUT; + } + return E_NOTIMPL; } -- 2.35.1

3 5

[PATCH v2 1/3] winhttp: Fix filling TIMEVAL in netconn_create().
by Paul Gofman March 14, 2022

March 14, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 229700: no changes, resent to avoid conflicts with the next patches. dlls/winhttp/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 19fafb25804..09ed5e222d1 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -229,7 +229,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock if (ret == WSAEWOULDBLOCK || ret == WSAEINPROGRESS) { FD_SET set; - TIMEVAL timeval = { 0, timeout * 1000 }; + TIMEVAL timeval = { timeout / 1000, (timeout % 1000) * 1000 }; int res; FD_ZERO( &set ); -- 2.35.1

3 6

[PATCH vkd3d v5 8/8] vkd3d-shader/hlsl: Treat all braceless initializers as assignments.
by Francisco Casas March 14, 2022

March 14, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v5: - No changes from v4. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 91 +++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d6ba2c12..88d9b88f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1599,61 +1599,66 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces - && type->dimx * type->dimy != size) + if (v->initializer.braces) { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + unsigned int size = initializer_size(&v->initializer); - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && hlsl_type_component_count(type) != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + else + { + hlsl_fixme(ctx, &v->loc, "Complex initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + assert(v->initializer.args_count == 1); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } vkd3d_free(v); -- 2.25.1

3 2

[PATCH vkd3d v5 6/8] vkd3d-shader/hlsl: Don't check exact number of components for braceless initialization of numeric types.
by Francisco Casas March 14, 2022

March 14, 2022

The implicit conversion in add_assignment() takes responsability now. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v5: - No changes from v4. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bbdc1493..0b6093ba 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1602,19 +1602,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t unsigned int size = initializer_size(&v->initializer); struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) { -- 2.25.1

3 2

[PATCH vkd3d v5 4/8] vkd3d-shader/hlsl: Add 'braces' flag to parse initializers.
by Francisco Casas March 14, 2022

March 14, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v5: - No changes from v4. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5f8841fe..34b4a8bb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -48,6 +48,7 @@ struct parse_initializer struct hlsl_ir_node **args; unsigned int args_count; struct list *instrs; + bool braces; }; struct parse_array_sizes @@ -3218,14 +3219,17 @@ complex_initializer: } $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | '{' complex_initializer_list '}' { $$ = $2; + $$.braces = true; } | '{' complex_initializer_list ',' '}' { $$ = $2; + $$.braces = true; } complex_initializer_list: @@ -3259,6 +3263,7 @@ initializer_expr_list: YYABORT; $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | initializer_expr_list ',' initializer_expr { @@ -3395,6 +3400,7 @@ func_arguments: $$.args_count = 0; if (!($$.instrs = make_empty_list(ctx))) YYABORT; + $$.braces = false; } | initializer_expr_list -- 2.25.1

3 2

[PATCH vkd3d v5 3/8] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas March 14, 2022

March 14, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v5: - Preserve array pointer to correctly free memory on realloc failure. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index aca246f6..5f8841fe 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2411,6 +2411,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3218,15 +3219,35 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + struct hlsl_ir_node **new_args; + + $$ = $1; + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + free_parse_initializer(&$3); + YYABORT; + } + $$.args = new_args; + for (unsigned int i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

3 2

[PATCH vkd3d v5 2/8] vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Francisco Casas March 14, 2022

March 14, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v5: - Preserve array pointer to correctly free memory on realloc failure. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 92dcb3f2..aca246f6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3211,7 +3211,10 @@ complex_initializer: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } @@ -3238,9 +3241,16 @@ initializer_expr_list: } | initializer_expr_list ',' initializer_expr { + struct hlsl_ir_node **new_args; + $$ = $1; - if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + destroy_instr_list($3); YYABORT; + } + $$.args = new_args; $$.args[$$.args_count++] = node_from_list($3); list_move_tail($$.instrs, $3); vkd3d_free($3); -- 2.25.1

3 2