- Wine-Devel - list.winehq.org

[PATCH 6/9] win32u: Move NtUserBeginPaint implementation from user32.
by Jacek Caban March 14, 2022

March 14, 2022

2 1

[PATCH 4/9] win32u: Move NtUserGetDCEx implementation from user32.
by Jacek Caban March 14, 2022

March 14, 2022

2 1

[PATCH 3/9] win32u: Mmove dummy surface implementation from user32.
by Jacek Caban March 14, 2022

March 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/painting.c | 4 +- dlls/user32/win.c | 68 ---------------------- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 7 ++- dlls/win32u/dce.c | 110 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 9 ++- dlls/win32u/window.c | 43 +------------- include/ntuser.h | 1 + 8 files changed, 126 insertions(+), 117 deletions(-)

2 1

[PATCH 2/9] win32u: Move NtUserWindowFromDC implementation from user32.
by Jacek Caban March 14, 2022

March 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/painting.c | 27 ----------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/win32u/Makefile.in | 1 + dlls/win32u/dce.c | 42 ++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 13 ++++++++++- dlls/win32u/palette.c | 9 +++----- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 ++++++ include/ntuser.h | 1 + 12 files changed, 71 insertions(+), 38 deletions(-) create mode 100644 dlls/win32u/dce.c

2 1

[PATCH 1/9] user32: Fix nameA pointer in alloc_menu_nameW.
by Jacek Caban March 14, 2022

March 14, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52651 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 1 + dlls/user32/tests/class.c | 48 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)

2 1

[PATCH] mfplat: Properly align memory allocated by IMF2DBuffer.
by Nikolay Sivov March 14, 2022

March 14, 2022

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Contains changes from 228247 and 228249. dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 1cb84cba944..2ec714c1419 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1385,7 +1385,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo max_length = pitch * height; } - if (FAILED(hr = memory_buffer_init(object, max_length, MF_1_BYTE_ALIGNMENT, &memory_1d_2d_buffer_vtbl))) + if (FAILED(hr = memory_buffer_init(object, max_length, row_alignment, &memory_1d_2d_buffer_vtbl))) { free(object); return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d9c25edaa72..dcb064daf85 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6005,6 +6005,31 @@ static void test_MFCreate2DMediaBuffer(void) IMFMediaBuffer_Release(buffer); } + + /* Alignment tests */ + for (i = 0; i < ARRAY_SIZE(_2d_buffer_tests); ++i) + { + const struct _2d_buffer_test *ptr = &_2d_buffer_tests[i]; + + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->fourcc, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); + ok(hr == S_OK, "Failed to get interface, hr %#lx.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); + ok(((uintptr_t)data & (pitch - 1)) == 0, "Misaligned data at %p.\n", data); + + ok(pitch == ptr->pitch, "%d: unexpected pitch %ld, expected %d, %u x %u, format %s.\n", i, pitch, ptr->pitch, + ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); + + IMF2DBuffer_Release(_2dbuffer); + IMFMediaBuffer_Release(buffer); + } } static void test_MFCreateMediaBufferFromMediaType(void) -- 2.35.1

2 3

[v3 PATCH] mfplat: Properly align system memory buffers.
by Nikolay Sivov March 14, 2022

March 14, 2022

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This covers both 228248 and 228239. dlls/mfplat/buffer.c | 24 +++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 39 +++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index a912c61a3ac..1cb84cba944 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -18,6 +18,8 @@ #define COBJMACROS +#include <malloc.h> + #include "mfplat_private.h" #include "rtworkq.h" @@ -171,7 +173,7 @@ static ULONG WINAPI memory_buffer_Release(IMFMediaBuffer *iface) } DeleteCriticalSection(&buffer->cs); free(buffer->_2d.linear_buffer); - free(buffer->data); + _aligned_free(buffer->data); free(buffer); } @@ -1254,8 +1256,26 @@ static const IMFDXGIBufferVtbl dxgi_buffer_vtbl = static HRESULT memory_buffer_init(struct buffer *buffer, DWORD max_length, DWORD alignment, const IMFMediaBufferVtbl *vtbl) { - if (!(buffer->data = calloc(1, ALIGN_SIZE(max_length, alignment)))) + size_t size; + + if (!alignment) alignment = MF_64_BYTE_ALIGNMENT; + alignment++; + + if (alignment & (alignment - 1)) + { + alignment--; + alignment |= alignment >> 1; + alignment |= alignment >> 2; + alignment |= alignment >> 4; + alignment |= alignment >> 8; + alignment |= alignment >> 16; + alignment++; + } + + size = ALIGN_SIZE(max_length, alignment - 1); + if (!(buffer->data = _aligned_malloc(size, alignment))) return E_OUTOFMEMORY; + memset(buffer->data, 0, size); buffer->IMFMediaBuffer_iface.lpVtbl = vtbl; buffer->refcount = 1; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f61dbad7ab9..d9c25edaa72 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2287,8 +2287,25 @@ static void test_system_memory_buffer(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaBuffer_Release(buffer); +} + +static void test_system_memory_aligned_buffer(void) +{ + static const DWORD alignments[] = + { + MF_16_BYTE_ALIGNMENT, + MF_32_BYTE_ALIGNMENT, + MF_64_BYTE_ALIGNMENT, + MF_128_BYTE_ALIGNMENT, + MF_256_BYTE_ALIGNMENT, + MF_512_BYTE_ALIGNMENT, + }; + IMFMediaBuffer *buffer; + DWORD length, max; + unsigned int i; + BYTE *data; + HRESULT hr; - /* Aligned buffer. */ hr = MFCreateAlignedMemoryBuffer(16, MF_8_BYTE_ALIGNMENT, NULL); ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); @@ -2324,6 +2341,25 @@ static void test_system_memory_buffer(void) ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); IMFMediaBuffer_Release(buffer); + + for (i = 0; i < ARRAY_SIZE(alignments); ++i) + { + hr = MFCreateAlignedMemoryBuffer(200, alignments[i], &buffer); + ok(hr == S_OK, "Failed to create memory buffer, hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(max == 200 && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignments[i]), "Data at %p is misaligned.\n", data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + + IMFMediaBuffer_Release(buffer); + } + + hr = MFCreateAlignedMemoryBuffer(200, 0, &buffer); + ok(hr == S_OK, "Failed to create memory buffer, hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); } static void test_sample(void) @@ -7980,6 +8016,7 @@ START_TEST(mfplat) test_file_stream(); test_MFCreateMFByteStreamOnStream(); test_system_memory_buffer(); + test_system_memory_aligned_buffer(); test_source_resolver(); test_MFCreateAsyncResult(); test_allocate_queue(); -- 2.34.1

3 3

[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