wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Hans Leidekker : include: Fix a typo.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 19d18bbbc3504b7159bd27f1d722de1480087466 URL: https://gitlab.winehq.org/wine/wine/-/commit/19d18bbbc3504b7159bd27f1d722de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 15:12:57 2022 +0200 include: Fix a typo. --- dlls/secur32/schannel.c | 2 +- include/sspi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 34cd3ad9730..4699f79ac1f 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1164,7 +1164,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( stream_sizes->cbHeader = ctx->header_size; stream_sizes->cbTrailer = mac_size + 256; /* Max 255 bytes padding + 1 for padding size */ stream_sizes->cbMaximumMessage = message_size; - stream_sizes->cbBuffers = 4; + stream_sizes->cBuffers = 4; stream_sizes->cbBlockSize = block_size; } diff --git a/include/sspi.h b/include/sspi.h index 1cd1e6e0035..e2da48cd720 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -521,7 +521,7 @@ typedef struct _SecPkgContext_StreamSizes ULONG cbHeader; ULONG cbTrailer; ULONG cbMaximumMessage; - ULONG cbBuffers; + ULONG cBuffers; ULONG cbBlockSize; } SecPkgContext_StreamSizes, *PSecPkgContext_StreamSizes;

1 0

Jacek Caban : mshtml: Wine Gecko 2.47.3 release.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 05b9bc2161bc2729e6ffe5b28fbcda9fcb9c64aa URL: https://gitlab.winehq.org/wine/wine/-/commit/05b9bc2161bc2729e6ffe5b28fbcda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 12 18:14:33 2022 +0200 mshtml: Wine Gecko 2.47.3 release. - Enabled accessibility support. - Restored a few XPCOM interfaces. - Python compatibility fixes. --- dlls/appwiz.cpl/addons.c | 6 +++--- dlls/mshtml/nsiface.idl | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 021f5484af9..cdc5141bd33 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -46,13 +46,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); -#define GECKO_VERSION "2.47.2" +#define GECKO_VERSION "2.47.3" #ifdef __i386__ #define GECKO_ARCH "x86" -#define GECKO_SHA "e520ce7336cd420cd09c91337d87e74bb420300fd5cbc6f724c1802766b6a61d" +#define GECKO_SHA "e5b9b06d3ce355646a8d2e72e044e37e1e0c8d18464eb1985adcd187a7f48e01" #elif defined(__x86_64__) #define GECKO_ARCH "x86_64" -#define GECKO_SHA "0596761024823ff3c21f13e1cd5cd3e89dccc698294d62974d8930aeda86ce45" +#define GECKO_SHA "a53ee954392b6d1fe3d68545f6e4e2a97afbc8dc8b03a8b443349545ce139675" #else #define GECKO_ARCH "" #define GECKO_SHA "???" diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 2ecd8d93854..cad48f725c6 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -25,7 +25,7 @@ #pragma makedep header -cpp_quote("#define GECKO_VERSION \"2.47.2\"") +cpp_quote("#define GECKO_VERSION \"2.47.3\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; @@ -4287,6 +4287,7 @@ interface nsIXMLHttpRequest : nsISupports nsresult SetOnreadystatechange(JSContext*cx, int /*JS::HandleValue*/ aOnreadystatechange); nsresult GetMozAnon(bool *aMozAnon); nsresult GetMozSystem(bool *aMozSystem); + nsresult GetResponseBuffer(void *buffer, uint32_t buffer_size, uint32_t *_retval); } cpp_quote("DEFINE_GUID(IID_nsCycleCollectionISupports, 0xc61eac14,0x5f7a,0x4481,0x96,0x5e,0x7e,0xaa,0x6e,0xff,0xa8,0x5f);")

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: b00fa1f180e9ffd54cb941c005303a3f9a46f3ff URL: https://gitlab.winehq.org/wine/wine/-/commit/b00fa1f180e9ffd54cb941c005303a… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Jul 12 15:16:04 2022 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 56 +++----------------------------------------------------- 1 file changed, 3 insertions(+), 53 deletions(-) diff --git a/po/nl.po b/po/nl.po index 5e30fdb1e89..3ea51c96fea 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-06-25 00:15+0200\n" +"PO-Revision-Date: 2022-07-12 15:15+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -2456,7 +2456,7 @@ msgstr "Certificaat doeleinden" #: programs/taskmgr/taskmgr.rc:52 programs/winefile/winefile.rc:48 #: programs/wordpad/wordpad.rc:69 msgid "&View" -msgstr "&Bekijk" +msgstr "&Beeld" #: dlls/cryptui/cryptui.rc:360 msgid "Advanced Options" @@ -15915,56 +15915,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -16050,7 +16000,7 @@ msgstr "" " <type> één van de volgende zijn:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " Als [/t] niet is gegeven, dan wordt het type REG_SZ verondersteld.\n" "\n"

1 0

Floris Renaud : inetcpl.cpl: Fix typo.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: f67f4bbadde3e7d297da6444d5cfadf26db543c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f67f4bbadde3e7d297da6444d5cfad… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Jul 12 13:42:02 2022 +0000 inetcpl.cpl: Fix typo. --- dlls/inetcpl.cpl/connections.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index c14002ea256..a6591051771 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -291,7 +291,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) RegCloseKey(hkey); return FALSE; } - TRACE("ProxtServer set to %s\n", wine_dbgstr_w(proxy)); + TRACE("ProxyServer set to %s\n", wine_dbgstr_w(proxy)); use_pac_script = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT); pac_script_len = GetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT,

1 0

Jacek Caban : win32u: Use KeUserModeCallback interface for DDE message callbacks.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: d3c57dec71e714d4922daa45fee019fbc7dc7180 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3c57dec71e714d4922daa45fee019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 15:13:42 2022 +0200 win32u: Use KeUserModeCallback interface for DDE message callbacks. --- dlls/user32/message.c | 14 +++++++------- dlls/user32/user_main.c | 20 ++++++++++++++++++-- dlls/user32/user_private.h | 2 +- dlls/win32u/message.c | 36 +++++++++++++++++++++++++++++++----- dlls/win32u/ntuser_private.h | 4 ---- include/ntuser.h | 30 ++++++++++++++++++++++++++++++ 6 files changed, 87 insertions(+), 19 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index eff0c4efbcf..f4e9b5b404e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -477,7 +477,7 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD * Unpack a posted DDE message received from another process. */ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void **buffer, size_t size ) + const void *buffer, size_t size ) { UINT_PTR uiLo, uiHi; HGLOBAL hMem = 0; @@ -491,9 +491,9 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam ULONGLONG hpack; /* hMem is being passed */ if (size != sizeof(hpack)) return FALSE; - if (!buffer || !*buffer) return FALSE; + if (!size) return FALSE; uiLo = *lparam; - memcpy( &hpack, *buffer, size ); + memcpy( &hpack, buffer, size ); hMem = unpack_ptr( hpack ); uiHi = (UINT_PTR)hMem; TRACE("recv dde-ack %Ix mem=%Ix[%Ix]\n", uiLo, uiHi, GlobalSize( hMem )); @@ -509,7 +509,7 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam case WM_DDE_ADVISE: case WM_DDE_DATA: case WM_DDE_POKE: - if ((!buffer || !*buffer) && message != WM_DDE_DATA) return FALSE; + if (!size && message != WM_DDE_DATA) return FALSE; uiHi = *lparam; if (size) { @@ -517,7 +517,7 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam return FALSE; if ((ptr = GlobalLock( hMem ))) { - memcpy( ptr, *buffer, size ); + memcpy( ptr, buffer, size ); GlobalUnlock( hMem ); } else @@ -533,11 +533,11 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam case WM_DDE_EXECUTE: if (size) { - if (!buffer || !*buffer) return FALSE; + if (!size) return FALSE; if (!(hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_DDESHARE, size ))) return FALSE; if ((ptr = GlobalLock( hMem ))) { - memcpy( ptr, *buffer, size ); + memcpy( ptr, buffer, size ); GlobalUnlock( hMem ); TRACE( "exec: pairing c=%08Ix s=%p\n", *lparam, hMem ); if (!dde_add_pair( (HGLOBAL)*lparam, hMem )) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index f9bc4985368..16ce5c6a854 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -134,8 +134,6 @@ static NTSTATUS try_finally( NTSTATUS (CDECL *func)( void *), void *arg, static const struct user_callbacks user_funcs = { NtWaitForMultipleObjects, - post_dde_message, - unpack_dde_message, try_finally, }; @@ -192,6 +190,12 @@ static NTSTATUS WINAPI User32FreeCachedClipboardData( const struct free_cached_d return 0; } +static NTSTATUS WINAPI User32PostDDEMessage( const struct post_dde_message_params *params, ULONG size ) +{ + return post_dde_message( params->hwnd, params->msg, params->wparam, params->lparam, + params->dest_tid, params->type ); +} + static NTSTATUS WINAPI User32RenderSsynthesizedFormat( const struct render_synthesized_format_params *params, ULONG size ) { @@ -204,6 +208,16 @@ static BOOL WINAPI User32LoadDriver( const WCHAR *path, ULONG size ) return LoadLibraryW( path ) != NULL; } +static NTSTATUS WINAPI User32UnpackDDEMessage( const struct unpack_dde_message_params *params, ULONG size ) +{ + struct unpack_dde_message_result *result = params->result; + result->wparam = params->wparam; + result->lparam = params->lparam; + size -= FIELD_OFFSET( struct unpack_dde_message_params, data ); + return unpack_dde_message( params->hwnd, params->message, &result->wparam, &result->lparam, + params->data, size ); +} + static const void *kernel_callback_table[NtUserCallCount] = { User32CallEnumDisplayMonitor, @@ -220,8 +234,10 @@ static const void *kernel_callback_table[NtUserCallCount] = User32LoadDriver, User32LoadImage, User32LoadSysMenu, + User32PostDDEMessage, User32RegisterBuiltinClasses, User32RenderSsynthesizedFormat, + User32UnpackDDEMessage, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index e637bf01f5e..2e09605cc03 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -60,7 +60,7 @@ struct tagWND; extern BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ) DECLSPEC_HIDDEN; extern BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void **buffer, size_t size ) DECLSPEC_HIDDEN; + const void *buffer, size_t size ) DECLSPEC_HIDDEN; extern void free_cached_data( UINT format, HANDLE handle ) DECLSPEC_HIDDEN; extern HANDLE render_synthesized_format( UINT format, UINT from ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index b8ea7cdce9f..0045c8a54c0 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1827,9 +1827,26 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, } if (info.msg.message >= WM_DDE_FIRST && info.msg.message <= WM_DDE_LAST) { - if (!user_callbacks->unpack_dde_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, - &info.msg.lParam, &buffer, size )) - continue; /* ignore it */ + struct unpack_dde_message_result result; + struct unpack_dde_message_params *params; + void *ret_ptr; + ULONG len; + BOOL ret; + + len = FIELD_OFFSET( struct unpack_dde_message_params, data[size] ); + if (!(params = malloc( len ))) + continue; + params->result = &result; + params->hwnd = info.msg.hwnd; + params->message = info.msg.message; + params->wparam = info.msg.wParam; + params->lparam = info.msg.lParam; + if (size) memcpy( params->data, buffer, size ); + ret = KeUserModeCallback( NtUserUnpackDDEMessage, params, len, &ret_ptr, &len ); + free( params ); + if (!ret) continue; /* ignore it */ + info.msg.wParam = result.wparam; + info.msg.lParam = result.lparam; } *msg = info.msg; msg->pt = point_phys_to_win_dpi( info.msg.hwnd, info.msg.pt ); @@ -2185,8 +2202,17 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * } else if (info->type == MSG_POSTED && info->msg >= WM_DDE_FIRST && info->msg <= WM_DDE_LAST) { - return user_callbacks && user_callbacks->post_dde_message( info->hwnd, info->msg, - info->wparam, info->lparam, info->dest_tid, info->type ); + struct post_dde_message_params params; + void *ret_ptr; + ULONG ret_len; + + params.hwnd = info->hwnd; + params.msg = info->msg; + params.wparam = info->wparam; + params.lparam = info->lparam; + params.dest_tid = info->dest_tid; + params.type = info->type; + return KeUserModeCallback( NtUserPostDDEMessage, &params, sizeof(params), &ret_ptr, &ret_len ); } SERVER_START_REQ( send_message ) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 55f2a449be4..9c23799c6bb 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -33,10 +33,6 @@ struct hardware_msg_data; struct user_callbacks { NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); - BOOL (CDECL *post_dde_message)( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, - DWORD type ); - BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void **buffer, size_t size ); NTSTATUS (CDECL *try_finally)( NTSTATUS (CDECL *func)( void *), void *arg, void (CALLBACK *finally_func)( BOOL )); }; diff --git a/include/ntuser.h b/include/ntuser.h index d22799ebe01..8cd7833717f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -42,8 +42,10 @@ enum NtUserLoadDriver, NtUserLoadImage, NtUserLoadSysMenu, + NtUserPostDDEMessage, NtUserRegisterBuiltinClasses, NtUserRenderSynthesizedFormat, + NtUserUnpackDDEMessage, /* win16 hooks */ NtUserCallFreeIcon, NtUserThunkLock, @@ -218,6 +220,17 @@ struct load_sys_menu_params BOOL mdi; }; +/* NtUserPostDDEMessage params */ +struct post_dde_message_params +{ + HWND hwnd; + UINT msg; + WPARAM wparam; + LPARAM lparam; + DWORD dest_tid; + DWORD type; +}; + /* NtUserRenderSynthesizedFormat params */ struct render_synthesized_format_params { @@ -225,6 +238,23 @@ struct render_synthesized_format_params UINT from; }; +/* NtUserUnpackDDEMessage params */ +struct unpack_dde_message_result +{ + WPARAM wparam; + LPARAM lparam; +}; + +struct unpack_dde_message_params +{ + struct unpack_dde_message_result *result; /* FIXME: Use NtCallbackReturn instead */ + HWND hwnd; + UINT message; + WPARAM wparam; + LPARAM lparam; + char data[1]; +}; + /* process DPI awareness contexts */ #define NTUSER_DPI_UNAWARE 0x00006010 #define NTUSER_DPI_SYSTEM_AWARE 0x00006011

1 0

Jacek Caban : win32u: Use KeUserModeCallback for ImmProcessKey and ImmTranslateMessage calls.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 0826fbbb745917c7414df27da26c2cad7a0eac9a URL: https://gitlab.winehq.org/wine/wine/-/commit/0826fbbb745917c7414df27da26c2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 14:09:29 2022 +0200 win32u: Use KeUserModeCallback for ImmProcessKey and ImmTranslateMessage calls. --- dlls/user32/user_main.c | 15 +++++++++++++-- dlls/win32u/imm.c | 20 ++++++++++++++++++++ dlls/win32u/message.c | 9 ++++----- dlls/win32u/ntuser_private.h | 2 -- include/ntuser.h | 20 ++++++++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index ae6a0d4c8e4..f9bc4985368 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -133,8 +133,6 @@ static NTSTATUS try_finally( NTSTATUS (CDECL *func)( void *), void *arg, static const struct user_callbacks user_funcs = { - ImmProcessKey, - ImmTranslateMessage, NtWaitForMultipleObjects, post_dde_message, unpack_dde_message, @@ -163,6 +161,17 @@ static NTSTATUS WINAPI User32DrawText( const struct draw_text_params *params, UL return DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), params->rect, params->flags ); } +static NTSTATUS WINAPI User32ImmProcessKey( const struct imm_process_key_params *params, ULONG size ) +{ + return ImmProcessKey( params->hwnd, params->hkl, params->vkey, params->key_data, 0 ); +} + +static NTSTATUS WINAPI User32ImmTranslateMessage( const struct imm_translate_message_params *params, + ULONG size ) +{ + return ImmTranslateMessage( params->hwnd, params->msg, params->wparam, params->key_data ); +} + static NTSTATUS WINAPI User32LoadImage( const struct load_image_params *params, ULONG size ) { HANDLE ret = LoadImageW( params->hinst, params->name, params->type, @@ -206,6 +215,8 @@ static const void *kernel_callback_table[NtUserCallCount] = User32DrawScrollBar, User32DrawText, User32FreeCachedClipboardData, + User32ImmProcessKey, + User32ImmTranslateMessage, User32LoadDriver, User32LoadImage, User32LoadSysMenu, diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 94621bb2a5c..5adfe3704aa 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -27,6 +27,7 @@ #include <pthread.h> #include "win32u_private.h" #include "ntuser_private.h" +#include "ddk/imm.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -391,3 +392,22 @@ void cleanup_imm_thread(void) NtUserDestroyInputContext( thread_info->client_info.default_imc ); } + +BOOL WINAPI ImmProcessKey( HWND hwnd, HKL hkl, UINT vkey, LPARAM key_data, DWORD unknown ) +{ + struct imm_process_key_params params = + { .hwnd = hwnd, .hkl = hkl, .vkey = vkey, .key_data = key_data }; + void *ret_ptr; + ULONG ret_len; + return KeUserModeCallback( NtUserImmProcessKey, &params, sizeof(params), &ret_ptr, &ret_len ); +} + +BOOL WINAPI ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM key_data ) +{ + struct imm_translate_message_params params = + { .hwnd = hwnd, .msg = msg, .wparam = wparam, .key_data = key_data }; + void *ret_ptr; + ULONG ret_len; + return KeUserModeCallback( NtUserImmTranslateMessage, &params, sizeof(params), + &ret_ptr, &ret_len ); +} diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 65f44783fe6..b8ea7cdce9f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -32,6 +32,7 @@ #include "hidusage.h" #include "dbt.h" #include "dde.h" +#include "ddk/imm.h" #include "wine/server.h" #include "wine/debug.h" @@ -1362,9 +1363,8 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, if (remove) accept_hardware_message( hw_id ); msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); - if (remove && msg->message == WM_KEYDOWN && user_callbacks) - if (user_callbacks->pImmProcessKey( msg->hwnd, NtUserGetKeyboardLayout(0), - msg->wParam, msg->lParam, 0 )) + if (remove && msg->message == WM_KEYDOWN) + if (ImmProcessKey( msg->hwnd, NtUserGetKeyboardLayout(0), msg->wParam, msg->lParam, 0 )) msg->wParam = VK_PROCESSKEY; return TRUE; @@ -2969,8 +2969,7 @@ BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ) return TRUE; case VK_PROCESSKEY: - return user_callbacks && user_callbacks->pImmTranslateMessage( msg->hwnd, msg->message, - msg->wParam, msg->lParam ); + return ImmTranslateMessage( msg->hwnd, msg->message, msg->wParam, msg->lParam ); } NtUserGetKeyboardState( state ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 780af425673..55f2a449be4 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -32,8 +32,6 @@ struct hardware_msg_data; struct user_callbacks { - BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); - BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); BOOL (CDECL *post_dde_message)( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ); diff --git a/include/ntuser.h b/include/ntuser.h index 281d88dfb1a..d22799ebe01 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -37,6 +37,8 @@ enum NtUserDrawScrollBar, NtUserDrawText, NtUserFreeCachedClipboardData, + NtUserImmProcessKey, + NtUserImmTranslateMessage, NtUserLoadDriver, NtUserLoadImage, NtUserLoadSysMenu, @@ -181,6 +183,24 @@ struct free_cached_data_params HANDLE handle; }; +/* NtUserImmProcessKey params */ +struct imm_process_key_params +{ + HWND hwnd; + HKL hkl; + UINT vkey; + LPARAM key_data; +}; + +/* NtUserImmTranslateMessage params */ +struct imm_translate_message_params +{ + HWND hwnd; + UINT msg; + WPARAM wparam; + LPARAM key_data; +}; + /* NtUserLoadImage params */ struct load_image_params {

1 0

Jacek Caban : win32u: Move default IME window management from imm32.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 047d74c4b10bfbd62ad0530959237caad110be46 URL: https://gitlab.winehq.org/wine/wine/-/commit/047d74c4b10bfbd62ad0530959237c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 01:17:54 2022 +0200 win32u: Move default IME window management from imm32. --- dlls/imm32/imm.c | 219 +------------------------------------------ dlls/imm32/imm32.spec | 6 +- dlls/imm32/tests/imm32.c | 2 - dlls/user32/misc.c | 4 - dlls/user32/user_main.c | 19 ---- dlls/user32/user_private.h | 3 - dlls/win32u/class.c | 12 +++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/imm.c | 176 ++++++++++++++++++++++++++++++++++ dlls/win32u/input.c | 12 ++- dlls/win32u/ntuser_private.h | 5 +- dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 + dlls/win32u/window.c | 12 +-- dlls/win32u/wrappers.c | 6 ++ include/ntuser.h | 7 ++ 17 files changed, 228 insertions(+), 265 deletions(-)

1 0

Jacek Caban : imm32: Don't allow disabling other thread's IME by thread ID.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: f4f589c421154d0fa05faa87fd845e4455aabc67 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4f589c421154d0fa05faa87fd845e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 8 20:32:35 2022 +0200 imm32: Don't allow disabling other thread's IME by thread ID. --- dlls/imm32/imm.c | 3 ++- dlls/imm32/tests/imm32.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index f809e771cf8..c5b5895bec8 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1022,7 +1022,7 @@ BOOL WINAPI ImmDisableIME(DWORD idThread) DestroyWindow(to_destroy); } } - else + else if (!idThread || idThread == GetCurrentThreadId()) { thread_data = IMM_GetThreadData(NULL, idThread); if (!thread_data) return FALSE; @@ -1033,6 +1033,7 @@ BOOL WINAPI ImmDisableIME(DWORD idThread) if (to_destroy) DestroyWindow(to_destroy); } + else return FALSE; return TRUE; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index a7663376eee..c5409ce1708 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2377,7 +2377,6 @@ static DWORD WINAPI check_not_disabled_ime_thread(void *arg) hwnd = CreateWindowA("static", "static", 0, 0, 0, 0, 0, 0, 0, 0, 0); ok(hwnd != NULL, "CreateWindow failed\n"); def = ImmGetDefaultIMEWnd(hwnd); - todo_wine ok(def != NULL, "ImmGetDefaultIMEWnd returned %p\n", def); return 0; } @@ -2403,7 +2402,6 @@ static void test_ImmDisableIME(void) thread = CreateThread(NULL, 0, check_not_disabled_ime_thread, event, 0, &tid); ok(thread != NULL, "CreateThread failed\n"); r = ImmDisableIME(tid); - todo_wine ok(!r, "ImmDisableIME(tid) succeeded\n"); SetEvent(event); WaitForSingleObject(thread, INFINITE);

1 0

Jacek Caban : imm32/tests: Add more tests for disabling IME.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 0e763f72a62112a80368e20f366870b22656184a URL: https://gitlab.winehq.org/wine/wine/-/commit/0e763f72a62112a80368e20f366870… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 11 18:24:50 2022 +0200 imm32/tests: Add more tests for disabling IME. --- dlls/imm32/tests/imm32.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 5bb51d90456..a7663376eee 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2336,6 +2336,7 @@ static void test_com_initialization(void) wnd = CreateWindowA("static", "static", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, 0); ok(wnd != NULL, "CreateWindow failed\n"); + test_apttype(-1); ShowWindow(wnd, SW_SHOW); test_apttype(APTTYPE_MAINSTA); DestroyWindow(wnd); @@ -2368,15 +2369,47 @@ static DWORD WINAPI disable_ime_thread(void *arg) return 0; } +static DWORD WINAPI check_not_disabled_ime_thread(void *arg) +{ + HWND def, hwnd; + + WaitForSingleObject(arg, INFINITE); + hwnd = CreateWindowA("static", "static", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(hwnd != NULL, "CreateWindow failed\n"); + def = ImmGetDefaultIMEWnd(hwnd); + todo_wine + ok(def != NULL, "ImmGetDefaultIMEWnd returned %p\n", def); + return 0; +} + +static DWORD WINAPI disable_ime_process(void *arg) +{ + BOOL r = ImmDisableIME(-1); + ok(r, "ImmDisableIME failed\n"); + return 0; +} + static void test_ImmDisableIME(void) { - HANDLE thread; - HWND def; + HANDLE thread, event; + DWORD tid; + HWND def, def2; BOOL r; def = ImmGetDefaultIMEWnd(hwnd); ok(def != NULL, "ImmGetDefaultIMEWnd(hwnd) returned NULL\n"); + event = CreateEventW(NULL, TRUE, FALSE, FALSE); + thread = CreateThread(NULL, 0, check_not_disabled_ime_thread, event, 0, &tid); + ok(thread != NULL, "CreateThread failed\n"); + r = ImmDisableIME(tid); + todo_wine + ok(!r, "ImmDisableIME(tid) succeeded\n"); + SetEvent(event); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + CloseHandle(event); + thread = CreateThread(NULL, 0, disable_ime_thread, 0, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); WaitForSingleObject(thread, INFINITE); @@ -2387,6 +2420,23 @@ static void test_ImmDisableIME(void) WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + msg_spy_pump_msg_queue(); + thread = CreateThread(NULL, 0, disable_ime_process, 0, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + ok(IsWindow(def), "not a window\n"); + def2 = ImmGetDefaultIMEWnd(hwnd); + todo_wine + ok(def2 == def, "ImmGetDefaultIMEWnd(hwnd) returned %p\n", def2); + ok(IsWindow(def), "not a window\n"); + msg_spy_pump_msg_queue(); + todo_wine + ok(!IsWindow(def), "window is still valid\n"); + def = ImmGetDefaultIMEWnd(hwnd); + ok(!def, "ImmGetDefaultIMEWnd(hwnd) returned %p\n", def); + r = ImmDisableIME(-1); ok(r, "ImmDisableIME(-1) failed\n"); def = ImmGetDefaultIMEWnd(hwnd);

1 0

Jacek Caban : imm32/tests: Add NtUserAssociateInputContext tests.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 9c1ecf997108bf8ef06d156590f5cb10f2d2f9f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c1ecf997108bf8ef06d156590f5cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 11 18:17:47 2022 +0200 imm32/tests: Add NtUserAssociateInputContext tests. --- dlls/imm32/tests/imm32.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 3f2e503b5e5..5bb51d90456 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -30,6 +30,7 @@ BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); +static UINT (WINAPI *pNtUserAssociateInputContext)(HWND,HIMC,ULONG); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); @@ -303,6 +304,8 @@ static BOOL init(void) { pImmAssociateContextEx = (void*)GetProcAddress(hmod, "ImmAssociateContextEx"); pImmIsUIMessageA = (void*)GetProcAddress(hmod, "ImmIsUIMessageA"); pSendInput = (void*)GetProcAddress(huser, "SendInput"); + pNtUserAssociateInputContext = (void*)GetProcAddress(GetModuleHandleW(L"win32u.dll"), + "NtUserAssociateInputContext"); wc.cbSize = sizeof(WNDCLASSEXA); wc.style = 0; @@ -753,6 +756,81 @@ static void test_ImmAssociateContextEx(void) ImmReleaseContext(hwnd,imc); } +/* similar to above, but using NtUserAssociateInputContext */ +static void test_NtUserAssociateInputContext(void) +{ + HIMC imc; + UINT rc; + + if (!pNtUserAssociateInputContext) + { + win_skip("NtUserAssociateInputContext not available\n"); + return; + } + + imc = ImmGetContext(hwnd); + if (imc) + { + HIMC retimc, newimc; + HWND focus; + + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); + + ok(GetActiveWindow() == hwnd, "hwnd is not active\n"); + newimc = ImmCreateContext(); + ok(newimc != imc, "handles should not be the same\n"); + rc = pNtUserAssociateInputContext(NULL, NULL, 0); + ok(rc == 2, "NtUserAssociateInputContext returned %x\n", rc); + rc = pNtUserAssociateInputContext(hwnd, NULL, 0); + ok(rc == 1, "NtUserAssociateInputContext returned %x\n", rc); + rc = pNtUserAssociateInputContext(NULL, imc, 0); + ok(rc == 2, "NtUserAssociateInputContext returned %x\n", rc); + + rc = pNtUserAssociateInputContext(hwnd, imc, 0); + ok(rc == 1, "NtUserAssociateInputContext returned %x\n", rc); + retimc = ImmGetContext(hwnd); + ok(retimc == imc, "handles should be the same\n"); + ImmReleaseContext(hwnd,retimc); + + rc = pNtUserAssociateInputContext(hwnd, imc, 0); + ok(rc == 0, "NtUserAssociateInputContext returned %x\n", rc); + + rc = pNtUserAssociateInputContext(hwnd, newimc, 0); + ok(rc == 1, "NtUserAssociateInputContext returned %x\n", rc); + retimc = ImmGetContext(hwnd); + ok(retimc == newimc, "handles should be the same\n"); + ImmReleaseContext(hwnd,retimc); + + focus = CreateWindowA("button", "button", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(focus != NULL, "CreateWindow failed\n"); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SetFocus(focus); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + rc = pNtUserAssociateInputContext(hwnd, imc, 0); + ok(rc == 0, "NtUserAssociateInputContext returned %x\n", rc); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + DestroyWindow(focus); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SetFocus(child); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + rc = pNtUserAssociateInputContext(hwnd, newimc, 0); + ok(rc == 0, "NtUserAssociateInputContext returned %x\n", rc); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + SetFocus(hwnd); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + + rc = pNtUserAssociateInputContext(hwnd, NULL, IACE_DEFAULT); + ok(rc == 1, "NtUserAssociateInputContext returned %x\n", rc); + + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, FALSE); + } + ImmReleaseContext(hwnd,imc); +} + typedef struct _igc_threadinfo { HWND hwnd; HANDLE event; @@ -2331,6 +2409,7 @@ START_TEST(imm32) { test_ImmSetCompositionString(); test_ImmIME(); test_ImmAssociateContextEx(); + test_NtUserAssociateInputContext(); test_ImmThreads(); test_ImmIsUIMessage(); test_ImmGetContext();

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022