August 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Store receive_flags in ntuser_thread_info.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: eb317d9d8cfc959f78bfd6e766e7050a77b5ed7f URL: https://gitlab.winehq.org/wine/wine/-/commit/eb317d9d8cfc959f78bfd6e766e705… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 02:28:59 2022 +0200 win32u: Store receive_flags in ntuser_thread_info. --- dlls/user32/message.c | 5 +---- dlls/win32u/message.c | 12 ++++++++++-- include/ntuser.h | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e62e0566dd9..097e8fd4391 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -713,10 +713,7 @@ BOOL WINAPI InSendMessage(void) */ DWORD WINAPI InSendMessageEx( LPVOID reserved ) { - struct received_message_info *info = get_user_thread_info()->receive_info; - - if (info) return info->flags; - return ISMEX_NOSEND; + return NtUserGetThreadInfo()->receive_flags; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index e262fd7ab22..5fb065e1208 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1045,6 +1045,8 @@ static void reply_message( struct received_message_info *info, LRESULT result, M memset( &data, 0, sizeof(data) ); info->flags |= ISMEX_REPLIED; + if (info == get_user_thread_info()->receive_info) + NtUserGetThreadInfo()->receive_flags = info->flags; if (info->type == MSG_OTHER_PROCESS && !replied) { @@ -1069,11 +1071,16 @@ static void reply_message( struct received_message_info *info, LRESULT result, M */ BOOL reply_message_result( LRESULT result, MSG *msg ) { - struct received_message_info *info = get_user_thread_info()->receive_info; + struct user_thread_info *thread_info = get_user_thread_info(); + struct received_message_info *info = thread_info->receive_info; if (!info) return FALSE; reply_message( info, result, msg ); - if (msg) get_user_thread_info()->receive_info = info->prev; + if (msg) + { + thread_info->receive_info = info->prev; + thread_info->client_info.receive_flags = info->prev ? info->prev->flags : ISMEX_NOSEND; + } return TRUE; } @@ -1865,6 +1872,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, info.prev = thread_info->receive_info; thread_info->receive_info = &info; thread_info->client_info.msg_source = msg_source_unavailable; + thread_info->client_info.receive_flags = info.flags; result = call_window_proc( info.msg.hwnd, info.msg.message, info.msg.wParam, info.msg.lParam, (info.type != MSG_ASCII), FALSE, WMCHAR_MAP_RECVMESSAGE, needs_unpack, buffer, size ); diff --git a/include/ntuser.h b/include/ntuser.h index 5bc92fb562c..07b5afe7919 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -67,6 +67,7 @@ struct ntuser_thread_info ULONG_PTR message_extra; /* value for GetMessageExtraInfo */ INPUT_MESSAGE_SOURCE msg_source; /* Message source for current message */ WORD recursion_count; /* SendMessage recursion counter */ + UINT receive_flags; /* currently received message flags */ HWND top_window; /* desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ DPI_AWARENESS dpi_awareness; /* DPI awareness */

1 0

Nikolay Sivov : dwrite/fallback: Consider character size for returned mapped length.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: e25ff734cf05775c5ac136573e97c2067f6049d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e25ff734cf05775c5ac136573e97c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 22:43:08 2022 +0300 dwrite/fallback: Consider character size for returned mapped length. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index d23153a2d5e..3f23c72dab4 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2265,7 +2265,7 @@ static UINT32 fallback_font_get_supported_length(IDWriteFont3 *font, IDWriteText while (!text_source_get_next_u32_char(&context)) { if (!IDWriteFont3_HasCharacter(font, context.ch)) break; - mapped++; + mapped += context.ch > 0xffff ? 2 : 1; } return mapped;

1 0

Rémi Bernon : server: Avoid reallocating rawinput device array with zero size.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 28aa321f3696f0713e7ddecda66783e76b933ab9 URL: https://gitlab.winehq.org/wine/wine/-/commit/28aa321f3696f0713e7ddecda66783… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 5 15:46:05 2022 +0200 server: Avoid reallocating rawinput device array with zero size. It actually frees the pointer. --- server/queue.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/queue.c b/server/queue.c index d98d645065f..01fe8d6c060 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3380,6 +3380,14 @@ DECL_HANDLER(update_rawinput_devices) size_t size = device_count * sizeof(*devices); struct process *process = current->process; + if (!size) + { + process->rawinput_device_count = 0; + process->rawinput_mouse = NULL; + process->rawinput_kbd = NULL; + return; + } + if (!(tmp = realloc( process->rawinput_devices, size ))) { set_error( STATUS_NO_MEMORY );

1 0

Eric Pouech : shlwapi/tests: Use wide strings literals.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 0993c5ae8dc35b0c8ca9ae7c253da9c261145d2e URL: https://gitlab.winehq.org/wine/wine/-/commit/0993c5ae8dc35b0c8ca9ae7c253da9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 3 09:52:06 2022 +0200 shlwapi/tests: Use wide strings literals. This also prevents clash with use of 'open' as a global variable. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/shlwapi/tests/assoc.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 84eda1317bb..93e0d140518 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -30,12 +30,7 @@ static HRESULT (WINAPI *pAssocQueryStringA)(ASSOCF,ASSOCSTR,LPCSTR,LPCSTR,LPSTR, static HRESULT (WINAPI *pAssocQueryStringW)(ASSOCF,ASSOCSTR,LPCWSTR,LPCWSTR,LPWSTR,LPDWORD) = NULL; static HRESULT (WINAPI *pAssocCreate)(CLSID, REFIID, void **) = NULL; -/* Every version of Windows with IE should have this association? */ -static const WCHAR dotHtml[] = { '.','h','t','m','l',0 }; -static const WCHAR badBad[] = { 'b','a','d','b','a','d',0 }; -static const WCHAR dotBad[] = { '.','b','a','d',0 }; -static const WCHAR open[] = { 'o','p','e','n',0 }; -static const WCHAR invalid[] = { 'i','n','v','a','l','i','d',0 }; +/* Should every version of Windows with IE have .html association? */ static void test_getstring_bad(void) { @@ -51,19 +46,19 @@ static void test_getstring_bad(void) } len = 0xdeadbeef; - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, open, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, L"open", NULL, &len); expect_hr(E_INVALIDARG, hr); ok(len == 0xdeadbeef, "got %lu\n", len); len = 0xdeadbeef; - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, badBad, open, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, L"badbad", L"open", NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08lx\n", hr); ok(len == 0xdeadbeef, "got %lu\n", len); len = ARRAY_SIZE(buf); - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, buf, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, L".bad", L"open", buf, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || hr == S_OK /* Win8 */, @@ -75,31 +70,31 @@ static void test_getstring_bad(void) } len = 0xdeadbeef; - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, L".html", L"invalid", NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08lx\n", hr); ok(len == 0xdeadbeef, "got %lu\n", len); - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, L".html", L"open", NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08lx\n", hr); len = 0xdeadbeef; - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, open, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, L"open", NULL, &len); expect_hr(E_INVALIDARG, hr); ok(len == 0xdeadbeef, "got %lu\n", len); len = 0xdeadbeef; - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, L"badbad", L"open", NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08lx\n", hr); ok(len == 0xdeadbeef, "got %lu\n", len); len = 0xdeadbeef; - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, L".bad", L"open", NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND) /* Win8 */ || @@ -109,14 +104,14 @@ static void test_getstring_bad(void) "got hr=%08lx and len=%lu\n", hr, len); len = 0xdeadbeef; - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, L".html", L"invalid", NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || /* W2K/Vista/W2K8 */ hr == E_FAIL, /* Win9x/WinMe/NT4 */ "Unexpected result : %08lx\n", hr); ok(len == 0xdeadbeef, "got %lu\n", len); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, NULL); + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, L".html", L"open", NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08lx\n", hr); @@ -135,7 +130,7 @@ static void test_getstring_basic(void) return; } - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, L".html", L"open", NULL, &len); expect_hr(S_FALSE, hr); if (hr != S_FALSE) { @@ -152,14 +147,14 @@ static void test_getstring_basic(void) } len2 = len; - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, L".html", L"open", executableName, &len2); expect_hr(S_OK, hr); slen = lstrlenW(executableName) + 1; expect(len, len2); expect(len, slen); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, L".html", L"open", NULL, &len); ok(hr == S_FALSE || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win9x/NT4 */ || @@ -182,7 +177,7 @@ static void test_getstring_basic(void) } len2 = len; - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, L".html", L"open", friendlyName, &len2); expect_hr(S_OK, hr); slen = lstrlenW(friendlyName) + 1;

1 0

Jacek Caban : win32u: Move msg_source and recursion_count to ntuser_thread_info.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: ca903a4a16142225c9e353c55489f40e8c637e67 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca903a4a16142225c9e353c55489f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 22:01:44 2022 +0200 win32u: Move msg_source and recursion_count to ntuser_thread_info. --- dlls/user32/message.c | 4 ++-- dlls/win32u/message.c | 17 +++++++++-------- dlls/win32u/ntuser_private.h | 2 -- include/ntuser.h | 2 ++ 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d1a211bb281..e62e0566dd9 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -585,7 +585,7 @@ LRESULT WINAPI SendMessageTimeoutA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l static LRESULT dispatch_send_message( struct win_proc_params *params ) { - struct user_thread_info *thread_info = get_user_thread_info(); + struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); INPUT_MESSAGE_SOURCE prev_source = thread_info->msg_source; LRESULT retval = 0; @@ -1031,7 +1031,7 @@ LPARAM WINAPI SetMessageExtraInfo(LPARAM lParam) */ BOOL WINAPI GetCurrentInputMessageSource( INPUT_MESSAGE_SOURCE *source ) { - *source = get_user_thread_info()->msg_source; + *source = NtUserGetThreadInfo()->msg_source; return TRUE; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 7045aedb4b1..e262fd7ab22 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -245,7 +245,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, static BOOL dispatch_win_proc_params( struct win_proc_params *params, size_t size ) { - struct user_thread_info *thread_info = get_user_thread_info(); + struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); void *ret_ptr; ULONG ret_len; @@ -1593,11 +1593,12 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data, HWND hwnd_filter, UINT first, UINT last, BOOL remove ) { + struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); DPI_AWARENESS_CONTEXT context; BOOL ret = FALSE; - get_user_thread_info()->msg_source.deviceType = msg_data->source.device; - get_user_thread_info()->msg_source.originId = msg_data->source.origin; + thread_info->msg_source.deviceType = msg_data->source.device; + thread_info->msg_source.originId = msg_data->source.origin; /* hardware messages are always in physical coords */ context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); @@ -1625,7 +1626,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, { LRESULT result; struct user_thread_info *thread_info = get_user_thread_info(); - INPUT_MESSAGE_SOURCE prev_source = thread_info->msg_source; + INPUT_MESSAGE_SOURCE prev_source = thread_info->client_info.msg_source; struct received_message_info info; unsigned int hw_id = 0; /* id of previous hardware message */ void *buffer; @@ -1643,7 +1644,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, const message_data_t *msg_data = buffer; BOOL needs_unpack = FALSE; - thread_info->msg_source = prev_source; + thread_info->client_info.msg_source = prev_source; SERVER_START_REQ( get_message ) { @@ -1854,7 +1855,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, thread_info->client_info.message_pos = MAKELONG( msg->pt.x, msg->pt.y ); thread_info->client_info.message_time = info.msg.time; thread_info->client_info.message_extra = 0; - thread_info->msg_source = msg_source_unavailable; + thread_info->client_info.msg_source = msg_source_unavailable; free( buffer ); call_hooks( WH_GETMESSAGE, HC_ACTION, flags & PM_REMOVE, (LPARAM)msg, TRUE ); return 1; @@ -1863,7 +1864,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, /* if we get here, we have a sent message; call the window procedure */ info.prev = thread_info->receive_info; thread_info->receive_info = &info; - thread_info->msg_source = msg_source_unavailable; + thread_info->client_info.msg_source = msg_source_unavailable; result = call_window_proc( info.msg.hwnd, info.msg.message, info.msg.wParam, info.msg.lParam, (info.type != MSG_ASCII), FALSE, WMCHAR_MAP_RECVMESSAGE, needs_unpack, buffer, size ); @@ -2619,7 +2620,7 @@ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_pt */ static BOOL process_message( struct send_message_info *info, DWORD_PTR *res_ptr, BOOL ansi ) { - struct user_thread_info *thread_info = get_user_thread_info(); + struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); INPUT_MESSAGE_SOURCE prev_source = thread_info->msg_source; DWORD dest_pid; BOOL ret; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index c62bb0d457f..0f25ede6b2b 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -123,13 +123,11 @@ struct user_thread_info HANDLE server_queue; /* Handle to server-side queue */ DWORD wake_mask; /* Current queue wake mask */ DWORD changed_mask; /* Current queue changed mask */ - WORD recursion_count; /* SendMessage recursion counter */ WORD message_count; /* Get/PeekMessage loop counter */ WORD hook_call_depth; /* Number of recursively called hook procs */ WORD hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */ UINT active_hooks; /* Bitmap of active hooks */ - INPUT_MESSAGE_SOURCE msg_source; /* Message source for current message */ struct received_message_info *receive_info; /* Message being currently received */ struct user_key_state_info *key_state; /* Cache of global key state */ struct imm_thread_data *imm_thread_data; /* IMM thread data */ diff --git a/include/ntuser.h b/include/ntuser.h index ec6f58a2f2e..5bc92fb562c 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -65,6 +65,8 @@ struct ntuser_thread_info DWORD message_time; /* value for GetMessageTime */ DWORD message_pos; /* value for GetMessagePos */ ULONG_PTR message_extra; /* value for GetMessageExtraInfo */ + INPUT_MESSAGE_SOURCE msg_source; /* Message source for current message */ + WORD recursion_count; /* SendMessage recursion counter */ HWND top_window; /* desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ DPI_AWARENESS dpi_awareness; /* DPI awareness */

1 0

Jacek Caban : win32u: Store wmchar_data in ntuser_thread_info.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: da2c400edcf2d552b06369143103d20fcb3cddb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/da2c400edcf2d552b06369143103d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 21:13:39 2022 +0200 win32u: Store wmchar_data in ntuser_thread_info. --- dlls/user32/message.c | 10 +++++----- dlls/user32/user_main.c | 2 +- dlls/win32u/ntuser_private.h | 1 - include/ntuser.h | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 42cab89da05..d1a211bb281 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -63,7 +63,7 @@ static inline void *unpack_ptr( ULONGLONG ptr64 ) /* check for pending WM_CHAR message with DBCS trailing byte */ static inline BOOL get_pending_wmchar( MSG *msg, UINT first, UINT last, BOOL remove ) { - struct wm_char_mapping_data *data = get_user_thread_info()->wmchar_data; + struct wm_char_mapping_data *data = NtUserGetThreadInfo()->wmchar_data; if (!data || !data->get_msg.message) return FALSE; if ((first || last) && (first > WM_CHAR || last < WM_CHAR)) return FALSE; @@ -119,7 +119,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping */ if (mapping != WMCHAR_MAP_NOMAPPING) { - struct wm_char_mapping_data *data = get_user_thread_info()->wmchar_data; + struct wm_char_mapping_data *data = NtUserGetThreadInfo()->wmchar_data; BYTE low = LOBYTE(*wparam); cp = get_input_codepage(); @@ -152,7 +152,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) return FALSE; - get_user_thread_info()->wmchar_data = data; + NtUserGetThreadInfo()->wmchar_data = data; } TRACE( "storing lead byte %02x mapping %u\n", low, mapping ); data->lead_byte[mapping] = low; @@ -210,11 +210,11 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); if (len == 2) /* DBCS char */ { - struct wm_char_mapping_data *data = get_user_thread_info()->wmchar_data; + struct wm_char_mapping_data *data = NtUserGetThreadInfo()->wmchar_data; if (!data) { if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) return; - get_user_thread_info()->wmchar_data = data; + NtUserGetThreadInfo()->wmchar_data = data; } if (remove) { diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 269fdede708..139d9b5f46e 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -233,7 +233,7 @@ static BOOL process_attach(void) */ static void thread_detach(void) { - struct user_thread_info *thread_info = get_user_thread_info(); + struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); NtUserCallNoParam( NtUserExitingThread ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index b048d194a4e..c62bb0d457f 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -131,7 +131,6 @@ struct user_thread_info UINT active_hooks; /* Bitmap of active hooks */ INPUT_MESSAGE_SOURCE msg_source; /* Message source for current message */ struct received_message_info *receive_info; /* Message being currently received */ - struct wm_char_mapping_data *wmchar_data; /* Data for WM_CHAR mappings */ struct user_key_state_info *key_state; /* Cache of global key state */ struct imm_thread_data *imm_thread_data; /* IMM thread data */ HKL kbd_layout; /* Current keyboard layout */ diff --git a/include/ntuser.h b/include/ntuser.h index b36b630ce7f..ec6f58a2f2e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -70,6 +70,7 @@ struct ntuser_thread_info DPI_AWARENESS dpi_awareness; /* DPI awareness */ HIMC default_imc; /* default input context */ void *client_imm; /* client IMM thread info */ + struct wm_char_mapping_data *wmchar_data; /* Data for WM_CHAR mappings */ }; static inline struct ntuser_thread_info *NtUserGetThreadInfo(void)

1 0

Jacek Caban : win32u: Store DPI awareness in ntuser_thread_info.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: f390b5b884a66f4c34340ebbe7ae731d52dd66ef URL: https://gitlab.winehq.org/wine/wine/-/commit/f390b5b884a66f4c34340ebbe7ae73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 21:09:53 2022 +0200 win32u: Store DPI awareness in ntuser_thread_info. --- dlls/user32/sysparams.c | 4 ++-- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/sysparams.c | 4 ++-- include/ntuser.h | 17 +++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 26259ab76e9..36b166c627c 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -888,7 +888,7 @@ UINT WINAPI GetDpiForSystem(void) */ DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void) { - struct user_thread_info *info = get_user_thread_info(); + struct ntuser_thread_info *info = NtUserGetThreadInfo(); if (info->dpi_awareness) return ULongToHandle( info->dpi_awareness ); return UlongToHandle( (NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ) & 3 ) | 0x10 ); @@ -899,7 +899,7 @@ DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void) */ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) { - struct user_thread_info *info = get_user_thread_info(); + struct ntuser_thread_info *info = NtUserGetThreadInfo(); DPI_AWARENESS prev, val = GetAwarenessFromDpiAwarenessContext( context ); if (val == DPI_AWARENESS_INVALID) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index e068ff849f3..b048d194a4e 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -129,7 +129,6 @@ struct user_thread_info WORD hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */ UINT active_hooks; /* Bitmap of active hooks */ - DPI_AWARENESS dpi_awareness; /* DPI awareness */ INPUT_MESSAGE_SOURCE msg_source; /* Message source for current message */ struct received_message_info *receive_info; /* Message being currently received */ struct wm_char_mapping_data *wmchar_data; /* Data for WM_CHAR mappings */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5300d09eefe..ef2462e6540 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1608,7 +1608,7 @@ UINT get_win_monitor_dpi( HWND hwnd ) */ DPI_AWARENESS get_thread_dpi_awareness(void) { - struct user_thread_info *info = get_user_thread_info(); + struct ntuser_thread_info *info = NtUserGetThreadInfo(); ULONG_PTR context = info->dpi_awareness; if (!context) context = NtUserGetProcessDpiAwarenessContext( NULL ); @@ -1677,7 +1677,7 @@ static DPI_AWARENESS get_awareness_from_dpi_awareness_context( DPI_AWARENESS_CON */ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) { - struct user_thread_info *info = get_user_thread_info(); + struct ntuser_thread_info *info = NtUserGetThreadInfo(); DPI_AWARENESS prev, val = get_awareness_from_dpi_awareness_context( context ); if (val == DPI_AWARENESS_INVALID) diff --git a/include/ntuser.h b/include/ntuser.h index 6d0ae96ec6f..b36b630ce7f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -61,14 +61,15 @@ enum /* TEB thread info, not compatible with Windows */ struct ntuser_thread_info { - void *driver_data; /* driver-specific data */ - DWORD message_time; /* value for GetMessageTime */ - DWORD message_pos; /* value for GetMessagePos */ - ULONG_PTR message_extra; /* value for GetMessageExtraInfo */ - HWND top_window; /* desktop window */ - HWND msg_window; /* HWND_MESSAGE parent window */ - HIMC default_imc; /* default input context */ - void *client_imm; /* client IMM thread info */ + void *driver_data; /* driver-specific data */ + DWORD message_time; /* value for GetMessageTime */ + DWORD message_pos; /* value for GetMessagePos */ + ULONG_PTR message_extra; /* value for GetMessageExtraInfo */ + HWND top_window; /* desktop window */ + HWND msg_window; /* HWND_MESSAGE parent window */ + DPI_AWARENESS dpi_awareness; /* DPI awareness */ + HIMC default_imc; /* default input context */ + void *client_imm; /* client IMM thread info */ }; static inline struct ntuser_thread_info *NtUserGetThreadInfo(void)

1 0

Jacek Caban : win32u: Move register_desktop_class implementation from user32.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: fc0753f9184ba36ac87b42a1ee4f8b6febed8f68 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc0753f9184ba36ac87b42a1ee4f8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 20:33:22 2022 +0200 win32u: Move register_desktop_class implementation from user32. --- dlls/user32/class.c | 10 ------ dlls/user32/controls.h | 3 -- dlls/user32/desktop.c | 14 --------- dlls/user32/message.c | 12 -------- dlls/user32/user_main.c | 1 - dlls/win32u/class.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/syscall.c | 2 ++ 8 files changed, 76 insertions(+), 40 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index c18e48b257a..bb81e4551bc 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -332,16 +332,6 @@ BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, } -/*********************************************************************** - * register_desktop_class - */ -void register_desktop_class(void) -{ - register_builtin( &DESKTOP_builtin_class ); - register_builtin( &MESSAGE_builtin_class ); -} - - /*********************************************************************** * RegisterClassA (USER32.@) * diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index a6c45ca1652..b004413113b 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -39,13 +39,11 @@ extern const struct builtin_class_descr BUTTON_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr COMBO_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr COMBOLBOX_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr DIALOG_builtin_class DECLSPEC_HIDDEN; -extern const struct builtin_class_descr DESKTOP_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr EDIT_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr ICONTITLE_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr LISTBOX_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr MDICLIENT_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr MENU_builtin_class DECLSPEC_HIDDEN; -extern const struct builtin_class_descr MESSAGE_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr SCROLL_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr STATIC_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr IME_builtin_class DECLSPEC_HIDDEN; @@ -102,7 +100,6 @@ extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE /* Class functions */ extern ATOM get_int_atom_value( UNICODE_STRING *name ) DECLSPEC_HIDDEN; -extern void register_desktop_class(void) DECLSPEC_HIDDEN; /* desktop */ extern BOOL update_wallpaper( const WCHAR *wallpaper, const WCHAR *pattern ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index ca000972bc4..377c21d4f48 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -34,20 +34,6 @@ static SIZE bitmapSize; static BOOL fTileWallPaper; -/********************************************************************* - * desktop class descriptor - */ -const struct builtin_class_descr DESKTOP_builtin_class = -{ - (LPCWSTR)DESKTOP_CLASS_ATOM, /* name */ - CS_DBLCLKS, /* style */ - WINPROC_DESKTOP, /* proc */ - 0, /* extra */ - 0, /* cursor */ - (HBRUSH)(COLOR_BACKGROUND+1) /* brush */ -}; - - /*********************************************************************** * DESKTOP_LoadBitmap */ diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 65aa93d858c..42cab89da05 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -47,18 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msg); -/* Message class descriptor */ -const struct builtin_class_descr MESSAGE_builtin_class = -{ - L"Message", /* name */ - 0, /* style */ - WINPROC_MESSAGE, /* proc */ - 0, /* extra */ - 0, /* cursor */ - 0 /* brush */ -}; - - /* pack a pointer into a 32/64 portable format */ static inline ULONGLONG pack_ptr( const void *ptr ) { diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index acbd93cccdd..133a7457bfd 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -220,7 +220,6 @@ static BOOL process_attach(void) dpiaware_init(); winproc_init(); - register_desktop_class(); /* Initialize system colors and metrics */ SYSPARAMS_Init(); diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index eab65b72ef6..84e923c5b0c 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -60,6 +60,17 @@ typedef struct tagCLASS struct client_menu_name menu_name; /* Default menu name */ } CLASS; +/* Built-in class descriptor */ +struct builtin_class_descr +{ + const char *name; /* class name */ + UINT style; /* class style */ + INT extra; /* window extra bytes */ + ULONG_PTR cursor; /* cursor id */ + HBRUSH brush; /* brush or system color */ + enum builtin_winprocs proc; +}; + typedef struct tagWINDOWPROC { WNDPROC procA; /* ANSI window proc */ @@ -1050,6 +1061,59 @@ BOOL needs_ime_window( HWND hwnd ) return ret; } +static const struct builtin_class_descr desktop_builtin_class = +{ + .name = MAKEINTRESOURCEA(DESKTOP_CLASS_ATOM), + .style = CS_DBLCLKS, + .proc = WINPROC_DESKTOP, + .brush = (HBRUSH)(COLOR_BACKGROUND + 1), +}; + +static const struct builtin_class_descr message_builtin_class = +{ + .name = "Message", + .proc = WINPROC_MESSAGE, +}; + +/*********************************************************************** + * register_builtin + * + * Register a builtin control class. + * This allows having both ANSI and Unicode winprocs for the same class. + */ +static void register_builtin( const struct builtin_class_descr *descr ) +{ + UNICODE_STRING name, version = { .Length = 0 }; + struct client_menu_name menu_name = { 0 }; + WCHAR nameW[64]; + WNDCLASSEXW class = { + .cbSize = sizeof(class), + .hInstance = user32_module, + .style = descr->style, + .cbWndExtra = descr->extra, + .hbrBackground = descr->brush, + .lpfnWndProc = BUILTIN_WINPROC( descr->proc ), + }; + + if (descr->cursor) + class.hCursor = LoadImageW( 0, (const WCHAR *)descr->cursor, IMAGE_CURSOR, + 0, 0, LR_SHARED | LR_DEFAULTSIZE ); + + if (IS_INTRESOURCE( descr->name )) + { + name.Buffer = (WCHAR *)descr->name; + name.Length = name.MaximumLength = 0; + } + else + { + asciiz_to_unicode( nameW, descr->name ); + RtlInitUnicodeString( &name, nameW ); + } + + if (!NtUserRegisterClassExWOW( &class, &name, &version, &menu_name, 1, 0, NULL ) && class.hCursor) + NtUserDestroyCursor( class.hCursor, 0 ); +} + static void register_builtins(void) { void *ret_ptr; @@ -1065,3 +1129,12 @@ void register_builtin_classes(void) static pthread_once_t init_once = PTHREAD_ONCE_INIT; pthread_once( &init_once, register_builtins ); } + +/*********************************************************************** + * register_desktop_class + */ +void register_desktop_class(void) +{ + register_builtin( &desktop_builtin_class ); + register_builtin( &message_builtin_class ); +} diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 3ecd7424f77..e068ff849f3 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -249,6 +249,7 @@ struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; BOOL needs_ime_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void register_builtin_classes(void) DECLSPEC_HIDDEN; +extern void register_desktop_class(void) DECLSPEC_HIDDEN; /* cursoricon.c */ HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 532c08ef2e0..e36e7097047 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winnt.h" #include "ntgdi_private.h" +#include "ntuser_private.h" #include "ntuser.h" #include "wine/unixlib.h" @@ -318,6 +319,7 @@ static NTSTATUS init( void *dispatcher ) if ((status = gdi_init())) return status; winstation_init(); sysparams_init(); + register_desktop_class(); return STATUS_SUCCESS; }

1 0

Olivier F. R. Dierick : secur32: Define AES-CCM ciphers missing from GNUTLS before 3.4.0.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 8f3352ed91a8723989864a643aab22a4fe2f0ddd URL: https://gitlab.winehq.org/wine/wine/-/commit/8f3352ed91a8723989864a643aab22… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sat Jul 16 22:43:30 2022 +0200 secur32: Define AES-CCM ciphers missing from GNUTLS before 3.4.0. --- dlls/secur32/schannel_gnutls.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 8a7b26bc997..6d65f41ca1b 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -136,6 +136,11 @@ MAKE_FUNCPTR(gnutls_x509_privkey_deinit); #define GNUTLS_KX_ECDHE_PSK 14 #endif +#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 4) +#define GNUTLS_CIPHER_AES_128_CCM 19 +#define GNUTLS_CIPHER_AES_256_CCM 20 +#endif + #if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 5) #define GNUTLS_ALPN_SERVER_PRECEDENCE (1<<1) #endif

1 0

Jacek Caban : user32: Always use 64-bit cbWndExtra for edit control.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 30209d86b0a585b8a6d6b51c5afbf0653055d62c URL: https://gitlab.winehq.org/wine/wine/-/commit/30209d86b0a585b8a6d6b51c5afbf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 8 13:42:09 2022 +0200 user32: Always use 64-bit cbWndExtra for edit control. --- dlls/user32/edit.c | 6 +----- dlls/user32/tests/class.c | 10 +++------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 81296f7deeb..3bbcd9ab746 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5265,11 +5265,7 @@ const struct builtin_class_descr EDIT_builtin_class = L"Edit", /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ WINPROC_EDIT, /* proc */ -#ifdef __i386__ - sizeof(EDITSTATE *) + sizeof(WORD), /* extra */ -#else - sizeof(EDITSTATE *), /* extra */ -#endif + sizeof(UINT64), /* extra */ IDC_IBEAM, /* cursor */ 0 /* brush */ }; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 795c65b7c48..686fced55ee 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -957,15 +957,11 @@ static const struct { const char name[9]; int value; - int badvalue; + int value64; /* 64-bit Windows use 64-bit size also for 32-bit applications */ } extra_values[] = { {"#32770",30,30}, /* Dialog */ -#ifdef _WIN64 - {"Edit",8,8}, -#else - {"Edit",6,8}, /* Windows XP 64-bit returns 8 also to 32-bit applications */ -#endif + {"Edit",6,8}, }; static void test_extra_values(void) @@ -978,7 +974,7 @@ static void test_extra_values(void) ok( ret, "GetClassInfo (0) failed for global class %s\n", extra_values[i].name); if (!ret) continue; - ok(extra_values[i].value == wcx.cbWndExtra || broken(extra_values[i].badvalue == wcx.cbWndExtra), + ok(extra_values[i].value == wcx.cbWndExtra || extra_values[i].value64 == wcx.cbWndExtra, "expected %d, got %d\n", extra_values[i].value, wcx.cbWndExtra); } }

1 0