[PATCH v2 0/4] MR3848: wine{alsa,coreaudio,oss,pulse}: Ensure unixlib function tables and enum stay in sync.
-- v2: winepulse: Ensure unixlib function tables and enum stay in sync. wineoss: Ensure unixlib function tables and enum stay in sync. winecoreaudio: Ensure unixlib function tables and enum stay in sync. winealsa: Ensure unixlib function tables and enum stay in sync. https://gitlab.winehq.org/wine/wine/-/merge_requests/3848
From: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/mmdevapi/unixlib.h | 1 + dlls/winealsa.drv/alsa.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/unixlib.h b/dlls/mmdevapi/unixlib.h index b1e025a512b..d83ed918a51 100644 --- a/dlls/mmdevapi/unixlib.h +++ b/dlls/mmdevapi/unixlib.h @@ -332,4 +332,5 @@ enum unix_funcs midi_in_message, midi_notify_wait, aux_message, + funcs_count }; diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 17737012579..94fc3c6fa4b 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2504,7 +2504,7 @@ static NTSTATUS alsa_get_prop_value(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { alsa_process_attach, alsa_not_implemented, @@ -2542,6 +2542,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -2958,7 +2960,7 @@ static NTSTATUS alsa_wow64_get_prop_value(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_wow64_funcs[] = +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { alsa_process_attach, alsa_not_implemented, @@ -2996,4 +2998,6 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3848
From: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index e2bce64ea14..5cdb3a4f676 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1796,7 +1796,7 @@ static NTSTATUS unix_set_event_handle(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { unix_process_attach, unix_not_implemented, @@ -1834,6 +1834,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = unix_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -2249,7 +2251,7 @@ static NTSTATUS unix_wow64_get_prop_value(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_wow64_funcs[] = +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { unix_process_attach, unix_not_implemented, @@ -2287,4 +2289,6 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = unix_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3848
From: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/wineoss.drv/oss.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 1e839c57f5f..9a7a0fbb5d9 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1704,7 +1704,7 @@ static NTSTATUS oss_aux_message(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { oss_process_attach, oss_not_implemented, @@ -1742,6 +1742,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_aux_message, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -2197,7 +2199,7 @@ static NTSTATUS oss_wow64_aux_message(void *args) return oss_aux_message(¶ms); } -unixlib_entry_t __wine_unix_call_wow64_funcs[] = +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { oss_process_attach, oss_not_implemented, @@ -2235,4 +2237,6 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_wow64_aux_message, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3848
From: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 370c361b02f..0ddddb00185 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2572,6 +2572,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -3041,4 +3043,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = pulse_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3848
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3848
participants (3)
-
Brendan Shanks -
Brendan Shanks (＠bshanks)
-
Huw Davies (＠huw)