July 2023 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Use user message packing for messages passing string.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 4777bd62aeaeaaec54abbb5834845e3fff9f54e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/4777bd62aeaeaaec54abbb5834845e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 17 23:43:19 2023 +0200 win32u: Use user message packing for messages passing string. --- dlls/user32/winproc.c | 11 +++++++---- dlls/win32u/hook.c | 2 +- dlls/win32u/message.c | 23 +++++++++++++++++++++-- dlls/win32u/tests/win32u.c | 13 ++++++++++++- dlls/win32u/win32u_private.h | 3 ++- 5 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 530f87633d9..c457fef7d11 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -833,17 +833,13 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, break; case WM_GETTEXT: case WM_ASKCBFORMATNAME: - break; case WM_WININICHANGE: - if (!*lparam) return TRUE; - /* fall through */ case WM_SETTEXT: case WM_DEVMODECHANGE: case CB_DIR: case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - if (!check_string( *buffer, size )) return FALSE; break; case WM_GETMINMAXINFO: minsize = sizeof(MINMAXINFO); @@ -1184,6 +1180,13 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) case WM_NCCALCSIZE: case WM_GETTEXT: case WM_ASKCBFORMATNAME: + case WM_WININICHANGE: + case WM_SETTEXT: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index c53ec57c32b..8fcb7ef2796 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -246,7 +246,7 @@ static LRESULT call_hook( struct win_hook_params *info, const WCHAR *module, siz if (params->id == WH_CBT && params->code == HCBT_CREATEWND) { CBT_CREATEWNDW *cbtc = (CBT_CREATEWNDW *)params->lparam; - message_size = user_message_size( WM_NCCREATE, 0, (LPARAM)cbtc->lpcs, FALSE ); + message_size = user_message_size( WM_NCCREATE, 0, (LPARAM)cbtc->lpcs, TRUE, FALSE ); lparam_size = lparam_ret_size = 0; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 6cf5d4ea47d..6e1b31bc93d 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -420,6 +420,16 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case WM_ASKCBFORMATNAME: if (!get_buffer_space( buffer, (*wparam * sizeof(WCHAR)), size )) return FALSE; break; + case WM_WININICHANGE: + if (!*lparam) return TRUE; + /* fall through */ + case WM_SETTEXT: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: + break; case WM_WINE_SETWINDOWPOS: { WINDOWPOS wp; @@ -1172,7 +1182,7 @@ static size_t copy_string( void *ptr, const void *str, BOOL ansi ) * * Calculate size of packed message buffer. */ -size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL ansi ) +size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL other_process, BOOL ansi ) { const void *lparam_ptr = (const void *)lparam; size_t size = 0; @@ -1195,6 +1205,15 @@ size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL ansi case WM_ASKCBFORMATNAME: size = wparam * char_size( ansi ); break; + case WM_WININICHANGE: + case WM_SETTEXT: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: + if (other_process && lparam) size = string_size( lparam_ptr, ansi ); + break; } return size; @@ -1590,7 +1609,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar if (!needs_unpack) size = 0; if (!is_current_thread_window( hwnd )) return 0; - packed_size = user_message_size( msg, wparam, lparam, ansi ); + packed_size = user_message_size( msg, wparam, lparam, needs_unpack, ansi ); if (packed_size) size = packed_size; /* first the WH_CALLWNDPROC hook */ diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index cd3fa6e7aa3..5d9186d901d 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1362,6 +1362,7 @@ struct lparam_hook_test const void *change_lparam; const void *check_lparam; size_t lparam_size; + size_t lparam_init_size; size_t check_size; BOOL poison_lparam; BOOL todo; @@ -1582,7 +1583,9 @@ static void init_hook_test( const struct lparam_hook_test *test ) if (test->lparam_size) { - if (test->lparam) + if (test->lparam_init_size) + memcpy( lparam_buffer, test->lparam, test->lparam_init_size ); + else if (test->lparam) memcpy( lparam_buffer, test->lparam, test->lparam_size ); else memset( lparam_buffer, 0xcc, test->lparam_size ); @@ -1689,8 +1692,16 @@ static void test_wndproc_hook(void) .lparam_size = sizeof(BOOL), .change_lparam = &false_lparam, .todo = TRUE }, + /* messages that don't change lparam */ { "WM_USER", WM_USER }, { "WM_NOTIFY", WM_NOTIFY }, + { "WM_SETTEXT", WM_SETTEXT, .lparam = strbufW, .lparam_init_size = sizeof(strbufW) }, + { "WM_DEVMODECHANGE", WM_DEVMODECHANGE, .lparam = strbufW, .lparam_init_size = sizeof(strbufW) }, + { "CB_DIR", CB_DIR, .lparam = strbufW, .lparam_init_size = sizeof(strbufW) }, + { "LB_DIR", LB_DIR, .lparam = strbufW, .lparam_init_size = sizeof(strbufW) }, + { "LB_ADDFILE", LB_ADDFILE, .lparam = strbufW, .lparam_init_size = sizeof(strbufW) }, + { "EM_REPLACESEL", EM_REPLACESEL, .lparam = strbufW, .lparam_init_size = sizeof(strbufW) }, + { "WM_WININICHANGE", WM_WININICHANGE, .lparam = strbufW, .lparam_init_size = sizeof(strbufW) }, }; cls.lpfnWndProc = lparam_test_proc; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 27a3d1a0305..d23026876da 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -140,7 +140,8 @@ extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) extern BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, BOOL ansi ) DECLSPEC_HIDDEN; -extern size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; +extern size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, + BOOL other_process, BOOL ansi ) DECLSPEC_HIDDEN; extern void pack_user_message( void *buffer, size_t size, UINT message, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : win32u/tests: Fully initialize lparam_buffer before each test.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 78a4bad8c54f62b13d667932db048c8f36c88ad7 URL: https://gitlab.winehq.org/wine/wine/-/commit/78a4bad8c54f62b13d667932db048c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 22 02:27:39 2023 +0200 win32u/tests: Fully initialize lparam_buffer before each test. --- dlls/win32u/tests/win32u.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 8653049b828..cd3fa6e7aa3 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1533,6 +1533,8 @@ static void test_msg_output( const struct lparam_hook_test *test, LRESULT result else expected = test->lparam; if (expected) + todo_wine_if((test->message == CB_GETLBTEXT && test->msg_result == 7) || + (test->message == LB_GETTEXT && test->msg_result == 7)) ok( !memcmp( lparam_buffer, expected, test->lparam_size ), "unexpected lparam content\n" ); todo_wine_if(test->todo) @@ -1578,8 +1580,13 @@ static void init_hook_test( const struct lparam_hook_test *test ) retwnd_hook_lparam = 0; retwnd_hook_lparam2 = 0; - if (test->lparam_size && test->lparam) - memcpy( lparam_buffer, test->lparam, test->lparam_size ); + if (test->lparam_size) + { + if (test->lparam) + memcpy( lparam_buffer, test->lparam, test->lparam_size ); + else + memset( lparam_buffer, 0xcc, test->lparam_size ); + } } static void test_wndproc_hook(void) @@ -1593,8 +1600,9 @@ static void test_wndproc_hook(void) static const BOOL false_lparam = FALSE; static const WCHAR strbufW[8] = L"abc\0defg"; - static const WCHAR strbuf2W[8] = L"\0bc\0defg"; + static const WCHAR strbuf2W[8] = L"\0\xcccc\xcccc\xcccc\xcccc\xcccc\xcccc\xcccc"; static const WCHAR strbuf3W[8] = L"abcdefgh"; + static const WCHAR strbuf4W[8] = L"abc\0\xcccc\xcccc\xcccc\xcccc"; static const RECT rect_in = { 1, 2, 100, 200 }; static const RECT rect_out = { 3, 4, 110, 220 }; @@ -1628,27 +1636,27 @@ static void test_wndproc_hook(void) }, { "WM_GETTEXT2", WM_GETTEXT, .wparam = 8, .msg_result = 1, - .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbufW, + .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbuf4W, }, { "WM_GETTEXT3", WM_GETTEXT, .wparam = 8, .msg_result = 9, - .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbufW, + .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbuf4W, }, { "WM_ASKCBFORMATNAME", WM_ASKCBFORMATNAME, .wparam = 8, - .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbufW, + .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbuf4W, }, { "WM_ASKCBFORMATNAME2", WM_ASKCBFORMATNAME, .wparam = 8, .msg_result = 1, - .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbufW, + .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbuf4W, }, { "WM_ASKCBFORMATNAME3", WM_ASKCBFORMATNAME, .wparam = 8, .msg_result = 9, - .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbufW, + .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbuf4W, }, { "CB_GETLBTEXT", CB_GETLBTEXT, .msg_result = 7, .check_result = 4, .todo_result = TRUE, - .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbufW, + .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbuf4W, .todo = TRUE }, { @@ -1663,7 +1671,7 @@ static void test_wndproc_hook(void) }, { "LB_GETTEXT", LB_GETTEXT, .msg_result = 7, .check_result = 4, .todo_result = TRUE, - .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbufW, + .lparam_size = sizeof(strbufW), .change_lparam = strbufW, .check_lparam = strbuf4W, .todo = TRUE }, {

1 0

Alistair Leslie-Hughes : user.exe16: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 3b6bf90ae0b95c6a85da3a2729cdc1d8bcd52c5b URL: https://gitlab.winehq.org/wine/wine/-/commit/3b6bf90ae0b95c6a85da3a2729cdc1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 25 18:02:42 2023 +1000 user.exe16: Remove DECLSPEC_HIDDEN usage. --- dlls/user.exe16/user_private.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 0805997246b..a6bde804c38 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -62,11 +62,11 @@ struct wow_handlers32 INT (*dialog_box_loop)(HWND,HWND); }; -extern struct wow_handlers32 wow_handlers32 DECLSPEC_HIDDEN; +extern struct wow_handlers32 wow_handlers32; -extern HWND create_window16(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL) DECLSPEC_HIDDEN; -extern void free_module_classes(HINSTANCE16) DECLSPEC_HIDDEN; -extern void register_wow_handlers(void) DECLSPEC_HIDDEN; +extern HWND create_window16(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); +extern void free_module_classes(HINSTANCE16); +extern void register_wow_handlers(void); extern void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wow_handlers32 *orig ); @@ -80,14 +80,14 @@ typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp typedef LRESULT (*winproc_callback16_t)( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, LRESULT *result, void *arg ); -extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ) DECLSPEC_HIDDEN; -extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func ) DECLSPEC_HIDDEN; +extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ); +extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func ); extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, - WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ) DECLSPEC_HIDDEN; + WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ); extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) DECLSPEC_HIDDEN; + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); -extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) DECLSPEC_HIDDEN; +extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ); #define GET_BYTE(ptr) (*(const BYTE *)(ptr)) #define GET_WORD(ptr) (*(const WORD *)(ptr)) @@ -116,10 +116,10 @@ typedef struct tagDIALOGINFO #define HINSTANCE_16(h32) (LOWORD(h32)) #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) -extern HICON16 get_icon_16( HICON icon ) DECLSPEC_HIDDEN; -extern HICON get_icon_32( HICON16 icon16 ) DECLSPEC_HIDDEN; +extern HICON16 get_icon_16( HICON icon ); +extern HICON get_icon_32( HICON16 icon16 ); -extern DWORD USER16_AlertableWait DECLSPEC_HIDDEN; -extern WORD USER_HeapSel DECLSPEC_HIDDEN; +extern DWORD USER16_AlertableWait; +extern WORD USER_HeapSel; #endif /* __WINE_USER_PRIVATE_H */

1 0

Paul Gofman : nsiproxy.sys: Detect wireless interface type on Linux.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 7b243afc6322fa82ac42cec6de247a642e16b5a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b243afc6322fa82ac42cec6de247a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 24 19:38:56 2023 -0600 nsiproxy.sys: Detect wireless interface type on Linux. --- configure | 6 ++++++ configure.ac | 1 + dlls/nsiproxy.sys/ndis.c | 19 +++++++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 29 insertions(+) diff --git a/configure b/configure index d65d819b148..36ae965fe34 100755 --- a/configure +++ b/configure @@ -7974,6 +7974,12 @@ if test "x$ac_cv_header_linux_ucdrom_h" = xyes then : printf "%s\n" "#define HAVE_LINUX_UCDROM_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "linux/wireless.h" "ac_cv_header_linux_wireless_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_wireless_h" = xyes +then : + printf "%s\n" "#define HAVE_LINUX_WIRELESS_H 1" >>confdefs.h + fi ac_fn_c_check_header_compile "$LINENO" "lwp.h" "ac_cv_header_lwp_h" "$ac_includes_default" if test "x$ac_cv_header_lwp_h" = xyes diff --git a/configure.ac b/configure.ac index 758f6250eec..c782c17ac61 100644 --- a/configure.ac +++ b/configure.ac @@ -423,6 +423,7 @@ AC_CHECK_HEADERS(\ linux/serial.h \ linux/types.h \ linux/ucdrom.h \ + linux/wireless.h \ lwp.h \ mach-o/loader.h \ mach/mach.h \ diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 1fc66c3611b..9d53c1591f6 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -62,6 +62,10 @@ #include <net/if_types.h> #endif +#ifdef HAVE_LINUX_WIRELESS_H +#include <linux/wireless.h> +#endif + #include <pthread.h> #define NONAMELESSUNION @@ -173,6 +177,21 @@ static NTSTATUS if_get_physical( const char *name, UINT *type, IF_PHYSICAL_ADDRE if (*type == MIB_IF_TYPE_OTHER && !ioctl( fd, SIOCGIFFLAGS, &ifr ) && ifr.ifr_flags & IFF_POINTOPOINT) *type = MIB_IF_TYPE_PPP; +#ifdef HAVE_LINUX_WIRELESS_H + if (*type == MIB_IF_TYPE_ETHERNET) + { + struct iwreq pwrq; + + memset( &pwrq, 0, sizeof(pwrq) ); + memcpy( pwrq.ifr_name, name, size ); + if (ioctl( fd, SIOCGIWNAME, &pwrq ) != -1) + { + TRACE( "iface %s, wireless protocol %s.\n", debugstr_a(name), debugstr_a(pwrq.u.name) ); + *type = IF_TYPE_IEEE80211; + } + } +#endif + err: close( fd ); return ret; diff --git a/include/config.h.in b/include/config.h.in index 2e806157ebd..9836ec64cf9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -195,6 +195,9 @@ /* Define to 1 if you have the <linux/videodev2.h> header file. */ #undef HAVE_LINUX_VIDEODEV2_H +/* Define to 1 if you have the <linux/wireless.h> header file. */ +#undef HAVE_LINUX_WIRELESS_H + /* Define to 1 if you have the <lwp.h> header file. */ #undef HAVE_LWP_H

1 0

Davide Beatrici : winepulse: Remove GetAudioSessionWrapper.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: ad3a0b767f86a1332c0dbbcc19137986d623a081 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad3a0b767f86a1332c0dbbcc191379… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jul 22 05:36:38 2023 +0200 winepulse: Remove GetAudioSessionWrapper. --- dlls/winepulse.drv/mmdevdrv.c | 35 ----------------------------------- dlls/winepulse.drv/winepulse.drv.spec | 1 - 2 files changed, 36 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0180c148f1e..3dbb88d880e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -54,8 +54,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); #define MAX_PULSE_NAME_LEN 256 -#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) - static struct list g_devices_cache = LIST_INIT(g_devices_cache); struct device_cache { @@ -72,25 +70,6 @@ static GUID pulse_capture_guid = static WCHAR drv_key_devicesW[256]; -static CRITICAL_SECTION session_cs; -static CRITICAL_SECTION_DEBUG session_cs_debug = { - 0, 0, &session_cs, - { &session_cs_debug.ProcessLocksList, - &session_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": session_cs") } -}; -static CRITICAL_SECTION session_cs = { &session_cs_debug, -1, 0, 0, 0, 0 }; - -void DECLSPEC_HIDDEN sessions_lock(void) -{ - EnterCriticalSection(&session_cs); -} - -void DECLSPEC_HIDDEN sessions_unlock(void) -{ - LeaveCriticalSection(&session_cs); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { @@ -117,9 +96,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -extern struct audio_session_wrapper *session_wrapper_create( - struct audio_client *client) DECLSPEC_HIDDEN; - static void pulse_call(enum unix_funcs code, void *params) { NTSTATUS status; @@ -336,17 +312,6 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) return FALSE; } -/* if channels == 0, then this will return or create a session with - * matching dataflow and GUID. otherwise, channels must also match */ -extern HRESULT get_audio_session(const GUID *sessionguid, - IMMDevice *device, UINT channels, AudioSession **out); - -HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, - AudioSessionWrapper **out) -{ - return E_NOTIMPL; -} - HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) { struct get_prop_value_params params; diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 79746fe4749..fe5b62e053b 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -1,7 +1,6 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper @ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue # WinMM driver functions

1 0

Davide Beatrici : winealsa: Remove GetAudioSessionWrapper.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 41e4506996038ee04fcc7caba59a17fe8cb48326 URL: https://gitlab.winehq.org/wine/wine/-/commit/41e4506996038ee04fcc7caba59a17… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jul 22 05:35:43 2023 +0200 winealsa: Remove GetAudioSessionWrapper. --- dlls/winealsa.drv/mmdevdrv.c | 36 ------------------------------------ dlls/winealsa.drv/winealsa.drv.spec | 1 - 2 files changed, 37 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 4b42e64db72..50e53dcda41 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -51,33 +51,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); -#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) - -static CRITICAL_SECTION g_sessions_lock; -static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = -{ - 0, 0, &g_sessions_lock, - { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } -}; -static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; - static WCHAR drv_key_devicesW[256]; static const WCHAR guidW[] = {'g','u','i','d',0}; -extern struct audio_session_wrapper *session_wrapper_create( - struct audio_client *client) DECLSPEC_HIDDEN; - -void DECLSPEC_HIDDEN sessions_lock(void) -{ - EnterCriticalSection(&g_sessions_lock); -} - -void DECLSPEC_HIDDEN sessions_unlock(void) -{ - LeaveCriticalSection(&g_sessions_lock); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -101,7 +77,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) } case DLL_PROCESS_DETACH: if (reserved) break; - DeleteCriticalSection(&g_sessions_lock); break; } return TRUE; @@ -312,17 +287,6 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) return FALSE; } -/* if channels == 0, then this will return or create a session with - * matching dataflow and GUID. otherwise, channels must also match */ -extern HRESULT get_audio_session(const GUID *sessionguid, - IMMDevice *device, UINT channels, AudioSession **out); - -HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, - AudioSessionWrapper **out) -{ - return E_NOTIMPL; -} - HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) { struct get_prop_value_params params; diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index a27c34b648f..ae6cfdd84ca 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -6,5 +6,4 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper @ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue

1 0

Davide Beatrici : winecoreaudio: Remove GetAudioSessionWrapper.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: e1eb454904060ffbb15bd533d7753aff825de907 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1eb454904060ffbb15bd533d7753a… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jul 22 05:36:11 2023 +0200 winecoreaudio: Remove GetAudioSessionWrapper. --- dlls/winecoreaudio.drv/mmdevdrv.c | 36 --------------------------- dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 - 2 files changed, 37 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c5624506d2f..09668ee9699 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -46,32 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) - static WCHAR drv_key_devicesW[256]; -static CRITICAL_SECTION g_sessions_lock; -static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = -{ - 0, 0, &g_sessions_lock, - { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } -}; -static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; - -extern struct audio_session_wrapper *session_wrapper_create( - struct audio_client *client) DECLSPEC_HIDDEN; - -void DECLSPEC_HIDDEN sessions_lock(void) -{ - EnterCriticalSection(&g_sessions_lock); -} - -void DECLSPEC_HIDDEN sessions_unlock(void) -{ - LeaveCriticalSection(&g_sessions_lock); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -97,7 +73,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) } case DLL_PROCESS_DETACH: if (reserved) break; - DeleteCriticalSection(&g_sessions_lock); break; } return TRUE; @@ -305,14 +280,3 @@ BOOL WINAPI get_device_name_from_guid(const GUID *guid, char **name, EDataFlow * return FALSE; } - -/* if channels == 0, then this will return or create a session with - * matching dataflow and GUID. otherwise, channels must also match */ -extern HRESULT get_audio_session(const GUID *sessionguid, - IMMDevice *device, UINT channels, AudioSession **out); - -HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, - AudioSessionWrapper **out) -{ - return E_NOTIMPL; -} diff --git a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec index 1c9751f9404..16cd7f08b2b 100644 --- a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec +++ b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec @@ -6,4 +6,3 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper

1 0

Davide Beatrici : wineoss: Remove GetAudioSessionWrapper.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: b0d1625300520a0b16a7a13d30b8c84781613c63 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0d1625300520a0b16a7a13d30b8c8… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jul 22 05:36:24 2023 +0200 wineoss: Remove GetAudioSessionWrapper. --- dlls/wineoss.drv/mmdevdrv.c | 37 ------------------------------------- dlls/wineoss.drv/wineoss.drv.spec | 1 - 2 files changed, 38 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 1c71360a80a..4a45c532dd0 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -48,8 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); -#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) - typedef struct _OSSDevice { struct list entry; EDataFlow flow; @@ -62,28 +60,6 @@ static struct list g_devices = LIST_INIT(g_devices); static WCHAR drv_key_devicesW[256]; static const WCHAR guidW[] = {'g','u','i','d',0}; -static CRITICAL_SECTION g_sessions_lock; -static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = -{ - 0, 0, &g_sessions_lock, - { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } -}; -static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; - -extern struct audio_session_wrapper *session_wrapper_create( - struct audio_client *client) DECLSPEC_HIDDEN; - -void DECLSPEC_HIDDEN sessions_lock(void) -{ - EnterCriticalSection(&g_sessions_lock); -} - -void DECLSPEC_HIDDEN sessions_unlock(void) -{ - LeaveCriticalSection(&g_sessions_lock); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -110,8 +86,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { OSSDevice *iter, *iter2; - DeleteCriticalSection(&g_sessions_lock); - LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &g_devices, OSSDevice, entry){ HeapFree(GetProcessHeap(), 0, iter); } @@ -292,14 +266,3 @@ end: return params.result; } - -/* if channels == 0, then this will return or create a session with - * matching dataflow and GUID. otherwise, channels must also match */ -extern HRESULT get_audio_session(const GUID *sessionguid, - IMMDevice *device, UINT channels, AudioSession **out); - -HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, - AudioSessionWrapper **out) -{ - return E_NOTIMPL; -} diff --git a/dlls/wineoss.drv/wineoss.drv.spec b/dlls/wineoss.drv/wineoss.drv.spec index c61d81e7ee9..e12fb20fd17 100644 --- a/dlls/wineoss.drv/wineoss.drv.spec +++ b/dlls/wineoss.drv/wineoss.drv.spec @@ -7,4 +7,3 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper

1 0

Davide Beatrici : mmdevapi: Implement AudioClient_Create.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: b26bad578a9cebaff067ef60dbef3c5be8c9da4a URL: https://gitlab.winehq.org/wine/wine/-/commit/b26bad578a9cebaff067ef60dbef3c… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jul 25 00:53:51 2023 +0200 mmdevapi: Implement AudioClient_Create. --- dlls/mmdevapi/audiosessionmanager.c | 7 ++- dlls/mmdevapi/client.c | 57 +++++++++++++++++++- dlls/mmdevapi/devenum.c | 4 +- dlls/mmdevapi/main.c | 2 - dlls/mmdevapi/mmdevapi_private.h | 14 +++-- dlls/mmdevapi/mmdevdrv.h | 9 ---- dlls/mmdevapi/session.c | 21 +++++++- dlls/winealsa.drv/Makefile.in | 5 +- dlls/winealsa.drv/mmdevdrv.c | 73 +------------------------ dlls/winealsa.drv/winealsa.drv.spec | 1 - dlls/winecoreaudio.drv/Makefile.in | 5 +- dlls/winecoreaudio.drv/mmdevdrv.c | 73 +------------------------ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 - dlls/wineoss.drv/Makefile.in | 5 +- dlls/wineoss.drv/mmdevdrv.c | 76 +-------------------------- dlls/wineoss.drv/wineoss.drv.spec | 1 - dlls/winepulse.drv/Makefile.in | 5 +- dlls/winepulse.drv/mmdevdrv.c | 73 +------------------------ dlls/winepulse.drv/winepulse.drv.spec | 1 - 19 files changed, 98 insertions(+), 335 deletions(-)

1 0

Davide Beatrici : mmdevapi: Introduce wine_unix_call helper.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 55b6cded641a81cf1e28a33e015476abe764a6ce URL: https://gitlab.winehq.org/wine/wine/-/commit/55b6cded641a81cf1e28a33e015476… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jul 25 00:47:57 2023 +0200 mmdevapi: Introduce wine_unix_call helper. --- dlls/mmdevapi/client.c | 46 +++++++++++++++++++++++----------------------- dlls/mmdevapi/mmdevdrv.h | 9 +++++++++ dlls/mmdevapi/session.c | 2 +- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 11a0a572d98..a88ef5b2a67 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -67,7 +67,7 @@ void set_stream_volumes(struct audio_client *This) params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - WINE_UNIX_CALL(set_volumes, &params); + wine_unix_call(set_volumes, &params); } static inline struct audio_client *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) @@ -142,7 +142,7 @@ static DWORD CALLBACK main_loop_func(void *event) params.event = event; - WINE_UNIX_CALL(main_loop, &params); + wine_unix_call(main_loop, &params); return 0; } @@ -174,7 +174,7 @@ static DWORD CALLBACK timer_loop_func(void *user) params.stream = This->stream; - WINE_UNIX_CALL(timer_loop, &params); + wine_unix_call(timer_loop, &params); return 0; } @@ -186,7 +186,7 @@ HRESULT stream_release(stream_handle stream, HANDLE timer_thread) params.stream = stream; params.timer_thread = timer_thread; - WINE_UNIX_CALL(release_stream, &params); + wine_unix_call(release_stream, &params); return params.result; } @@ -352,7 +352,7 @@ static HRESULT WINAPI capture_GetBuffer(IAudioCaptureClient *iface, BYTE **data, params.devpos = devpos; params.qpcpos = qpcpos; - WINE_UNIX_CALL(get_capture_buffer, &params); + wine_unix_call(get_capture_buffer, &params); return params.result; } @@ -370,7 +370,7 @@ static HRESULT WINAPI capture_ReleaseBuffer(IAudioCaptureClient *iface, UINT32 d params.stream = This->stream; params.done = done; - WINE_UNIX_CALL(release_capture_buffer, &params); + wine_unix_call(release_capture_buffer, &params); return params.result; } @@ -391,7 +391,7 @@ static HRESULT WINAPI capture_GetNextPacketSize(IAudioCaptureClient *iface, UINT params.stream = This->stream; params.frames = frames; - WINE_UNIX_CALL(get_next_packet_size, &params); + wine_unix_call(get_next_packet_size, &params); return params.result; } @@ -526,7 +526,7 @@ static HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE params.channel_count = &channel_count; params.stream = &stream; - WINE_UNIX_CALL(create_stream, &params); + wine_unix_call(create_stream, &params); free(name); @@ -578,7 +578,7 @@ static HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, UINT32 *out) params.stream = This->stream; params.frames = out; - WINE_UNIX_CALL(get_buffer_size, &params); + wine_unix_call(get_buffer_size, &params); return params.result; } @@ -599,7 +599,7 @@ static HRESULT WINAPI client_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TI params.stream = This->stream; params.latency = latency; - WINE_UNIX_CALL(get_latency, &params); + wine_unix_call(get_latency, &params); return params.result; } @@ -620,7 +620,7 @@ static HRESULT WINAPI client_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out params.stream = This->stream; params.padding = out; - WINE_UNIX_CALL(get_current_padding, &params); + wine_unix_call(get_current_padding, &params); return params.result; } @@ -648,7 +648,7 @@ static HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHA params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out)); } - WINE_UNIX_CALL(is_format_supported, &params); + wine_unix_call(is_format_supported, &params); if (params.result == S_FALSE) *out = &params.fmt_out->Format; @@ -676,7 +676,7 @@ static HRESULT WINAPI client_GetMixFormat(IAudioClient3 *iface, WAVEFORMATEX **p if (!params.fmt) return E_OUTOFMEMORY; - WINE_UNIX_CALL(get_mix_format, &params); + wine_unix_call(get_mix_format, &params); if (SUCCEEDED(params.result)) { *pwfx = &params.fmt->Format; @@ -703,7 +703,7 @@ static HRESULT WINAPI client_GetDevicePeriod(IAudioClient3 *iface, REFERENCE_TIM params.def_period = defperiod; params.min_period = minperiod; - WINE_UNIX_CALL(get_device_period, &params); + wine_unix_call(get_device_period, &params); return params.result; } @@ -723,7 +723,7 @@ static HRESULT WINAPI client_Start(IAudioClient3 *iface) } params.stream = This->stream; - WINE_UNIX_CALL(start, &params); + wine_unix_call(start, &params); if (SUCCEEDED(params.result) && !This->timer_thread) { if ((This->timer_thread = CreateThread(NULL, 0, timer_loop_func, This, 0, NULL))) @@ -751,7 +751,7 @@ static HRESULT WINAPI client_Stop(IAudioClient3 *iface) params.stream = This->stream; - WINE_UNIX_CALL(stop, &params); + wine_unix_call(stop, &params); return params.result; } @@ -768,7 +768,7 @@ static HRESULT WINAPI client_Reset(IAudioClient3 *iface) params.stream = This->stream; - WINE_UNIX_CALL(reset, &params); + wine_unix_call(reset, &params); return params.result; } @@ -789,7 +789,7 @@ static HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface, HANDLE event) params.stream = This->stream; params.event = event; - WINE_UNIX_CALL(set_event_handle, &params); + wine_unix_call(set_event_handle, &params); return params.result; } @@ -1031,7 +1031,7 @@ static HRESULT WINAPI clock_GetFrequency(IAudioClock *iface, UINT64 *freq) params.stream = This->stream; params.freq = freq; - WINE_UNIX_CALL(get_frequency, &params); + wine_unix_call(get_frequency, &params); return params.result; } @@ -1054,7 +1054,7 @@ static HRESULT WINAPI clock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 params.pos = pos; params.qpctime = qpctime; - WINE_UNIX_CALL(get_position, &params); + wine_unix_call(get_position, &params); return params.result; } @@ -1119,7 +1119,7 @@ static HRESULT WINAPI clock2_GetDevicePosition(IAudioClock2 *iface, UINT64 *pos, params.pos = pos; params.qpctime = qpctime; - WINE_UNIX_CALL(get_position, &params); + wine_unix_call(get_position, &params); return params.result; } @@ -1187,7 +1187,7 @@ static HRESULT WINAPI render_GetBuffer(IAudioRenderClient *iface, UINT32 frames, params.frames = frames; params.data = data; - WINE_UNIX_CALL(get_render_buffer, &params); + wine_unix_call(get_render_buffer, &params); return params.result; } @@ -1207,7 +1207,7 @@ static HRESULT WINAPI render_ReleaseBuffer(IAudioRenderClient *iface, UINT32 wri params.written_frames = written_frames; params.flags = flags; - WINE_UNIX_CALL(release_render_buffer, &params); + wine_unix_call(release_render_buffer, &params); return params.result; } diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index df21859cbad..c1b8790c0c5 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -14,10 +14,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include <audiopolicy.h> #include <mmdeviceapi.h> #include <wine/list.h> +#include <wine/unixlib.h> typedef struct audio_client ACImpl; @@ -82,3 +85,9 @@ struct audio_client { /* Keep at end */ char device_name[0]; }; + +static inline void wine_unix_call(const unsigned int code, void *args) +{ + const NTSTATUS status = WINE_UNIX_CALL(code, args); + assert(!status); +} diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index 24188ad7658..e16ece01825 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -127,7 +127,7 @@ static HRESULT WINAPI control_GetState(IAudioSessionControl2 *iface, AudioSessio LIST_FOR_EACH_ENTRY(client, &This->session->clients, struct audio_client, entry) { params.stream = client->stream; - WINE_UNIX_CALL(is_started, &params); + wine_unix_call(is_started, &params); if (params.result == S_OK) { *state = AudioSessionStateActive; sessions_unlock();

1 0