January 2024 - Wine-Commits

Rémi Bernon : win32u: Support posting IME updates while processing keys.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 2d6fa952179c9a3fe6759b49d6dc74e327e707cd URL: https://gitlab.winehq.org/wine/wine/-/commit/2d6fa952179c9a3fe6759b49d6dc74… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 12 12:10:06 2024 +0100 win32u: Support posting IME updates while processing keys. --- dlls/win32u/imm.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 5f5e626869e..82124f72567 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -37,7 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); struct ime_update { struct list entry; - DWORD id; + WORD vkey; + WORD scan; DWORD cursor_pos; WCHAR *comp_str; WCHAR *result_str; @@ -58,6 +59,9 @@ struct imm_thread_data HWND default_hwnd; BOOL disable_ime; UINT window_cnt; + WORD ime_process_scan; /* scan code of the key being processed */ + WORD ime_process_vkey; /* vkey of the key being processed */ + BOOL ime_process_result; /* result string has been received */ }; static struct list thread_data_list = LIST_INIT( thread_data_list ); @@ -434,7 +438,9 @@ NTSTATUS WINAPI NtUserBuildHimcList( UINT thread_id, UINT count, HIMC *buffer, U static void post_ime_update( HWND hwnd, UINT cursor_pos, WCHAR *comp_str, WCHAR *result_str ) { static UINT ime_update_count; - UINT id, comp_len, result_len; + + struct imm_thread_data *data = get_imm_thread_data(); + UINT id = -1, comp_len, result_len; struct ime_update *update; TRACE( "hwnd %p, cursor_pos %u, comp_str %s, result_str %s\n", hwnd, cursor_pos, @@ -449,19 +455,25 @@ static void post_ime_update( HWND hwnd, UINT cursor_pos, WCHAR *comp_str, WCHAR update->result_str = result_str ? memcpy( update->buffer + comp_len, result_str, result_len * sizeof(WCHAR) ) : NULL; pthread_mutex_lock( &imm_mutex ); - id = update->id = ++ime_update_count; + update->scan = data->ime_process_scan; + if (!(update->vkey = data->ime_process_vkey)) + { + id = update->scan = ++ime_update_count; + update->vkey = VK_PROCESSKEY; + } list_add_tail( &ime_updates, &update->entry ); pthread_mutex_unlock( &imm_mutex ); - NtUserPostMessage( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_COMP_STRING, id ); + if (!data->ime_process_vkey) NtUserPostMessage( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_COMP_STRING, id ); + if (result_str) data->ime_process_result = TRUE; } -static struct ime_update *find_ime_update( UINT id ) +static struct ime_update *find_ime_update( WORD vkey, WORD scan ) { struct ime_update *update; LIST_FOR_EACH_ENTRY( update, &ime_updates, struct ime_update, entry ) - if (update->id == id) return update; + if (update->vkey == vkey && update->scan == scan) return update; return NULL; } @@ -476,7 +488,7 @@ UINT ime_to_tascii_ex( UINT vkey, UINT lparam, const BYTE *state, COMPOSITIONSTR pthread_mutex_lock( &imm_mutex ); - if (!(update = find_ime_update( lparam ))) + if (!(update = find_ime_update( vkey, lparam ))) { pthread_mutex_unlock( &imm_mutex ); return STATUS_NOT_FOUND; @@ -564,7 +576,19 @@ LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPAR switch (call) { case WINE_IME_PROCESS_KEY: - return user_driver->pImeProcessKey( params->himc, wparam, lparam, params->state ); + { + struct imm_thread_data *data = get_imm_thread_data(); + + data->ime_process_scan = HIWORD(lparam) & 0x1ff; + data->ime_process_vkey = LOWORD(wparam); + data->ime_process_result = FALSE; + res = user_driver->pImeProcessKey( params->himc, wparam, lparam, params->state ); + data->ime_process_vkey = data->ime_process_scan = 0; + if (!res) res = data->ime_process_result; + + TRACE( "processing scan %#x, vkey %#x -> %u\n", LOWORD(wparam), HIWORD(lparam) & 0x1ff, (UINT)res ); + return res; + } case WINE_IME_TO_ASCII_EX: res = user_driver->pImeToAsciiEx( wparam, lparam, params->state, params->compstr, params->himc ); if ((NTSTATUS)res != STATUS_NOT_IMPLEMENTED) return res;

1 0

Rémi Bernon : win32u: Move ImeToAsciiEx implementation from winex11.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 5f313c0fdb81622e24164cd6cefbdccb04c2beb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f313c0fdb81622e24164cd6cefbdc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 12 12:30:18 2024 +0100 win32u: Move ImeToAsciiEx implementation from winex11. Using a new WINE_IME_POST_UPDATE NtUserMessageCall call for the drivers. --- dlls/win32u/driver.c | 2 +- dlls/win32u/imm.c | 144 +++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/xim.c | 149 +--------------------------------------------- dlls/wow64win/user.c | 1 + include/ntuser.h | 1 + 7 files changed, 149 insertions(+), 151 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Add exception test for int 2d on x86-64.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: fad3e416f8615938a4ca0e554bea7d75d1cc8f86 URL: https://gitlab.winehq.org/wine/wine/-/commit/fad3e416f8615938a4ca0e554bea7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 17 12:16:37 2024 +0100 ntdll/tests: Add exception test for int 2d on x86-64. --- dlls/ntdll/tests/exception.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 76190aef75a..0153843da19 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3185,6 +3185,13 @@ static const struct exception 1, 1, STATUS_SINGLE_STEP, 0 }, { { 0xcd, 0x2c, 0xc3 }, 0, 2, STATUS_ASSERTION_FAILURE, 0 }, + { { 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, /* mov $0xb8b8b8b8, %eax */ + 0xcd, 0x2d, 0xfa, 0xc3 }, /* int $0x2d; cli; ret */ + 7, 1, STATUS_BREAKPOINT, 1, { 0xb8b8b8b8 } }, +/* 40 */ + { { 0xb8, 0x01, 0x00, 0x00, 0x00, /* mov $0x01, %eax */ + 0xcd, 0x2d, 0xfa, 0xc3 }, /* int $0x2d; cli; ret */ + 8, 0, STATUS_SUCCESS, 0 }, }; static int got_exception;

1 0

Brendan Shanks : opengl32: Make wglSwapLayerBuffers hookable.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 1f8bba0f749fffdcd3fbb3392c8f8580860af71a URL: https://gitlab.winehq.org/wine/wine/-/commit/1f8bba0f749fffdcd3fbb3392c8f85… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 16 13:36:25 2024 -0800 opengl32: Make wglSwapLayerBuffers hookable. --- dlls/opengl32/wgl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b3cffa00a3e..40602d7d22d 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -438,8 +438,8 @@ PROC WINAPI wglGetDefaultProcAddress( LPCSTR name ) /*********************************************************************** * wglSwapLayerBuffers (OPENGL32.@) */ -BOOL WINAPI wglSwapLayerBuffers(HDC hdc, - UINT fuPlanes) { +BOOL WINAPI DECLSPEC_HOTPATCH wglSwapLayerBuffers(HDC hdc, UINT fuPlanes) +{ TRACE("(%p, %08x)\n", hdc, fuPlanes); if (fuPlanes & WGL_SWAP_MAIN_PLANE) {

1 0

Dmitry Timoshkov : ntdll: Add NtCompareTokens() stub.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 16d2f3c8a700d9909dd373c00f98ae853cd38dcb URL: https://gitlab.winehq.org/wine/wine/-/commit/16d2f3c8a700d9909dd373c00f98ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 10:57:53 2023 +0300 ntdll: Add NtCompareTokens() stub. SQL Native Client ODBC driver fails to load if GetProcAddress("NtCompareTokens") returns NULL, however it never calls it. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/ntsyscalls.h | 852 ++++++++++++++++++++++++----------------------- dlls/ntdll/unix/server.c | 10 + dlls/wow64/security.c | 12 + include/winternl.h | 1 + 5 files changed, 452 insertions(+), 427 deletions(-)

1 0

Nikolay Sivov : evr/dshow: Handle YUY2 sample copy.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: ba664e108eeb73548d094b08875102897155fcea URL: https://gitlab.winehq.org/wine/wine/-/commit/ba664e108eeb73548d094b08875102… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 18 23:15:43 2023 +0100 evr/dshow: Handle YUY2 sample copy. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53810 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 803c1d2dff9..516427c5fff 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -344,7 +344,7 @@ static void evr_destroy(struct strmbase_renderer *iface) free(filter); } -static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sample, IMFSample **sample) +static HRESULT evr_copy_sample_buffer(struct evr *filter, const GUID *subtype, IMediaSample *input_sample, IMFSample **sample) { IDirect3DSurface9 *surface; D3DLOCKED_RECT locked_rect; @@ -364,6 +364,15 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sa width = frame_size >> 32; lines = frame_size; + if (IsEqualGUID(subtype, &MFVideoFormat_YUY2)) + { + width = (3 * width + 3) & ~3; + } + else + { + width *= 4; + } + if (FAILED(hr = IMediaSample_GetPointer(input_sample, &src))) { WARN("Failed to get pointer to sample data, hr %#lx.\n", hr); @@ -383,7 +392,7 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sa if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_DISCARD))) { if (src_stride < 0) src += (-src_stride) * (lines - 1); - MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width * 4, lines); + MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width, lines); IDirect3DSurface9_UnlockRect(surface); } @@ -417,9 +426,10 @@ static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *input_s IMFMediaType_GetGUID(filter->media_type, &MF_MT_SUBTYPE, &subtype); if (IsEqualGUID(&subtype, &MFVideoFormat_ARGB32) - || IsEqualGUID(&subtype, &MFVideoFormat_RGB32)) + || IsEqualGUID(&subtype, &MFVideoFormat_RGB32) + || IsEqualGUID(&subtype, &MFVideoFormat_YUY2)) { - if (SUCCEEDED(hr = evr_copy_sample_buffer(filter, input_sample, &sample))) + if (SUCCEEDED(hr = evr_copy_sample_buffer(filter, &subtype, input_sample, &sample))) { if (SUCCEEDED(IMFTransform_ProcessInput(filter->mixer, 0, sample, 0))) IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0);

1 0

Sven Baars : advapi32/tests: Introduce a new has_wow64 helper.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 7565d61403fcb1e784eb5304273c075e499e317c URL: https://gitlab.winehq.org/wine/wine/-/commit/7565d61403fcb1e784eb5304273c07… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Dec 23 14:15:02 2023 +0100 advapi32/tests: Introduce a new has_wow64 helper. --- dlls/advapi32/tests/registry.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 30a79368c94..27b33194fc4 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -64,6 +64,17 @@ static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD, static BOOL limited_user; static const BOOL is_64bit = sizeof(void *) > sizeof(int); +static BOOL has_wow64(void) +{ + if (!is_64bit) + { + BOOL is_wow64; + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64) + return FALSE; + } + return TRUE; +} + static const char *dbgstr_SYSTEMTIME(const SYSTEMTIME *st) { return wine_dbg_sprintf("%02d-%02d-%04d %02d:%02d:%02d.%03d", @@ -2575,14 +2586,10 @@ static void test_redirection(void) HKEY key, key32, key64, root, root32, root64; DWORD subkeys, subkeys32, subkeys64; - if (ptr_size != 64) + if (!has_wow64()) { - BOOL is_wow64; - if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64) - { - skip( "Not on Wow64, no redirection\n" ); - return; - } + skip( "Not on Wow64, no redirection\n" ); + return; } if (limited_user)

1 0

Sven Baars : advapi32/tests: Skip WoW64 tests on 32-bit in test_reg_create_key.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: a1adaaca2768708f5158b82d7a7edaf69124783e URL: https://gitlab.winehq.org/wine/wine/-/commit/a1adaaca2768708f5158b82d7a7eda… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Dec 23 14:17:35 2023 +0100 advapi32/tests: Skip WoW64 tests on 32-bit in test_reg_create_key. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54613 --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 27b33194fc4..35df1b226f5 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1338,9 +1338,9 @@ static void test_reg_create_key(void) * the registry access check is performed correctly. Redirection isn't * being tested, so the tests don't care about whether the process is * running under WOW64. */ - if (!pIsWow64Process) + if (!has_wow64()) { - win_skip("WOW64 flags are not recognized\n"); + skip("WOW64 flags are not recognized\n"); return; }

1 0

Eric Pouech : user32: Load dynamically wine_get_version().
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 20b4cdde55cdd1462d97c30c9e72f128b7d24df4 URL: https://gitlab.winehq.org/wine/wine/-/commit/20b4cdde55cdd1462d97c30c9e72f1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jan 2 11:50:58 2024 +0100 user32: Load dynamically wine_get_version(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/user32/nonclient.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 00c7368c516..b28e9e258da 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -159,12 +159,16 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) if (hmodule) { BOOL (WINAPI *aboutproc)(HWND, LPCSTR, LPCSTR, HICON); - extern const char * CDECL wine_get_version(void); + const char * (CDECL *p_wine_get_version)(void); char app[256]; - sprintf( app, "Wine %s", wine_get_version() ); + p_wine_get_version = (void *)GetProcAddress( GetModuleHandleW(L"ntdll.dll"), "wine_get_version" ); aboutproc = (void *)GetProcAddress( hmodule, "ShellAboutA" ); - if (aboutproc) aboutproc( hwnd, app, NULL, 0 ); + if (p_wine_get_version && aboutproc) + { + snprintf( app, ARRAY_SIZE(app), "Wine %s", p_wine_get_version() ); + aboutproc( hwnd, app, NULL, 0 ); + } FreeLibrary( hmodule ); } }

1 0

Zhiyi Zhang : win32u: Fix a possible out-of-bounds write (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: d91eab24d245d13642cf2fd5d96a9f5851fdb240 URL: https://gitlab.winehq.org/wine/wine/-/commit/d91eab24d245d13642cf2fd5d96a9f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 13:11:34 2023 +0800 win32u: Fix a possible out-of-bounds write (Coverity). --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index ad6e7dce39b..a9563eaff84 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -6121,7 +6121,7 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va if (IS_INTRESOURCE(colors)) return FALSE; /* stupid app passes a color instead of an array */ for (i = 0; i < count; i++) - if (colors[i] >= 0 && colors[i] <= ARRAY_SIZE( system_colors )) + if (colors[i] >= 0 && colors[i] < ARRAY_SIZE( system_colors )) set_entry( &system_colors[colors[i]], values[i], 0, 0 ); /* Send WM_SYSCOLORCHANGE message to all windows */

1 0