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

Jacek Caban : win32u/tests: Fully initialize lparam_buffer before each test.
by Alexandre Julliard 27 Jul '23

27 Jul '23

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

Jacek Caban : win32u: Use user message packing for messages passing string.
by Alexandre Julliard 27 Jul '23

27 Jul '23

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: Use user message packing for WM_GETMINMAXINFO.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: f104be399bb26009f616b798dad883f79b55f31d URL: https://gitlab.winehq.org/wine/wine/-/commit/f104be399bb26009f616b798dad883… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 00:06:13 2023 +0200 win32u: Use user message packing for WM_GETMINMAXINFO. --- dlls/user32/winproc.c | 3 +-- dlls/win32u/message.c | 12 +++++++++--- dlls/win32u/tests/win32u.c | 7 +++++++ dlls/wow64win/user.c | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index c457fef7d11..27b63dbf90f 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -840,9 +840,7 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - break; case WM_GETMINMAXINFO: - minsize = sizeof(MINMAXINFO); break; case WM_DRAWITEM: { @@ -1187,6 +1185,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: + case WM_GETMINMAXINFO: { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 6e1b31bc93d..01bf238e87a 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -430,6 +430,9 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case LB_ADDFILE: case EM_REPLACESEL: break; + case WM_GETMINMAXINFO: + minsize = sizeof(MINMAXINFO); + break; case WM_WINE_SETWINDOWPOS: { WINDOWPOS wp; @@ -1214,6 +1217,9 @@ size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL other case EM_REPLACESEL: if (other_process && lparam) size = string_size( lparam_ptr, ansi ); break; + case WM_GETMINMAXINFO: + size = sizeof(MINMAXINFO); + break; } return size; @@ -1325,6 +1331,9 @@ static void copy_user_result( void *buffer, size_t size, LRESULT result, UINT me case WM_ASKCBFORMATNAME: copy_size = string_size( buffer, ansi ); break; + case WM_GETMINMAXINFO: + copy_size = sizeof(MINMAXINFO); + break; default: return; } @@ -1349,9 +1358,6 @@ static void copy_reply( LRESULT result, HWND hwnd, UINT message, WPARAM wparam, case LB_GETTEXT: copy_size = (result + 1) * sizeof(WCHAR); break; - case WM_GETMINMAXINFO: - copy_size = sizeof(MINMAXINFO); - break; case WM_MEASUREITEM: copy_size = sizeof(MEASUREITEMSTRUCT); break; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 5d9186d901d..57eb9691993 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1608,6 +1608,8 @@ static void test_wndproc_hook(void) 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 }; + static const MINMAXINFO minmax_in = { .ptMinTrackSize.x = 1 }; + static const MINMAXINFO minmax_out = { .ptMinTrackSize.x = 2 }; static const struct lparam_hook_test lparam_hook_tests[] = { @@ -1692,6 +1694,11 @@ static void test_wndproc_hook(void) .lparam_size = sizeof(BOOL), .change_lparam = &false_lparam, .todo = TRUE }, + { + "WM_GETMINMAXINFO", WM_GETMINMAXINFO, + .lparam_size = sizeof(minmax_in), .lparam = &minmax_in, .change_lparam = &minmax_out, + .check_size = sizeof(minmax_in) + }, /* messages that don't change lparam */ { "WM_USER", WM_USER }, { "WM_NOTIFY", WM_NOTIFY }, diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 79298ae2eed..982104867f7 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -697,6 +697,7 @@ static size_t packed_result_32to64( UINT message, WPARAM wparam, const void *par case WM_GETTEXT: case WM_ASKCBFORMATNAME: + case WM_GETMINMAXINFO: break; default:

1 0

Jacek Caban : win32u: Use user message packing for WM_DRAWITEM.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 0be20785312676065afd462852d2411b1891a73b URL: https://gitlab.winehq.org/wine/wine/-/commit/0be20785312676065afd462852d241… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 00:28:55 2023 +0200 win32u: Use user message packing for WM_DRAWITEM. --- dlls/user32/winproc.c | 15 --------------- dlls/win32u/message.c | 19 +++++++++++++++++++ dlls/win32u/tests/win32u.c | 17 +++++++++++++++++ dlls/wow64win/user.c | 21 +++++++++++++++++++++ 4 files changed, 57 insertions(+), 15 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 27b63dbf90f..22874360af0 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -841,23 +841,8 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case LB_ADDFILE: case EM_REPLACESEL: case WM_GETMINMAXINFO: - break; case WM_DRAWITEM: - { - DRAWITEMSTRUCT dis; - if (size < sizeof(ps->dis)) return FALSE; - dis.CtlType = ps->dis.CtlType; - dis.CtlID = ps->dis.CtlID; - dis.itemID = ps->dis.itemID; - dis.itemAction = ps->dis.itemAction; - dis.itemState = ps->dis.itemState; - dis.hwndItem = unpack_handle( ps->dis.hwndItem ); - dis.hDC = unpack_handle( ps->dis.hDC ); - dis.rcItem = ps->dis.rcItem; - dis.itemData = (ULONG_PTR)unpack_ptr( ps->dis.itemData ); - memcpy( *buffer, &dis, sizeof(dis) ); break; - } case WM_MEASUREITEM: { MEASUREITEMSTRUCT mis; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 01bf238e87a..679e349f817 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -433,6 +433,22 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case WM_GETMINMAXINFO: minsize = sizeof(MINMAXINFO); break; + case WM_DRAWITEM: + { + DRAWITEMSTRUCT dis; + if (size < sizeof(ps->dis)) return FALSE; + dis.CtlType = ps->dis.CtlType; + dis.CtlID = ps->dis.CtlID; + dis.itemID = ps->dis.itemID; + dis.itemAction = ps->dis.itemAction; + dis.itemState = ps->dis.itemState; + dis.hwndItem = wine_server_ptr_handle( ps->dis.hwndItem ); + dis.hDC = wine_server_ptr_handle( ps->dis.hDC ); + dis.rcItem = ps->dis.rcItem; + dis.itemData = (ULONG_PTR)unpack_ptr( ps->dis.itemData ); + memcpy( *buffer, &dis, sizeof(dis) ); + break; + } case WM_WINE_SETWINDOWPOS: { WINDOWPOS wp; @@ -1220,6 +1236,9 @@ size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL other case WM_GETMINMAXINFO: size = sizeof(MINMAXINFO); break; + case WM_DRAWITEM: + size = sizeof(DRAWITEMSTRUCT); + break; } return size; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 57eb9691993..0fa46a57c2e 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1365,6 +1365,7 @@ struct lparam_hook_test size_t lparam_init_size; size_t check_size; BOOL poison_lparam; + BOOL not_allowed; BOOL todo; }; @@ -1506,6 +1507,16 @@ static void test_msg_output( const struct lparam_hook_test *test, LRESULT result const LPARAM orig = (LPARAM)lparam_buffer; const void *expected; + /* Some messages are not allowed with NtUserMessageCall, they seem to be reserved + * for system. Unhooked SendMessage still works for them. */ + if (test->not_allowed) + { + todo_wine ok( !wndproc_lparam, "wndproc_lparam called\n" ); + return; + } + + ok( wndproc_lparam, "wndproc_lparam not called\n" ); + if (test->check_result) todo_wine_if(test->todo_result) ok( result == test->check_result, "unexpected result %Ix\n", result ); @@ -1610,6 +1621,7 @@ static void test_wndproc_hook(void) static const RECT rect_out = { 3, 4, 110, 220 }; static const MINMAXINFO minmax_in = { .ptMinTrackSize.x = 1 }; static const MINMAXINFO minmax_out = { .ptMinTrackSize.x = 2 }; + static const DRAWITEMSTRUCT drawitem_in = { .itemID = 1 }; static const struct lparam_hook_test lparam_hook_tests[] = { @@ -1709,6 +1721,11 @@ static void test_wndproc_hook(void) { "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) }, + /* messages not allowed to be sent by NtUserMessageCall */ + { + "WM_DRAWITEM", WM_DRAWITEM, .wparam = 10, + .lparam_size = sizeof(drawitem_in), .lparam = &drawitem_in, .not_allowed = TRUE, + }, }; cls.lpfnWndProc = lparam_test_proc; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 982104867f7..32dea8e84ac 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -648,6 +648,27 @@ static size_t packed_message_64to32( UINT message, WPARAM wparam, return sizeof(ncp32) + sizeof(WINDOWPOS32); } break; + + case WM_DRAWITEM: + { + DRAWITEMSTRUCT32 dis32; + const DRAWITEMSTRUCT *dis64 = params64; + + dis32.CtlType = dis64->CtlType; + dis32.CtlID = dis64->CtlID; + dis32.itemID = dis64->itemID; + dis32.itemAction = dis64->itemAction; + dis32.itemState = dis64->itemState; + dis32.hwndItem = HandleToLong( dis64->hwndItem ); + dis32.hDC = HandleToUlong( dis64->hDC ); + dis32.itemData = dis64->itemData; + dis32.rcItem.left = dis64->rcItem.left; + dis32.rcItem.top = dis64->rcItem.top; + dis32.rcItem.right = dis64->rcItem.right; + dis32.rcItem.bottom = dis64->rcItem.bottom; + memcpy( params32, &dis32, sizeof(dis32) ); + return sizeof(dis32); + } } memmove( params32, params64, size );

1 0

Davide Beatrici : winealsa: Export get_device_name_from_guid().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: fbb03f929bf07ca1373fa17a3f487e8e1b3e2ffd URL: https://gitlab.winehq.org/wine/wine/-/commit/fbb03f929bf07ca1373fa17a3f487e… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 30 22:52:23 2023 +0200 winealsa: Export get_device_name_from_guid(). --- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winealsa.drv/winealsa.drv.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c4de829f152..fc80b102ee1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -247,7 +247,7 @@ end: return params.result; } -static BOOL get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) +BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) { HKEY devices_key; UINT i = 0; diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index d6d566e3b13..abfb2e052d8 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -4,6 +4,7 @@ @ stdcall -private modMessage(long long long long long) ALSA_modMessage # 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 GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper

1 0

Davide Beatrici : winecoreaudio: Export get_device_name_from_guid().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 5a0d3fc31df8adb14b8be86829864b4bf57f500a URL: https://gitlab.winehq.org/wine/wine/-/commit/5a0d3fc31df8adb14b8be86829864b… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 30 22:52:35 2023 +0200 winecoreaudio: Export get_device_name_from_guid(). --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index aee06e5a7f7..9a5bd0fdf91 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -243,7 +243,7 @@ end: return params.result; } -static BOOL get_device_name_from_guid(const GUID *guid, char **name, EDataFlow *flow) +BOOL WINAPI get_device_name_from_guid(const GUID *guid, char **name, EDataFlow *flow) { HKEY devices_key; UINT i = 0; diff --git a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec index 1467fc8b032..1f2ac2a9bf0 100644 --- a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec +++ b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec @@ -4,6 +4,7 @@ @ stdcall -private modMessage(long long long long long) CoreAudio_modMessage # 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 GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper

1 0

Davide Beatrici : wineoss: Export get_device_name_from_guid().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 10075a9e928e3d73cec1321375bd293f6288c533 URL: https://gitlab.winehq.org/wine/wine/-/commit/10075a9e928e3d73cec1321375bd29… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 30 22:52:50 2023 +0200 wineoss: Export get_device_name_from_guid(). --- dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/wineoss.drv.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 549cd66b6bd..9a09970aa3b 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -200,7 +200,7 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static BOOL get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) +BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) { OSSDevice *dev_item; LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ diff --git a/dlls/wineoss.drv/wineoss.drv.spec b/dlls/wineoss.drv/wineoss.drv.spec index 4506cc67ab5..496a6eae570 100644 --- a/dlls/wineoss.drv/wineoss.drv.spec +++ b/dlls/wineoss.drv/wineoss.drv.spec @@ -5,6 +5,7 @@ @ stdcall -private modMessage(long long long long long) OSS_modMessage # 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 GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper

1 0

Davide Beatrici : winepulse: Export get_device_name_from_guid().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: dd6807b4088a0b6301e9b8d1bb17761aa703ca98 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd6807b4088a0b6301e9b8d1bb1776… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 30 22:52:59 2023 +0200 winepulse: Export get_device_name_from_guid(). --- dlls/winepulse.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/winepulse.drv.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 15e1538f330..65fbc414ce4 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -241,7 +241,7 @@ end: return params.result; } -static BOOL get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) +BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) { struct device_cache *device; WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 96cbd97bd68..9ae26ae35e9 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -1,4 +1,5 @@ # 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 GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper

1 0

Davide Beatrici : mmdevapi: Import get_device_name_from_guid() from driver.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: a5e3e5efa0d6b9374553b238e7eb2fdbf5a859bc URL: https://gitlab.winehq.org/wine/wine/-/commit/a5e3e5efa0d6b9374553b238e7eb2f… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 30 23:06:16 2023 +0200 mmdevapi: Import get_device_name_from_guid() from driver. --- dlls/mmdevapi/main.c | 1 + dlls/mmdevapi/mmdevapi_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index d1006b9999c..d34075ebf58 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -98,6 +98,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) #define LDFC(n) do { driver->p##n = (void*)GetProcAddress(driver->module, #n);\ if(!driver->p##n) { goto fail; } } while(0) + LDFC(get_device_name_from_guid); LDFC(GetEndpointIDs); LDFC(GetAudioEndpoint); LDFC(GetAudioSessionWrapper); diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h index 1cd8412b6ea..ca7a1f8f629 100644 --- a/dlls/mmdevapi/mmdevapi_private.h +++ b/dlls/mmdevapi/mmdevapi_private.h @@ -40,6 +40,7 @@ typedef struct _DriverFuncs { * valid. See enum _DriverPriority. */ int priority; + BOOL (WINAPI *pget_device_name_from_guid)(GUID *guid, char **name, EDataFlow *flow); /* ids gets an array of human-friendly endpoint names * keys gets an array of driver-specific stuff that is used * in GetAudioEndpoint to identify the endpoint

1 0

Davide Beatrici : mmdevapi: Introduce wine_unix_call helper.
by Alexandre Julliard 27 Jul '23

27 Jul '23

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