- Wine-Devel - list.winehq.org

[PATCH vkd3d v7 1/6] vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Francisco Casas March 25, 2022

March 25, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. 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 1ab56fba..2b26d0b0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3208,7 +3208,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; } @@ -3235,9 +3238,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

1 0

[PATCH] kernel32/tests: Add a test to show that services.exe is supposed to run in the session 0.
by Dmitry Timoshkov March 25, 2022

March 25, 2022

IsWindowsService() from Microsoft.Extensions.Hosting.WindowsServices (.Net 4.6, 4.8, 5.0) depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/process.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e9e8555c32e..8f18a0d37a7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4959,6 +4959,40 @@ static void test_job_list_attribute(HANDLE parent_job) ok(ret, "SetInformationJobObject error %lu\n", GetLastError()); } +static void test_services_exe(void) +{ + NTSTATUS status; + ULONG size, offset; + char *buf; + SYSTEM_PROCESS_INFORMATION *spi; + ULONG services_pid = 0, services_session_id = ~0; + + status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); + + buf = malloc(size); + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, &size); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + spi = (SYSTEM_PROCESS_INFORMATION *)buf; + offset = 0; + + do + { + spi = (SYSTEM_PROCESS_INFORMATION *)(buf + offset); + if (!wcsnicmp(spi->ProcessName.Buffer, L"services.exe", spi->ProcessName.Length/sizeof(WCHAR))) + { + services_pid = HandleToUlong(spi->UniqueProcessId); + services_session_id = spi->SessionId; + } + offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset != 0); + + ok(services_pid != 0, "services.exe not found\n"); + todo_wine + ok(services_session_id == 0, "got services.exe SessionId %lu\n", services_session_id); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -5088,6 +5122,7 @@ START_TEST(process) test_parent_process_attribute(0, NULL); test_handle_list_attribute(FALSE, NULL, NULL); test_dead_process(); + test_services_exe(); /* things that can be tested: * lookup: check the way program to be executed is searched -- 2.35.1

1 0

[PATCH] bcrypt: Use GNUTLS_DIG_UNKNOWN for an unknown digest.
by Huw Davies March 25, 2022

March 25, 2022

Mainly to avoid a clang warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index ba251c72fa1..b38bf4ba8ff 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1552,7 +1552,7 @@ static gnutls_digest_algorithm_t get_digest_from_id( const WCHAR *alg_id ) if (!wcscmp( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512; if (!wcscmp( alg_id, BCRYPT_MD2_ALGORITHM )) return GNUTLS_DIG_MD2; if (!wcscmp( alg_id, BCRYPT_MD5_ALGORITHM )) return GNUTLS_DIG_MD5; - return -1; + return GNUTLS_DIG_UNKNOWN; } static NTSTATUS key_asymmetric_verify( void *args ) @@ -1596,7 +1596,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) if (!(flags & BCRYPT_PAD_PKCS1) || !info) return STATUS_INVALID_PARAMETER; if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; - if ((hash_alg = get_digest_from_id(info->pszAlgId)) == -1) + if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); return STATUS_NOT_SUPPORTED; @@ -1751,7 +1751,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) return STATUS_INVALID_PARAMETER; } - if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == -1) + if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) ); return STATUS_NOT_SUPPORTED; -- 2.23.0

2 1

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

March 25, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v6: - Declaration of "unsigned int i" moved out of the 'for' initialization clause. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index aca246f6..c40957c2 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,36 @@ 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; + unsigned int i; + + $$ = $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 (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

1 1

[PATCH] win32u: Move menu handle management from user32.
by Jacek Caban March 25, 2022

March 25, 2022

4 4

[PATCH 1/2] user32/tests: Test a recursive activation loop on WM_ACTIVATE.
by Rémi Bernon March 25, 2022

March 25, 2022

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Windows only sends the activation messages and hooks once, until the SetActiveWindow completes for that window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- AFAICS these two patches help with the recent user32 tests failures on the testbot. Although I believe the patches are correct, I'm not sure the failure root cause is that windows are now activated recursively. Instead, I think that some change caused window procs to now be always called recursively when they weren't before. dlls/user32/tests/msg.c | 91 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a2adf56565d..adb167bdad3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10203,6 +10203,40 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP return ret; } +static LRESULT WINAPI SetActiveWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + struct recvd_message msg; + LRESULT ret; + + switch (message) + { + /* log only specific messages we are interested in */ + case WM_NCACTIVATE: + case WM_ACTIVATE: + case WM_SETFOCUS: + case WM_KILLFOCUS: + break; + default: + return DefWindowProcA(hwnd, message, wParam, lParam); + } + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "activation"; + add_message(&msg); + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + static LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) @@ -10300,6 +10334,10 @@ static BOOL RegisterWindowClasses(void) cls.lpszClassName = "ShowWindowClass"; if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = SetActiveWindowProcA; + cls.lpszClassName = "SetActiveWindowClass"; + if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = PopupMsgCheckProcA; cls.lpszClassName = "TestPopupClass"; if(!RegisterClassA(&cls)) return FALSE; @@ -10355,6 +10393,7 @@ static BOOL is_our_logged_class(HWND hwnd) { if (!lstrcmpiA(buf, "TestWindowClass") || !lstrcmpiA(buf, "ShowWindowClass") || + !lstrcmpiA(buf, "SetActiveWindowClass") || !lstrcmpiA(buf, "TestParentClass") || !lstrcmpiA(buf, "TestPopupClass") || !lstrcmpiA(buf, "SimpleWindowClass") || @@ -14758,10 +14797,46 @@ static const struct message SetActiveWindowSeq4[] = { 0 } }; +static LRESULT WINAPI test_recursive_set_active_window_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_ACTIVATE && LOWORD(wparam) != WA_INACTIVE) + { + SetActiveWindow((HWND)lparam); + SetActiveWindow(hwnd); + return 0; + } + + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +static void test_set_active_window_recursive(HWND hwnd, HWND hwnd2) +{ + const struct message RecursiveActivationSeq[] = + { + { HCBT_ACTIVATE, hook|wparam, (WPARAM)hwnd }, + { WM_NCACTIVATE, sent|wparam|lparam, FALSE, (LPARAM)hwnd }, + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)hwnd }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { HCBT_ACTIVATE, hook|wparam, (WPARAM)hwnd2 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { WM_NCACTIVATE, sent|wparam|lparam, FALSE, (LPARAM)hwnd }, + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)hwnd }, + { 0 } + }; + SetActiveWindow(hwnd2); + + flush_sequence(); + SetActiveWindow(hwnd); + ok_sequence(RecursiveActivationSeq, "recursive activation", TRUE); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + flush_sequence(); +} static void test_SetActiveWindow(void) { - HWND hwnd, popup, ret; + HWND hwnd, hwnd2, popup, ret; hwnd = CreateWindowExA(0, "TestWindowClass", "Test SetActiveWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -14812,6 +14887,20 @@ static void test_SetActiveWindow(void) trace("done\n"); DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "SimpleWindowClass", NULL, WS_OVERLAPPED|WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "Failed to create simple window\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)test_recursive_set_active_window_proc); + + hwnd2 = CreateWindowExA(0, "SetActiveWindowClass", NULL, WS_OVERLAPPED|WS_VISIBLE, + 10, 10, 50, 50, hwnd, 0, 0, NULL); + ok(hwnd2 != 0, "Failed to create recursive activation window\n"); + + test_set_active_window_recursive(hwnd, hwnd2); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); } static const struct message SetForegroundWindowSeq[] = -- 2.35.1

3 5

[PATCH 6/6] winealsa: Build with msvcrt.
by Huw Davies March 25, 2022

March 25, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 2 -- dlls/winealsa.drv/midi.c | 9 --------- dlls/winealsa.drv/mmdevdrv.c | 17 ++++++----------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 2113594fbe3..1349f6f9dab 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ alsa.c \ alsamidi.c \ diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4db38537dd0..fc2205de6f6 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -22,17 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <string.h> #include <stdarg.h> -#include <stdio.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 389c40b47de..7dc01940dc9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -18,23 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS -#include "config.h" #include <stdarg.h> -#include <stdio.h> -#include <math.h> #include "windef.h" #include "winbase.h" #include "winnls.h" #include "winreg.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" -#include "wine/unixlib.h" - +#include "winternl.h" #include "propsys.h" #include "initguid.h" #include "ole2.h" @@ -44,11 +36,14 @@ #include "mmsystem.h" #include "dsound.h" -#include "initguid.h" #include "endpointvolume.h" #include "audioclient.h" #include "audiopolicy.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unixlib.h" + #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(alsa); @@ -371,7 +366,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); ids[i] = HeapAlloc(GetProcessHeap(), 0, size); if(!ids[i]){ params.result = E_OUTOFMEMORY; -- 2.25.1

2 1

[PATCH 5/6] winealsa: Move DRVM_INIT to the unixlib.
by Huw Davies March 25, 2022

March 25, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 1 - dlls/winealsa.drv/alsamidi.c | 25 ++++++++++++------------- dlls/winealsa.drv/midi.c | 27 --------------------------- dlls/winealsa.drv/unixlib.h | 7 ------- 4 files changed, 12 insertions(+), 48 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index e068f6608f3..e5f755b69ed 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2444,7 +2444,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, get_prop_value, - midi_init, midi_release, midi_out_message, midi_in_message, diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 8ec646281d2..476ea383a25 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -400,27 +400,22 @@ static void port_add(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, u } } -NTSTATUS midi_init(void *args) +static UINT midi_init(void) { - struct midi_init_params *params = args; static BOOL init_done; snd_seq_client_info_t *cinfo; snd_seq_port_info_t *pinfo; snd_seq_t *seq; - if (init_done) { - *params->err = ERROR_ALREADY_INITIALIZED; - return STATUS_SUCCESS; - } + if (init_done) + return ERROR_ALREADY_INITIALIZED; TRACE("Initializing the MIDI variables.\n"); init_done = TRUE; /* try to open device */ - if (!(seq = seq_open(NULL))) { - *params->err = ERROR_OPEN_FAILED; - return STATUS_SUCCESS; - } + if (!(seq = seq_open(NULL))) + return ERROR_OPEN_FAILED; cinfo = calloc( 1, snd_seq_client_info_sizeof() ); pinfo = calloc( 1, snd_seq_port_info_sizeof() ); @@ -454,11 +449,9 @@ NTSTATUS midi_init(void *args) free( cinfo ); free( pinfo ); - *params->err = NOERROR; - TRACE("End\n"); - return STATUS_SUCCESS; + return NOERROR; } NTSTATUS midi_release(void *args) @@ -1369,6 +1362,9 @@ NTSTATUS midi_out_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: @@ -1424,6 +1420,9 @@ NTSTATUS midi_in_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index b768517e655..4db38537dd0 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -59,22 +59,6 @@ static void notify_client(struct notify_context *notify) * MIDI entry points * *======================================================================*/ -/************************************************************************** - * ALSA_MidiInit [internal] - * - * Initializes the MIDI devices information variables - */ -static BOOL ALSA_MidiInit(void) -{ - struct midi_init_params params; - UINT err; - - params.err = &err; - ALSA_CALL(midi_init, &params); - - return TRUE; -} - /************************************************************************** * midMessage (WINEALSA.@) */ @@ -87,11 +71,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case DRVM_INIT: - ALSA_MidiInit(); - return 0; - } params.dev_id = wDevID; params.msg = wMsg; @@ -123,12 +102,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case DRVM_INIT: - ALSA_MidiInit(); - return 0; - } - params.dev_id = wDevID; params.msg = wMsg; params.user = dwUser; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index ad8865a0988..7d7be1e140d 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -207,11 +207,6 @@ struct get_prop_value_params unsigned int *buffer_size; }; -struct midi_init_params -{ - UINT *err; -}; - struct notify_context { BOOL send_notify; @@ -278,14 +273,12 @@ enum alsa_funcs alsa_set_event_handle, alsa_is_started, alsa_get_prop_value, - alsa_midi_init, alsa_midi_release, alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, }; -NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH 4/6] winealsa: Move MIDM_OPEN and MIDM_CLOSE to the unixlib.
by Huw Davies March 25, 2022

March 25, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winealsa.drv/alsa.c | 4 - dlls/winealsa.drv/alsamidi.c | 231 ++++++++++++++++++++++++--- dlls/winealsa.drv/midi.c | 287 ---------------------------------- dlls/winealsa.drv/unixlib.h | 33 ---- 5 files changed, 206 insertions(+), 351 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 41be57d8b83..2113594fbe3 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -3,7 +3,7 @@ MODULE = winealsa.drv UNIXLIB = winealsa.so IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm -EXTRALIBS = $(ALSA_LIBS) +EXTRALIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b18588ab1c0..e068f6608f3 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2449,8 +2449,4 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_in_message, midi_notify_wait, - - midi_seq_lock, /* temporary */ - midi_seq_open, - midi_handle_event, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 1633268b533..8ec646281d2 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -60,6 +60,19 @@ struct midi_dest int port_out; }; +struct midi_src +{ + int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIHDR *lpQueueHdr; + UINT startTime; + MIDIINCAPSW caps; + snd_seq_t *seq; + snd_seq_addr_t addr; + int port_in; +}; + static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -70,6 +83,10 @@ static snd_seq_t *midi_seq; static unsigned int seq_refs; static int port_in = -1; +static unsigned int num_midi_in_started; +static int rec_cancel_pipe[2]; +static pthread_t rec_thread_id; + static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; static BOOL notify_quit; @@ -87,14 +104,6 @@ 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; -} - static void in_buffer_lock(void) { pthread_mutex_lock(&in_buffer_mutex); @@ -233,18 +242,6 @@ static void seq_close(void) seq_unlock(); } -NTSTATUS midi_seq_open(void *args) -{ - struct midi_seq_open_params *params = args; - - if (!params->close) - params->seq = seq_open(params->port_in); - else - seq_close(); - - return STATUS_SUCCESS; -} - static int alsa_to_win_device_type(unsigned int type) { /* MOD_MIDIPORT output port @@ -458,8 +455,6 @@ NTSTATUS midi_init(void *args) free( pinfo ); *params->err = NOERROR; - params->num_srcs = num_srcs; - params->srcs = srcs; TRACE("End\n"); @@ -1033,9 +1028,8 @@ static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) } } -NTSTATUS midi_handle_event(void *args) +static void midi_handle_event(snd_seq_event_t *ev) { - snd_seq_event_t *ev = args; struct midi_src *src; /* Find the target device */ @@ -1043,14 +1037,193 @@ NTSTATUS midi_handle_event(void *args) if ((ev->source.client == src->addr.client) && (ev->source.port == src->addr.port)) break; if ((src == srcs + num_srcs) || (src->state != 1)) - return STATUS_SUCCESS; + return; if (ev->type == SND_SEQ_EVENT_SYSEX) handle_sysex_event(src, ev->data.ext.ptr, ev->data.ext.len); else handle_regular_event(src, ev); +} - return STATUS_SUCCESS; +static void *rec_thread_proc(void *arg) +{ + snd_seq_t *midi_seq = (snd_seq_t *)arg; + int num_fds; + struct pollfd *pollfd; + int ret; + + /* Add on one for the read end of the cancel pipe */ + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; + pollfd = malloc(num_fds * sizeof(struct pollfd)); + + while(1) + { + pollfd[0].fd = rec_cancel_pipe[0]; + pollfd[0].events = POLLIN; + + seq_lock(); + snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); + seq_unlock(); + + /* Check if an event is present */ + if (poll(pollfd, num_fds, -1) <= 0) + continue; + + if (pollfd[0].revents & POLLIN) /* cancelled */ + break; + + do + { + snd_seq_event_t *ev; + + seq_lock(); + snd_seq_event_input(midi_seq, &ev); + seq_unlock(); + + if (ev) + { + midi_handle_event(ev); + snd_seq_free_event(ev); + } + + seq_lock(); + ret = snd_seq_event_input_pending(midi_seq, 0); + seq_unlock(); + } while(ret > 0); + } + + free(pollfd); + return 0; +} + +static UINT midi_in_open(WORD dev_id, MIDIOPENDESC *desc, UINT flags, struct notify_context *notify) +{ + struct midi_src *src; + int ret = 0, port_in; + snd_seq_t *midi_seq; + + TRACE("(%04X, %p, %08X);\n", dev_id, desc, flags); + + if (!desc) + { + WARN("Invalid Parameter !\n"); + return MMSYSERR_INVALPARAM; + } + + /* FIXME: check that contents of desc are correct */ + + if (dev_id >= num_srcs) + { + WARN("dev_id too large (%u) !\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + + if (src->state == -1) + { + WARN("device disabled\n"); + return MIDIERR_NODEVICE; + } + if (src->midiDesc.hMidi) + { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if (flags & MIDI_IO_STATUS) + { + WARN("No support for MIDI_IO_STATUS in flags yet, ignoring it\n"); + flags &= ~MIDI_IO_STATUS; + } + if (flags & ~CALLBACK_TYPEMASK) + { + FIXME("Bad flags %08X\n", flags); + return MMSYSERR_INVALFLAG; + } + + if (!(midi_seq = seq_open(&port_in))) + return MMSYSERR_ERROR; + + src->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + + src->lpQueueHdr = NULL; + src->midiDesc = *desc; + src->state = 0; + src->startTime = 0; + src->seq = midi_seq; + src->port_in = port_in; + + /* Connect our app port to the device port */ + seq_lock(); + ret = snd_seq_connect_from(midi_seq, port_in, src->addr.client, src->addr.port); + seq_unlock(); + if (ret < 0) + return MMSYSERR_NOTENABLED; + + TRACE("Input port :%d connected %d:%d\n", port_in, src->addr.client, src->addr.port); + + if (num_midi_in_started++ == 0) + { + pipe(rec_cancel_pipe); + if (pthread_create(&rec_thread_id, NULL, rec_thread_proc, midi_seq)) + { + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); + num_midi_in_started = 0; + WARN("Couldn't create thread for midi-in\n"); + seq_close(); + return MMSYSERR_ERROR; + } + } + + set_in_notify(notify, src, dev_id, MIM_OPEN, 0, 0); + return MMSYSERR_NOERROR; +} + +static UINT midi_in_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("dev_id too big (%u) !\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + if (!src->midiDesc.hMidi) + { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + if (src->lpQueueHdr) + return MIDIERR_STILLPLAYING; + + if (src->seq == NULL) + { + WARN("ooops !\n"); + return MMSYSERR_ERROR; + } + if (--num_midi_in_started == 0) + { + TRACE("Stopping thread for midi-in\n"); + write(rec_cancel_pipe[1], "x", 1); + pthread_join(rec_thread_id, NULL); + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); + TRACE("Stopped thread for midi-in\n"); + } + + seq_lock(); + snd_seq_disconnect_from(src->seq, src->port_in, src->addr.client, src->addr.port); + seq_unlock(); + seq_close(); + + set_in_notify(notify, src, dev_id, MIM_CLOSE, 0, 0); + src->midiDesc.hMidi = 0; + src->seq = NULL; + + return MMSYSERR_NOERROR; } static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) @@ -1257,6 +1430,12 @@ NTSTATUS midi_in_message(void *args) /* FIXME: Pretend this is supported */ *params->err = MMSYSERR_NOERROR; break; + case MIDM_OPEN: + *params->err = midi_in_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); + break; + case MIDM_CLOSE: + *params->err = midi_in_close(params->dev_id, params->notify); + break; case MIDM_ADDBUFFER: *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 327d4b7b200..b768517e655 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -47,26 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -static WINE_MIDIIN *MidiInDev; - -/* this is the total number of MIDI out devices found */ -static int MIDM_NumDevs = 0; - -static int numStartedMidiIn = 0; - -static int rec_cancel_pipe[2]; -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); -} - static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -75,264 +55,6 @@ static void notify_client(struct notify_context *notify) notify->instance, notify->param_1, notify->param_2); } -/*======================================================================* - * Low level MIDI implementation * - *======================================================================*/ - -#if 0 /* Debug Purpose */ -static void error_handler(const char* file, int line, const char* function, int err, const char* fmt, ...) -{ - va_list arg; - if (err == ENOENT) - return; - va_start(arg, fmt); - fprintf(stderr, "ALSA lib %s:%i:(%s) ", file, line, function); - vfprintf(stderr, fmt, arg); - if (err) - fprintf(stderr, ": %s", snd_strerror(err)); - putc('\n', stderr); - va_end(arg); -} -#endif - -/************************************************************************** - * MIDI_NotifyClient [internal] - */ -static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - DWORD_PTR dwCallBack; - UINT uFlags; - HANDLE hDev; - DWORD_PTR dwInstance; - - TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", - wDevID, wMsg, dwParam1, dwParam2); - - switch (wMsg) { - case MIM_OPEN: - case MIM_CLOSE: - if (wDevID > MIDM_NumDevs) return; - - dwCallBack = MidiInDev[wDevID].midiDesc.dwCallback; - uFlags = MidiInDev[wDevID].wFlags; - hDev = MidiInDev[wDevID].midiDesc.hMidi; - dwInstance = MidiInDev[wDevID].midiDesc.dwInstance; - break; - default: - ERR("Unsupported MSW-MIDI message %u\n", wMsg); - return; - } - - DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); -} - -/************************************************************************** - * midiOpenSeq [internal] - */ -static snd_seq_t *midiOpenSeq(int *port_in_ret) -{ - struct midi_seq_open_params params; - - params.port_in = port_in_ret; - params.close = 0; - ALSA_CALL(midi_seq_open, &params); - - return params.seq; -} - -/************************************************************************** - * midiCloseSeq [internal] - */ -static int midiCloseSeq(void) -{ - struct midi_seq_open_params params; - - params.port_in = NULL; - params.close = 1; - ALSA_CALL(midi_seq_open, &params); - - return 0; -} - -static DWORD WINAPI midRecThread(void *arg) -{ - snd_seq_t *midi_seq = arg; - int num_fds; - struct pollfd *pollfd; - int ret; - - /* Add on one for the read end of the cancel pipe */ - num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; - pollfd = malloc(num_fds * sizeof(struct pollfd)); - - while(1) { - pollfd[0].fd = rec_cancel_pipe[0]; - pollfd[0].events = POLLIN; - - seq_lock(); - snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); - seq_unlock(); - - /* Check if an event is present */ - if (poll(pollfd, num_fds, -1) <= 0) - continue; - - if (pollfd[0].revents & POLLIN) /* cancelled */ - break; - - do { - snd_seq_event_t *ev; - - seq_lock(); - snd_seq_event_input(midi_seq, &ev); - seq_unlock(); - - if (ev) { - ALSA_CALL(midi_handle_event, ev); - snd_seq_free_event(ev); - } - - seq_lock(); - ret = snd_seq_event_input_pending(midi_seq, 0); - seq_unlock(); - } while(ret > 0); - } - - free(pollfd); - return 0; -} - -/************************************************************************** - * midOpen [internal] - */ -static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - int ret = 0, port_in; - snd_seq_t *midi_seq; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); - - if (lpDesc == NULL) { - WARN("Invalid Parameter !\n"); - return MMSYSERR_INVALPARAM; - } - - /* FIXME : - * how to check that content of lpDesc is correct ? - */ - if (wDevID >= MIDM_NumDevs) { - WARN("wDevID too large (%u) !\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (MidiInDev[wDevID].state == -1) { - WARN("device disabled\n"); - return MIDIERR_NODEVICE; - } - if (MidiInDev[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - if ((dwFlags & MIDI_IO_STATUS) != 0) { - WARN("No support for MIDI_IO_STATUS in dwFlags yet, ignoring it\n"); - dwFlags &= ~MIDI_IO_STATUS; - } - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - FIXME("Bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - - if (!(midi_seq = midiOpenSeq(&port_in))) { - return MMSYSERR_ERROR; - } - - MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].midiDesc = *lpDesc; - MidiInDev[wDevID].state = 0; - MidiInDev[wDevID].startTime = 0; - MidiInDev[wDevID].seq = midi_seq; - MidiInDev[wDevID].port_in = port_in; - - /* Connect our app port to the device port */ - seq_lock(); - ret = snd_seq_connect_from(midi_seq, port_in, MidiInDev[wDevID].addr.client, - MidiInDev[wDevID].addr.port); - seq_unlock(); - if (ret < 0) - return MMSYSERR_NOTENABLED; - - TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); - - if (numStartedMidiIn++ == 0) { - pipe(rec_cancel_pipe); - hThread = CreateThread(NULL, 0, midRecThread, midi_seq, 0, NULL); - if (!hThread) { - close(rec_cancel_pipe[0]); - close(rec_cancel_pipe[1]); - numStartedMidiIn = 0; - WARN("Couldn't create thread for midi-in\n"); - midiCloseSeq(); - return MMSYSERR_ERROR; - } - SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL); - TRACE("Created thread for midi-in\n"); - } - - MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * midClose [internal] - */ -static DWORD midClose(WORD wDevID) -{ - int ret = MMSYSERR_NOERROR; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) { - WARN("wDevID too big (%u) !\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (MidiInDev[wDevID].midiDesc.hMidi == 0) { - WARN("device not opened !\n"); - return MMSYSERR_ERROR; - } - if (MidiInDev[wDevID].lpQueueHdr != 0) { - return MIDIERR_STILLPLAYING; - } - - if (MidiInDev[wDevID].seq == NULL) { - WARN("ooops !\n"); - return MMSYSERR_ERROR; - } - if (--numStartedMidiIn == 0) { - TRACE("Stopping thread for midi-in\n"); - write(rec_cancel_pipe[1], "x", 1); - if (WaitForSingleObject(hThread, 5000) != WAIT_OBJECT_0) { - WARN("Thread end not signaled, force termination\n"); - TerminateThread(hThread, 0); - } - close(rec_cancel_pipe[0]); - close(rec_cancel_pipe[1]); - TRACE("Stopped thread for midi-in\n"); - } - - seq_lock(); - snd_seq_disconnect_from(MidiInDev[wDevID].seq, MidiInDev[wDevID].port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port); - seq_unlock(); - midiCloseSeq(); - - MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); - MidiInDev[wDevID].midiDesc.hMidi = 0; - MidiInDev[wDevID].seq = NULL; - - return ret; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -350,11 +72,6 @@ static BOOL ALSA_MidiInit(void) params.err = &err; ALSA_CALL(midi_init, &params); - if (!err) - { - MIDM_NumDevs = params.num_srcs; - MidiInDev = params.srcs; - } return TRUE; } @@ -374,10 +91,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MIDM_OPEN: - return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); - case MIDM_CLOSE: - return midClose(wDevID); } params.dev_id = wDevID; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 46f256a1c6a..ad8865a0988 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -207,27 +207,9 @@ struct get_prop_value_params unsigned int *buffer_size; }; -#include <alsa/asoundlib.h> -#include "mmddk.h" - -typedef struct midi_src -{ - int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIHDR *lpQueueHdr; - UINT startTime; - MIDIINCAPSW caps; - snd_seq_t *seq; - snd_seq_addr_t addr; - int port_in; -} WINE_MIDIIN; - struct midi_init_params { UINT *err; - unsigned int num_srcs; - void *srcs; }; struct notify_context @@ -271,13 +253,6 @@ struct midi_notify_wait_params struct notify_context *notify; }; -struct midi_seq_open_params -{ - int close; - snd_seq_t *seq; - int *port_in; -}; - enum alsa_funcs { alsa_get_endpoint_ids, @@ -308,10 +283,6 @@ enum alsa_funcs alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, - - alsa_midi_seq_lock, /* temporary */ - alsa_midi_seq_open, - alsa_midi_handle_event, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; @@ -320,10 +291,6 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_handle_event(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/6] winealsa: Use a pipe to signal the end of the record thread.
by Huw Davies March 25, 2022

March 25, 2022

This means the thread doesn't have to wake every 250ms to test "end_thread". Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4cc906b03ca..327d4b7b200 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -54,7 +54,7 @@ static int MIDM_NumDevs = 0; static int numStartedMidiIn = 0; -static int end_thread; +static int rec_cancel_pipe[2]; static HANDLE hThread; static void seq_lock(void) @@ -162,18 +162,25 @@ static DWORD WINAPI midRecThread(void *arg) struct pollfd *pollfd; int ret; - num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN); + /* Add on one for the read end of the cancel pipe */ + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; pollfd = malloc(num_fds * sizeof(struct pollfd)); - while(!end_thread) { + while(1) { + pollfd[0].fd = rec_cancel_pipe[0]; + pollfd[0].events = POLLIN; + seq_lock(); - snd_seq_poll_descriptors(midi_seq, pollfd, num_fds, POLLIN); + snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); seq_unlock(); /* Check if an event is present */ - if (poll(pollfd, num_fds, 250) <= 0) + if (poll(pollfd, num_fds, -1) <= 0) continue; + if (pollfd[0].revents & POLLIN) /* cancelled */ + break; + do { snd_seq_event_t *ev; @@ -259,9 +266,11 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); if (numStartedMidiIn++ == 0) { - end_thread = 0; + pipe(rec_cancel_pipe); hThread = CreateThread(NULL, 0, midRecThread, midi_seq, 0, NULL); if (!hThread) { + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); numStartedMidiIn = 0; WARN("Couldn't create thread for midi-in\n"); midiCloseSeq(); @@ -302,11 +311,13 @@ static DWORD midClose(WORD wDevID) } if (--numStartedMidiIn == 0) { TRACE("Stopping thread for midi-in\n"); - end_thread = 1; + write(rec_cancel_pipe[1], "x", 1); if (WaitForSingleObject(hThread, 5000) != WAIT_OBJECT_0) { WARN("Thread end not signaled, force termination\n"); TerminateThread(hThread, 0); } + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); TRACE("Stopped thread for midi-in\n"); } -- 2.25.1

2 1